Merge pull request #59 from XDex/TNT-43949

TNT-43949 Update ECID-service to fix NFE in parsing expiry values from AMCV cookie

CHANGELOG.md

@@ -1,13 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.2.2] - 2022-03-30
+### Fixed
+- Updated ECID-service dependency to fix parsing expiry values from AMCV cookie
+- Add ClientHints to Delivery API model in preparation for ClientHints support
+
 ## [2.2.1] - 2022-03-10
 ### Fixed
 - Fixed incorrect logic for execution mode calculation.
 - Always use context.beacon=false for sendNotifications() calls.
 
-
-
 ## [2.2.0] - 2022-01-24
 ### Added
 - Added SDK telemetry data collection.

README.md

@@ -19,14 +19,14 @@ Analytics.
 
 To get started with Target Java SDK, just add it as a dependency in `gradle` as:
 ```groovy
-implementation 'com.adobe.target:target-java-sdk:2.2.1'
+implementation 'com.adobe.target:target-java-sdk:2.2.2'
 ```
 or `maven` as:
 ```xml
 <dependency>
     <groupId>com.adobe.target</groupId>
     <artifactId>target-java-sdk</artifactId>
-    <version>2.2.1 </version>
+    <version>2.2.2</version>
 </dependency>
 ```
 

build.gradle

@@ -132,7 +132,7 @@ signing {
 }
 
 dependencies {
-    api "com.adobe.experiencecloud.ecid:ecid-service:1.0.2"
+    api "com.adobe.experiencecloud.ecid:ecid-service:1.0.3"
     implementation "org.slf4j:slf4j-api:1.7.30"
     implementation "com.fasterxml.jackson.core:jackson-annotations:2.11.3"
     implementation "com.fasterxml.jackson.core:jackson-core:2.11.3"

gradle.properties

@@ -1,5 +1,5 @@
 group=com.adobe.target
-version=2.2.1
+version=2.2.2
 mavenCentralUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2
 pomDescription=Adobe Target Java SDK
 pomURL=https://docs.adobe.com/content/help/en/target/using/implement-target/server-side/api-and-sdk-overview.html

src/main/java/com/adobe/target/delivery/v1/model/Context.java

@@ -51,9 +51,6 @@ public class Context {
   @JsonProperty("userAgent")
   private String userAgent;
 
-  @JsonProperty("clientHints")
-  private ClientHints clientHints;
-
   @JsonProperty("beacon")
   private Boolean beacon = false;
 
@@ -237,24 +234,6 @@ public void setUserAgent(String userAgent) {
     this.userAgent = userAgent;
   }
 
-  public Context clientHints(ClientHints clientHints) {
-    this.clientHints = clientHints;
-    return this;
-  }
-
-  /**
-   * Get clientHints
-   *
-   * @return clientHints
-   */
-  public ClientHints getClientHints() {
-    return clientHints;
-  }
-
-  public void setClientHints(ClientHints clientHints) {
-    this.clientHints = clientHints;
-  }
-
   public Context beacon(Boolean beacon) {
     this.beacon = beacon;
     return this;
@@ -293,7 +272,6 @@ public boolean equals(Object o) {
         && Objects.equals(this.geo, context.geo)
         && Objects.equals(this.timeOffsetInMinutes, context.timeOffsetInMinutes)
         && Objects.equals(this.userAgent, context.userAgent)
-        && Objects.equals(this.clientHints, context.clientHints)
         && Objects.equals(this.beacon, context.beacon);
   }
 
@@ -310,7 +288,6 @@ public int hashCode() {
         geo,
         timeOffsetInMinutes,
         userAgent,
-        clientHints,
         beacon);
   }
 
@@ -330,7 +307,6 @@ public String toString() {
         .append(toIndentedString(timeOffsetInMinutes))
         .append("\n");
     sb.append("    userAgent: ").append(toIndentedString(userAgent)).append("\n");
-    sb.append("    clientHints: ").append(toIndentedString(clientHints)).append("\n");
     sb.append("    beacon: ").append(toIndentedString(beacon)).append("\n");
     sb.append("}");
     return sb.toString();

src/main/java/com/adobe/target/edge/client/utils/TargetConstants.java

@@ -15,5 +15,5 @@ public class TargetConstants {
 
   public static final String COOKIE_NAME = "mbox";
   public static final String CLUSTER_COOKIE_NAME = "mboxEdgeCluster";
-  public static final String SDK_VERSION = "2.2.1";
+  public static final String SDK_VERSION = "2.2.2";
 }