Skip to content

Commit

Permalink
refactor: move event type to avoid compiler warning
Browse files Browse the repository at this point in the history
  • Loading branch information
fractalwrench committed Feb 1, 2024
1 parent c1873f2 commit e7a9262
Show file tree
Hide file tree
Showing 36 changed files with 220 additions and 228 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.embrace.android.embracesdk.assertions

import io.embrace.android.embracesdk.Embrace
import io.embrace.android.embracesdk.EmbraceEvent
import io.embrace.android.embracesdk.EventType
import io.embrace.android.embracesdk.payload.EventMessage
import io.embrace.android.embracesdk.IntegrationTestRule
import io.embrace.android.embracesdk.LogExceptionType
Expand All @@ -13,7 +13,7 @@ import org.junit.Assert.assertEquals
internal fun assertLogMessageReceived(
eventMessage: EventMessage,
message: String,
eventType: EmbraceEvent.Type,
eventType: EventType,
logType: LogExceptionType = LogExceptionType.NONE,
timeMs: Long = IntegrationTestRule.DEFAULT_SDK_START_TIME_MS,
properties: Map<String, Any>? = null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package io.embrace.android.embracesdk.testcases

import android.os.Build
import androidx.test.ext.junit.runners.AndroidJUnit4
import io.embrace.android.embracesdk.EmbraceEvent
import io.embrace.android.embracesdk.EventType
import io.embrace.android.embracesdk.IntegrationTestRule
import io.embrace.android.embracesdk.LogType
import io.embrace.android.embracesdk.assertions.assertLogMessageReceived
Expand Down Expand Up @@ -125,25 +125,25 @@ internal class EmbraceInternalInterfaceTest {
assertLogMessageReceived(
logs[0],
message = "info",
eventType = EmbraceEvent.Type.INFO_LOG,
eventType = EventType.INFO_LOG,
properties = expectedProperties
)
assertLogMessageReceived(
logs[1],
message = "warning",
eventType = EmbraceEvent.Type.WARNING_LOG,
eventType = EventType.WARNING_LOG,
properties = expectedProperties
)
assertLogMessageReceived(
logs[2],
message = "error",
eventType = EmbraceEvent.Type.ERROR_LOG,
eventType = EventType.ERROR_LOG,
properties = expectedProperties
)
assertLogMessageReceived(
logs[3],
message = "",
eventType = EmbraceEvent.Type.ERROR_LOG,
eventType = EventType.ERROR_LOG,
properties = expectedProperties
)
}
Expand Down Expand Up @@ -252,7 +252,7 @@ internal class EmbraceInternalInterfaceTest {
embrace.start(harness.fakeCoreModule.context)
embrace.internalInterface.setProcessStartedByNotification()
harness.recordSession(simulateAppStartup = true) { }
assertEquals(EmbraceEvent.Type.START, harness.fakeDeliveryModule.deliveryService.lastEventSentAsync?.event?.type)
assertEquals(EventType.START, harness.fakeDeliveryModule.deliveryService.lastEventSentAsync?.event?.type)
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.embrace.android.embracesdk.testcases

import androidx.test.ext.junit.runners.AndroidJUnit4
import io.embrace.android.embracesdk.EmbraceEvent
import io.embrace.android.embracesdk.EventType
import io.embrace.android.embracesdk.IntegrationTestRule
import io.embrace.android.embracesdk.LogExceptionType
import io.embrace.android.embracesdk.Severity
Expand All @@ -26,7 +26,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = "test message",
eventType = EmbraceEvent.Type.INFO_LOG
eventType = EventType.INFO_LOG
)
}
}
Expand All @@ -39,7 +39,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = "test message",
eventType = EmbraceEvent.Type.WARNING_LOG
eventType = EventType.WARNING_LOG
)
}
}
Expand All @@ -52,7 +52,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = "test message",
eventType = EmbraceEvent.Type.ERROR_LOG
eventType = EventType.ERROR_LOG
)
}
}
Expand All @@ -69,7 +69,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = expectedMessage,
eventType = EmbraceEvent.Type.fromSeverity(severity)
eventType = EventType.fromSeverity(severity)
)
}
}
Expand All @@ -87,7 +87,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = expectedMessage,
eventType = EmbraceEvent.Type.fromSeverity(severity),
eventType = EventType.fromSeverity(severity),
properties = customProperties
)
}
Expand All @@ -102,7 +102,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = checkNotNull(testException.message),
eventType = EmbraceEvent.Type.ERROR_LOG,
eventType = EventType.ERROR_LOG,
logType = LogExceptionType.HANDLED,
exception = testException
)
Expand All @@ -120,7 +120,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = checkNotNull(testException.message),
eventType = EmbraceEvent.Type.fromSeverity(severity),
eventType = EventType.fromSeverity(severity),
logType = LogExceptionType.HANDLED,
exception = testException
)
Expand All @@ -139,7 +139,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = checkNotNull(testException.message),
eventType = EmbraceEvent.Type.fromSeverity(severity),
eventType = EventType.fromSeverity(severity),
properties = customProperties,
logType = LogExceptionType.HANDLED,
exception = testException
Expand All @@ -160,7 +160,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = expectedMessage,
eventType = EmbraceEvent.Type.fromSeverity(severity),
eventType = EventType.fromSeverity(severity),
properties = customProperties,
logType = LogExceptionType.HANDLED,
exception = testException
Expand All @@ -177,7 +177,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = "",
eventType = EmbraceEvent.Type.ERROR_LOG,
eventType = EventType.ERROR_LOG,
logType = LogExceptionType.HANDLED,
stack = stacktrace
)
Expand All @@ -195,7 +195,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = "",
eventType = EmbraceEvent.Type.fromSeverity(severity),
eventType = EventType.fromSeverity(severity),
logType = LogExceptionType.HANDLED,
stack = stacktrace
)
Expand All @@ -214,7 +214,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = "",
eventType = EmbraceEvent.Type.fromSeverity(severity),
eventType = EventType.fromSeverity(severity),
properties = customProperties,
logType = LogExceptionType.HANDLED,
stack = stacktrace
Expand All @@ -235,7 +235,7 @@ internal class LoggingApiTest {
assertLogMessageReceived(
eventMessage,
message = expectedMessage,
eventType = EmbraceEvent.Type.fromSeverity(severity),
eventType = EventType.fromSeverity(severity),
properties = customProperties,
logType = LogExceptionType.HANDLED,
stack = stacktrace
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ void logMessage(@NonNull String message,
@NonNull Severity severity,
@Nullable Map<String, Object> properties) {
logMessage(
EmbraceEvent.Type.Companion.fromSeverity(severity),
EventType.Companion.fromSeverity(severity),
message,
properties,
null,
Expand All @@ -1116,7 +1116,7 @@ void logException(@NonNull Throwable throwable,
@Nullable String message) {
String exceptionMessage = throwable.getMessage() != null ? throwable.getMessage() : "";
logMessage(
EmbraceEvent.Type.Companion.fromSeverity(severity),
EventType.Companion.fromSeverity(severity),
message != null ? message : exceptionMessage,
properties,
ThrowableUtilsKt.getSafeStackTrace(throwable),
Expand All @@ -1133,7 +1133,7 @@ void logCustomStacktrace(@NonNull StackTraceElement[] stacktraceElements,
@Nullable Map<String, Object> properties,
@Nullable String message) {
logMessage(
EmbraceEvent.Type.Companion.fromSeverity(severity),
EventType.Companion.fromSeverity(severity),
message != null ? message : "",
properties,
stacktraceElements,
Expand All @@ -1146,7 +1146,7 @@ void logCustomStacktrace(@NonNull StackTraceElement[] stacktraceElements,
}

void logMessage(
@NonNull EmbraceEvent.Type type,
@NonNull EventType type,
@NonNull String message,
@Nullable Map<String, Object> properties,
@Nullable StackTraceElement[] stackTraceElements,
Expand All @@ -1167,7 +1167,7 @@ void logMessage(
}

void logMessage(
@NonNull EmbraceEvent.Type type,
@NonNull EventType type,
@NonNull String message,
@Nullable Map<String, Object> properties,
@Nullable StackTraceElement[] stackTraceElements,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ internal class EmbraceInternalInterfaceImpl(

override fun logInfo(message: String, properties: Map<String, Any>?) {
embraceImpl.logMessage(
EmbraceEvent.Type.INFO_LOG,
EventType.INFO_LOG,
message,
properties,
null,
Expand All @@ -40,7 +40,7 @@ internal class EmbraceInternalInterfaceImpl(
stacktrace: String?
) {
embraceImpl.logMessage(
EmbraceEvent.Type.WARNING_LOG,
EventType.WARNING_LOG,
message,
properties,
null,
Expand All @@ -58,7 +58,7 @@ internal class EmbraceInternalInterfaceImpl(
isException: Boolean,
) {
embraceImpl.logMessage(
EmbraceEvent.Type.ERROR_LOG,
EventType.ERROR_LOG,
message,
properties,
null,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package io.embrace.android.embracesdk

import android.annotation.SuppressLint
import com.squareup.moshi.Json
import io.embrace.android.embracesdk.annotation.InternalApi

/**
* Models the different types of Event.
*/
@InternalApi
@SuppressLint("EmbracePublicApiPackageRule")
internal enum class EventType(

/**
* The abbreviation used in the story ID header when sending the event to the Embrace
* API using the [ApiClient].
*
* @return the abbreviation for the event type
*/
val abbreviation: String
) {

@Json(name = "start")
START("s"),

@Json(name = "late")
LATE("l"),

@Json(name = "interrupt")
INTERRUPT("i"),

@Json(name = "crash")
CRASH("c"),

@Json(name = "end")
END("e"),

@Json(name = "info")
INFO_LOG("il"),

@Json(name = "error")
ERROR_LOG("el"),

@Json(name = "warning")
WARNING_LOG("wl"),

@Json(name = "network")
NETWORK_LOG("n");

companion object {
fun fromSeverity(severity: Severity): EventType {
return when (severity) {
Severity.INFO -> INFO_LOG
Severity.WARNING -> WARNING_LOG
Severity.ERROR -> ERROR_LOG
}
}
}
}
Loading

0 comments on commit e7a9262

Please sign in to comment.