Skip to content

Commit 341118c

Browse files
author
markvdouw
authored
feat: SQDSDKS-5543 formatting, clean-up and reorganizing imports (#406)
* Formatting core * Formatting kit-base * Formatting tooling, kit-plugins and tets-utils * ktlintformat
1 parent 49ec0ea commit 341118c

219 files changed

Lines changed: 2306 additions & 1802 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎android-core/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ dependencies {
137137

138138
api 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
139139

140-
lintPublish project( path: ':tooling:custom-lint-rules', configuration: 'lintBuild')
140+
lintPublish project(path: ':tooling:custom-lint-rules', configuration: 'lintBuild')
141141

142142
//the junit tests seem to explicitly need this dependency while
143143
//working in Android studio, but from the command line it's not necessary
@@ -168,5 +168,6 @@ configurations {
168168
}
169169
}
170170

171-
boolean useOrchestrator() { return project.hasProperty('orchestrator') ? project.property('orchestrator') : false
171+
boolean useOrchestrator() {
172+
return project.hasProperty('orchestrator') ? project.property('orchestrator') : false
172173
}

‎android-core/lint-baseline.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
<lint>
33
<issue id="UnknownNullness">
44
<ignore path="src/main/java/com/mparticle/internal" />
5-
<ignore path="src/main/java/com/mparticle/networking/BaseNetworkConnection"/>
6-
<ignore path="src/main/java/com/mparticle/ExceptionHandler.java"/>
7-
<ignore path="src/main/java/com/mparticle/messaging/InstanceIdService"/>
8-
<ignore path="src/main/java/com/mparticle/networking/MPConnection"/>
9-
<ignore path="src/main/java/com/mparticle/networking/MPUrl"/>
10-
<ignore path="src/main/java/com/mparticle/messaging/MPMessagingRouter"/>
11-
<ignore path="src/main/java/com/mparticle/MPServiceUtil"/>
12-
<ignore path="src/main/java/com/mparticle/networking/MParticleBaseClientImpl"/>
13-
<ignore path="src/main/java/com/mparticle/networking/MParticleBaseClient"/>
14-
<ignore path="src/main/java/com/mparticle/networking/NetworkConnection"/>
15-
<ignore path="src/main/java/com/mparticle/networking/NetworkOptionsManager"/>
16-
<ignore path="src/main/java/com/mparticle/identity/MParticleUserImpl"/>
17-
<ignore path="src/main/java/com/mparticle/identity/MParticleIdentityClient"/>
18-
<ignore path="src/main/java/com/mparticle/messaging/ProviderCloudMessage"/>
19-
<ignore path="src/main/java/com/mparticle/messaging/PushAnalyticsReceiver"/>
5+
<ignore path="src/main/java/com/mparticle/networking/BaseNetworkConnection" />
6+
<ignore path="src/main/java/com/mparticle/ExceptionHandler.java" />
7+
<ignore path="src/main/java/com/mparticle/messaging/InstanceIdService" />
8+
<ignore path="src/main/java/com/mparticle/networking/MPConnection" />
9+
<ignore path="src/main/java/com/mparticle/networking/MPUrl" />
10+
<ignore path="src/main/java/com/mparticle/messaging/MPMessagingRouter" />
11+
<ignore path="src/main/java/com/mparticle/MPServiceUtil" />
12+
<ignore path="src/main/java/com/mparticle/networking/MParticleBaseClientImpl" />
13+
<ignore path="src/main/java/com/mparticle/networking/MParticleBaseClient" />
14+
<ignore path="src/main/java/com/mparticle/networking/NetworkConnection" />
15+
<ignore path="src/main/java/com/mparticle/networking/NetworkOptionsManager" />
16+
<ignore path="src/main/java/com/mparticle/identity/MParticleUserImpl" />
17+
<ignore path="src/main/java/com/mparticle/identity/MParticleIdentityClient" />
18+
<ignore path="src/main/java/com/mparticle/messaging/ProviderCloudMessage" />
19+
<ignore path="src/main/java/com/mparticle/messaging/PushAnalyticsReceiver" />
2020
</issue>
2121
</lint>

‎android-core/src/androidTest/AndroidManifest.xml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:tools="http://schemas.android.com/tools">
33

4-
<uses-sdk android:minSdkVersion="21" tools:overrideLibrary="com.mparticle.testutils"/>
4+
<uses-sdk
5+
android:minSdkVersion="21"
6+
tools:overrideLibrary="com.mparticle.testutils" />
57

68
<uses-permission android:name="android.permission.INTERNET" />
7-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
8-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
9-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
10-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
11-
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
9+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
10+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
11+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
12+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
13+
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
1214

13-
<application
14-
android:usesCleartextTraffic="true">
15+
<application android:usesCleartextTraffic="true">
1516

16-
<activity android:exported="true" android:name="com.mparticle.WebViewActivity">
17+
<activity
18+
android:exported="true"
19+
android:name="com.mparticle.WebViewActivity">
1720
<intent-filter>
1821
<action android:name="android.intent.action.MAIN" />
1922
<category android:name="android.intent.category.LAUNCHER" />
2023
</intent-filter>
2124
</activity>
22-
<service android:exported="true" android:name="com.mparticle.MPService" />
25+
<service
26+
android:exported="true"
27+
android:name="com.mparticle.MPService" />
2328
</application>
2429

2530
</manifest>

‎android-core/src/androidTest/java/com/mparticle/internal/MParticleJSInterfaceITest.java‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ public void run() {
216216

217217
@Test
218218
public void testSetUserAttribute() throws Exception {
219-
final String key = mRandomUtils.getAlphaNumericString(25);
220-
final String value = mRandomUtils.getAlphaNumericString(25);
219+
final String key = mRandomUtils.getAlphaNumericString(25);
220+
final String value = mRandomUtils.getAlphaNumericString(25);
221221
String testJavascript = String.format("mParticle.Identity.getCurrentUser().setUserAttribute(\"%s\", \"%s\");\n", key, value);
222222
final MutableBoolean called = new MutableBoolean(false);
223223
final CountDownLatch latch = new MPLatch(1);
224-
runJavascriptTest(testJavascript, new MParticleJSInterface(){
224+
runJavascriptTest(testJavascript, new MParticleJSInterface() {
225225
@Override
226226
@JavascriptInterface
227227
public void setUserAttribute(String json) {
@@ -232,8 +232,7 @@ public void setUserAttribute(String json) {
232232
assertEquals(value, jsonObject.getString("value"));
233233
called.value = true;
234234
latch.countDown();
235-
}
236-
catch (JSONException jse) {
235+
} catch (JSONException jse) {
237236
jse.printStackTrace();
238237
}
239238

@@ -249,7 +248,7 @@ public void testRemoveUserAttribute() throws Exception {
249248
String testJavascript = String.format("mParticle.Identity.getCurrentUser().removeUserAttribute(\"%s\");\n", key);
250249
final MutableBoolean called = new MutableBoolean(false);
251250
final CountDownLatch latch = new MPLatch(1);
252-
runJavascriptTest(testJavascript, new MParticleJSInterface(){
251+
runJavascriptTest(testJavascript, new MParticleJSInterface() {
253252
@Override
254253
@JavascriptInterface
255254
public void removeUserAttribute(String json) {
@@ -259,8 +258,7 @@ public void removeUserAttribute(String json) {
259258
assertEquals(key, jsonObject.getString("key"));
260259
called.value = true;
261260
latch.countDown();
262-
}
263-
catch (JSONException jse) {
261+
} catch (JSONException jse) {
264262
jse.printStackTrace();
265263
}
266264
}
@@ -276,7 +274,7 @@ public void testSetUserTag() throws Exception {
276274
final MutableBoolean called = new MutableBoolean(false);
277275
final CountDownLatch latch = new MPLatch(1);
278276
//This is acceptable if the JS SDK calls either setUserTag, or setUserAttribute with a null value
279-
runJavascriptTest(testJavascript, new MParticleJSInterface(){
277+
runJavascriptTest(testJavascript, new MParticleJSInterface() {
280278
@Override
281279
@JavascriptInterface
282280
public void setUserTag(String json) {
@@ -286,8 +284,7 @@ public void setUserTag(String json) {
286284
assertEquals(tag, jsonObject.getString("key"));
287285
called.value = true;
288286
latch.countDown();
289-
}
290-
catch (JSONException jse) {
287+
} catch (JSONException jse) {
291288
jse.printStackTrace();
292289
}
293290
}
@@ -302,8 +299,7 @@ public void setUserAttribute(String json) {
302299
assertEquals(jsonObject.optString("value", "null"), "null");
303300
called.value = true;
304301
latch.countDown();
305-
}
306-
catch (JSONException jse) {
302+
} catch (JSONException jse) {
307303
jse.printStackTrace();
308304
}
309305
}
@@ -314,7 +310,7 @@ public void setUserAttribute(String json) {
314310

315311
@Test
316312
public void testLogEvent() throws Exception {
317-
final JSONObject customAttributes = MPUtility.mapToJson( mRandomUtils.getRandomAttributes(10));
313+
final JSONObject customAttributes = MPUtility.mapToJson(mRandomUtils.getRandomAttributes(10));
318314
final JSONObject customFlagsJSON = MPUtility.mapToJson(getCustomFlags());
319315
String testJavascript = String.format("mParticle.logEvent('Play Movie Tapped',\n" +
320316
" mParticle.EventType.Navigation,\n" +
@@ -371,7 +367,7 @@ public void logEvent(String json) {
371367

372368
@Test
373369
public void testLogCommerceEvent() throws Exception {
374-
final JSONObject customAttributes = MPUtility.mapToJson( mRandomUtils.getRandomAttributes(10));
370+
final JSONObject customAttributes = MPUtility.mapToJson(mRandomUtils.getRandomAttributes(10));
375371
final JSONObject customFlags = MPUtility.mapToJson(getCustomFlags());
376372
String testJavascript = String.format("// 1. Create the product\n" +
377373
"var product = mParticle.eCommerce.createProduct(\n" +
@@ -454,7 +450,7 @@ public void logEvent(String json) {
454450

455451
@Test
456452
public void testLogout() throws Exception {
457-
final Map<MParticle.IdentityType, String> userIdentityMap = mRandomUtils.getRandomUserIdentities();
453+
final Map<MParticle.IdentityType, String> userIdentityMap = mRandomUtils.getRandomUserIdentities();
458454
JSONObject jsonObject = userIdentityMapToJson(userIdentityMap);
459455
String testJavascript = String.format("mParticle.Identity.logout(%s , null);", jsonObject.toString(4));
460456

@@ -506,7 +502,7 @@ public void logout() {
506502

507503
@Test
508504
public void testLogin() throws Exception {
509-
final Map<MParticle.IdentityType, String> userIdentityMap = mRandomUtils.getRandomUserIdentities();
505+
final Map<MParticle.IdentityType, String> userIdentityMap = mRandomUtils.getRandomUserIdentities();
510506
JSONObject jsonObject = userIdentityMapToJson(userIdentityMap);
511507
String testJavascript = String.format("mParticle.Identity.login(%s , null);", jsonObject.toString(4));
512508

@@ -558,7 +554,7 @@ public void login() {
558554

559555
@Test
560556
public void testModify() throws Exception {
561-
final Map<MParticle.IdentityType, String> userIdentities = mRandomUtils.getRandomUserIdentities();
557+
final Map<MParticle.IdentityType, String> userIdentities = mRandomUtils.getRandomUserIdentities();
562558
JSONObject jsonObject = userIdentityMapToJson(userIdentities);
563559
String testJavascript = String.format("mParticle.Identity.modify(%s , null);", jsonObject.toString(4));
564560

‎android-core/src/androidTest/kotlin/com.mparticle/BatchCreationCallbackTests.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,18 @@ class BatchCreationCallbackTests : BaseCleanInstallEachTest() {
6969
it.optJSONArray("msgs")
7070
?.toList()
7171
?.filterIsInstance<JSONObject>()
72-
?.any { it.optString("n") == targetEventName && it.optString("mb").isNullOrEmpty() } ?: false
72+
?.any {
73+
it.optString("n") == targetEventName && it.optString("mb").isNullOrEmpty()
74+
} ?: false
7375
}
7476
)
7577

7678
mServer.Requests().events.any {
7779
it.bodyJson.optJSONArray("msgs")
7880
?.toList()
7981
?.filterIsInstance<JSONObject>()
80-
?.any { it.optString("n") == targetEventName && it.optString("mb").isNullOrEmpty() } ?: false
82+
?.any { it.optString("n") == targetEventName && it.optString("mb").isNullOrEmpty() }
83+
?: false
8184
}.let {
8285
assertTrue { it }
8386
}

‎android-core/src/androidTest/kotlin/com.mparticle/PushRegistrationTest.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ class PushRegistrationTest : BaseCleanStartedEachTest() {
117117
var setPushes = arrayOf(
118118
object : SetPush {
119119
override fun setPushRegistration(pushRegistration: PushRegistration) {
120-
MParticle.getInstance()?.logPushRegistration(pushRegistration.instanceId, pushRegistration.senderId)
120+
MParticle.getInstance()
121+
?.logPushRegistration(pushRegistration.instanceId, pushRegistration.senderId)
121122
}
122123

123124
override val name: String
@@ -134,8 +135,10 @@ class PushRegistrationTest : BaseCleanStartedEachTest() {
134135
},
135136
object : SetPush {
136137
override fun setPushRegistration(pushRegistration: PushRegistration) {
137-
MParticle.getInstance()?.mInternal?.configManager?.pushSenderId = pushRegistration.senderId
138-
MParticle.getInstance()?.mInternal?.configManager?.pushInstanceId = pushRegistration.instanceId
138+
MParticle.getInstance()?.mInternal?.configManager?.pushSenderId =
139+
pushRegistration.senderId
140+
MParticle.getInstance()?.mInternal?.configManager?.pushInstanceId =
141+
pushRegistration.instanceId
139142
}
140143

141144
override val name: String

‎android-core/src/androidTest/kotlin/com.mparticle/UploadEventKotlinTest.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ class UploadEventKotlinTest : BaseCleanStartedEachTest() {
121121
it.optJSONArray("msgs")?.let { messagesArray ->
122122
(0 until messagesArray.length())
123123
.any {
124-
val eventProductName = messagesArray.getJSONObject(it).optJSONObject("pd")?.optJSONArray("pl")?.optJSONObject(0)?.optString("nm")
124+
val eventProductName =
125+
messagesArray.getJSONObject(it).optJSONObject("pd")
126+
?.optJSONArray("pl")?.optJSONObject(0)?.optString("nm")
125127
assertNotEquals("Should Not Upload", eventProductName)
126128
if (eventProductName == "Should Upload 1" || eventProductName == "Should Upload 2") {
127129
numUploadedEvents++

‎android-core/src/androidTest/kotlin/com.mparticle/identity/IdentityApiTest.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import org.json.JSONObject
1515
import org.junit.Assert
1616
import org.junit.Before
1717
import org.junit.Test
18-
import java.lang.Exception
1918
import java.util.UUID
2019
import java.util.concurrent.CountDownLatch
2120

‎android-core/src/androidTest/kotlin/com.mparticle/identity/MParticleUserDelegateITest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MParticleUserDelegateITest : BaseCleanStartedEachTest() {
3434
val attributes = HashMap<Long, Map<IdentityType, String>>()
3535
for (i in 0..4) {
3636
val mpid = ran.nextLong()
37-
val pairs = HashMap<IdentityType, String> ()
37+
val pairs = HashMap<IdentityType, String>()
3838
attributes[mpid] = pairs
3939
for (j in 0..2) {
4040
val identityType =

‎android-core/src/androidTest/kotlin/com.mparticle/internal/ApplicationContextWrapperITest.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ class ApplicationContextWrapperITest {
1919
@OrchestratorOnly
2020
@Test
2121
fun testRegisterListenerBackgroundThread() {
22-
val applicationContextWrapper = ApplicationContextWrapper(InstrumentationRegistry.getInstrumentation().getContext().applicationContext as Application)
22+
val applicationContextWrapper = ApplicationContextWrapper(
23+
InstrumentationRegistry.getInstrumentation()
24+
.getContext().applicationContext as Application
25+
)
2326
var exception: Exception? = null
2427
assertNull(Looper.myLooper())
2528
try {

0 commit comments

Comments
 (0)