Merge pull request #13 from launchdarkly/pk/ch4021/shutdown-fully

Faster shutdown. Add equals() and hashCode() to LDUser

Author: drichelson

gradle.properties

@@ -1,3 +1,3 @@
-version=2.2.5
+version=2.2.6-SNAPSHOT
 ossrhUsername=
 ossrhPassword=

scripts/release.sh

@@ -13,9 +13,14 @@ echo "Starting java-client release."
 
 VERSION=$1
 
-#Update version in gradle.properties file:
+# Update version in gradle.properties file:
 sed  -i.bak "s/^version.*$/version=${VERSION}/" gradle.properties
 rm -f gradle.properties.bak
+
+# Update version in README.md:
+sed  -i.bak "s/<version>.*<\/version>/<version>${VERSION}<\/version>/" README.md
+rm -f README.md.bak
+
 ./gradlew clean test install sourcesJar javadocJar uploadArchives closeAndReleaseRepository
 ./gradlew publishGhPages
 echo "Finished java-client release."

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

@@ -377,6 +377,18 @@ public void close() throws IOException {
     if (this.updateProcessor != null) {
       this.updateProcessor.close();
     }
+    if (this.config.httpClient != null) {
+      if (this.config.httpClient.dispatcher() != null && this.config.httpClient.dispatcher().executorService() != null) {
+        this.config.httpClient.dispatcher().cancelAll();
+        this.config.httpClient.dispatcher().executorService().shutdownNow();
+      }
+      if (this.config.httpClient.connectionPool() != null) {
+        this.config.httpClient.connectionPool().evictAll();
+      }
+      if (this.config.httpClient.cache() != null) {
+        this.config.httpClient.cache().close();
+      }
+    }
   }
 
   /**

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

@@ -90,7 +90,7 @@ protected LDConfig(Builder builder) {
 
     OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder()
         .cache(cache)
-        .connectionPool(new ConnectionPool(5, 5, TimeUnit.MINUTES))
+        .connectionPool(new ConnectionPool(5, 5, TimeUnit.SECONDS))
         .connectTimeout(connectTimeoutMillis, TimeUnit.MILLISECONDS)
         .readTimeout(socketTimeoutMillis, TimeUnit.MILLISECONDS)
         .writeTimeout(socketTimeoutMillis, TimeUnit.MILLISECONDS)

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

@@ -126,6 +126,43 @@ JsonElement getCustom(String key) {
     }
     return null;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    LDUser ldUser = (LDUser) o;
+
+    if (key != null ? !key.equals(ldUser.key) : ldUser.key != null) return false;
+    if (secondary != null ? !secondary.equals(ldUser.secondary) : ldUser.secondary != null) return false;
+    if (ip != null ? !ip.equals(ldUser.ip) : ldUser.ip != null) return false;
+    if (email != null ? !email.equals(ldUser.email) : ldUser.email != null) return false;
+    if (name != null ? !name.equals(ldUser.name) : ldUser.name != null) return false;
+    if (avatar != null ? !avatar.equals(ldUser.avatar) : ldUser.avatar != null) return false;
+    if (firstName != null ? !firstName.equals(ldUser.firstName) : ldUser.firstName != null) return false;
+    if (lastName != null ? !lastName.equals(ldUser.lastName) : ldUser.lastName != null) return false;
+    if (anonymous != null ? !anonymous.equals(ldUser.anonymous) : ldUser.anonymous != null) return false;
+    if (country != null ? !country.equals(ldUser.country) : ldUser.country != null) return false;
+    return custom != null ? custom.equals(ldUser.custom) : ldUser.custom == null;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = key != null ? key.hashCode() : 0;
+    result = 31 * result + (secondary != null ? secondary.hashCode() : 0);
+    result = 31 * result + (ip != null ? ip.hashCode() : 0);
+    result = 31 * result + (email != null ? email.hashCode() : 0);
+    result = 31 * result + (name != null ? name.hashCode() : 0);
+    result = 31 * result + (avatar != null ? avatar.hashCode() : 0);
+    result = 31 * result + (firstName != null ? firstName.hashCode() : 0);
+    result = 31 * result + (lastName != null ? lastName.hashCode() : 0);
+    result = 31 * result + (anonymous != null ? anonymous.hashCode() : 0);
+    result = 31 * result + (country != null ? country.hashCode() : 0);
+    result = 31 * result + (custom != null ? custom.hashCode() : 0);
+    return result;
+  }
+
   /**
    * A <a href="http://en.wikipedia.org/wiki/Builder_pattern">builder</a> that helps construct {@link LDUser} objects. Builder
    * calls can be chained, enabling the following pattern: