fix(AbstractClient): Don't add existing userAgents

* fix(AbstractClient): Don't add existing userAgents

fixes algolia/instantsearch-android#45

* test(AbstractClient): Don't add existing userAgents

* style(AbstractClient): Spaces, indent

Author: PLNech

algoliasearch/src/main/java/com/algolia/search/saas/AbstractClient.java

@@ -78,9 +78,10 @@ public LibraryVersion(@NonNull String name, @NonNull String version) {
 
         @Override
         public boolean equals(Object object) {
-            if (!(object instanceof LibraryVersion))
+            if (!(object instanceof LibraryVersion)) {
                 return false;
-            LibraryVersion other = (LibraryVersion)object;
+            }
+            LibraryVersion other = (LibraryVersion) object;
             return this.name.equals(other.name) && this.version.equals(other.version);
         }
 
@@ -150,7 +151,8 @@ private static class HostStatus {
     protected ExecutorService searchExecutorService = Executors.newFixedThreadPool(4);
 
     /** Executor used to run completion handlers. By default, runs on the main thread. */
-    protected @NonNull Executor completionExecutor = new HandlerExecutor(new Handler(Looper.getMainLooper()));
+    protected @NonNull
+    Executor completionExecutor = new HandlerExecutor(new Handler(Looper.getMainLooper()));
 
     protected Map<String, WeakReference<Object>> indices = new HashMap<>();
 
@@ -162,19 +164,21 @@ private static class HostStatus {
      * Create a new client.
      *
      * @param applicationID [optional] The application ID.
-     * @param apiKey [optional] A valid API key for the service.
-     * @param readHosts List of hosts for read operations.
-     * @param writeHosts List of hosts for write operations.
+     * @param apiKey        [optional] A valid API key for the service.
+     * @param readHosts     List of hosts for read operations.
+     * @param writeHosts    List of hosts for write operations.
      */
     protected AbstractClient(@Nullable String applicationID, @Nullable String apiKey, @Nullable String[] readHosts, @Nullable String[] writeHosts) {
         this.applicationID = applicationID;
         this.apiKey = apiKey;
         this.addUserAgent(new LibraryVersion("Algolia for Android", version));
         this.addUserAgent(new LibraryVersion("Android", Build.VERSION.RELEASE));
-        if (readHosts != null)
+        if (readHosts != null) {
             setReadHosts(readHosts);
-        if (writeHosts != null)
+        }
+        if (writeHosts != null) {
             setWriteHosts(writeHosts);
+        }
     }
 
     // ----------------------------------------------------------------------
@@ -322,7 +326,9 @@ public void setHostDownDelay(int hostDownDelay) {
      * @param userAgent The library to add.
      */
     public void addUserAgent(@NonNull LibraryVersion userAgent) {
-        userAgents.add(userAgent);
+        if (!userAgents.contains(userAgent)) {
+            userAgents.add(userAgent);
+        }
         updateUserAgents();
     }
 
@@ -444,6 +450,7 @@ private static String _toCharArray(InputStream stream) throws IOException {
 
     /**
      * Reads the InputStream into a byte array
+     *
      * @param stream the InputStream to read
      * @return the stream's content as a byte[]
      * @throws AlgoliaException if the stream can't be read or flushed
@@ -638,12 +645,10 @@ private byte[] _requestRaw(@NonNull Method m, @NonNull String url, @Nullable Map
                 }
                 return rawResponse;
 
-            }
-            catch (JSONException e) { // fatal
+            } catch (JSONException e) { // fatal
                 consumeQuietly(hostConnection);
                 throw new AlgoliaException("Invalid JSON returned by server", e);
-            }
-            catch (UnsupportedEncodingException e) { // fatal
+            } catch (UnsupportedEncodingException e) { // fatal
                 consumeQuietly(hostConnection);
                 throw new AlgoliaException("Invalid encoding returned by server", e);
             } catch (IOException e) { // host error, continue on the next host
@@ -697,6 +702,7 @@ private void checkTimeout(int connectTimeout) {
 
     /**
      * Get the hosts that are not considered down in a given list.
+     *
      * @param hosts a list of hosts whose {@link HostStatus} will be checked.
      * @return the hosts considered up, or all hosts if none is known to be reachable.
      */
@@ -727,7 +733,7 @@ abstract protected class AsyncTaskRequest extends FutureRequest {
          * Construct a new request with the specified completion handler, executing on the client's search executor,
          * and calling the completion handler on the client's completion executor.
          *
-         * @param completionHandler  The completion handler to be notified of results. May be null if the caller omitted it.
+         * @param completionHandler The completion handler to be notified of results. May be null if the caller omitted it.
          */
         protected AsyncTaskRequest(@Nullable CompletionHandler completionHandler) {
             this(completionHandler, searchExecutorService);
@@ -737,8 +743,8 @@ protected AsyncTaskRequest(@Nullable CompletionHandler completionHandler) {
          * Construct a new request with the specified completion handler, executing on the specified executor, and
          * calling the completion handler on the client's completion executor.
          *
-         * @param completionHandler  The completion handler to be notified of results. May be null if the caller omitted it.
-         * @param requestExecutor    Executor on which to execute the request.
+         * @param completionHandler The completion handler to be notified of results. May be null if the caller omitted it.
+         * @param requestExecutor   Executor on which to execute the request.
          */
         protected AsyncTaskRequest(@Nullable CompletionHandler completionHandler, @NonNull Executor requestExecutor) {
             super(completionHandler, requestExecutor, completionExecutor);

algoliasearch/src/test/java/com/algolia/search/saas/ClientTest.java

@@ -57,7 +57,7 @@ public void tearDown() throws Exception {
 
     @Test
     public void testIndexReuse() throws Exception {
-        Map<String, WeakReference<Index>> indices = (Map<String, WeakReference<Index>>)Whitebox.getInternalState(client, "indices");
+        Map<String, WeakReference<Index>> indices = (Map<String, WeakReference<Index>>) Whitebox.getInternalState(client, "indices");
         final String indexName = "name";
 
         // Ask for the same index twice and check that it is re-used.
@@ -78,4 +78,18 @@ public void testIndexReuse() throws Exception {
         assertNull(indices.get(indexName).get());
         */
     }
+
+    @Test
+    public void testUniqueAgent() {
+        client.addUserAgent(new AbstractClient.LibraryVersion("foo", "bar"));
+        client.addUserAgent(new AbstractClient.LibraryVersion("foo", "bar"));
+        final AbstractClient.LibraryVersion[] userAgents = client.getUserAgents();
+        int found = 0;
+        for (int i = 0; i < userAgents.length; i++) {
+            if ("foo".equals(userAgents[i].name)) {
+                found++;
+            }
+        }
+        assertEquals("There should be only one foo user agent.", 1, found);
+    }
 }