Follow AdX style for extensions, cleanup

Author: Ethan Kenny

com/magnite/openrtb/openrtb-xapi.proto

@@ -33,10 +33,10 @@ message BidRequestExt {
     }
 
     optional Rp rp = 1;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest {
-        optional BidRequestExt ext = 5010;
-    }
+extend com.iabtechlab.openrtb.v2.BidRequest {
+    optional BidRequestExt bid_request = 5010;
 }
 
 // Imp
@@ -74,11 +74,11 @@ message ImpExt {
     optional Rp rp = 1;
     optional Window window = 2;
     repeated string viewabilityvendors = 3;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.Imp {
-        optional ImpExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.Imp {
+    optional ImpExt imp = 5010;
+}
 
 // Video
 message VideoExt {
@@ -97,11 +97,11 @@ message VideoExt {
     optional bool skip = 4;
     optional int32 skipdelay = 5;
     optional int32 placement = 6; // ortb enum VideoPlacementType
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.Imp.Video {
-        optional VideoExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.Imp.Video {
+    optional VideoExt video = 5010;
+}
 
 // Banner
 message BannerExt {
@@ -114,11 +114,11 @@ message BannerExt {
     }
 
     optional Rp rp = 1;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.Imp.Banner {
-        optional BannerExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.Imp.Banner {
+    optional BannerExt banner = 5010;
+}
 
 message Transparency {
     optional int32 blind = 1;
@@ -141,11 +141,11 @@ message AppExt {
     }
 
     optional Rp rp = 1;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.App {
-        optional AppExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.App {
+    optional AppExt app = 5010;
+}
 
 // Site
 message SiteExt {
@@ -158,11 +158,11 @@ message SiteExt {
 
     optional Rp rp = 1;
     optional Window window = 2;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.Site {
-        optional SiteExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.Site {
+    optional SiteExt site = 5010;
+}
 
 // Publisher
 message PublisherExt {
@@ -171,11 +171,11 @@ message PublisherExt {
     }
 
     optional Rp rp = 1;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.Publisher {
-        optional PublisherExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.Publisher {
+    optional PublisherExt publisher = 5010;
+}
 
 // Device
 message DeviceExt {
@@ -192,11 +192,11 @@ message DeviceExt {
     optional Rp rp = 1;
     optional bool ipmask = 2;
     optional Dooh dooh = 3;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.Device {
-        optional DeviceExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.Device {
+    optional DeviceExt device = 5010;
+}
 
 // Geo
 message GeoExt {
@@ -205,11 +205,11 @@ message GeoExt {
     }
 
     optional Rp rp = 1;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.Geo {
-        optional GeoExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.Geo {
+    optional GeoExt geo = 5010;
+}
 
 // User
 message UserExt {
@@ -227,30 +227,30 @@ message UserExt {
     optional string us_privacy = 2;
     optional Rp rp = 3;
     optional string liveramp_idl = 4;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.User {
-        optional UserExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.User {
+    optional UserExt user = 5010;
+}
 
 // Regs
 message RegsExt {
     optional bool s22580 = 1;
     optional string us_privacy = 2;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.Regs {
-        optional RegsExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.Regs {
+    optional RegsExt regs = 5010;
+}
 
 // Source
 message SourceExt {
     optional bool ssreq = 1;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.Source {
-        optional SourceExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.Source {
+    optional SourceExt source = 5010;
+}
 
 // Native
 message NativeExt {
@@ -259,20 +259,20 @@ message NativeExt {
     }
 
     optional Rp rp = 1;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidRequest.Imp.Native {
-        optional NativeExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidRequest.Imp.Native {
+    optional NativeExt native = 5010;
+}
 
 // NativeRequest
 message NativeRequestExt {
     optional bool privacy = 1;
+}
 
-    extend com.iabtechlab.openrtb.v2.NativeRequest {
-        optional NativeRequestExt ext = 5010;
-    }
-};
+extend com.iabtechlab.openrtb.v2.NativeRequest {
+    optional NativeRequestExt native_request = 5010;
+}
 
 
 // ===== Response =====
@@ -292,11 +292,11 @@ message BidResponseExt {
     }
 
     optional Rp rp = 1;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidResponse {
-        optional BidResponseExt ext = 5011;
-    }
-};
+extend com.iabtechlab.openrtb.v2.BidResponse {
+    optional BidResponseExt bid_response = 5011;
+}
 
 // SeatBidExt
 message SeatBidExt {
@@ -305,10 +305,10 @@ message SeatBidExt {
     }
 
     optional Rp rp = 1;
+}
 
-    extend com.iabtechlab.openrtb.v2.BidResponse.SeatBid {
-        optional SeatBidExt ext = 5011;
-    }
+extend com.iabtechlab.openrtb.v2.BidResponse.SeatBid {
+    optional SeatBidExt seatbid = 5011;
 }
 
 // BidExt
@@ -332,9 +332,8 @@ message BidExt {
     }
 
     optional Rp rp = 1;
-
-    extend com.iabtechlab.openrtb.v2.BidResponse.SeatBid.Bid {
-        optional BidExt ext = 5011;
-    }
 }
 
+extend com.iabtechlab.openrtb.v2.BidResponse.SeatBid.Bid {
+    optional BidExt bid = 5011;
+}