Fixing long integers when printing in scientific notation while supporting DecisionResponse with single and multiple decisions

.openapi-generator/FILES

@@ -1,9 +1,5 @@
-.gitignore
-.openapi-generator-ignore
 .travis.yml
 README.md
-api/openapi.yaml
-build.gradle
 build.sbt
 docs/ConsentRequest.md
 docs/Content.md
@@ -15,7 +11,6 @@ docs/Event.md
 docs/MatchedPoint.md
 docs/Placement.md
 docs/PricingData.md
-docs/SkipFilters.md
 docs/User.md
 docs/UserdbApi.md
 git_push.sh
@@ -55,18 +50,4 @@ src/main/java/com/adzerk/sdk/generated/model/Event.java
 src/main/java/com/adzerk/sdk/generated/model/MatchedPoint.java
 src/main/java/com/adzerk/sdk/generated/model/Placement.java
 src/main/java/com/adzerk/sdk/generated/model/PricingData.java
-src/main/java/com/adzerk/sdk/generated/model/SkipFilters.java
 src/main/java/com/adzerk/sdk/generated/model/User.java
-src/test/java/com/adzerk/sdk/generated/api/DecisionApiTest.java
-src/test/java/com/adzerk/sdk/generated/api/UserdbApiTest.java
-src/test/java/com/adzerk/sdk/generated/model/ConsentRequestTest.java
-src/test/java/com/adzerk/sdk/generated/model/ContentTest.java
-src/test/java/com/adzerk/sdk/generated/model/DecisionRequestTest.java
-src/test/java/com/adzerk/sdk/generated/model/DecisionResponseTest.java
-src/test/java/com/adzerk/sdk/generated/model/DecisionTest.java
-src/test/java/com/adzerk/sdk/generated/model/EventTest.java
-src/test/java/com/adzerk/sdk/generated/model/MatchedPointTest.java
-src/test/java/com/adzerk/sdk/generated/model/PlacementTest.java
-src/test/java/com/adzerk/sdk/generated/model/PricingDataTest.java
-src/test/java/com/adzerk/sdk/generated/model/SkipFiltersTest.java
-src/test/java/com/adzerk/sdk/generated/model/UserTest.java

.openapi-generator/VERSION

@@ -1 +1 @@
-5.1.0
+4.3.1

build.gradle

@@ -103,33 +103,32 @@ task execute(type:JavaExec) {
    classpath = sourceSets.main.runtimeClasspath
 }
 
