Allow accessing actual values from certain native enums

realm · Aug 8, 2022 · 3ddf15b · 3ddf15b
1 parent a92ca9c
commit 3ddf15b
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 33 deletions.
diff --git a/.../cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/sync/AppErrorCategory.kt b/.../cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/sync/AppErrorCategory.kt
@@ -33,4 +33,6 @@ expect enum class AppErrorCategory {
     companion object {
         fun fromInt(nativeValue: Int): AppErrorCategory
     }
+
+    fun toInt(): Int
 }
diff --git a/...s/cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/sync/ClientErrorCode.kt b/...s/cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/sync/ClientErrorCode.kt
@@ -31,4 +31,6 @@ expect enum class ClientErrorCode {
     companion object {
         fun fromInt(nativeValue: Int): ClientErrorCode
     }
+
+    fun toInt(): Int
 }
diff --git a/...cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/sync/ProtocolErrorCode.kt b/...cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/sync/ProtocolErrorCode.kt
@@ -88,6 +88,8 @@ expect enum class ProtocolConnectionErrorCode {
     companion object {
         fun fromInt(nativeValue: Int): ProtocolConnectionErrorCode
     }
+
+    fun toInt(): Int
 }
 
 /**

diff --git a/...erop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/sync/SyncErrorCodeCategory.kt b/...erop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/sync/SyncErrorCodeCategory.kt
@@ -33,4 +33,6 @@ expect enum class SyncErrorCodeCategory {
     companion object {
         fun fromInt(nativeValue: Int): SyncErrorCodeCategory
     }
+
+    fun toInt(): Int
 }
diff --git a/...ages/cinterop/src/darwin/kotlin/io/realm/kotlin/internal/interop/sync/AppErrorCategory.kt b/...ages/cinterop/src/darwin/kotlin/io/realm/kotlin/internal/interop/sync/AppErrorCategory.kt
@@ -40,4 +40,6 @@ actual enum class AppErrorCategory(actual val description: String, val nativeVal
             return fromInt(nativeValue.value.toInt())
         }
     }
+
+    actual fun toInt(): Int = nativeValue.value.toInt()
 }
diff --git a/packages/cinterop/src/darwin/kotlin/io/realm/kotlin/internal/interop/sync/ClientErrorCode.kt b/packages/cinterop/src/darwin/kotlin/io/realm/kotlin/internal/interop/sync/ClientErrorCode.kt
@@ -32,14 +32,7 @@ actual enum class ClientErrorCode(actual val description: String, val nativeValu
             }
             error("Unknown client error code: $nativeValue")
         }
-
-        internal fun of(nativeValue: realm_app_errno_client): ClientErrorCode {
-            for (value in values()) {
-                if (value.nativeValue == nativeValue) {
-                    return value
-                }
-            }
-            error("Unknown client error code: $nativeValue")
-        }
     }
+
+    actual fun toInt(): Int = nativeValue.toInt()
 }
diff --git a/...ges/cinterop/src/darwin/kotlin/io/realm/kotlin/internal/interop/sync/ProtocolErrorCode.kt b/...ges/cinterop/src/darwin/kotlin/io/realm/kotlin/internal/interop/sync/ProtocolErrorCode.kt
@@ -93,6 +93,8 @@ actual enum class ProtocolConnectionErrorCode(actual val description: String, va
             error("Unknown protocol connection error code: $nativeValue")
         }
     }
+
+    actual fun toInt(): Int = nativeValue.toInt()
 }
 
 actual enum class ProtocolSessionErrorCode(actual val description: String, val nativeValue: realm_sync_errno_session) {

diff --git a/...cinterop/src/darwin/kotlin/io/realm/kotlin/internal/interop/sync/SyncErrorCodeCategory.kt b/...cinterop/src/darwin/kotlin/io/realm/kotlin/internal/interop/sync/SyncErrorCodeCategory.kt
@@ -36,4 +36,6 @@ actual enum class SyncErrorCodeCategory(actual val description: String, val nati
             error("Unknown sync error code category: $nativeValue")
         }
     }
+
+    actual fun toInt(): Int = nativeValue.value.toInt()
 }
diff --git a/packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/sync/AppErrorCategory.kt b/packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/sync/AppErrorCategory.kt
@@ -36,10 +36,7 @@ actual enum class AppErrorCategory(actual val description: String, override val
             }
             error("Unknown app error category value: $nativeValue")
         }
-
-        @JvmStatic
-        fun of(nativeValue: Int): AppErrorCategory {
-            return fromInt(nativeValue)
-        }
     }
+
+    actual fun toInt(): Int = nativeValue
 }
diff --git a/packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/sync/ClientErrorCode.kt b/packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/sync/ClientErrorCode.kt
@@ -33,9 +33,7 @@ actual enum class ClientErrorCode(actual val description: String, override val n
             }
             error("Unknown client error code: $nativeValue")
         }
-
-        internal fun of(nativeValue: Int): ClientErrorCode {
-            return fromInt(nativeValue)
-        }
     }
+
+    actual fun toInt(): Int = nativeValue
 }
diff --git a/packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/sync/ProtocolErrorCode.kt b/packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/sync/ProtocolErrorCode.kt
@@ -93,6 +93,8 @@ actual enum class ProtocolConnectionErrorCode(actual val description: String, ov
             error("Unknown protocol connection error code: $nativeValue")
         }
     }
+
+    actual fun toInt(): Int = nativeValue
 }
 
 actual enum class ProtocolSessionErrorCode(actual val description: String, override val nativeValue: Int) : NativeEnumerated {

diff --git a/...es/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/sync/SyncErrorCodeCategory.kt b/...es/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/sync/SyncErrorCodeCategory.kt
@@ -35,15 +35,7 @@ actual enum class SyncErrorCodeCategory(actual val description: String, override
             }
             error("Unknown sync error code category value: $nativeValue")
         }
-
-        @JvmStatic
-        fun of(nativeValue: Int): SyncErrorCodeCategory {
-            for (value in values()) {
-                if (value.nativeValue == nativeValue) {
-                    return value
-                }
-            }
-            error("Unknown sync error code category value: $nativeValue")
-        }
     }
+
+    actual fun toInt(): Int = nativeValue
 }
diff --git a/...src/androidTest/kotlin/io/realm/kotlin/test/mongodb/shared/internal/RealmSyncUtilsTest.kt b/...src/androidTest/kotlin/io/realm/kotlin/test/mongodb/shared/internal/RealmSyncUtilsTest.kt
@@ -35,7 +35,7 @@ class RealmSyncUtilsTest {
     fun convertSyncErrorCode_unknownErrorCode1() {
         val syncException = convertSyncErrorCode(
             SyncErrorCode(
-                category = SyncErrorCodeCategory.RLM_SYNC_ERROR_CATEGORY_UNKNOWN.nativeValue,
+                category = SyncErrorCodeCategory.RLM_SYNC_ERROR_CATEGORY_UNKNOWN.toInt(),
                 value = 9999,
                 message = "Placeholder message"
             )
@@ -48,7 +48,7 @@ class RealmSyncUtilsTest {
     fun convertSyncErrorCode_unknownErrorCode2() {
         val syncException = convertSyncErrorCode(
             SyncErrorCode(
-                category = SyncErrorCodeCategory.RLM_SYNC_ERROR_CATEGORY_CONNECTION.nativeValue,
+                category = SyncErrorCodeCategory.RLM_SYNC_ERROR_CATEGORY_CONNECTION.toInt(),
                 value = 9999,
                 message = "Placeholder message"
             )
@@ -62,7 +62,7 @@ class RealmSyncUtilsTest {
         val syncException = convertSyncErrorCode(
             SyncErrorCode(
                 category = 9999,
-                value = ProtocolConnectionErrorCode.RLM_SYNC_ERR_CONNECTION_CONNECTION_CLOSED.nativeValue,
+                value = ProtocolConnectionErrorCode.RLM_SYNC_ERR_CONNECTION_CONNECTION_CLOSED.toInt(),
                 message = "Placeholder message"
             )
         )
@@ -74,7 +74,7 @@ class RealmSyncUtilsTest {
     fun convertAppError_unknownErrorCode() {
         val appException = convertAppError(
             AppError(
-                category = AppErrorCategory.RLM_APP_ERROR_CATEGORY_CUSTOM.nativeValue,
+                category = AppErrorCategory.RLM_APP_ERROR_CATEGORY_CUSTOM.toInt(),
                 errorCode = 9999,
                 message = "Placeholder message",
                 httpStatusCode = 9999,
@@ -90,7 +90,7 @@ class RealmSyncUtilsTest {
         val appException = convertAppError(
             AppError(
                 category = 9999,
-                errorCode = ClientErrorCode.RLM_APP_ERR_CLIENT_USER_NOT_FOUND.nativeValue,
+                errorCode = ClientErrorCode.RLM_APP_ERR_CLIENT_USER_NOT_FOUND.toInt(),
                 message = "Placeholder message",
                 httpStatusCode = 9999,
                 linkToServerLog = null
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,6 +88,8 @@ expect enum class ProtocolConnectionErrorCode { @@
         companion object {
             fun fromInt(nativeValue: Int): ProtocolConnectionErrorCode
         }
+        fun toInt(): Int
     }
     /**
@@ Expand Down @@