Skip to content

Updated OpenRTB version from 2.1 to 2.5 #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anandshah123 wants to merge 1 commit into
base: 2.0
Choose a base branch
from
Open

Updated OpenRTB version from 2.1 to 2.5 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
233 changes: 192 additions & 41 deletions common/src/main/avro/openrtbapi.avpr
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions demand-side/dsp-client/src/main/java/org/openrtb/dsp/client/SimpleBidder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public BidResponse process(BidRequest request) throws AvroRemoteException
response.id = wReq.getId();
response.bidid = "simple-bid-tracker";
Map<String, String> seats = wReq.getUnblockedSeats(wReq.getSSPName());
for (Impression i : wReq.getRequest().getImp())
for (Imp i : wReq.getRequest().getImp())
{
for (Map.Entry<String, String> s : seats.entrySet())
{
Expand Down Expand Up @@ -104,10 +104,10 @@ public boolean validateRequest(BidRequest request) {
logger.error("BidRequest must have one or more impressions");
return false;
} else {
List<Impression> impressionList = request.getImp();
Iterator<Impression> itr = impressionList.iterator();
List<Imp> impressionList = request.getImp();
Iterator<Imp> itr = impressionList.iterator();
while (itr.hasNext()) {
Impression imp = itr.next();
Imp imp = itr.next();
if (imp.getId() == null) {
logger.error("Impression must have valid Id");
return false;
Expand Down
12 changes: 6 additions & 6 deletions demand-side/dsp-client/src/main/java/org/openrtb/dsp/client/StatefulBidder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import org.openrtb.common.api.Bid;
import org.openrtb.common.api.BidRequest;
import org.openrtb.common.api.BidResponse;
import org.openrtb.common.api.Impression;
import org.openrtb.common.api.Imp;
import org.openrtb.common.api.OpenRTBAPI;
import org.openrtb.common.api.SeatBid;
import org.openrtb.common.util.StringUtils;
Expand Down Expand Up @@ -94,12 +94,12 @@ public boolean validateRequest(BidRequest request) {
logger.error("BidRequest must have one or more impressions");
return false;
} else {
List<Impression> impressionList = request.getImp();
Iterator<Impression> itr = impressionList.iterator();
List<Imp> impressionList = request.getImp();
Iterator<Imp> itr = impressionList.iterator();
while (itr.hasNext()) {
Impression imp = itr.next();
Imp imp = itr.next();
if (imp.getId() == null) {
logger.error("Impression must have valid Id");
logger.error("Imp must have valid Id");
return false;
} else if (imp.getBanner() == null && imp.getVideo() == null) {
logger.error("Impression must have atleast Banner or Video Object");
Expand Down Expand Up @@ -135,7 +135,7 @@ public BidResponse selectBids(RTBRequestWrapper wReq, BidResponse response) {

Map<String, String> seats = wReq.getUnblockedSeats(wReq
.getSSPName());
for (Impression i : wReq.getRequest().getImp()) {
for (Imp i : wReq.getRequest().getImp()) {
for (Map.Entry<String, String> s : seats.entrySet()) {
RTBAdvertiser a = wReq.getAdvertiser(s.getValue());

Expand Down
16 changes: 8 additions & 8 deletions demand-side/dsp-client/src/test/java/org/openrtb/dsp/client/FiniteStateMachineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.openrtb.common.api.Banner;
import org.openrtb.common.api.BidRequest;
import org.openrtb.common.api.BidResponse;
import org.openrtb.common.api.Impression;
import org.openrtb.common.api.Imp;
import org.openrtb.common.api.Site;
import org.openrtb.common.api.Video;
import org.openrtb.dsp.intf.model.RTBAdvertiser;
Expand All @@ -38,7 +38,7 @@ public void setUpFormatError() {
Banner banner = new Banner();
banner.setH(25);
banner.setW(30);
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setBidfloor(new Float(10.085));
Expand All @@ -55,7 +55,7 @@ public void setUpFormatError() {
site.setId("124545sfdghs");

when(requestError.getImp()).thenReturn(
Collections.<Impression> singletonList(imp));
Collections.<Imp> singletonList(imp));
when(requestError.getSite()).thenReturn(site);
when(requestError.getWseat()).thenReturn(
Collections.<CharSequence> singletonList("012asfdfd25"));
Expand All @@ -67,7 +67,7 @@ public void setUpNoMatchingBid() {
Banner banner = new Banner();
banner.setH(25);
banner.setW(30);
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setBidfloor(new Float(10.085));
Expand All @@ -94,7 +94,7 @@ public void setUpRequestExpired() {
Banner banner = new Banner();
banner.setH(25);
banner.setW(30);
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setBidfloor(new Float(10.085));
Expand All @@ -107,7 +107,7 @@ public void setUpRequestExpired() {
video.setMaxduration(500);
video.setProtocol(200);
imp.setVideo(video);
List<Impression> impList = new ArrayList<Impression>();
List<Imp> impList = new ArrayList<Imp>();
for (int i = 0; i < 1000000; i++) {
imp.setId("10212sdsa1" + i);
impList.add(imp);
Expand All @@ -127,7 +127,7 @@ public void setUpOfferedExpired() {
Banner banner = new Banner();
banner.setH(25);
banner.setW(30);
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setBidfloor(new Float(10.085));
Expand All @@ -140,7 +140,7 @@ public void setUpOfferedExpired() {
video.setMaxduration(500);
video.setProtocol(200);
imp.setVideo(video);
List<Impression> impList = new ArrayList<Impression>();
List<Imp> impList = new ArrayList<Imp>();
for (int i = 0; i < 10; i++) {
imp.setId("10212sdsa1" + i);
impList.add(imp);
Expand Down
22 changes: 11 additions & 11 deletions demand-side/dsp-client/src/test/java/org/openrtb/dsp/client/SimpleBidderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.openrtb.common.api.Banner;
import org.openrtb.common.api.BidRequest;
import org.openrtb.common.api.BidResponse;
import org.openrtb.common.api.Impression;
import org.openrtb.common.api.Imp;
import org.openrtb.common.api.Site;
import org.openrtb.common.api.Video;
import org.openrtb.dsp.intf.model.DSPException;
Expand All @@ -46,7 +46,7 @@ public void setUp() throws Exception {
Banner banner = new Banner();
banner.setH(25);
banner.setW(30);
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setBidfloor((float) 10.085);
Expand All @@ -65,7 +65,7 @@ public void setUp() throws Exception {
when(request.getId()).thenReturn(
"ad1d762d6d9719b6b3c9e09f6433a76d9b593738");
when(request.getImp()).thenReturn(
Collections.<Impression> singletonList(imp));
Collections.<Imp> singletonList(imp));
when(request.getApp()).thenReturn(app);
when(request.getWseat()).thenReturn(
Collections.<CharSequence> singletonList("012asfdfd25"));
Expand All @@ -78,7 +78,7 @@ public void setUpSiteTest() throws Exception {
Banner banner = new Banner();
banner.setH(25);
banner.setW(30);
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setBidfloor((float) 10.085);
Expand All @@ -97,7 +97,7 @@ public void setUpSiteTest() throws Exception {
when(requestSite.getId()).thenReturn(
"ad1d762d6d9719b6b3c9e09f6433a76d9b593738");
when(requestSite.getImp()).thenReturn(
Collections.<Impression> singletonList(imp));
Collections.<Imp> singletonList(imp));
when(requestSite.getWseat()).thenReturn(
Collections.<CharSequence> singletonList("012asfdfd25"));
when(requestSite.getSite()).thenReturn(site);
Expand Down Expand Up @@ -129,10 +129,10 @@ public void appTest() {
*/
@Test
public void bannerAdTest() {
List<Impression> impList = request.getImp();
Iterator<Impression> itr = impList.iterator();
List<Imp> impList = request.getImp();
Iterator<Imp> itr = impList.iterator();
while (itr.hasNext()) {
Impression imp = itr.next();
Imp imp = itr.next();
Banner b = imp.getBanner();
assertTrue("Height of the impression must be provided in Banner Object",
b.getH() == 25);
Expand Down Expand Up @@ -160,10 +160,10 @@ public void SiteTest() {
*/
@Test
public void videoAdTest() {
List<Impression> impList = request.getImp();
Iterator<Impression> itr = impList.iterator();
List<Imp> impList = request.getImp();
Iterator<Imp> itr = impList.iterator();
while (itr.hasNext()) {
Impression imp = itr.next();
Imp imp = itr.next();
Video video = imp.getVideo();
assertNotNull("mimes types must be provided in Video Object",
video.getMimes());
Expand Down
22 changes: 11 additions & 11 deletions demand-side/dsp-client/src/test/java/org/openrtb/dsp/client/StatefulBidderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.openrtb.common.api.Banner;
import org.openrtb.common.api.BidRequest;
import org.openrtb.common.api.BidResponse;
import org.openrtb.common.api.Impression;
import org.openrtb.common.api.Imp;
import org.openrtb.common.api.Site;
import org.openrtb.common.api.Video;
import org.openrtb.dsp.intf.model.DSPException;
Expand All @@ -43,7 +43,7 @@ public void setUp() {
Banner banner = new Banner();
banner.setH(25);
banner.setW(30);
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setBidfloor(new Float(10.085) );
Expand All @@ -62,7 +62,7 @@ public void setUp() {
when(request.getId()).thenReturn(
"ad1d762d6d9719b6b3c9e09f6433a76d9b593738");
when(request.getImp()).thenReturn(
Collections.<Impression> singletonList(imp));
Collections.<Imp> singletonList(imp));
when(request.getApp()).thenReturn(app);
when(request.getWseat()).thenReturn(
Collections.<CharSequence> singletonList("012asfdfd25"));
Expand All @@ -75,7 +75,7 @@ public void setUpSiteTest() {
Banner banner = new Banner();
banner.setH(25);
banner.setW(30);
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setBidfloor(new Float(10.085) );
Expand All @@ -94,7 +94,7 @@ public void setUpSiteTest() {
when(requestSite.getId()).thenReturn(
"ad1d762d6d9719b6b3c9e09f6433a76d9b593738");
when(requestSite.getImp()).thenReturn(
Collections.<Impression> singletonList(imp));
Collections.<Imp> singletonList(imp));
when(requestSite.getSite()).thenReturn(site);
when(requestSite.getWseat()).thenReturn(
Collections.<CharSequence> singletonList("012asfdfd25"));
Expand Down Expand Up @@ -125,10 +125,10 @@ public void appTest() {
*/
@Test
public void bannerAdTest() {
List<Impression> impList = request.getImp();
Iterator<Impression> itr = impList.iterator();
List<Imp> impList = request.getImp();
Iterator<Imp> itr = impList.iterator();
while (itr.hasNext()) {
Impression imp = itr.next();
Imp imp = itr.next();
Banner b = imp.getBanner();
assertTrue("Height of the impression must be provided in Banner Object",
b.getH() == 25);
Expand All @@ -142,10 +142,10 @@ public void bannerAdTest() {
*/
@Test
public void videoAdTest() {
List<Impression> impList = request.getImp();
Iterator<Impression> itr = impList.iterator();
List<Imp> impList = request.getImp();
Iterator<Imp> itr = impList.iterator();
while (itr.hasNext()) {
Impression imp = itr.next();
Imp imp = itr.next();
Video video = imp.getVideo();
assertNotNull("mimes types must be provided in Video Object",
video.getMimes());
Expand Down
10 changes: 5 additions & 5 deletions demand-side/dsp-core/src/test/java/org/openrtb/dsp/core/DemandSideServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.openrtb.common.api.Data;
import org.openrtb.common.api.Device;
import org.openrtb.common.api.Geo;
import org.openrtb.common.api.Impression;
import org.openrtb.common.api.Imp;
import org.openrtb.common.api.Site;
import org.openrtb.common.api.User;
import org.openrtb.common.api.Video;
Expand Down Expand Up @@ -87,7 +87,7 @@ public void setUp() {
video.setMaxextended(44);
video.setMinbitrate(55);
video.setMaxbitrate(55);
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setVideo(video);
Expand All @@ -99,7 +99,7 @@ public void setUp() {
imp.setDisplaymanagerver("ss223");
imp.setTagid("56666");
imp.setBidfloorcur("dfsd");
List<Impression> impression = new ArrayList<Impression>();
List<Imp> impression = new ArrayList<Imp>();
impression.add(imp);
List<CharSequence> wseat = new ArrayList<CharSequence>();
wseat.add("SeatID001");
Expand Down Expand Up @@ -176,14 +176,14 @@ public void setUpRequiredFieldBidRequest() {
User user = new User();
user.setBuyeruid("a44");
user.setId("56sdf");
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setVideo(video);
imp.setDisplaymanager("sdf555");
imp.setDisplaymanagerver("ss223");
imp.setBidfloor(new Float(15.4));
List<Impression> impression = new ArrayList<Impression>();
List<Imp> impression = new ArrayList<Imp>();
impression.add(imp);

bidRequest.setId("102335assd55d");
Expand Down
2 changes: 1 addition & 1 deletion demand-side/dsp-core/src/test/java/org/openrtb/dsp/core/OpenRTBAPIDummyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public BidResponse process(BidRequest request) throws AvroRemoteException {
response.bidid = "simple-bid-tracker";
Map<String, String> seats = wReq.getUnblockedSeats(wReq
.getSSPName());
for (Impression i : wReq.getRequest().getImp()) {
for (Imp i : wReq.getRequest().getImp()) {
for (Map.Entry<String, String> s : seats.entrySet()) {

RTBAdvertiser a = wReq.getAdvertiser(s.getValue());
Expand Down
16 changes: 8 additions & 8 deletions demand-side/dsp-intf/src/main/java/org/openrtb/dsp/intf/model/RTBRequestWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@

package org.openrtb.dsp.intf.model;

import org.openrtb.common.api.BidRequest;

import java.util.HashMap;
import java.util.Map;

import org.openrtb.common.api.BidRequest;

public class RTBRequestWrapper extends BidRequest {

public RTBRequestWrapper() {
Expand All @@ -52,12 +52,12 @@ public RTBRequestWrapper() {

public RTBRequestWrapper(BidRequest request) {

super(request.getId(), request.getImp(), request.getSite(), request
.getApp(), request.getDevice(), request.getUser(), request
.getAt(), request.getTmax(), request.getWseat(), request
.getAllimps(), request.getCur(), request.getBcat(), request
.getBadv(), request.getExt());
this.request = request;
super(request.getId(), request.getImp(), request.getSite(), request
.getApp(), request.getDevice(), request.getUser(), request.getTest(), request
.getAt(), request.getTmax(), request.getWseat(), request.getBseat(), request
.getAllimps(), request.getCur(), request.getWlang(), request.getBcat(), request
.getBadv(), request.getBapp(), request.getSource(), request.getRegs(), request.getExt());
this.request = request;
}

public void setContext(RTBExchange exchange, Map<String, RTBAdvertiser> advertisers,
Expand Down
11 changes: 4 additions & 7 deletions demand-side/dsp-intf/src/test/java/org/openrtb/dsp/intf/model/RTBRequestWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@

import org.junit.Before;
import org.junit.Test;
import org.openrtb.common.api.App;
import org.openrtb.common.api.Banner;
import org.openrtb.common.api.BidRequest;
import org.openrtb.common.api.Impression;
import org.openrtb.common.api.Video;
import org.openrtb.common.api.*;

/**
* This class is used to test the functionality of RTBRequestWrapper class
*/
Expand Down Expand Up @@ -53,7 +50,7 @@ public void setUpBidRequest()
Banner banner = new Banner();
banner.setH(25);
banner.setW(30);
Impression imp = new Impression();
Imp imp = new Imp();
imp.setId("10212sdsa1");
imp.setBanner(banner);
imp.setBidfloor((float) 10.085);
Expand All @@ -72,7 +69,7 @@ public void setUpBidRequest()
when(bidRequest.getId()).thenReturn(
"ad1d762d6d9719b6b3c9e09f6433a76d9b593738");
when(bidRequest.getImp()).thenReturn(
Collections.<Impression> singletonList(imp));
Collections.<Imp> singletonList(imp));
when(bidRequest.getApp()).thenReturn(app);
when(bidRequest.getWseat()).thenReturn(
Collections.<CharSequence> singletonList("012asfdfd25"));
Expand Down