-task javadocJar(type: Jar) {
-    archiveClassifier.set('javadoc')
-    from javadoc
-}
-
 task sourcesJar(type: Jar) {
     archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 
 artifacts {
-    archives javadocJar, sourcesJar
+    archives sourcesJar
 }
 
 dependencies {
     implementation 'io.swagger:swagger-annotations:1.5.22'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'io.gsonfire:gson-fire:1.8.4'
-    implementation 'org.apache.commons:commons-lang3:3.10'
+    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'io.gsonfire:gson-fire:1.9.0'
+    implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
+    implementation 'org.apache.commons:commons-lang3:3.17.0'
+    implementation "jakarta.annotation:jakarta.annotation-api:1.3.5"
     implementation 'org.threeten:threetenbp:1.4.3'
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
     implementation 'org.slf4j:slf4j-api:2.0.17'
     implementation 'org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0'
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
+    testImplementation 'org.mockito:mockito-core:3.12.4'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
 }
 
 javadoc {

docs/Consent.md

@@ -0,0 +1,12 @@
+
+
+# Consent
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**gdpr** | **Boolean** |  |  [optional]
+
+
+

docs/ConsentRequest.md

@@ -2,13 +2,12 @@
 
 # ConsentRequest
 
-
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **userKey** | **String** |  |  [optional]
-**consent** | **Object** |  |  [optional]
+**consent** | [**Object**](.md) |  |  [optional]
 
 
 ## Implemented Interfaces

docs/Content.md

@@ -2,15 +2,14 @@
 
 # Content
 
-
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **type** | **String** |  |  [optional]
 **template** | **String** |  |  [optional]
 **customTemplate** | **String** |  |  [optional]
-**data** | **Object** |  |  [optional]
+**data** | [**Object**](.md) |  |  [optional]
 **body** | **String** |  |  [optional]
 
 

docs/Decision.md

@@ -2,7 +2,6 @@
 
 # Decision
 
-
 ## Properties
 
 Name | Type | Description | Notes
@@ -13,9 +12,9 @@ Name | Type | Description | Notes
 **flightId** | **Integer** |  |  [optional]
 **campaignId** | **Integer** |  |  [optional]
 **priorityId** | **Integer** |  |  [optional]
-**clickUrl** | **URI** |  |  [optional]
+**clickUrl** | [**URI**](URI.md) |  |  [optional]
 **contents** | [**List<Content>**](Content.md) |  |  [optional]
-**impressionUrl** | **URI** |  |  [optional]
+**impressionUrl** | [**URI**](URI.md) |  |  [optional]
 **events** | [**List<Event>**](Event.md) |  |  [optional]
 **matchedPoints** | [**List<MatchedPoint>**](MatchedPoint.md) |  |  [optional]
 **pricing** | [**PricingData**](PricingData.md) |  |  [optional]

docs/DecisionApi.md

@@ -30,7 +30,7 @@ public class Example {
     defaultClient.setBasePath("https://e-23.adzerk.net");
 
     DecisionApi apiInstance = new DecisionApi(defaultClient);
-    DecisionRequest decisionRequest = new DecisionRequest(); // DecisionRequest | 
+    DecisionRequest decisionRequest = {"placements": [{ "divName": "header", "networkId": 23, "siteId": 667480, "adTypes": [5] }] }; // DecisionRequest | 
     try {
       DecisionResponse result = apiInstance.getDecisions(decisionRequest);
       System.out.println(result);

docs/DecisionRequest.md

@@ -2,7 +2,6 @@
 
 # DecisionRequest
 
-
 ## Properties
 
 Name | Type | Description | Notes
@@ -19,7 +18,7 @@ Name | Type | Description | Notes
 **notrack** | **Boolean** | If true, only return ads that are set to honor Do Not Track |  [optional]
 **enableBotFiltering** | **Boolean** | If making a client-side request, set to true. Defaults to false to ensure a server isn't seen as a bot. See [here](https://dev.adzerk.com/docs/tracking-overview#section-bot-filtering) for more info |  [optional]
 **enableUserDBIP** | **Boolean** | If true, override the IP address of the request with the IP address supplied on the UserKey. If no IP address is found on the UserKey, this will fall back to the IP address on the request. Requires UserDB |  [optional]
-**consent** | **Object** | Object that sets the data consent preferences. Other consent settings are available in the GDPR settings documentation. |  [optional]
+**consent** | [**Object**](.md) | Object that sets the data consent preferences. Other consent settings are available in the GDPR settings documentation. |  [optional]
 **deviceID** | **String** | RTB requests only - sets an Identifier for Advertisers (IFA or IDFA) |  [optional]
 **parallel** | **Boolean** |  |  [optional]
 **intendedLatitude** | **Float** |  |  [optional]

docs/DecisionResponse.md

@@ -2,14 +2,13 @@
 
 # DecisionResponse
 
-
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **user** | [**User**](User.md) |  |  [optional]
-**decisions** | [**Map<String, Decision>**](Decision.md) |  |  [optional]
-**explain** | **Object** |  |  [optional]
+**decisions** | [**Object**](.md) |  |  [optional]
+**explain** | [**Object**](.md) |  |  [optional]
 
 
 ## Implemented Interfaces

docs/Event.md

@@ -2,13 +2,12 @@
 
 # Event
 
-
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **Integer** |  |  [optional]
-**url** | **URI** |  |  [optional]
+**url** | [**URI**](URI.md) |  |  [optional]
 
 
 ## Implemented Interfaces

docs/GdprConsent.md

@@ -0,0 +1,13 @@
+
+
+# GdprConsent
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**userKey** | **String** |  |  [optional]
+**consent** | [**Consent**](Consent.md) |  |  [optional]
+
+
+

docs/MatchedPoint.md

@@ -2,7 +2,6 @@
 
 # MatchedPoint
 
-
 ## Properties
 
 Name | Type | Description | Notes

docs/Placement.md

@@ -2,7 +2,6 @@
 
 # Placement
 
-
 ## Properties
 
 Name | Type | Description | Notes
@@ -16,20 +15,19 @@ Name | Type | Description | Notes
 **flightId** | **Integer** | A numeric ad (flight-creative map) id; if specified, only serve that ad if possible |  [optional]
 **adId** | **Integer** | A numeric ad (flight-creative map) id; if specified, only serve that ad if possible |  [optional]
 **clickUrl** | **String** | The ad's click-through URL |  [optional]
-**properties** | **Object** | A map of key/value pairs used for [Custom Targeting](https://dev.adzerk.com/docs/custom-targeting) |  [optional]
+**properties** | [**Object**](.md) | A map of key/value pairs used for [Custom Targeting](https://dev.adzerk.com/docs/custom-targeting) |  [optional]
 **eventIds** | **List<Integer>** | An array of numeric event types. Requests tracking URLs for custom events. See here for [Event Tracking IDs](https://dev.adzerk.com/v1.0/docs/custom-event-tracking) |  [optional]
-**overrides** | **Object** | An object that overrides values for an advertiser, campaign, flight or ad. Used especially for header bidding |  [optional]
+**overrides** | [**Object**](.md) | An object that overrides values for an advertiser, campaign, flight or ad. Used especially for header bidding |  [optional]
 **contentKeys** | **Map<String, String>** | A map of key/value pairs used with [ContentDB](https://dev.adzerk.com/docs/contentdb-1). The format is `\"contentKeys\": {\"schema\": \"contentKey\"}` |  [optional]
 **count** | **Integer** | (BETA) The number of ads to return per placement. Integer between 1 and 20 |  [optional]
 **proportionality** | **Boolean** | (BETA) If true, fills ads in a multi-winner placement in proportion to the flight's goals |  [optional]
 **ecpmPartition** | **String** | (BETA) The name of the eCPM Partition that should be used to source eCPM data for auctions |  [optional]
 **ecpmPartitions** | **List<String>** | (BETA) The names of the eCPM Partitions that should be used to source eCPM data for auctions |  [optional]
 **eventMultiplier** | **Integer** |  |  [optional]
 **skipSelection** | **Boolean** |  |  [optional]
-**adQuery** | **Object** |  |  [optional]
+**adQuery** | [**Object**](.md) |  |  [optional]
 **floorPrice** | **Float** |  |  [optional]
 **floorCpc** | **Float** |  |  [optional]
-**skipFilters** | [**SkipFilters**](SkipFilters.md) |  |  [optional]
 
 
 ## Implemented Interfaces

docs/PricingData.md

@@ -2,7 +2,6 @@
 
 # PricingData
 
-
 ## Properties
 
 Name | Type | Description | Notes

docs/Request.md

@@ -0,0 +1,25 @@
+
+
+# Request
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**placements** | [**List<Placement>**](Placement.md) | One or more Placement objects | 
+**user** | [**User**](User.md) |  |  [optional]
+**keywords** | **List<String>** | Keywords for keyword Targeting. Such as `\"keywords\": [\"foo\", \"bar\", \"baz\"]`. |  [optional]
+**url** | **String** | The current page URL |  [optional]
+**referrer** | **String** | The referrer URL |  [optional]
+**ip** | **String** | The IP address. Required for [Geo-Targeting](https://dev.adzerk.com/docs/geo-location) |  [optional]
+**blockedCreatives** | **List<Integer>** | Numeric creative ids to disregard for ad selection |  [optional]
+**isMobile** | **Boolean** | If true, only ads containing a single image will be returned |  [optional]
+**includePricingData** | **Boolean** | If true, return pricing data for the decision in the response |  [optional]
+**notrack** | **Boolean** | If true, only return ads that are set to honor Do Not Track |  [optional]
+**enableBotFiltering** | **Boolean** | If making a client-side request, set to true. Defaults to false to ensure a server isn't seen as a bot. See [here](https://dev.adzerk.com/docs/tracking-overview#section-bot-filtering) for more info |  [optional]
+**enableUserDBIP** | **Boolean** | If true, override the IP address of the request with the IP address supplied on the UserKey. If no IP address is found on the UserKey, this will fall back to the IP address on the request. Requires UserDB |  [optional]
+**consent** | [**RequestConsent**](RequestConsent.md) |  |  [optional]
+**deviceID** | **String** | RTB requests only - sets an Identifier for Advertisers (IFA or IDFA) |  [optional]
+
+
+

docs/RequestConsent.md

@@ -0,0 +1,13 @@
+
+
+# RequestConsent
+
+Object that sets the data consent preferences. Other consent settings are available in the GDPR settings documentation.
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**gdpr** | **Boolean** |  |  [optional]
+
+
+

docs/RequestLocation.md

@@ -0,0 +1,17 @@
+
+
+# RequestLocation
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**latitude** | **String** |  |  [optional]
+**longitude** | **String** |  |  [optional]
+
+
+## Implemented Interfaces
+
+* Serializable
+
+

docs/Response.md

@@ -0,0 +1,14 @@
+
+
+# Response
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**user** | [**User**](User.md) |  |  [optional]
+**decisions** | [**Object**](.md) |  |  [optional]
+**explain** | [**Object**](.md) |  |  [optional]
+
+
+

docs/User.md

@@ -3,7 +3,6 @@
 # User
 
 Object containing the UserKey used for [UserDB targeting](https://dev.adzerk.com/docs/userdb-1)
-
 ## Properties
 
 Name | Type | Description | Notes

src/main/java/com/adzerk/sdk/generated/ApiCallback.java

@@ -52,10 +52,10 @@ public interface ApiCallback<T> {
     void onUploadProgress(long bytesWritten, long contentLength, boolean done);
 
     /**
-     * This is called when the API downlond processing.
+     * This is called when the API download processing.
      *
      * @param bytesRead bytes Read
-     * @param contentLength content lenngth of the response
+     * @param contentLength content length of the response
      * @param done Read end
      */
     void onDownloadProgress(long bytesRead, long contentLength, boolean done);