prepare 5.6.7 release (#256)

Author: LaunchDarklyReleaseBot

.circleci/config.yml

@@ -17,6 +17,12 @@ workflows:
           docker-image: cimg/openjdk:11.0
           requires:
             - build-linux
+      - test-linux:
+          name: Java 17 - Linux - OpenJDK
+          docker-image: cimg/openjdk:17.0
+          with-coverage: true
+          requires:
+            - build-linux
       - packaging:
           requires:
             - build-linux
@@ -25,6 +31,10 @@ workflows:
             - build-linux
       - build-test-windows:
           name: Java 11 - Windows - OpenJDK
+          openjdk-version: 11.0.2.01
+      - build-test-windows:
+          name: Java 17 - Windows - OpenJDK
+          openjdk-version: 17.0.1
 
 jobs:
   build-linux:
@@ -85,6 +95,9 @@ jobs:
                 path: coverage
 
   build-test-windows:
+    parameters:
+      openjdk-version:
+        type: string
     executor:
       name: win/vs2019
       shell: powershell.exe
@@ -94,8 +107,8 @@ jobs:
           name: install OpenJDK
           command: |
             $ProgressPreference = "SilentlyContinue"  # prevents console errors from CircleCI host
-            iwr -outf openjdk.msi https://developers.redhat.com/download-manager/file/java-11-openjdk-11.0.5.10-2.windows.redhat.x86_64.msi
-            Start-Process msiexec.exe -Wait -ArgumentList '/I openjdk.msi /quiet'
+            choco install openjdk --version <<parameters.openjdk-version>> --allow-downgrade
+      - run: java -version
       - run:
           name: build and test
           command: |

benchmarks/build.gradle

@@ -1,7 +1,6 @@
 
 buildscript {
     repositories {
-        jcenter()
         mavenCentral()
     }
 }
@@ -21,15 +20,19 @@ ext.versions = [
 ]
 
 dependencies {
-    compile files("lib/launchdarkly-java-server-sdk-all.jar")
-    compile files("lib/launchdarkly-java-server-sdk-test.jar")
-    compile "com.google.code.gson:gson:2.8.9"
-    compile "com.google.guava:guava:${versions.guava}" // required by SDK test code
-    compile "com.squareup.okhttp3:mockwebserver:3.12.10"
-    compile "org.openjdk.jmh:jmh-core:1.21"
-    compile "org.openjdk.jmh:jmh-generator-annprocess:${versions.jmh}"
+    implementation files("lib/launchdarkly-java-server-sdk-all.jar")
+    implementation files("lib/launchdarkly-java-server-sdk-test.jar")
+    implementation "com.google.code.gson:gson:2.8.9"
+    implementation "com.google.guava:guava:${versions.guava}" // required by SDK test code
+    implementation "com.squareup.okhttp3:mockwebserver:3.12.10"
+    implementation "org.openjdk.jmh:jmh-core:1.21"
+    implementation "org.openjdk.jmh:jmh-generator-annprocess:${versions.jmh}"
 }
 
+// need to set duplicatesStrategy because otherwise some non-class files with
+// duplicate names in our dependencies will cause an error
+tasks.getByName('jmhJar').doFirst() {duplicatesStrategy(DuplicatesStrategy.EXCLUDE)}
+
 jmh {
     iterations = 10 // Number of measurement iterations to do.
     benchmarkMode = ['avgt'] // "average time" - reports execution time as ns/op and allocations as B/op.

build.gradle

@@ -19,7 +19,7 @@ plugins {
     id "checkstyle"
     id "jacoco"
     id "signing"
-    id "com.github.johnrengelman.shadow" version "5.2.0"
+    id "com.github.johnrengelman.shadow" version "7.1.2"
     id "maven-publish"
     id "de.marcphilipp.nexus-publish" version "0.3.0"
     id "io.codearte.nexus-staging" version "0.21.2"
@@ -72,7 +72,7 @@ ext.versions = [
     "gson": "2.8.9",
     "guava": "30.1-jre",
     "jackson": "2.11.2", 
-    "launchdarklyJavaSdkCommon": "1.2.1",
+    "launchdarklyJavaSdkCommon": "1.2.2",
     "okhttp": "4.8.1", // specify this for the SDK build instead of relying on the transitive dependency from okhttp-eventsource
     "okhttpEventsource": "2.3.2",
     "slf4j": "1.7.21",
@@ -196,7 +196,6 @@ dependencies {
 
 checkstyle {
     configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml")
-    configDir file("${project.rootDir}/config/checkstyle")
 }
 
 task generateJava(type: Copy) {
@@ -224,7 +223,7 @@ jar {
     // configuration phase; this is necessary because it accesses the build products
     doFirst {
         // In OSGi, the "thin" jar has to import all of its dependencies.
-        addOsgiManifest(project.tasks.jar, [ configurations.runtime ], [])
+        addOsgiManifest(project.tasks.jar, [ configurations.runtimeClasspath ], [])
     }
 }
 
@@ -534,9 +533,9 @@ test {
 
 jacocoTestReport { // code coverage report
     reports {
-        xml.enabled
-        csv.enabled true
-        html.enabled true
+        xml.required = true
+        csv.required = true
+        html.required = true
     }
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -1,7 +1,6 @@
 
 buildscript {
     repositories {
-        jcenter()
         mavenCentral()
     }
 }

packaging-test/test-app/build.gradle

@@ -401,13 +401,18 @@ private void processEvent(Event e, SimpleLRUCache<String, String> userKeys, Even
       if (!addFullEvent || !eventsConfig.inlineUsersInEvents) {
         LDUser user = e.getUser();
         if (user != null && user.getKey() != null) {
-          boolean isIndexEvent = e instanceof Event.Identify;
-          String key = user.getKey();
-          // Add to the set of users we've noticed
-          boolean alreadySeen = (userKeys.put(key, key) != null);
-          addIndexEvent = !isIndexEvent & !alreadySeen;
-          if (!isIndexEvent & alreadySeen) {
-            deduplicatedUsers++;
+          if (e instanceof Event.FeatureRequest || e instanceof Event.Custom) {
+            String key = user.getKey();
+            // Add to the set of users we've noticed
+            boolean alreadySeen = (userKeys.put(key, key) != null);
+            if (alreadySeen) {
+              deduplicatedUsers++;
+            } else {
+              addIndexEvent = true;
+            }
+          } else if (e instanceof Event.Identify) {
+            String key = user.getKey();
+            userKeys.put(key, key); // just mark that we've seen it
           }
         }
       }

src/main/java/com/launchdarkly/sdk/server/DefaultEventProcessor.java

@@ -2,7 +2,7 @@
 
 import com.launchdarkly.sdk.LDValue;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.regex.Pattern;
 
 import static com.launchdarkly.sdk.server.EvaluatorTypeConversion.valueToDateTime;
@@ -120,11 +120,11 @@ private static boolean compareDate(
       ) {
     // If preprocessed is non-null, it means we've already tried to parse the clause value as a date/time,
     // in which case if preprocessed.parsedDate is null it was not a valid date/time.
-    ZonedDateTime clauseDate = preprocessed == null ? valueToDateTime(clauseValue) : preprocessed.parsedDate;
+    Instant clauseDate = preprocessed == null ? valueToDateTime(clauseValue) : preprocessed.parsedDate;
     if (clauseDate == null) {
       return false;
     }
-    ZonedDateTime userDate = valueToDateTime(userValue);
+    Instant userDate = valueToDateTime(userValue);
     if (userDate == null) {
       return false;
     }

src/main/java/com/launchdarkly/sdk/server/EvaluatorOperators.java

@@ -11,7 +11,7 @@
 import com.launchdarkly.sdk.server.DataModel.Segment;
 import com.launchdarkly.sdk.server.DataModel.SegmentRule;
 
-import java.time.ZonedDateTime;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -40,11 +40,11 @@ static final class ClauseExtra {
     }
 
     static final class ValueExtra {
-      final ZonedDateTime parsedDate;
+      final Instant parsedDate;
       final Pattern parsedRegex;
       final SemanticVersion parsedSemVer;
 
-      ValueExtra(ZonedDateTime parsedDate, Pattern parsedRegex, SemanticVersion parsedSemVer) {
+      ValueExtra(Instant parsedDate, Pattern parsedRegex, SemanticVersion parsedSemVer) {
         this.parsedDate = parsedDate;
         this.parsedRegex = parsedRegex;
         this.parsedSemVer = parsedSemVer;

src/main/java/com/launchdarkly/sdk/server/EvaluatorPreprocessing.java

@@ -3,20 +3,19 @@
 import com.launchdarkly.sdk.LDValue;
 
 import java.time.Instant;
-import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 abstract class EvaluatorTypeConversion {
   private EvaluatorTypeConversion() {}
 
-  static ZonedDateTime valueToDateTime(LDValue value) {
+  static Instant valueToDateTime(LDValue value) {
     if (value.isNumber()) {
-      return ZonedDateTime.ofInstant(Instant.ofEpochMilli(value.longValue()), ZoneOffset.UTC);
+      return Instant.ofEpochMilli(value.longValue());
     } else if (value.isString()) {
       try {
-        return ZonedDateTime.parse(value.stringValue());
+        return ZonedDateTime.parse(value.stringValue()).toInstant();
       } catch (Throwable t) {
         return null;
       }

src/main/java/com/launchdarkly/sdk/server/EvaluatorTypeConversion.java

@@ -206,7 +206,7 @@ Event.AliasEvent newAliasEvent(LDUser user, LDUser previousUser) {
     }
   }
 
-  private static boolean isExperiment(DataModel.FeatureFlag flag, EvaluationReason reason) {
+  static boolean isExperiment(DataModel.FeatureFlag flag, EvaluationReason reason) {
     if (reason == null) {
       // doesn't happen in real life, but possible in testing
       return false;