Merge pull request #266 from launchdarkly/gw/ch90182/fix-java-7-compat

Fix compatibility with Java 7.

Author: eli-darkly

build.gradle

@@ -58,7 +58,7 @@ ext.versions = [
  "gson": "2.7",
  "guava": "19.0",
  "jodaTime": "2.9.3",
- "okhttp": "3.14.9", // specify this for the SDK build instead of relying on the transitive dependency from okhttp-eventsource
+ "okhttp": "3.12.2", // specify this for the SDK build instead of relying on the transitive dependency from okhttp-eventsource
  "okhttpEventsource": "1.11.0",
  "slf4j": "1.7.21",
  "snakeyaml": "1.26",
@@ -445,3 +445,4 @@ gitPublish {
  }
  commitMessage = 'publishing javadocs'
 }
+

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

@@ -50,11 +50,6 @@ public interface LDClientInterface extends Closeable {
 
  /**
  * Tracks that a user performed an event, and provides an additional numeric value for custom metrics.
- * <p>
- * As of this version’s release date, the LaunchDarkly service does not support the {@code metricValue}
- * parameter. As a result, calling this overload of {@code track} will not yet produce any different
- * behavior from calling {@link #track(String, LDUser, JsonElement)} without a {@code metricValue}.
- * Refer to the <a href="https://docs.launchdarkly.com/docs/java-sdk-reference#section-track">SDK reference guide</a> for the latest status.
  * 
  * @param eventName the name of the event
  * @param user the user that performed the event
@@ -70,11 +65,6 @@ public interface LDClientInterface extends Closeable {
 
  /**
  * Tracks that a user performed an event, and provides an additional numeric value for custom metrics.
- * <p>
- * As of this version’s release date, the LaunchDarkly service does not support the {@code metricValue}
- * parameter. As a result, calling this overload of {@code track} will not yet produce any different
- * behavior from calling {@link #trackData(String, LDUser, LDValue)} without a {@code metricValue}.
- * Refer to the <a href="https://docs.launchdarkly.com/docs/java-sdk-reference#section-track">SDK reference guide</a> for the latest status.
  * 
  * @param eventName the name of the event
  * @param user the user that performed the event

src/main/java/com/launchdarkly/client/value/LDValue.java

@@ -3,6 +3,7 @@
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Ordering;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.annotations.JsonAdapter;
@@ -468,7 +469,9 @@ public int hashCode() {
  return ah;
  case OBJECT:
  int oh = 0;
- for (String name: keys()) {
+ // We sort the keys here to guarantee ordering equivalence with LDValueJsonElement
+ // wrapping JsonObjects.
+ for (String name: Ordering.natural().immutableSortedCopy(keys())) {
  oh = (oh * 31 + name.hashCode()) * 31 + get(name).hashCode();
  }
  return oh;

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

@@ -7,6 +7,7 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
 import com.google.gson.reflect.TypeToken;
 import com.launchdarkly.client.value.LDValue;
 
@@ -29,6 +30,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 @SuppressWarnings("javadoc")
 public class LDUserTest {
@@ -344,8 +346,14 @@ private Map<LDUser, String> getUserPropertiesJsonMap() {
  @Test
  public void defaultJsonEncodingHasPrivateAttributeNames() {
  LDUser user = new LDUser.Builder("userkey").privateName("x").privateEmail("y").build();
- String expected = "{\"key\":\"userkey\",\"name\":\"x\",\"email\":\"y\",\"privateAttributeNames\":[\"name\",\"email\"]}";
- assertEquals(defaultGson.fromJson(expected, JsonElement.class), defaultGson.toJsonTree(user));
+ JsonObject serialized = defaultGson.toJsonTree(user).getAsJsonObject();
+ assertEquals(serialized.get("key").getAsJsonPrimitive().getAsString(), "userkey");
+ assertEquals(serialized.get("name").getAsJsonPrimitive().getAsString(), "x");
+ assertEquals(serialized.get("email").getAsJsonPrimitive().getAsString(), "y");
+ JsonArray privateAttrs = serialized.get("privateAttributeNames").getAsJsonArray();
+ assertEquals(privateAttrs.size(), 2);
+ assertTrue(privateAttrs.contains(new JsonPrimitive("name")));
+ assertTrue(privateAttrs.contains(new JsonPrimitive("email")));
  }
 
  @Test

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

@@ -17,7 +17,6 @@
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.tls.HandshakeCertificates;
 import okhttp3.tls.HeldCertificate;
-import okhttp3.tls.internal.TlsUtil;
 
 class TestHttpUtil {
  static MockWebServer makeStartedServer(MockResponse... responses) throws IOException {
@@ -72,9 +71,14 @@ public ServerWithCert() throws IOException, GeneralSecurityException {
  .certificateAuthority(1)
  .commonName(hostname)
  .addSubjectAlternativeName(hostname)
+ .rsa2048()
  .build();
 
- HandshakeCertificates hc = TlsUtil.localhost();
+ HandshakeCertificates hc = new HandshakeCertificates.Builder()
+ .addPlatformTrustedCertificates()
+ .heldCertificate(cert)
+ .addTrustedCertificate(cert.certificate())
+ .build();
  socketFactory = hc.sslSocketFactory();
  trustManager = hc.trustManager();
 

src/test/java/com/launchdarkly/client/value/LDValueTest.java

@@ -10,6 +10,7 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -277,7 +278,7 @@ public void objectKeysCanBeEnumerated() {
  for (String key: LDValue.buildObject().put("1", LDValue.of("x")).put("2", LDValue.of("y")).build().keys()) {
  keys.add(key);
  }
- keys.sort(null);
+ Collections.sort(keys);
  assertEquals(ImmutableList.of("1", "2"), keys);
  }
 
@@ -287,7 +288,7 @@ public void objectValuesCanBeEnumerated() {
  for (LDValue value: LDValue.buildObject().put("1", LDValue.of("x")).put("2", LDValue.of("y")).build().values()) {
  values.add(value.stringValue());
  }
- values.sort(null);
+ Collections.sort(values);
  assertEquals(ImmutableList.of("x", "y"), values);
  }