Merge pull request #850 from embrace-io/session-api-delegate

Extract session api to delegate
embrace-io · May 17, 2024 · f1437e4 · f1437e4
2 parents ea0eca8 + 2bb5ea3
commit f1437e4
Show file tree

Hide file tree

Showing 17 changed files with 670 additions and 259 deletions.
diff --git a/embrace-android-sdk/config/detekt/baseline.xml b/embrace-android-sdk/config/detekt/baseline.xml
@@ -7,6 +7,6 @@
  <ID>DataClassShouldBeImmutable:LegacyExceptionError.kt$LegacyExceptionError$@Json(name = "c") var occurrences: Int = 0</ID>
  <ID>DataClassShouldBeImmutable:LegacyExceptionError.kt$LegacyExceptionError$@Json(name = "rep") var exceptionErrors: MutableList&lt;LegacyExceptionErrorInfo&gt; = mutableListOf()</ID>
  <ID>LongParameterList:FakeModuleInitBootstrapper.kt$( fakeEmbLogger: FakeEmbLogger = FakeEmbLogger(), fakeInitModule: FakeInitModule = FakeInitModule(), fakeOpenTelemetryModule: FakeOpenTelemetryModule = FakeOpenTelemetryModule(), coreModuleSupplier: CoreModuleSupplier = { _, _, _ -&gt; FakeCoreModule() }, systemServiceModuleSupplier: SystemServiceModuleSupplier = { _, _ -&gt; FakeSystemServiceModule() }, androidServicesModuleSupplier: AndroidServicesModuleSupplier = { _, _, _ -&gt; FakeAndroidServicesModule() }, workerThreadModuleSupplier: WorkerThreadModuleSupplier = { _ -&gt; FakeWorkerThreadModule() }, storageModuleSupplier: StorageModuleSupplier = { _, _, _ -&gt; FakeStorageModule() }, essentialServiceModuleSupplier: EssentialServiceModuleSupplier = { _, _, _, _, _, _, _, _, _, _ -&gt; FakeEssentialServiceModule() }, dataSourceModuleSupplier: DataSourceModuleSupplier = { _, _, _, _, _, _, _, _ -&gt; FakeDataSourceModule() }, dataCaptureServiceModuleSupplier: DataCaptureServiceModuleSupplier = { _, _, _, _, _, _, _ -&gt; FakeDataCaptureServiceModule() }, deliveryModuleSupplier: DeliveryModuleSupplier = { _, _, _, _, _ -&gt; FakeDeliveryModule() }, anrModuleSupplier: AnrModuleSupplier = { _, _, _, _ -&gt; FakeAnrModule() }, customerLogModuleSupplier: CustomerLogModuleSupplier = { _, _, _, _, _, _, _, _ -&gt; FakeCustomerLogModule() }, nativeModuleSupplier: NativeModuleSupplier = { _, _, _, _, _, _, _ -&gt; FakeNativeModule() }, dataContainerModuleSupplier: DataContainerModuleSupplier = { _, _, _, _, _ -&gt; FakeDataContainerModule() }, sessionModuleSupplier: SessionModuleSupplier = { _, _, _, _, _, _, _, _, _, _, _, _, _ -&gt; FakeSessionModule() }, crashModuleSupplier: CrashModuleSupplier = { _, _, _, _, _, _, _, _, _, _, _ -&gt; FakeCrashModule() }, payloadModuleSupplier: PayloadModuleSupplier = { _, _, _, _, _, _, _, _, _ -&gt; FakePayloadModule() } )</ID>
- <ID>TooManyFunctions:EmbraceImpl.kt$EmbraceImpl : UserApi</ID>
+ <ID>TooManyFunctions:EmbraceImpl.kt$EmbraceImpl : UserApiSessionApiNetworkRequestApiLogsApi</ID>
  </CurrentIssues>
 </SmellBaseline>
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/Embrace.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/Embrace.java
@@ -285,21 +285,21 @@ public void recordNetworkRequest(@NonNull EmbraceNetworkRequest networkRequest)
  @Override
  public void logInfo(@NonNull String message) {
  if (verifyNonNullParameters("logInfo", message)) {
- logMessage(message, Severity.INFO);
+ impl.logInfo(message);
  }
  }
 
  @Override
  public void logWarning(@NonNull String message) {
  if (verifyNonNullParameters("logWarning", message)) {
- logMessage(message, Severity.WARNING);
+ impl.logWarning(message);
  }
  }
 
  @Override
  public void logError(@NonNull String message) {
  if (verifyNonNullParameters("logError", message)) {
- logMessage(message, Severity.ERROR);
+ impl.logError(message);
  }
  }
 
@@ -313,7 +313,7 @@ public void addBreadcrumb(@NonNull String message) {
  @Override
  public void logMessage(@NonNull String message, @NonNull Severity severity) {
  if (verifyNonNullParameters("logMessage", message, severity)) {
- logMessage(message, severity, null);
+ impl.logMessage(message, severity);
  }
  }
 
@@ -329,14 +329,14 @@ public void logMessage(@NonNull String message,
  @Override
  public void logException(@NonNull Throwable throwable) {
  if (verifyNonNullParameters("logException", throwable)) {
- logException(throwable, Severity.ERROR);
+ impl.logException(throwable);
  }
  }
 
  @Override
  public void logException(@NonNull Throwable throwable, @NonNull Severity severity) {
  if (verifyNonNullParameters("logException", throwable, severity)) {
- logException(throwable, severity, null);
+ impl.logException(throwable, severity);
  }
  }
 
@@ -345,7 +345,7 @@ public void logException(@NonNull Throwable throwable,
  @NonNull Severity severity,
  @Nullable Map<String, ?> properties) {
  if (verifyNonNullParameters("logException", throwable, severity)) {
- logException(throwable, severity, properties, null);
+ impl.logException(throwable, severity, properties);
  }
  }
 
@@ -362,14 +362,14 @@ public void logException(@NonNull Throwable throwable,
  @Override
  public void logCustomStacktrace(@NonNull StackTraceElement[] stacktraceElements) {
  if (verifyNonNullParameters("logCustomStacktrace", (Object) stacktraceElements)) {
- logCustomStacktrace(stacktraceElements, Severity.ERROR);
+ impl.logCustomStacktrace(stacktraceElements);
  }
  }
 
  @Override
  public void logCustomStacktrace(@NonNull StackTraceElement[] stacktraceElements, @NonNull Severity severity) {
  if (verifyNonNullParameters("logCustomStacktrace", (Object) stacktraceElements, severity)) {
- logCustomStacktrace(stacktraceElements, severity, null);
+ impl.logCustomStacktrace(stacktraceElements, severity);
  }
  }
 
@@ -378,7 +378,7 @@ public void logCustomStacktrace(@NonNull StackTraceElement[] stacktraceElements,
  @NonNull Severity severity,
  @Nullable Map<String, ?> properties) {
  if (verifyNonNullParameters("logCustomStacktrace", (Object) stacktraceElements, severity)) {
- logCustomStacktrace(stacktraceElements, severity, properties, null);
+ impl.logCustomStacktrace(stacktraceElements, severity, properties);
  }
  }
 
@@ -587,7 +587,8 @@ public void logPushNotification(@Nullable String title,
  id,
  notificationPriority,
  messageDeliveredPriority,
- PushNotificationBreadcrumb.NotificationType.Builder.notificationTypeFor(hasData, isNotification)
+ isNotification,
+ hasData
  );
  }
  }