switch to data class

Author: BFergerson

src/commonMain/kotlin/spp.protocol/platform/auth/DeveloperRole.kt

@@ -17,20 +17,21 @@
  */
 package spp.protocol.platform.auth
 
-enum class DeveloperRole(var roleName: String, var nativeRole: Boolean) {
-    ROLE_MANAGER("role_manager", true),
-    ROLE_USER("role_user", true),
-    USER("*", false);
+import kotlinx.serialization.Serializable
 
+@Serializable
+data class DeveloperRole(val roleName: String, val nativeRole: Boolean) {
     companion object {
+        val ROLE_MANAGER = DeveloperRole("role_manager", true)
+        val ROLE_USER = DeveloperRole("role_user", true)
+
         fun fromString(roleName: String): DeveloperRole {
-            val nativeRole = values().find { it.name.lowercase() == roleName.lowercase() }
-            return if (nativeRole != null) {
-                nativeRole
+            return if (roleName.equals("role_manager", true)) {
+                ROLE_MANAGER
+            } else if (roleName.equals("role_user", true)) {
+                ROLE_USER
             } else {
-                val user = USER
-                user.roleName = roleName.toLowerCase().replace(' ', '_').trim()
-                user
+                DeveloperRole(roleName.toLowerCase().replace(' ', '_').trim(), false)
             }
         }
     }

src/jvmMain/kotlin/spp/protocol/marshall/ProtocolMarshaller.kt

@@ -39,6 +39,7 @@ import spp.protocol.instrument.event.LiveInstrumentRemoved
 import spp.protocol.instrument.event.LiveLogHit
 import spp.protocol.instrument.variable.LiveVariable
 import spp.protocol.platform.auth.DataRedaction
+import spp.protocol.platform.auth.DeveloperRole
 import spp.protocol.platform.auth.RedactionType
 import spp.protocol.platform.developer.SelfInfo
 import spp.protocol.platform.general.Service
@@ -424,4 +425,17 @@ object ProtocolMarshaller {
             value.getString("replacement")
         )
     }
+
+    @JvmStatic
+    fun serializeDeveloperRole(value: DeveloperRole): JsonObject {
+        return JsonObject(Json.encode(value))
+    }
+
+    @JvmStatic
+    fun deserializeDeveloperRole(value: JsonObject): DeveloperRole {
+        return DeveloperRole(
+            value.getString("roleName"),
+            value.getBoolean("nativeRole")
+        )
+    }
 }

src/jvmMain/resources/META-INF/vertx/json-mappers.properties

@@ -29,4 +29,6 @@ spp.protocol.platform.status.ActiveInstance.deserializer=spp.protocol.marshall.P
 spp.protocol.instrument.event.LiveInstrumentRemoved.serializer=spp.protocol.marshall.ProtocolMarshaller#serializeLiveInstrumentRemoved
 spp.protocol.instrument.event.LiveInstrumentRemoved.deserializer=spp.protocol.marshall.ProtocolMarshaller#deserializeLiveInstrumentRemoved
 spp.protocol.instrument.event.LiveBreakpointHit.serializer=spp.protocol.marshall.ProtocolMarshaller#serializeLiveBreakpointHit
-spp.protocol.instrument.event.LiveBreakpointHit.deserializer=spp.protocol.marshall.ProtocolMarshaller#deserializeLiveBreakpointHit
+spp.protocol.instrument.event.LiveBreakpointHit.deserializer=spp.protocol.marshall.ProtocolMarshaller#deserializeLiveBreakpointHit
+spp.protocol.platform.auth.DeveloperRole.serializer=spp.protocol.marshall.ProtocolMarshaller#serializeDeveloperRole
+spp.protocol.platform.auth.DeveloperRole.deserializer=spp.protocol.marshall.ProtocolMarshaller#deserializeDeveloperRole