Merge pull request #589 from segmentio/spotless

replace javafmt with spotless
segmentio · Aug 28, 2018 · 24a5139 · 24a5139
2 parents e55e935 + 0312c0c
commit 24a5139
Show file tree

Hide file tree

Showing 30 changed files with 410 additions and 417 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,7 +22,7 @@ jobs:
             fi
       - run:
           name: Build
-          command: ./gradlew checkFmt build assembleAndroidTest
+          command: ./gradlew check build assembleAndroidTest
       - run:
           name: Run E2E Test
           command: |

diff --git a/analytics-samples/analytics-sample/build.gradle b/analytics-samples/analytics-sample/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.f2prateek.javafmt'
 
 apply from: rootProject.file('gradle/android.gradle')
 

diff --git a/analytics-samples/analytics-sample/src/androidTest/java/com/segment/analytics/E2ETest.java b/analytics-samples/analytics-sample/src/androidTest/java/com/segment/analytics/E2ETest.java
@@ -1,14 +1,13 @@
 package com.segment.analytics;
 
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import com.segment.analytics.webhook.WebhookService;
 import com.segment.analytics.sample.MainActivity;
 import com.segment.analytics.sample.test.BuildConfig;
+import com.segment.analytics.webhook.WebhookService;
 import com.segment.backo.Backo;
 import java.io.IOException;
 import java.util.List;
@@ -34,7 +33,8 @@
  * connected to the source connected to the source (configured manually via the app) is able to
  * receive the data sent by this library.
  *
