Merge pull request #38 from adzerk/rs/user-group

ryuichis · web-flow · commit 758318e7883c · 2026-02-18T18:57:28.000-06:00
Add User.group and DecisionRequest.searchTerm fields
diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES
@@ -1,9 +1,3 @@
-.gitignore
-.openapi-generator-ignore
-.travis.yml
-README.md
-api/openapi.yaml
-build.gradle
 build.sbt
 docs/ConsentRequest.md
 docs/Content.md
@@ -57,16 +51,3 @@ 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
diff --git a/.openapi-generator/VERSION b/.openapi-generator/VERSION
@@ -1 +1 @@
-5.1.0
+5.1.0
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ publishing {
 
             artifactId = 'adzerk-decision-sdk'
             group = 'com.adzerk'
-            version = '1.0.0-beta.15'
+            version = '1.0.0-beta.16'
 
             pom {
                 name = 'Adzerk Decision SDK'
@@ -118,18 +118,18 @@ artifacts {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.5.22'
+    implementation 'io.swagger:swagger-annotations:1.6.16'
     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 'org.threeten:threetenbp:1.4.3'
+    implementation 'com.google.code.gson:gson:2.13.2'
+    implementation 'io.gsonfire:gson-fire:1.9.0'
+    implementation 'org.apache.commons:commons-lang3:3.17.0'
+    implementation 'org.threeten:threetenbp:1.7.2'
     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'
+    implementation 'org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3'
+    testImplementation 'junit:junit:4.13.2'
 }
 
 javadoc {
diff --git a/docs/DecisionRequest.md b/docs/DecisionRequest.md
@@ -26,6 +26,7 @@ Name | Type | Description | Notes
 **intendedLongitude** | **Float** |  |  [optional]
 **radius** | **Float** |  |  [optional]
 **includeMatchedPoints** | **Boolean** |  |  [optional]
+**searchTerm** | **String** | A way to target ads based on shopper search terms |  [optional]
 
 
 ## Implemented Interfaces
diff --git a/docs/DecisionResponse.md b/docs/DecisionResponse.md
@@ -8,7 +8,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **user** | [**User**](User.md) |  |  [optional]
-**decisions** | [**Map&lt;String, Decision&gt;**](Decision.md) |  |  [optional]
+**decisions** | **Object** |  |  [optional]
 **explain** | **Object** |  |  [optional]
 
 
diff --git a/docs/User.md b/docs/User.md
@@ -9,6 +9,7 @@ Object containing the UserKey used for [UserDB targeting](https://dev.adzerk.com
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **key** | **String** | The UserKey used for UserDB Targeting |  [optional]
+**group** | **Integer** | The assigned cohort for the User |  [optional]
 
 
 ## Implemented Interfaces
diff --git a/openapitools.json b/openapitools.json
@@ -2,6 +2,6 @@
   "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "4.3.1"
+    "version": "5.1.0"
   }
 }
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
diff --git a/src/main/java/com/adzerk/sdk/generated/ApiException.java b/src/main/java/com/adzerk/sdk/generated/ApiException.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
diff --git a/src/main/java/com/adzerk/sdk/generated/Configuration.java b/src/main/java/com/adzerk/sdk/generated/Configuration.java
@@ -13,7 +13,7 @@
 
 package com.adzerk.sdk.generated;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 
diff --git a/src/main/java/com/adzerk/sdk/generated/Pair.java b/src/main/java/com/adzerk/sdk/generated/Pair.java
@@ -13,7 +13,7 @@
 
 package com.adzerk.sdk.generated;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/src/main/java/com/adzerk/sdk/generated/StringUtil.java b/src/main/java/com/adzerk/sdk/generated/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/src/main/java/com/adzerk/sdk/generated/auth/ApiKeyAuth.java b/src/main/java/com/adzerk/sdk/generated/auth/ApiKeyAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/src/main/java/com/adzerk/sdk/generated/auth/HttpBearerAuth.java b/src/main/java/com/adzerk/sdk/generated/auth/HttpBearerAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/src/main/java/com/adzerk/sdk/generated/model/ConsentRequest.java b/src/main/java/com/adzerk/sdk/generated/model/ConsentRequest.java
@@ -28,7 +28,7 @@
 /**
  * ConsentRequest
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class ConsentRequest implements Serializable {
   private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/adzerk/sdk/generated/model/Content.java b/src/main/java/com/adzerk/sdk/generated/model/Content.java
@@ -28,7 +28,7 @@
 /**
  * Content
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class Content implements Serializable {
   private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/adzerk/sdk/generated/model/Decision.java b/src/main/java/com/adzerk/sdk/generated/model/Decision.java
@@ -35,7 +35,7 @@
 /**
  * Decision
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class Decision implements Serializable {
   private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/adzerk/sdk/generated/model/DecisionRequest.java b/src/main/java/com/adzerk/sdk/generated/model/DecisionRequest.java
@@ -32,7 +32,7 @@
 /**
  * DecisionRequest
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class DecisionRequest implements Serializable {
   private static final long serialVersionUID = 1L;
 
@@ -112,6 +112,10 @@ public class DecisionRequest implements Serializable {
   @SerializedName(SERIALIZED_NAME_INCLUDE_MATCHED_POINTS)
   private Boolean includeMatchedPoints;
 
+  public static final String SERIALIZED_NAME_SEARCH_TERM = "searchTerm";
+  @SerializedName(SERIALIZED_NAME_SEARCH_TERM)
+  private String searchTerm;
+
 
   public DecisionRequest placements(List<Placement> placements) {
     
@@ -570,6 +574,29 @@ public void setIncludeMatchedPoints(Boolean includeMatchedPoints) {
   }
 
 
+  public DecisionRequest searchTerm(String searchTerm) {
+    
+    this.searchTerm = searchTerm;
+    return this;
+  }
+
+   /**
+   * A way to target ads based on shopper search terms
+   * @return searchTerm
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "A way to target ads based on shopper search terms")
+
+  public String getSearchTerm() {
+    return searchTerm;
+  }
+
+
+  public void setSearchTerm(String searchTerm) {
+    this.searchTerm = searchTerm;
+  }
+
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -597,12 +624,13 @@ public boolean equals(Object o) {
         Objects.equals(this.intendedLatitude, decisionRequest.intendedLatitude) &&
         Objects.equals(this.intendedLongitude, decisionRequest.intendedLongitude) &&
         Objects.equals(this.radius, decisionRequest.radius) &&
-        Objects.equals(this.includeMatchedPoints, decisionRequest.includeMatchedPoints);
+        Objects.equals(this.includeMatchedPoints, decisionRequest.includeMatchedPoints) &&
+        Objects.equals(this.searchTerm, decisionRequest.searchTerm);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(placements, user, keywords, url, referrer, ip, blockedCreatives, isMobile, includePricingData, notrack, enableBotFiltering, enableUserDBIP, consent, deviceID, parallel, intendedLatitude, intendedLongitude, radius, includeMatchedPoints);
+    return Objects.hash(placements, user, keywords, url, referrer, ip, blockedCreatives, isMobile, includePricingData, notrack, enableBotFiltering, enableUserDBIP, consent, deviceID, parallel, intendedLatitude, intendedLongitude, radius, includeMatchedPoints, searchTerm);
   }
 
   @Override
@@ -628,6 +656,7 @@ public String toString() {
     sb.append("    intendedLongitude: ").append(toIndentedString(intendedLongitude)).append("\n");
     sb.append("    radius: ").append(toIndentedString(radius)).append("\n");
     sb.append("    includeMatchedPoints: ").append(toIndentedString(includeMatchedPoints)).append("\n");
+    sb.append("    searchTerm: ").append(toIndentedString(searchTerm)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/src/main/java/com/adzerk/sdk/generated/model/DecisionResponse.java b/src/main/java/com/adzerk/sdk/generated/model/DecisionResponse.java
@@ -15,7 +15,6 @@
 
 import java.util.Objects;
 import java.util.Arrays;
-import com.adzerk.sdk.generated.model.Decision;
 import com.adzerk.sdk.generated.model.User;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
@@ -25,15 +24,12 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.io.Serializable;
 
 /**
  * DecisionResponse
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class DecisionResponse implements Serializable {
   private static final long serialVersionUID = 1L;
 
@@ -43,7 +39,7 @@ public class DecisionResponse implements Serializable {
 
   public static final String SERIALIZED_NAME_DECISIONS = "decisions";
   @SerializedName(SERIALIZED_NAME_DECISIONS)
-  private Map<String, Decision> decisions = null;
+  private Object decisions;
 
   public static final String SERIALIZED_NAME_EXPLAIN = "explain";
   @SerializedName(SERIALIZED_NAME_EXPLAIN)
@@ -73,33 +69,25 @@ public void setUser(User user) {
   }
 
 
-  public DecisionResponse decisions(Map<String, Decision> decisions) {
+  public DecisionResponse decisions(Object decisions) {
     
     this.decisions = decisions;
     return this;
   }
 
-  public DecisionResponse putDecisionsItem(String key, Decision decisionsItem) {
-    if (this.decisions == null) {
-      this.decisions = new HashMap<String, Decision>();
-    }
-    this.decisions.put(key, decisionsItem);
-    return this;
-  }
-
    /**
    * Get decisions
    * @return decisions
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
 
-  public Map<String, Decision> getDecisions() {
+  public Object getDecisions() {
     return decisions;
   }
 
 
-  public void setDecisions(Map<String, Decision> decisions) {
+  public void setDecisions(Object decisions) {
     this.decisions = decisions;
   }
 
diff --git a/src/main/java/com/adzerk/sdk/generated/model/Event.java b/src/main/java/com/adzerk/sdk/generated/model/Event.java
@@ -29,7 +29,7 @@
 /**
  * Event
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class Event implements Serializable {
   private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/adzerk/sdk/generated/model/MatchedPoint.java b/src/main/java/com/adzerk/sdk/generated/model/MatchedPoint.java
@@ -28,7 +28,7 @@
 /**
  * MatchedPoint
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class MatchedPoint implements Serializable {
   private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/adzerk/sdk/generated/model/Placement.java b/src/main/java/com/adzerk/sdk/generated/model/Placement.java
@@ -33,7 +33,7 @@
 /**
  * Placement
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class Placement implements Serializable {
   private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/adzerk/sdk/generated/model/PricingData.java b/src/main/java/com/adzerk/sdk/generated/model/PricingData.java
@@ -28,7 +28,7 @@
 /**
  * PricingData
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class PricingData implements Serializable {
   private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/adzerk/sdk/generated/model/SkipFilters.java b/src/main/java/com/adzerk/sdk/generated/model/SkipFilters.java
@@ -28,7 +28,7 @@
 /**
  * SkipFilters
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2025-07-16T01:15:27.717Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2026-02-07T04:47:08.783685028Z[Etc/UTC]")
 public class SkipFilters implements Serializable {
   private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/adzerk/sdk/generated/model/User.java b/src/main/java/com/adzerk/sdk/generated/model/User.java

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",`
`3`	`3`	`"spaces": 2,`
`4`	`4`	`"generator-cli": {`
`5`		`- "version": "4.3.1"`
	`5`	`+ "version": "5.1.0"`
`6`	`6`	`}`
`7`	`7`	`}`