Skip to content

Commit ec87e70

Browse files
fix: migrate all generic logs to Logger class
1 parent 95d2535 commit ec87e70

24 files changed

Lines changed: 62 additions & 48 deletions

File tree

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void setUserAttribute(String json) {
233233
called.value = true;
234234
latch.countDown();
235235
} catch (JSONException jse) {
236-
jse.printStackTrace();
236+
Logger.error(jse);
237237
}
238238

239239
}
@@ -259,7 +259,7 @@ public void removeUserAttribute(String json) {
259259
called.value = true;
260260
latch.countDown();
261261
} catch (JSONException jse) {
262-
jse.printStackTrace();
262+
Logger.error(jse);
263263
}
264264
}
265265
});
@@ -285,7 +285,7 @@ public void setUserTag(String json) {
285285
called.value = true;
286286
latch.countDown();
287287
} catch (JSONException jse) {
288-
jse.printStackTrace();
288+
Logger.error(jse);
289289
}
290290
}
291291

@@ -300,7 +300,7 @@ public void setUserAttribute(String json) {
300300
called.value = true;
301301
latch.countDown();
302302
} catch (JSONException jse) {
303-
jse.printStackTrace();
303+
Logger.error(jse);
304304
}
305305
}
306306
});
@@ -357,7 +357,7 @@ public void logEvent(String json) {
357357
}
358358
Logger.error(new JSONObject(json).toString(4));
359359
} catch (JSONException e) {
360-
e.printStackTrace();
360+
Logger.error(e);
361361
}
362362
}
363363
});
@@ -466,7 +466,7 @@ public void logout(String json) {
466466
called.value = true;
467467
latch.countDown();
468468
} catch (JSONException e) {
469-
e.printStackTrace();
469+
Logger.error(e);
470470
}
471471
}
472472
});
@@ -518,7 +518,7 @@ public void login(String json) {
518518
called.value = true;
519519
latch.countDown();
520520
} catch (JSONException e) {
521-
e.printStackTrace();
521+
Logger.error(e);
522522
}
523523
}
524524
});
@@ -570,7 +570,7 @@ public void modify(String json) {
570570
called.value = true;
571571
latch.countDown();
572572
} catch (JSONException e) {
573-
e.printStackTrace();
573+
Logger.error(e);
574574
}
575575
}
576576
});

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mparticle
22

33
import android.content.Context
44
import com.mparticle.internal.ConfigManager
5+
import com.mparticle.internal.Logger
56
import com.mparticle.internal.PushRegistrationHelper
67
import com.mparticle.internal.PushRegistrationHelper.PushRegistration
78
import com.mparticle.networking.Matcher
@@ -160,7 +161,7 @@ class PushRegistrationTest : BaseCleanStartedEachTest() {
160161
try {
161162
Thread.sleep(10)
162163
} catch (e: InterruptedException) {
163-
e.printStackTrace()
164+
Logger.error(e)
164165
}
165166
}
166167
TestingUtils.setFirebasePresent(false, null)

