more strict enums

Author: BFergerson

src/main/kotlin/spp/cli/commands/admin/access/AddAccessPermission.kt

@@ -31,8 +31,8 @@ import spp.cli.PlatformCLI
 import spp.cli.PlatformCLI.echoError
 import spp.cli.protocol.access.AddAccessPermissionMutation
 import spp.cli.protocol.access.adapter.AddAccessPermissionMutation_ResponseAdapter.AddAccessPermission
-import spp.cli.protocol.type.AccessType
 import spp.cli.util.JsonCleaner
+import spp.protocol.platform.auth.AccessType
 import kotlin.system.exitProcess
 
 class AddAccessPermission : CliktCommand(printHelpOnEmptyArgs = true) {
@@ -43,7 +43,10 @@ class AddAccessPermission : CliktCommand(printHelpOnEmptyArgs = true) {
     override fun run() = runBlocking {
         val response = try {
             PlatformCLI.apolloClient.mutation(
-                AddAccessPermissionMutation(Optional.Present(locationPatterns), type)
+                AddAccessPermissionMutation(
+                    Optional.Present(locationPatterns),
+                    spp.cli.protocol.type.AccessType.valueOf(type.toString())
+                )
             ).execute()
         } catch (e: Exception) {
             echoError(e)

src/main/kotlin/spp/cli/commands/admin/permission/AddRolePermission.kt

@@ -25,7 +25,7 @@ import spp.cli.Main
 import spp.cli.PlatformCLI.apolloClient
 import spp.cli.PlatformCLI.echoError
 import spp.cli.protocol.permission.AddRolePermissionMutation
-import spp.cli.protocol.type.RolePermission
+import spp.protocol.platform.auth.RolePermission
 import kotlin.system.exitProcess
 
 class AddRolePermission : CliktCommand(printHelpOnEmptyArgs = true) {

src/main/kotlin/spp/cli/commands/developer/instrument/AddBreakpoint.kt

@@ -36,8 +36,8 @@ import spp.cli.protocol.instrument.adapter.AddLiveBreakpointMutation_ResponseAda
 import spp.cli.protocol.type.InstrumentThrottleInput
 import spp.cli.protocol.type.LiveBreakpointInput
 import spp.cli.protocol.type.LiveSourceLocationInput
-import spp.cli.protocol.type.ThrottleStep
 import spp.cli.util.JsonCleaner
+import spp.protocol.instrument.throttle.ThrottleStep
 import kotlin.system.exitProcess
 
 class AddBreakpoint : CliktCommand(name = "breakpoint", help = "Add a live breakpoint instrument") {
@@ -57,7 +57,11 @@ class AddBreakpoint : CliktCommand(name = "breakpoint", help = "Add a live break
             condition = Optional.Present(condition),
             expiresAt = Optional.Present(expiresAt),
             hitLimit = Optional.Present(hitLimit),
-            throttle = Optional.Present(InstrumentThrottleInput(throttleLimit, throttleStep))
+            throttle = Optional.Present(
+                InstrumentThrottleInput(
+                    throttleLimit, spp.cli.protocol.type.ThrottleStep.valueOf(throttleStep.toString())
+                )
+            )
         )
         val response = try {
             apolloClient.mutation(AddLiveBreakpointMutation(input)).execute()

src/main/kotlin/spp/cli/commands/developer/instrument/AddLog.kt

@@ -37,8 +37,8 @@ import spp.cli.protocol.instrument.adapter.AddLiveLogMutation_ResponseAdapter.Ad
 import spp.cli.protocol.type.InstrumentThrottleInput
 import spp.cli.protocol.type.LiveLogInput
 import spp.cli.protocol.type.LiveSourceLocationInput
-import spp.cli.protocol.type.ThrottleStep
 import spp.cli.util.JsonCleaner
+import spp.protocol.instrument.throttle.ThrottleStep
 import kotlin.system.exitProcess
 
 class AddLog : CliktCommand(name = "log", help = "Add a live log instrument") {
@@ -62,7 +62,11 @@ class AddLog : CliktCommand(name = "log", help = "Add a live log instrument") {
             condition = Optional.Present(condition),
             expiresAt = Optional.Present(expiresAt),
             hitLimit = Optional.Present(hitLimit),
-            throttle = Optional.Present(InstrumentThrottleInput(throttleLimit, throttleStep))
+            throttle = Optional.Present(
+                InstrumentThrottleInput(
+                    throttleLimit, spp.cli.protocol.type.ThrottleStep.valueOf(throttleStep.toString())
+                )
+            )
         )
         val response = try {
             apolloClient.mutation(AddLiveLogMutation(input)).execute()

src/main/kotlin/spp/cli/commands/developer/instrument/AddMeter.kt

@@ -33,8 +33,14 @@ import spp.cli.PlatformCLI.apolloClient
 import spp.cli.PlatformCLI.echoError
 import spp.cli.protocol.instrument.AddLiveMeterMutation
 import spp.cli.protocol.instrument.adapter.AddLiveMeterMutation_ResponseAdapter.AddLiveMeter
-import spp.cli.protocol.type.*
+import spp.cli.protocol.type.InstrumentThrottleInput
+import spp.cli.protocol.type.LiveMeterInput
+import spp.cli.protocol.type.LiveSourceLocationInput
+import spp.cli.protocol.type.MetricValueInput
 import spp.cli.util.JsonCleaner
+import spp.protocol.instrument.meter.MeterType
+import spp.protocol.instrument.meter.MetricValueType
+import spp.protocol.instrument.throttle.ThrottleStep
 import kotlin.system.exitProcess
 
 class AddMeter : CliktCommand(name = "meter", help = "Add a live meter instrument") {
@@ -55,16 +61,20 @@ class AddMeter : CliktCommand(name = "meter", help = "Add a live meter instrumen
     override fun run() = runBlocking {
         val input = LiveMeterInput(
             meterName = meterName,
-            meterType = meterType,
+            meterType = spp.cli.protocol.type.MeterType.valueOf(meterType.toString()),
             metricValue = MetricValueInput(
-                valueType = valueType,
+                valueType = spp.cli.protocol.type.MetricValueType.valueOf(valueType.toString()),
                 value = Optional.presentIfNotNull(value)
             ),
             location = LiveSourceLocationInput(source, line),
             condition = Optional.Present(condition),
             expiresAt = Optional.Present(expiresAt),
             hitLimit = Optional.Present(hitLimit),
-            throttle = Optional.Present(InstrumentThrottleInput(throttleLimit, throttleStep))
+            throttle = Optional.Present(
+                InstrumentThrottleInput(
+                    throttleLimit, spp.cli.protocol.type.ThrottleStep.valueOf(throttleStep.toString())
+                )
+            )
         )
         val response = try {
             apolloClient.mutation(AddLiveMeterMutation(input)).execute()