- * See https://paper.dropbox.com/doc/Libraries-End-to-End-Tests-ESEakc3LxFrqcHz69AmyN for details.
+ * <p>See https://paper.dropbox.com/doc/Libraries-End-to-End-Tests-ESEakc3LxFrqcHz69AmyN for
+ * details.
  */
 @RunWith(AndroidJUnit4.class)
 public class E2ETest {
@@ -56,35 +56,40 @@ public class E2ETest {
   /** Credentials to retrieve data from the webhook. */
   private static final String WEBHOOK_AUTH_USERNAME = BuildConfig.WEBHOOK_AUTH_USERNAME;
 
-  private static final Backo BACKO = Backo.builder()
-      .base(TimeUnit.SECONDS, 1)
-      .cap(TimeUnit.SECONDS, 5)
-      .build();
+  private static final Backo BACKO =
+      Backo.builder().base(TimeUnit.SECONDS, 1).cap(TimeUnit.SECONDS, 5).build();
 
   private Analytics analytics;
   private WebhookService webhookService;
 
   @Before
   public void setup() {
-    analytics = new Analytics.Builder(activityActivityTestRule.getActivity(), SEGMENT_WRITE_KEY)
-        .build();
-
-    webhookService = new Retrofit.Builder()
-        .baseUrl("https://webhook-e2e.segment.com")
-        .addConverterFactory(MoshiConverterFactory.create())
-        .client(new OkHttpClient.Builder()
-            .addNetworkInterceptor(new Interceptor() {
-              @Override
-              public okhttp3.Response intercept(Chain chain) throws IOException {
-                return chain.proceed(chain.request()
-                    .newBuilder()
-                    .addHeader("Authorization", Credentials.basic(WEBHOOK_AUTH_USERNAME, ""))
-                    .build());
-              }
-            })
-            .build())
-        .build()
-        .create(WebhookService.class);
+    analytics =
+        new Analytics.Builder(activityActivityTestRule.getActivity(), SEGMENT_WRITE_KEY).build();
+
+    webhookService =
+        new Retrofit.Builder()
+            .baseUrl("https://webhook-e2e.segment.com")
+            .addConverterFactory(MoshiConverterFactory.create())
+            .client(
+                new OkHttpClient.Builder()
+                    .addNetworkInterceptor(
+                        new Interceptor() {
+                          @Override
+                          public okhttp3.Response intercept(Chain chain) throws IOException {
+                            return chain.proceed(
+                                chain
+                                    .request()
+                                    .newBuilder()
+                                    .addHeader(
+                                        "Authorization",
+                                        Credentials.basic(WEBHOOK_AUTH_USERNAME, ""))
+                                    .build());
+                          }
+                        })
+                    .build())
+            .build()
+            .create(WebhookService.class);
   }
 
   @After
@@ -143,14 +148,11 @@ private void assertMessageReceivedByWebhook(String id) {
     fail("did not find message with id: " + id);
   }
 
-  /**
-   * Returns {@code true} if a message with the provided ID is found in the webhook.
-   */
+  /** Returns {@code true} if a message with the provided ID is found in the webhook. */
   @SuppressWarnings("ConstantConditions")
   private boolean hasMatchingRequest(String id) throws IOException {
-    Response<List<String>> messagesResponse = webhookService
-        .messages(WEBHOOK_BUCKET, 500)
-        .execute();
+    Response<List<String>> messagesResponse =
+        webhookService.messages(WEBHOOK_BUCKET, 500).execute();
 
     assertThat(messagesResponse.code()).isEqualTo(200);
 
@@ -164,9 +166,7 @@ private boolean hasMatchingRequest(String id) throws IOException {
     return false;
   }
 
-  /**
-   * Skips tests if they were supposed to be ignored.
-   */
+  /** Skips tests if they were supposed to be ignored. */
   static class EndToEndTestsDisabledRule implements MethodRule {
 
     @Override

diff --git a/analytics-samples/analytics-sample/src/main/res/layout/activity_main.xml b/analytics-samples/analytics-sample/src/main/res/layout/activity_main.xml
@@ -59,7 +59,8 @@
         android:id="@+id/user_id"
         android:hint="@string/identify_user_id"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:inputType="text"/>
 
     <Button
         android:id="@+id/action_identify"

diff --git a/analytics-samples/analytics-wear-sample/build.gradle b/analytics-samples/analytics-wear-sample/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.f2prateek.javafmt'
 
 apply from: rootProject.file('gradle/android.gradle')
 

diff --git a/analytics-tests/build.gradle b/analytics-tests/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.f2prateek.javafmt'
 
 apply from: rootProject.file('gradle/android.gradle')
 

diff --git a/analytics-wear/build.gradle b/analytics-wear/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.f2prateek.javafmt'
 
 apply from: rootProject.file('gradle/android.gradle')
 

diff --git a/analytics/build.gradle b/analytics/build.gradle
@@ -1,6 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.vanniktech.android.junit.jacoco'
-apply plugin: 'com.f2prateek.javafmt'
 apply plugin: 'com.getkeepsafe.dexcount'
 
 apply from: rootProject.file('gradle/android.gradle')

diff --git a/analytics/src/main/java/com/segment/analytics/Client.java b/analytics/src/main/java/com/segment/analytics/Client.java
@@ -24,8 +24,8 @@
 
 package com.segment.analytics;
 
-import static com.segment.analytics.internal.Utils.readFully;
 import static com.segment.analytics.internal.Utils.getInputStream;
+import static com.segment.analytics.internal.Utils.readFully;
 import static java.net.HttpURLConnection.HTTP_OK;
 
 import android.text.TextUtils;

diff --git a/analytics/src/main/java/com/segment/analytics/internal/Utils.java b/analytics/src/main/java/com/segment/analytics/internal/Utils.java
@@ -115,7 +115,7 @@ public static Date toISO8601Date(String date) throws ParseException {
     return parseISO8601Date(date);
   }
 
-  //TODO: Migrate other coercion methods.
+  // TODO: Migrate other coercion methods.
 
   /**
    * Returns the float representation at {@code value} if it exists and is a float or can be coerced

diff --git a/analytics/src/test/java/com/segment/analytics/AnalyticsBuilderTest.java b/analytics/src/test/java/com/segment/analytics/AnalyticsBuilderTest.java
@@ -99,12 +99,13 @@ public void invalidMiddlewareThrowsException() throws Exception {
     }
 
     try {
-      Middleware middleware = new Middleware() {
-        @Override
-        public void intercept(Chain chain) {
-          throw new AssertionError("should not be invoked");
-        }
-      };
+      Middleware middleware =
+          new Middleware() {
+            @Override
+            public void intercept(Chain chain) {
+              throw new AssertionError("should not be invoked");
+            }
+          };
       new Builder(context, "foo").middleware(middleware).middleware(middleware);
       fail("Registering middleware twice throw exception.");
     } catch (IllegalStateException expected) {

diff --git a/analytics/src/test/java/com/segment/analytics/AnalyticsContextTest.java b/analytics/src/test/java/com/segment/analytics/AnalyticsContextTest.java
@@ -83,10 +83,10 @@ public void createWithoutDeviceIdCollection() {
     context = AnalyticsContext.create(RuntimeEnvironment.application, traits, false);
 
     assertThat(context.getValueMap("device")) //
-            .containsEntry("id", traits.anonymousId())
-            .containsEntry("manufacturer", "unknown")
-            .containsEntry("model", "unknown")
-            .containsEntry("name", "unknown");
+        .containsEntry("id", traits.anonymousId())
+        .containsEntry("manufacturer", "unknown")
+        .containsEntry("model", "unknown")
+        .containsEntry("name", "unknown");
   }
 
   @Test

diff --git a/analytics/src/test/java/com/segment/analytics/AnalyticsTest.java b/analytics/src/test/java/com/segment/analytics/AnalyticsTest.java
@@ -1,5 +1,29 @@
 package com.segment.analytics;
 
+import static android.content.Context.MODE_PRIVATE;
+import static com.segment.analytics.Analytics.LogLevel.NONE;
+import static com.segment.analytics.Analytics.LogLevel.VERBOSE;
+import static com.segment.analytics.TestUtils.SynchronousExecutor;
+import static com.segment.analytics.TestUtils.grantPermission;
+import static com.segment.analytics.TestUtils.mockApplication;
+import static com.segment.analytics.Utils.createContext;
+import static com.segment.analytics.internal.Utils.DEFAULT_FLUSH_INTERVAL;
+import static com.segment.analytics.internal.Utils.DEFAULT_FLUSH_QUEUE_SIZE;
+import static com.segment.analytics.internal.Utils.isNullOrEmpty;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+
 import android.Manifest;
 import android.app.Activity;
 import android.app.Application;
@@ -10,7 +34,6 @@
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
-
 import com.segment.analytics.TestUtils.NoDescriptionMatcher;
 import com.segment.analytics.integrations.AliasPayload;
 import com.segment.analytics.integrations.GroupPayload;
@@ -20,7 +43,11 @@
 import com.segment.analytics.integrations.ScreenPayload;
 import com.segment.analytics.integrations.TrackPayload;
 import com.segment.analytics.internal.Utils.AnalyticsNetworkExecutorService;
-
+import java.io.IOException;
+import java.util.Collections;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
 import org.assertj.core.data.MapEntry;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
@@ -35,36 +62,6 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.io.IOException;
-import java.util.Collections;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static android.content.Context.MODE_PRIVATE;
-import static com.segment.analytics.Analytics.LogLevel.NONE;
-import static com.segment.analytics.Analytics.LogLevel.VERBOSE;
-import static com.segment.analytics.TestUtils.SynchronousExecutor;
-import static com.segment.analytics.TestUtils.grantPermission;
-import static com.segment.analytics.TestUtils.mockApplication;
-import static com.segment.analytics.Utils.createContext;
-import static com.segment.analytics.internal.Utils.DEFAULT_FLUSH_INTERVAL;
-import static com.segment.analytics.internal.Utils.DEFAULT_FLUSH_QUEUE_SIZE;
-import static com.segment.analytics.internal.Utils.isNullOrEmpty;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class AnalyticsTest {
@@ -564,8 +561,7 @@ protected boolean matchesSafely(Traits traits) {
                   }
 
                   @Override
-                  public void describeTo(Description description) {
-                  }
+                  public void describeTo(Description description) {}
                 }));
     assertThat(analyticsContext.traits()).hasSize(1).containsKey("anonymousId");
   }
@@ -796,7 +792,8 @@ public void trackApplicationLifecycleEventsUpdated() throws NameNotFoundExceptio
     editor.putInt("build", 100);
     editor.putString("version", "1.0.0");
     editor.apply();
-    when(application.getSharedPreferences("analytics-android-qaz", MODE_PRIVATE)).thenReturn(sharedPreferences);
+    when(application.getSharedPreferences("analytics-android-qaz", MODE_PRIVATE))
+        .thenReturn(sharedPreferences);
 
     PackageManager packageManager = mock(PackageManager.class);
     when(packageManager.getPackageInfo("com.foo", 0)).thenReturn(packageInfo);
@@ -1026,23 +1023,25 @@ public void unregisterActivityLifecycleCallbacks() throws NameNotFoundException
     doNothing()
         .when(application)
         .registerActivityLifecycleCallbacks(
-            argThat(new NoDescriptionMatcher<Application.ActivityLifecycleCallbacks>() {
-              @Override
-              protected boolean matchesSafely(Application.ActivityLifecycleCallbacks item) {
-                registeredCallback.set(item);
-                return true;
-              }
-            }));
+            argThat(
+                new NoDescriptionMatcher<Application.ActivityLifecycleCallbacks>() {
+                  @Override
+                  protected boolean matchesSafely(Application.ActivityLifecycleCallbacks item) {
+                    registeredCallback.set(item);
+                    return true;
+                  }
+                }));
     doNothing()
         .when(application)
         .unregisterActivityLifecycleCallbacks(
-            argThat(new NoDescriptionMatcher<Application.ActivityLifecycleCallbacks>() {
-              @Override
-              protected boolean matchesSafely(Application.ActivityLifecycleCallbacks item) {
-                unregisteredCallback.set(item);
-                return true;
-              }
-            }));
+            argThat(
+                new NoDescriptionMatcher<Application.ActivityLifecycleCallbacks>() {
+                  @Override
+                  protected boolean matchesSafely(Application.ActivityLifecycleCallbacks item) {
+                    unregisteredCallback.set(item);
+                    return true;
+                  }
+                }));
 
     analytics =
         new Analytics(

diff --git a/analytics/src/test/java/com/segment/analytics/CartographerTest.java b/analytics/src/test/java/com/segment/analytics/CartographerTest.java
@@ -232,7 +232,7 @@ public void decodesArraysWithLists() throws IOException {
   @Test
   public void encodesArraysWithArrays() throws IOException {
     Map<String, Object> map =
-        ImmutableMap.<String, Object>builder().put("a", new String[]{"b", "c", "d"}).build();
+        ImmutableMap.<String, Object>builder().put("a", new String[] {"b", "c", "d"}).build();
 
     assertThat(cartographer.toJson(map))
         .isEqualTo(
@@ -250,7 +250,7 @@ public void encodesPrimitiveArrays() throws IOException {
     // Exercise a bug where primitive arrays would throw an IOException.
     // https://github.com/segmentio/analytics-android/issues/507
     Map<String, Object> map =
-        ImmutableMap.<String, Object>builder().put("a", new int[]{1, 2}).build();
+        ImmutableMap.<String, Object>builder().put("a", new int[] {1, 2}).build();
 
     assertThat(cartographer.toJson(map))
         .isEqualTo("{\n" + "  \"a\": [\n" + "    1,\n" + "    2\n" + "  ]\n" + "}");

diff --git a/analytics/src/test/java/com/segment/analytics/GetAdvertisingIdTaskTest.java b/analytics/src/test/java/com/segment/analytics/GetAdvertisingIdTaskTest.java
@@ -70,7 +70,8 @@ public void getAdvertisingIdAmazonFireOSLimitAdTracking0() throws Exception {
     task.execute(context);
     latch.await();
 
-    assertThat(analyticsContext.device()).containsEntry("advertisingId", "df07c7dc-cea7-4a89-b328-810ff5acb15d");
+    assertThat(analyticsContext.device())
+        .containsEntry("advertisingId", "df07c7dc-cea7-4a89-b328-810ff5acb15d");
     assertThat(analyticsContext.device()).containsEntry("adTrackingEnabled", true);
   }
 }