Skip to content

Commit 24a5139

Browse files
f2prateekf2prateek
authored
Merge pull request #589 from segmentio/spotless
replace javafmt with spotless
2 parents e55e935 + 0312c0c commit 24a5139

30 files changed

+410
-417
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fi
2323
- run:
2424
name: Build
25-
command: ./gradlew checkFmt build assembleAndroidTest
25+
command: ./gradlew check build assembleAndroidTest
2626
- run:
2727
name: Run E2E Test
2828
command: |

‎analytics-samples/analytics-sample/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'com.f2prateek.javafmt'
32

43
apply from: rootProject.file('gradle/android.gradle')
54

‎analytics-samples/analytics-sample/src/androidTest/java/com/segment/analytics/E2ETest.java

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package com.segment.analytics;
22

3-
43
import static org.assertj.core.api.Assertions.assertThat;
54
import static org.junit.Assert.fail;
65

76
import android.support.test.rule.ActivityTestRule;
87
import android.support.test.runner.AndroidJUnit4;
9-
import com.segment.analytics.webhook.WebhookService;
108
import com.segment.analytics.sample.MainActivity;
119
import com.segment.analytics.sample.test.BuildConfig;
10+
import com.segment.analytics.webhook.WebhookService;
1211
import com.segment.backo.Backo;
1312
import java.io.IOException;
1413
import java.util.List;
@@ -34,7 +33,8 @@
3433
* connected to the source connected to the source (configured manually via the app) is able to
3534
* receive the data sent by this library.
3635
*
37-
* See https://paper.dropbox.com/doc/Libraries-End-to-End-Tests-ESEakc3LxFrqcHz69AmyN for details.
36+
* <p>See https://paper.dropbox.com/doc/Libraries-End-to-End-Tests-ESEakc3LxFrqcHz69AmyN for
37+
* details.
3838
*/
3939
@RunWith(AndroidJUnit4.class)
4040
public class E2ETest {
@@ -56,35 +56,40 @@ public class E2ETest {
5656
/** Credentials to retrieve data from the webhook. */
5757
private static final String WEBHOOK_AUTH_USERNAME = BuildConfig.WEBHOOK_AUTH_USERNAME;
5858

59-
private static final Backo BACKO = Backo.builder()
60-
.base(TimeUnit.SECONDS, 1)
61-
.cap(TimeUnit.SECONDS, 5)
62-
.build();
59+
private static final Backo BACKO =
60+
Backo.builder().base(TimeUnit.SECONDS, 1).cap(TimeUnit.SECONDS, 5).build();
6361

6462
private Analytics analytics;
6563
private WebhookService webhookService;
6664

6765
@Before
6866
public void setup() {
69-
analytics = new Analytics.Builder(activityActivityTestRule.getActivity(), SEGMENT_WRITE_KEY)
70-
.build();
71-
72-
webhookService = new Retrofit.Builder()
73-
.baseUrl("https://webhook-e2e.segment.com")
74-
.addConverterFactory(MoshiConverterFactory.create())
75-
.client(new OkHttpClient.Builder()
76-
.addNetworkInterceptor(new Interceptor() {
77-
@Override
78-
public okhttp3.Response intercept(Chain chain) throws IOException {
79-
return chain.proceed(chain.request()
80-
.newBuilder()
81-
.addHeader("Authorization", Credentials.basic(WEBHOOK_AUTH_USERNAME, ""))
82-
.build());
83-
}
84-
})
85-
.build())
86-
.build()
87-
.create(WebhookService.class);
67+
analytics =
68+
new Analytics.Builder(activityActivityTestRule.getActivity(), SEGMENT_WRITE_KEY).build();
69+
70+
webhookService =
71+
new Retrofit.Builder()
72+
.baseUrl("https://webhook-e2e.segment.com")
73+
.addConverterFactory(MoshiConverterFactory.create())
74+
.client(
75+
new OkHttpClient.Builder()
76+
.addNetworkInterceptor(
77+
new Interceptor() {
78+
@Override
79+
public okhttp3.Response intercept(Chain chain) throws IOException {
80+
return chain.proceed(
81+
chain
82+
.request()
83+
.newBuilder()
84+
.addHeader(
85+
"Authorization",
86+
Credentials.basic(WEBHOOK_AUTH_USERNAME, ""))
87+
.build());
88+
}
89+
})
90+
.build())
91+
.build()
92+
.create(WebhookService.class);
8893
}
8994

9095
@After
@@ -143,14 +148,11 @@ private void assertMessageReceivedByWebhook(String id) {
143148
fail("did not find message with id: " + id);
144149
}
145150

146-
/**
147-
* Returns {@code true} if a message with the provided ID is found in the webhook.
148-
*/
151+
/** Returns {@code true} if a message with the provided ID is found in the webhook. */
149152
@SuppressWarnings("ConstantConditions")
150153
private boolean hasMatchingRequest(String id) throws IOException {
151-
Response<List<String>> messagesResponse = webhookService
152-
.messages(WEBHOOK_BUCKET, 500)
153-
.execute();
154+
Response<List<String>> messagesResponse =
155+
webhookService.messages(WEBHOOK_BUCKET, 500).execute();
154156

155157
assertThat(messagesResponse.code()).isEqualTo(200);
156158

@@ -164,9 +166,7 @@ private boolean hasMatchingRequest(String id) throws IOException {
164166
return false;
165167
}
166168

167-
/**
168-
* Skips tests if they were supposed to be ignored.
169-
*/
169+
/** Skips tests if they were supposed to be ignored. */
170170
static class EndToEndTestsDisabledRule implements MethodRule {
171171

172172
@Override

‎analytics-samples/analytics-sample/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
android:id="@+id/user_id"
6060
android:hint="@string/identify_user_id"
6161
android:layout_width="match_parent"
62-
android:layout_height="wrap_content"/>
62+
android:layout_height="wrap_content"
63+
android:inputType="text"/>
6364

6465
<Button
6566
android:id="@+id/action_identify"

‎analytics-samples/analytics-wear-sample/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'com.f2prateek.javafmt'
32

43
apply from: rootProject.file('gradle/android.gradle')
54

‎analytics-tests/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'com.f2prateek.javafmt'
32

43
apply from: rootProject.file('gradle/android.gradle')
54

‎analytics-wear/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'com.f2prateek.javafmt'
32

43
apply from: rootProject.file('gradle/android.gradle')
54

‎analytics/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'com.vanniktech.android.junit.jacoco'
3-
apply plugin: 'com.f2prateek.javafmt'
42
apply plugin: 'com.getkeepsafe.dexcount'
53

64
apply from: rootProject.file('gradle/android.gradle')

‎analytics/src/main/java/com/segment/analytics/Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
package com.segment.analytics;
2626

27-
import static com.segment.analytics.internal.Utils.readFully;
2827
import static com.segment.analytics.internal.Utils.getInputStream;
28+
import static com.segment.analytics.internal.Utils.readFully;
2929
import static java.net.HttpURLConnection.HTTP_OK;
3030

3131
import android.text.TextUtils;

‎analytics/src/main/java/com/segment/analytics/internal/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static Date toISO8601Date(String date) throws ParseException {
115115
return parseISO8601Date(date);
116116
}
117117

118-
//TODO: Migrate other coercion methods.
118+
// TODO: Migrate other coercion methods.
119119

120120
/**
121121
* Returns the float representation at {@code value} if it exists and is a float or can be coerced

‎analytics/src/test/java/com/segment/analytics/AnalyticsBuilderTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,13 @@ public void invalidMiddlewareThrowsException() throws Exception {
9999
}
100100

101101
try {
102-
Middleware middleware = new Middleware() {
103-
@Override
104-
public void intercept(Chain chain) {
105-
throw new AssertionError("should not be invoked");
106-
}
107-
};
102+
Middleware middleware =
103+
new Middleware() {
104+
@Override
105+
public void intercept(Chain chain) {
106+
throw new AssertionError("should not be invoked");
107+
}
108+
};
108109
new Builder(context, "foo").middleware(middleware).middleware(middleware);
109110
fail("Registering middleware twice throw exception.");
110111
} catch (IllegalStateException expected) {

‎analytics/src/test/java/com/segment/analytics/AnalyticsContextTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ public void createWithoutDeviceIdCollection() {
8383
context = AnalyticsContext.create(RuntimeEnvironment.application, traits, false);
8484

8585
assertThat(context.getValueMap("device")) //
86-
.containsEntry("id", traits.anonymousId())
87-
.containsEntry("manufacturer", "unknown")
88-
.containsEntry("model", "unknown")
89-
.containsEntry("name", "unknown");
86+
.containsEntry("id", traits.anonymousId())
87+
.containsEntry("manufacturer", "unknown")
88+
.containsEntry("model", "unknown")
89+
.containsEntry("name", "unknown");
9090
}
9191

9292
@Test

‎analytics/src/test/java/com/segment/analytics/AnalyticsTest.java

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
package com.segment.analytics;
22

3+
import static android.content.Context.MODE_PRIVATE;
4+
import static com.segment.analytics.Analytics.LogLevel.NONE;
5+
import static com.segment.analytics.Analytics.LogLevel.VERBOSE;
6+
import static com.segment.analytics.TestUtils.SynchronousExecutor;
7+
import static com.segment.analytics.TestUtils.grantPermission;
8+
import static com.segment.analytics.TestUtils.mockApplication;
9+
import static com.segment.analytics.Utils.createContext;
10+
import static com.segment.analytics.internal.Utils.DEFAULT_FLUSH_INTERVAL;
11+
import static com.segment.analytics.internal.Utils.DEFAULT_FLUSH_QUEUE_SIZE;
12+
import static com.segment.analytics.internal.Utils.isNullOrEmpty;
13+
import static org.assertj.core.api.Assertions.assertThat;
14+
import static org.assertj.core.api.Assertions.fail;
15+
import static org.mockito.Matchers.any;
16+
import static org.mockito.Matchers.argThat;
17+
import static org.mockito.Matchers.eq;
18+
import static org.mockito.Mockito.doNothing;
19+
import static org.mockito.Mockito.mock;
20+
import static org.mockito.Mockito.never;
21+
import static org.mockito.Mockito.times;
22+
import static org.mockito.Mockito.verify;
23+
import static org.mockito.Mockito.verifyNoMoreInteractions;
24+
import static org.mockito.Mockito.when;
25+
import static org.mockito.MockitoAnnotations.initMocks;
26+
327
import android.Manifest;
428
import android.app.Activity;
529
import android.app.Application;
@@ -10,7 +34,6 @@
1034
import android.content.pm.PackageManager;
1135
import android.content.pm.PackageManager.NameNotFoundException;
1236
import android.os.Bundle;
13-
1437
import com.segment.analytics.TestUtils.NoDescriptionMatcher;
1538
import com.segment.analytics.integrations.AliasPayload;
1639
import com.segment.analytics.integrations.GroupPayload;
@@ -20,7 +43,11 @@
2043
import com.segment.analytics.integrations.ScreenPayload;
2144
import com.segment.analytics.integrations.TrackPayload;
2245
import com.segment.analytics.internal.Utils.AnalyticsNetworkExecutorService;
23-
46+
import java.io.IOException;
47+
import java.util.Collections;
48+
import java.util.concurrent.CountDownLatch;
49+
import java.util.concurrent.ExecutorService;
50+
import java.util.concurrent.atomic.AtomicReference;
2451
import org.assertj.core.data.MapEntry;
2552
import org.hamcrest.Description;
2653
import org.hamcrest.TypeSafeMatcher;
@@ -35,36 +62,6 @@
3562
import org.robolectric.RuntimeEnvironment;
3663
import org.robolectric.annotation.Config;
3764

38-
import java.io.IOException;
39-
import java.util.Collections;
40-
import java.util.concurrent.CountDownLatch;
41-
import java.util.concurrent.ExecutorService;
42-
import java.util.concurrent.atomic.AtomicReference;
43-
44-
import static android.content.Context.MODE_PRIVATE;
45-
import static com.segment.analytics.Analytics.LogLevel.NONE;
46-
import static com.segment.analytics.Analytics.LogLevel.VERBOSE;
47-
import static com.segment.analytics.TestUtils.SynchronousExecutor;
48-
import static com.segment.analytics.TestUtils.grantPermission;
49-
import static com.segment.analytics.TestUtils.mockApplication;
50-
import static com.segment.analytics.Utils.createContext;
51-
import static com.segment.analytics.internal.Utils.DEFAULT_FLUSH_INTERVAL;
52-
import static com.segment.analytics.internal.Utils.DEFAULT_FLUSH_QUEUE_SIZE;
53-
import static com.segment.analytics.internal.Utils.isNullOrEmpty;
54-
import static org.assertj.core.api.Assertions.assertThat;
55-
import static org.assertj.core.api.Assertions.fail;
56-
import static org.mockito.Matchers.any;
57-
import static org.mockito.Matchers.argThat;
58-
import static org.mockito.Matchers.eq;
59-
import static org.mockito.Mockito.doNothing;
60-
import static org.mockito.Mockito.mock;
61-
import static org.mockito.Mockito.never;
62-
import static org.mockito.Mockito.times;
63-
import static org.mockito.Mockito.verify;
64-
import static org.mockito.Mockito.verifyNoMoreInteractions;
65-
import static org.mockito.Mockito.when;
66-
import static org.mockito.MockitoAnnotations.initMocks;
67-
6865
@RunWith(RobolectricTestRunner.class)
6966
@Config(manifest = Config.NONE)
7067
public class AnalyticsTest {
@@ -564,8 +561,7 @@ protected boolean matchesSafely(Traits traits) {
564561
}
565562

566563
@Override
567-
public void describeTo(Description description) {
568-
}
564+
public void describeTo(Description description) {}
569565
}));
570566
assertThat(analyticsContext.traits()).hasSize(1).containsKey("anonymousId");
571567
}
@@ -796,7 +792,8 @@ public void trackApplicationLifecycleEventsUpdated() throws NameNotFoundExceptio
796792
editor.putInt("build", 100);
797793
editor.putString("version", "1.0.0");
798794
editor.apply();
799-
when(application.getSharedPreferences("analytics-android-qaz", MODE_PRIVATE)).thenReturn(sharedPreferences);
795+
when(application.getSharedPreferences("analytics-android-qaz", MODE_PRIVATE))
796+
.thenReturn(sharedPreferences);
800797

801798
PackageManager packageManager = mock(PackageManager.class);
802799
when(packageManager.getPackageInfo("com.foo", 0)).thenReturn(packageInfo);
@@ -1026,23 +1023,25 @@ public void unregisterActivityLifecycleCallbacks() throws NameNotFoundException
10261023
doNothing()
10271024
.when(application)
10281025
.registerActivityLifecycleCallbacks(
1029-
argThat(new NoDescriptionMatcher<Application.ActivityLifecycleCallbacks>() {
1030-
@Override
1031-
protected boolean matchesSafely(Application.ActivityLifecycleCallbacks item) {
1032-
registeredCallback.set(item);
1033-
return true;
1034-
}
1035-
}));
1026+
argThat(
1027+
new NoDescriptionMatcher<Application.ActivityLifecycleCallbacks>() {
1028+
@Override
1029+
protected boolean matchesSafely(Application.ActivityLifecycleCallbacks item) {
1030+
registeredCallback.set(item);
1031+
return true;
1032+
}
1033+
}));
10361034
doNothing()
10371035
.when(application)
10381036
.unregisterActivityLifecycleCallbacks(
1039-
argThat(new NoDescriptionMatcher<Application.ActivityLifecycleCallbacks>() {
1040-
@Override
1041-
protected boolean matchesSafely(Application.ActivityLifecycleCallbacks item) {
1042-
unregisteredCallback.set(item);
1043-
return true;
1044-
}
1045-
}));
1037+
argThat(
1038+
new NoDescriptionMatcher<Application.ActivityLifecycleCallbacks>() {
1039+
@Override
1040+
protected boolean matchesSafely(Application.ActivityLifecycleCallbacks item) {
1041+
unregisteredCallback.set(item);
1042+
return true;
1043+
}
1044+
}));
10461045

10471046
analytics =
10481047
new Analytics(

‎analytics/src/test/java/com/segment/analytics/CartographerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public void decodesArraysWithLists() throws IOException {
232232
@Test
233233
public void encodesArraysWithArrays() throws IOException {
234234
Map<String, Object> map =
235-
ImmutableMap.<String, Object>builder().put("a", new String[]{"b", "c", "d"}).build();
235+
ImmutableMap.<String, Object>builder().put("a", new String[] {"b", "c", "d"}).build();
236236

237237
assertThat(cartographer.toJson(map))
238238
.isEqualTo(
@@ -250,7 +250,7 @@ public void encodesPrimitiveArrays() throws IOException {
250250
// Exercise a bug where primitive arrays would throw an IOException.
251251
// https://github.com/segmentio/analytics-android/issues/507
252252
Map<String, Object> map =
253-
ImmutableMap.<String, Object>builder().put("a", new int[]{1, 2}).build();
253+
ImmutableMap.<String, Object>builder().put("a", new int[] {1, 2}).build();
254254

255255
assertThat(cartographer.toJson(map))
256256
.isEqualTo("{\n" + " \"a\": [\n" + " 1,\n" + " 2\n" + " ]\n" + "}");

‎analytics/src/test/java/com/segment/analytics/GetAdvertisingIdTaskTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ public void getAdvertisingIdAmazonFireOSLimitAdTracking0() throws Exception {
7070
task.execute(context);
7171
latch.await();
7272

73-
assertThat(analyticsContext.device()).containsEntry("advertisingId", "df07c7dc-cea7-4a89-b328-810ff5acb15d");
73+
assertThat(analyticsContext.device())
74+
.containsEntry("advertisingId", "df07c7dc-cea7-4a89-b328-810ff5acb15d");
7475
assertThat(analyticsContext.device()).containsEntry("adTrackingEnabled", true);
7576
}
7677
}

0 commit comments

Comments
 (0)