android-core/src/androidTest/kotlin/com.mparticle/SessionMessagesTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.os.Looper
55
import com.mparticle.internal.AccessUtils
66
import com.mparticle.internal.AppStateManager
77
import com.mparticle.internal.Constants
8+
import com.mparticle.internal.Logger
89
import com.mparticle.networking.Matcher
910
import com.mparticle.networking.MockServer.JSONMatch
1011
import com.mparticle.testutils.AndroidUtils
@@ -60,7 +61,7 @@ sent sessionId = ${eventObject.getString("id")}""",
6061
}
6162
}
6263
} catch (e: Exception) {
63-
e.printStackTrace()
64+
Logger.error(e)
6465
Assert.fail(e.message)
6566
}
6667
false

android-core/src/androidTest/kotlin/com.mparticle/UploadMessageTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.os.Looper
55
import com.mparticle.internal.AccessUtils
66
import com.mparticle.internal.AccessUtils.EmptyMParticleApiClient
77
import com.mparticle.internal.Constants
8+
import com.mparticle.internal.Logger
89
import com.mparticle.internal.MPUtility
910
import com.mparticle.internal.MParticleApiClientImpl.MPRampException
1011
import com.mparticle.internal.MParticleApiClientImpl.MPThrottleException
@@ -78,7 +79,7 @@ class UploadMessageTest : BaseCleanStartedEachTest() {
7879
}
7980
}
8081
} catch (e: Exception) {
81-
e.printStackTrace()
82+
Logger.error(e)
8283
Assert.fail(e.toString())
8384
}
8485
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.os.Looper
66
import com.mparticle.MParticle
77
import com.mparticle.MParticle.IdentityType
88
import com.mparticle.internal.ConfigManager
9+
import com.mparticle.internal.Logger
910
import com.mparticle.networking.Matcher
1011
import com.mparticle.testutils.AndroidUtils
1112
import com.mparticle.testutils.BaseCleanStartedEachTest
@@ -63,7 +64,7 @@ class IdentityApiTest : BaseCleanStartedEachTest() {
6364
try {
6465
com.mparticle.internal.AccessUtils.awaitMessageHandler()
6566
} catch (e: InterruptedException) {
66-
e.printStackTrace()
67+
Logger.error(e)
6768
}
6869
assertMParticleUserEquals(user, mpid1, identities, null, isLoggedIn)
6970
latch.countDown()

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.os.Handler
44
import android.util.MutableBoolean
55
import com.mparticle.MParticle
66
import com.mparticle.internal.ConfigManager
7+
import com.mparticle.internal.Logger
78
import com.mparticle.internal.MPUtility
89
import com.mparticle.networking.MPConnection
910
import com.mparticle.networking.MPConnectionTestImpl
@@ -300,7 +301,7 @@ class MParticleIdentityClientImplTest : BaseCleanStartedEachTest() {
300301
try {
301302
identityClient?.makeUrlRequest(connection, payload, identity)
302303
} catch (e: JSONException) {
303-
e.printStackTrace()
304+
Logger.error(e)
304305
Assert.fail(e.message)
305306
}
306307
(connection as MPConnectionTestImpl).responseCode = 202

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() {
5353
}
5454
checked[0] = true
5555
} catch (e: JSONException) {
56-
e.printStackTrace()
56+
Logger.error(e)
5757
}
5858
}
5959
}
@@ -93,7 +93,7 @@ class AppStateManagerInstrumentedTest : BaseCleanStartedEachTest() {
9393
latch.countDown()
9494
}
9595
} catch (e: JSONException) {
96-
e.printStackTrace()
96+
Logger.error(e)
9797
}
9898
}
9999
}

android-core/src/androidTest/kotlin/com.mparticle/internal/database/services/ReportingServiceTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mparticle.internal.database.services
22

33
import com.mparticle.internal.Constants
44
import com.mparticle.internal.JsonReportingMessage
5+
import com.mparticle.internal.Logger
56
import com.mparticle.testutils.TestingUtils
67
import org.json.JSONException
78
import org.junit.Assert
@@ -188,7 +189,7 @@ class ReportingServiceTest : BaseMPServiceTest() {
188189
return@Comparator o1.msgObject.getInt("a random Number")
189190
.compareTo(o2.msgObject.getInt("a random Number"))
190191
} catch (e: JSONException) {
191-
e.printStackTrace()
192+
Logger.error(e)
192193
}
193194
-1
194195
}
@@ -200,7 +201,7 @@ class ReportingServiceTest : BaseMPServiceTest() {
200201
return@Comparator o1.toJson().getInt("a random Number")
201202
.compareTo(o2.toJson().getInt("a random Number"))
202203
} catch (e: JSONException) {
203-
e.printStackTrace()
204+
Logger.error(e)
204205
}
205206
-1
206207
}

android-core/src/androidTest/kotlin/com.mparticle/networking/PinningTestHelper.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.mparticle.MParticle
77
import com.mparticle.identity.MParticleIdentityClient
88
import com.mparticle.internal.AccessUtils
99
import com.mparticle.internal.Constants
10+
import com.mparticle.internal.Logger
1011
import com.mparticle.internal.MParticleApiClient
1112
import com.mparticle.internal.MParticleApiClientImpl
1213
import com.mparticle.internal.MParticleApiClientImpl.MPNoConfigException
@@ -41,9 +42,9 @@ class PinningTestHelper internal constructor(
4142
)
4243
)
4344
} catch (e: MalformedURLException) {
44-
e.printStackTrace()
45+
Logger.error(e)
4546
} catch (e: MPNoConfigException) {
46-
e.printStackTrace()
47+
Logger.error(e)
4748
}
4849
val apiClient: MParticleApiClient = AccessUtils.getApiClient()
4950
setRequestClient(apiClient, path)

android-core/src/main/java/com/mparticle/MPReceiver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import androidx.annotation.NonNull;
1010

11+
import com.mparticle.internal.Logger;
1112
import com.mparticle.messaging.MPMessagingAPI;
1213
import com.mparticle.messaging.ProviderCloudMessage;
1314

@@ -62,7 +63,7 @@ public void run() {
6263
try {
6364
Class.forName("android.os.AsyncTask");
6465
} catch (ClassNotFoundException e) {
65-
e.printStackTrace();
66+
Logger.error(e);
6667
}
6768
}
6869
});

0 commit comments

Comments
 (0)