prepare 4.10.1 release (#179)

Author: LaunchDarklyCI

build.gradle

@@ -88,7 +88,7 @@ buildscript {
     }
     dependencies {
         classpath 'org.ajoberstar:gradle-git:1.5.0-rc.1'
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.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"
@@ -385,7 +385,21 @@ publishing {
             pom.withXml {
                 def root = asNode()
                 root.appendNode('description', 'Official LaunchDarkly SDK for Java')
-                asNode().children().last() + pomConfig
+
+                // The following workaround is for a known issue where the Shadow plugin assumes that all
+                // non-shaded dependencies should have "runtime" scope rather than "compile".
+                //    https://github.com/johnrengelman/shadow/issues/321
+                //    https://github.com/launchdarkly/java-server-sdk/issues/151
+                // Currently there doesn't seem to be any way way around this other than simply hacking the
+                // pom at this point after it has been generated by Shadow. All of the dependencies that
+                // are in the pom at this point should have compile scope.
+                def dependenciesNode = root.getAt('dependencies').get(0)
+                dependenciesNode.each { dependencyNode ->
+                    def scopeNode = dependencyNode.getAt('scope').get(0)
+                    scopeNode.setValue('compile')
+                }
+
+                root.children().last() + pomConfig
             }
         }
     }

src/test/java/com/launchdarkly/client/VariationOrRolloutTest.java

@@ -1,10 +1,58 @@
 package com.launchdarkly.client;
 
-import static org.junit.Assert.assertEquals;
+import com.launchdarkly.client.VariationOrRollout.WeightedVariation;
 
+import org.hamcrest.Matchers;
 import org.junit.Test;
 
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.junit.Assert.assertEquals;
+
+@SuppressWarnings("javadoc")
 public class VariationOrRolloutTest {
+  @Test
+  public void variationIndexIsReturnedForBucket() {
+    LDUser user = new LDUser.Builder("userkey").build();
+    String flagKey = "flagkey";
+    String salt = "salt";
+    
+    // First verify that with our test inputs, the bucket value will be greater than zero and less than 100000,
+    // so we can construct a rollout whose second bucket just barely contains that value
+    int bucketValue = (int)(VariationOrRollout.bucketUser(user, flagKey, "key", salt) * 100000);
+    assertThat(bucketValue, greaterThanOrEqualTo(1));
+    assertThat(bucketValue, Matchers.lessThan(100000));
+    
+    int badVariationA = 0, matchedVariation = 1, badVariationB = 2;
+    List<WeightedVariation> variations = Arrays.asList(
+        new WeightedVariation(badVariationA, bucketValue), // end of bucket range is not inclusive, so it will *not* match the target value
+        new WeightedVariation(matchedVariation, 1), // size of this bucket is 1, so it only matches that specific value
+        new WeightedVariation(badVariationB, 100000 - (bucketValue + 1)));
+    VariationOrRollout vr = new VariationOrRollout(null, new VariationOrRollout.Rollout(variations, null));
+    
+    Integer resultVariation = vr.variationIndexForUser(user, flagKey, salt);
+    assertEquals(Integer.valueOf(matchedVariation), resultVariation);
+  }
+
+  @Test
+  public void lastBucketIsUsedIfBucketValueEqualsTotalWeight() {
+    LDUser user = new LDUser.Builder("userkey").build();
+    String flagKey = "flagkey";
+    String salt = "salt";
+
+    // We'll construct a list of variations that stops right at the target bucket value
+    int bucketValue = (int)(VariationOrRollout.bucketUser(user, flagKey, "key", salt) * 100000);
+    
+    List<WeightedVariation> variations = Arrays.asList(new WeightedVariation(0, bucketValue));
+    VariationOrRollout vr = new VariationOrRollout(null, new VariationOrRollout.Rollout(variations, null));
+    
+    Integer resultVariation = vr.variationIndexForUser(user, flagKey, salt);
+    assertEquals(Integer.valueOf(0), resultVariation);
+  }
+
   @Test
   public void canBucketByIntAttributeSameAsString() {
     LDUser user = new LDUser.Builder("key")