Merge pull request #40 from launchdarkly/dr/java7Syntax

Syntax changes for Java7

Author: drichelson

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

@@ -1,7 +1,6 @@
 package com.launchdarkly.client;
 
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 
 class CustomEvent extends Event {
   private final JsonElement data;

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

@@ -1,7 +1,6 @@
 package com.launchdarkly.client;
 
 import com.google.gson.Gson;
-import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -25,7 +24,7 @@ class EventProcessor implements Closeable {
 
   EventProcessor(String apiKey, LDConfig config) {
     this.apiKey = apiKey;
-    this.queue = new ArrayBlockingQueue<Event>(config.capacity);
+    this.queue = new ArrayBlockingQueue<>(config.capacity);
     this.consumer = new Consumer(config);
     this.scheduler.scheduleAtFixedRate(consumer, 0, config.flushInterval, TimeUnit.SECONDS);
   }
@@ -70,7 +69,7 @@ public void run() {
     }
 
     public void flush() {
-      List<Event> events = new ArrayList<Event>(queue.size());
+      List<Event> events = new ArrayList<>(queue.size());
       queue.drainTo(events);
 
       if (!events.isEmpty()) {

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

@@ -14,7 +14,6 @@
 import java.util.List;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
 
 // EventSource class modified from
 // https://github.com/jersey/jersey/blob/master/media/sse/src/main/java/org/glassfish/jersey/media/sse/EventSource.java
@@ -55,15 +54,15 @@ private static enum State {
   /**
    * Event source internal state.
    */
-  private final AtomicReference<State> state = new AtomicReference<State>(State.READY);
+  private final AtomicReference<State> state = new AtomicReference<>(State.READY);
   /**
    * List of all listeners not bound to receive only events of a particular name.
    */
-  private final List<EventListener> unboundListeners = new CopyOnWriteArrayList<EventListener>();
+  private final List<EventListener> unboundListeners = new CopyOnWriteArrayList<>();
   /**
    * A map of listeners bound to receive only events of a particular name.
    */
-  private final ConcurrentMap<String, List<EventListener>> boundListeners = new ConcurrentHashMap<String, List<EventListener>>();
+  private final ConcurrentMap<String, List<EventListener>> boundListeners = new ConcurrentHashMap<>();
 
   private final MultivaluedMap<String, Object> headers;
 
@@ -96,7 +95,7 @@ private Builder(final WebTarget endpoint) {
       this.endpoint = endpoint;
     }
 
-    private MultivaluedMap<String, Object> headers = new StringKeyIgnoreCaseMultivaluedMap<Object>();
+    private MultivaluedMap<String, Object> headers = new StringKeyIgnoreCaseMultivaluedMap<>();
 
     /**
      * Set a custom name for the event source.
@@ -233,7 +232,7 @@ public static Builder target(WebTarget endpoint) {
    * @throws NullPointerException in case the supplied web target is {@code null}.
    */
   public EventSource(final WebTarget endpoint) {
-    this(endpoint, true, new StringKeyIgnoreCaseMultivaluedMap<Object>());
+    this(endpoint, true, new StringKeyIgnoreCaseMultivaluedMap<>());
   }
 
   /**
@@ -293,7 +292,7 @@ public Thread newThread(Runnable r) {
       }
     });
 
-    this.headers = new StringKeyIgnoreCaseMultivaluedMap<Object>();
+    this.headers = new StringKeyIgnoreCaseMultivaluedMap<>();
     this.headers.putAll(headers);
 
     if (open) {
@@ -373,7 +372,7 @@ public void register(final EventListener listener, final String eventName, final
 
   private void addBoundListener(final String name, final EventListener listener) {
     List<EventListener> listeners = boundListeners.putIfAbsent(name,
-        new CopyOnWriteArrayList<EventListener>(Collections.singleton(listener)));
+            new CopyOnWriteArrayList<>(Collections.singleton(listener)));
     if (listeners != null) {
       // alas, new listener collection registration conflict:
       // need to add the new listener to the existing listener collection

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

@@ -70,7 +70,7 @@ public int hashCode() {
     this.on = b.on;
     this.deleted = b.deleted;
     this.version = b.version;
-    this.variations = new ArrayList<Variation<E>>(b.variations);
+    this.variations = new ArrayList<>(b.variations);
   }
 
   private Float paramForUser(LDUser user) {
@@ -147,7 +147,7 @@ static class Builder<E> {
       this.name = name;
       this.key = key;
       this.salt = UUID.randomUUID().toString();
-      this.variations = new ArrayList<Variation<E>>();
+      this.variations = new ArrayList<>();
     }
 
     Builder<E> salt(String s) {
@@ -176,7 +176,7 @@ Builder<E> version(int v) {
     }
 
     FeatureRep<E> build() {
-      return new FeatureRep<E>(this);
+      return new FeatureRep<>(this);
     }
 
   }

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

@@ -1,7 +1,5 @@
 package com.launchdarkly.client;
 
-import com.google.gson.JsonObject;
-
 class IdentifyEvent extends Event {
 
   IdentifyEvent(LDUser user) {

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

@@ -13,7 +13,7 @@
 public class InMemoryFeatureStore implements FeatureStore {
 
   final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-  final Map<String, FeatureRep<?>> features = new HashMap<String, FeatureRep<?>>();
+  final Map<String, FeatureRep<?>> features = new HashMap<>();
   volatile boolean initialized = false;
 
 
@@ -52,7 +52,7 @@ public FeatureRep<?> get(String key) {
   public Map<String, FeatureRep<?>> all() {
     try {
       lock.readLock().lock();
-      Map<String, FeatureRep<?>> fs = new HashMap<String, FeatureRep<?>>();
+      Map<String, FeatureRep<?>> fs = new HashMap<>();
 
       for (Map.Entry<String, FeatureRep<?>> entry : features.entrySet()) {
         if (!entry.getValue().deleted) {

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

@@ -116,7 +116,7 @@ public void identify(LDUser user) {
   }
 
   private void sendFlagRequestEvent(String featureKey, LDUser user, boolean value, boolean defaultValue) {
-    boolean processed = eventProcessor.sendEvent(new FeatureRequestEvent<Boolean>(featureKey, user, value, defaultValue));
+    boolean processed = eventProcessor.sendEvent(new FeatureRequestEvent<>(featureKey, user, value, defaultValue));
     if (!processed) {
       logger.warn("Exceeded event queue capacity. Increase capacity to avoid dropping events.");
     }
@@ -174,9 +174,8 @@ public boolean toggle(String featureKey, LDUser user, boolean defaultValue) {
         sendFlagRequestEvent(featureKey, user, defaultValue, defaultValue);
         return defaultValue;
       } else {
-        boolean value = val.booleanValue();
-        sendFlagRequestEvent(featureKey, user, value, defaultValue);
-        return value;
+        sendFlagRequestEvent(featureKey, user, val, defaultValue);
+        return val;
       }
     } catch (Exception e) {
       logger.error("Encountered exception in LaunchDarkly client", e);

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

@@ -2131,8 +2131,8 @@ enum Assignment
   }
 
 
-  private static final Map<String, LDCountryCode> alpha3Map = new HashMap<String, LDCountryCode>();
-  private static final Map<Integer, LDCountryCode> numericMap = new HashMap<Integer, LDCountryCode>();
+  private static final Map<String, LDCountryCode> alpha3Map = new HashMap<>();
+  private static final Map<Integer, LDCountryCode> numericMap = new HashMap<>();
 
 
   static
@@ -2640,7 +2640,7 @@ public static List<LDCountryCode> findByName(Pattern pattern)
       throw new IllegalArgumentException("pattern is null.");
     }
 
-    List<LDCountryCode> list = new ArrayList<LDCountryCode>();
+    List<LDCountryCode> list = new ArrayList<>();
 
     for (LDCountryCode entry : values())
     {

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

@@ -54,7 +54,7 @@ protected LDUser(Builder builder) {
     this.name = builder.name == null ? null : new JsonPrimitive(builder.name);
     this.avatar = builder.avatar == null ? null : new JsonPrimitive(builder.avatar);
     this.anonymous =  builder.anonymous == null ? null : new JsonPrimitive(builder.anonymous);
-    this.custom = new HashMap<String, JsonElement>(builder.custom);
+    this.custom = new HashMap<>(builder.custom);
   }
 
   /**
@@ -63,7 +63,7 @@ protected LDUser(Builder builder) {
    */
   public LDUser(String key) {
     this.key = new JsonPrimitive(key);
-    this.custom = new HashMap<String, JsonElement>();
+    this.custom = new HashMap<>();
   }
 
   JsonPrimitive getKey() {
@@ -123,7 +123,7 @@ public static class Builder {
      */
     public Builder(String key) {
       this.key = key;
-      this.custom = new HashMap<String, JsonElement>();
+      this.custom = new HashMap<>();
     }
 
     /**

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

@@ -18,9 +18,7 @@ final class NewRelicReflector {
     try {
       newRelic = Class.forName("com.newrelic.api.agent.NewRelic");
       addCustomParameter = newRelic.getDeclaredMethod("addCustomParameter", String.class, String.class);
-    } catch (ClassNotFoundException e) {
-      logger.info("No NewRelic agent detected");
-    } catch (NoSuchMethodException e) {
+    } catch (ClassNotFoundException | NoSuchMethodException e) {
       logger.info("No NewRelic agent detected");
     }
   }