-
Notifications
You must be signed in to change notification settings - Fork 175
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into preciso_bdr_initial
- Loading branch information
Showing
382 changed files
with
12,047 additions
and
4,266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,3 +14,4 @@ target/ | |
.DS_Store | ||
|
||
.allure/ | ||
src/main/proto/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# Unit tests | ||
|
||
## Run unit tests | ||
|
||
### Run all tests | ||
|
||
``` | ||
mvn test | ||
``` | ||
|
||
### Run a single test file | ||
|
||
``` | ||
mvn test -Dtest=GenericBidderTest | ||
``` | ||
|
||
### Run a single unit test | ||
|
||
``` | ||
mvn test -Dtest=GenericBidderTest#makeHttpRequestsShouldCreateExpectedUrl | ||
``` | ||
|
||
### Run a unit test and skip checkstyle | ||
|
||
Can be useful for printf-debugging because Checkstyle will fail on `System.out.println` | ||
|
||
``` | ||
mvn test -Dtest=GenericBidderTest#makeHttpRequestsShouldCreateExpectedUrl -Dcheckstyle.skip | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
package com.iab.openrtb.request; | ||
|
||
import com.fasterxml.jackson.databind.JsonNode; | ||
import lombok.Builder; | ||
import lombok.Value; | ||
|
||
import java.util.List; | ||
|
||
/** | ||
* This object should be included if the ad supported content is a Digital Out-Of-Home screen. | ||
* A bid request with a DOOH object must not contain a site or app object. | ||
* At a minimum, it is useful to provide id and/or venuetypeid, but this is not strictly required. | ||
*/ | ||
@Value | ||
@Builder | ||
public class Dooh { | ||
|
||
/** | ||
* Exchange provided id for a placement or logical grouping of placements. | ||
*/ | ||
String id; | ||
|
||
/** | ||
* Name of the dooh placement. | ||
*/ | ||
String name; | ||
|
||
/** | ||
* The type of out-of-home venue. The taxonomy to be used is defined by the venuetax field. | ||
* If no venuetax field is supplied, The OpenOOH Venue Taxonomy is assumed. | ||
*/ | ||
List<String> venuetype; | ||
|
||
/** | ||
* The venue taxonomy in use. | ||
*/ | ||
Integer venuetypetax; | ||
|
||
/** | ||
* Details about the publisher of the placement. | ||
*/ | ||
Publisher publisher; | ||
|
||
/** | ||
* Domain of the inventory owner (e.g., “mysite.foo.com”) | ||
*/ | ||
String domain; | ||
|
||
/** | ||
* Comma separated list of keywords about the DOOH placement. | ||
*/ | ||
String keywords; | ||
|
||
/** | ||
* Details about the Content within the DOOH placement. | ||
*/ | ||
Content content; | ||
|
||
/** | ||
* Placeholder for exchange-specific extensions to OpenRTB. | ||
*/ | ||
JsonNode ext; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
src/main/java/org/prebid/server/activity/ActivityPayload.java
This file was deleted.
Oops, something went wrong.
4 changes: 2 additions & 2 deletions
4
...erver/activity/ActivityContextResult.java → ...ty/infrastructure/ActivityCallResult.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.