prepare 4.12.1 release

.ldrelease/publish-docs.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ue
+
+# Publish to Github Pages
+echo "Publishing to Github Pages"
+./gradlew gitPublishPush

.ldrelease/publish.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ue
+
+# Publish to Sonatype
+echo "Publishing to Sonatype"
+./gradlew publishToSonatype closeAndReleaseRepository || { echo "Gradle publish/release failed" >&2; exit 1; }

build.gradle

@@ -1,15 +1,26 @@
-apply plugin: 'java'
-apply plugin: 'checkstyle'
-apply plugin: 'maven-publish'
-apply plugin: 'org.ajoberstar.github-pages'
-apply plugin: 'signing'
-apply plugin: 'idea'
-apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'io.codearte.nexus-staging'
 
-configurations.all {
-    // check for updates every build for dependencies with: 'changing: true'
-    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+buildscript {
+    repositories {
+        mavenCentral()
+        mavenLocal()
+    }
+    dependencies {
+        classpath "org.eclipse.virgo.util:org.eclipse.virgo.util.osgi.manifest:3.5.0.RELEASE"
+        classpath "org.osgi:osgi_R4_core:1.0"
+    }
+}
+
+plugins {
+    id "java"
+    id "java-library"
+    id "checkstyle"
+    id "signing"
+    id "com.github.johnrengelman.shadow" version "4.0.4"
+    id "maven-publish"
+    id "de.marcphilipp.nexus-publish" version "0.3.0"
+    id "io.codearte.nexus-staging" version "0.21.2"
+    id "org.ajoberstar.git-publish" version "2.1.3"
+    id "idea"
 }
 
 repositories {
@@ -19,6 +30,11 @@ repositories {
     mavenCentral()
 }
 
+configurations.all {
+    // check for updates every build for dependencies with: 'changing: true'
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+
 allprojects {
     group = 'com.launchdarkly'
     version = "${version}"
@@ -44,7 +60,7 @@ libraries.internal = [
     "commons-codec:commons-codec:1.10",
     "com.google.guava:guava:19.0",
     "joda-time:joda-time:2.9.3",
-    "com.launchdarkly:okhttp-eventsource:1.10.0",
+    "com.launchdarkly:okhttp-eventsource:1.10.2",
     "org.yaml:snakeyaml:1.19",
     "redis.clients:jedis:2.9.0"
 ]
@@ -58,7 +74,8 @@ libraries.external = [
 
 // Add dependencies to "libraries.test" that are used only in unit tests.
 libraries.test = [
-    "com.squareup.okhttp3:mockwebserver:3.10.0",
+    "com.squareup.okhttp3:mockwebserver:3.12.10",
+    "com.squareup.okhttp3:okhttp-tls:3.12.10",
     "org.hamcrest:hamcrest-all:1.3",
     "org.easymock:easymock:3.4",
     "junit:junit:4.12",
@@ -80,21 +97,6 @@ task wrapper(type: Wrapper) {
     gradleVersion = '4.10.2'
 }
 
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-        mavenLocal()
-    }
-    dependencies {
-        classpath 'org.ajoberstar:gradle-git:1.5.0-rc.1'
-        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
-        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.8.0"
-        classpath "org.eclipse.virgo.util:org.eclipse.virgo.util.osgi.manifest:3.5.0.RELEASE"
-        classpath "org.osgi:osgi_R4_core:1.0"
-    }
-}
-
 checkstyle {
 	configFile file("${project.rootDir}/checkstyle.xml")
 }
@@ -188,17 +190,6 @@ if (JavaVersion.current().isJava8Compatible()) {
 	}
 }
 
-githubPages {
-    repoUri = 'https://github.com/launchdarkly/java-server-sdk.git'
-    pages {
-        from javadoc
-    }
-    credentials {
-        username = githubUser
-        password = githubPassword
-    }
-}
-
 // Returns the names of all Java packages defined in this library - not including
 // enclosing packages like "com" that don't have any classes in them.
 def getAllSdkPackages() {
@@ -341,6 +332,7 @@ idea {
 
 nexusStaging {
     packageGroup = "com.launchdarkly"
+    numberOfRetries = 40 // we've seen extremely long delays in closing repositories
 }
 
 def pomConfig = {
@@ -405,14 +397,15 @@ publishing {
     }
     repositories {
         mavenLocal()
-        maven {
-            def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-            def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-            credentials {
-                username ossrhUsername
-                password ossrhPassword
-            }
+    }
+}
+
+nexusPublishing {
+    clientTimeout = java.time.Duration.ofMinutes(2) // we've seen extremely long delays in creating repositories
+    repositories {
+        sonatype {
+            username = ossrhUsername
+            password = ossrhPassword            
         }
     }
 }
@@ -431,3 +424,12 @@ task exportDependencies(type: Copy, dependsOn: compileJava) {
     into "packaging-test/temp/dependencies-all"
     from configurations.runtime.resolvedConfiguration.resolvedArtifacts.collect { it.file }
 }
+
+gitPublish {
+    repoUri = 'git@github.com:launchdarkly/java-server-sdk.git'
+    branch = 'gh-pages'
+    contents {
+        from javadoc
+    }
+    commitMessage = 'publishing javadocs'
+}

src/main/java/com/launchdarkly/client/Clause.java

@@ -6,6 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
 import java.util.List;
 
 import static com.launchdarkly.client.VersionedDataKind.SEGMENTS;
@@ -28,6 +29,22 @@ public Clause(String attribute, Operator op, List<LDValue> values, boolean negat
     this.negate = negate;
   }
 
+  String getAttribute() {
+    return attribute;
+  }
+
+  Operator getOp() {
+    return op;
+  }
+
+  Collection<LDValue> getValues() {
+    return values;
+  }
+
+  boolean isNegate() {
+    return negate;
+  }
+
   boolean matchesUserNoSegments(LDUser user) {
     LDValue userValue = user.getValueForEvaluation(attribute);
     if (userValue.isNull()) {

src/main/java/com/launchdarkly/client/FeatureFlag.java

@@ -83,10 +83,8 @@ private EvaluationDetail<LDValue> evaluate(LDUser user, FeatureStore featureStor
     // Check to see if targets match
     if (targets != null) {
       for (Target target: targets) {
-        for (String v : target.getValues()) {
-          if (v.equals(user.getKey().stringValue())) {
-            return getVariation(target.getVariation(), EvaluationReason.targetMatch());
-          }
+        if (target.getValues().contains(user.getKey().stringValue())) {
+          return getVariation(target.getVariation(), EvaluationReason.targetMatch());
         }
       }
     }