Merge remote-tracking branch 'origin/v2'

Author: pkaeding

CHANGELOG.md

@@ -0,0 +1,20 @@
+# Change log
+
+
+All notable changes to the LaunchDarkly Java SDK will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
+
+## [2.0.0] - 2016-08-08
+### Added
+- Support for multivariate feature flags. New methods `boolVariation`, `jsonVariation` and `intVariation` and `doubleVariation` for multivariates.
+- Added `LDClientInterface`, an interface suitable for mocking `LDClient`.
+
+### Changed
+- The `Feature` data model has been replaced with `FeatureFlag`. `FeatureFlag` is not generic.
+- The `allFlags` method now returns a `Map<String, JsonElement>` to support multivariate flags.
+
+### Deprecated
+- The `toggle` call has been deprecated in favor of `boolVariation`.
+
+### Removed
+- The `getFlag` call has been removed.
+- The `debugStreaming` configuration option has been removed.

CONTRIBUTING.md

@@ -0,0 +1,4 @@
+Contributing to the LaunchDarkly SDK for Java
+================================================
+
+We encourage pull-requests and other contributions from the community. We've also published an [SDK contributor's guide](http://docs.launchdarkly.com/v1.0/docs/sdk-contributors-guide) that provides a detailed explanation of how our SDKs work.

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 Catamorphic, Co.
+Copyright 2016 Catamorphic, Co.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -11,16 +11,16 @@ Quick setup
         <dependency>
           <groupId>com.launchdarkly</groupId>
           <artifactId>launchdarkly-client</artifactId>
-          <version>1.0.2</version>
+          <version>2.0.0</version>
         </dependency>
 
 1. Import the LaunchDarkly package:
 
         import com.launchdarkly.client.*;
 
-2. Create a new LDClient with your API key:
+2. Create a new LDClient with your SDK key:
 
-        LDClient ldClient = new LDClient("YOUR_API_KEY");
+        LDClient ldClient = new LDClient("YOUR_SDK_KEY");
 
 Your first feature flag
 -----------------------
@@ -29,36 +29,14 @@ Your first feature flag
 2. In your application code, use the feature's key to check wthether the flag is on for each user:
 
         LDUser user = new LDUser(username);
-        boolean showFeature = ldClient.toggle("your.feature.key", user, false);
+        boolean showFeature = ldClient.boolVariation("your.feature.key", user, false);
         if (showFeature) {
           // application code to show the feature 
         }
         else {
           // the code to run if the feature is off
         }
 
-Troubleshooting
----------------
-1. Json parsing exception: java.lang.IllegalStateException: Expected BEGIN_OBJECT but was....ExceptionType: com.google.gson.JsonSyntaxException
-   Make sure your build tool is bringing in the proper version of Gson. The LaunchDarkly SDK may have problems with versions earlier than 2.2.4. To enforce the proper version add this dependency:
-   ```
-   <dependency>
-   	<groupId>com.google.code.gson</groupId>
-   	<artifactId>gson</artifactId>
-   	<version>2.2.4</version>
-   </dependency>
-   ```
-
-1. SSL exceptions when calling toggle():
-   Make sure your build tool is bringing in the proper version of the Apache http client. The LaunchDarkly SDK may have problems with versions earlier than 4.3.6. To enforce the proper version add this dependency:
-   ```
-   <dependency>
-     <groupId>org.apache.httpcomponents</groupId>
-     <artifactId>httpclient</artifactId>
-     <version>4.3.6</version>
-   </dependency>
-   ```
-
 Learn more
 ----------
 

build.gradle

@@ -19,34 +19,38 @@ repositories {
 
 allprojects {
     group = 'com.launchdarkly'
-    version = "1.0.2"
+    version = "2.0.0-SNAPSHOT"
     sourceCompatibility = 1.7
     targetCompatibility = 1.7
 }
 
 dependencies {
-    compile "org.apache.httpcomponents:httpclient:4.3.6"
-    compile "org.apache.httpcomponents:httpclient-cache:4.3.6"
-    compile "commons-codec:commons-codec:1.5"
-    compile "com.google.code.gson:gson:2.2.4"
+    compile "org.apache.httpcomponents:httpclient:4.5.2"
+    compile "org.apache.httpcomponents:httpclient-cache:4.5.2"
+    compile "commons-codec:commons-codec:1.10"
+    compile "com.google.code.gson:gson:2.6.2"
     compile "com.google.guava:guava:19.0"
-    compile "org.slf4j:slf4j-api:1.7.7"
+    compile "joda-time:joda-time:2.9.3"
+    compile "org.slf4j:slf4j-api:1.7.21"
     compile group: "com.launchdarkly", name: "okhttp-eventsource", version: "0.2.1", changing: true
-    compile "redis.clients:jedis:2.8.0"
+    compile "redis.clients:jedis:2.8.1"
     testCompile "org.easymock:easymock:3.4"
     testCompile 'junit:junit:4.12'
     testRuntime "ch.qos.logback:logback-classic:1.1.7"
 }
 
 jar {
-  baseName = 'launchdarkly-client'
-  manifest {
-    attributes("Implementation-Version": version)
-  }
+    baseName = 'launchdarkly-client'
+    // thin classifier means that the non-shaded non-fat jar is still available
+    // but is opt-in since users will have to specify it.
+    classifier = 'thin'
+    manifest {
+        attributes("Implementation-Version": version)
+    }
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.0'
+    gradleVersion = '2.14-rc-3'
 }
 
 buildscript {
@@ -56,7 +60,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'org.ajoberstar:gradle-git:0.12.0'
+        classpath 'org.ajoberstar:gradle-git:1.5.0-rc.1'
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
     }
 }
@@ -89,7 +93,35 @@ githubPages {
 }
 
 shadowJar {
-    classifier = 'all'
+    baseName = 'launchdarkly-client'
+    //no classifier means that the fat + shaded jar becomes the default artifact
+    classifier = ''
+
+    // Shade all jars except for launchdarkly
+    relocate('com', 'com.launchdarkly.shaded.com') {
+        exclude("com.launchdarkly.client.*")
+        exclude("com.google.gson.*")
+        exclude("com.google.gson.annotations.*")
+        exclude("com.google.gson.internal.*")
+        exclude("com.google.gson.internal.bind.*")
+        exclude("com.google.gson.internal.bind.util.*")
+        exclude("com.google.gson.internal.bind.util.*")
+        exclude("com.google.gson.reflect.*")
+        exclude("com.google.gson.stream.*")
+    }
+    relocate('okhttp3', 'com.launchdarkly.shaded.okhttp3')
+    relocate('okio', 'com.launchdarkly.shaded.okio')
+    relocate('org', 'com.launchdarkly.shaded.org') {
+        exclude("org.slf4j.*")
+        exclude("org.slf4j.event.*")
+        exclude("org.slf4j.helpers.*")
+        exclude("org.slf4j.spi.*")
+    }
+    relocate('redis', 'com.launchdarkly.shaded.redis')
+
+    manifest {
+        attributes("Implementation-Version": version)
+    }
 }
 
 test {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Mon Aug 11 16:15:27 PDT 2014
+#Tue Jun 07 10:02:02 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-rc-3-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,62 @@
+package com.launchdarkly.client;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+class Clause {
+  private final static Logger logger = LoggerFactory.getLogger(Clause.class);
+
+  private String attribute;
+  private Operator op;
+  private List<JsonPrimitive> values; //interpreted as an OR of values
+  private boolean negate;
+
+  boolean matchesUser(LDUser user) {
+    JsonElement userValue = user.getValueForEvaluation(attribute);
+    if (userValue == null) {
+      return false;
+    }
+
+    if (userValue.isJsonArray()) {
+      JsonArray array = userValue.getAsJsonArray();
+      for (JsonElement jsonElement : array) {
+        if (!jsonElement.isJsonPrimitive()) {
+          logger.error("Invalid custom attribute value in user object: " + jsonElement);
+          return false;
+        }
+        if (matchAny(jsonElement.getAsJsonPrimitive())) {
+          return maybeNegate(true);
+        }
+      }
+      return maybeNegate(false);
+    } else if (userValue.isJsonPrimitive()) {
+      return maybeNegate(matchAny(userValue.getAsJsonPrimitive()));
+    }
+    logger.warn("Got unexpected user attribute type: " + userValue.getClass().getName() + " for user key: "
+        + user.getKey() + " and attribute: " + attribute);
+    return false;
+  }
+
+  private boolean matchAny(JsonPrimitive userValue) {
+    for (JsonPrimitive v : values) {
+      if (op.apply(userValue, v)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private boolean maybeNegate(boolean b) {
+    if (negate)
+      return !b;
+    else
+      return b;
+  }
+
+
+}