refactor

Author: BFergerson

control/src/main/kotlin/spp/probe/SourceProbe.kt

@@ -267,20 +267,20 @@ object SourceProbe {
                 //register remotes
                 FrameHelper.sendFrame(
                     BridgeEventType.REGISTER.name.lowercase(),
-                    ProbeAddress.LIVE_INSTRUMENT_REMOTE.address,
+                    ProbeAddress.LIVE_INSTRUMENT_REMOTE,
                     JsonObject(),
                     tcpSocket
                 )
                 FrameHelper.sendFrame(
                     BridgeEventType.REGISTER.name.lowercase(),
-                    ProbeAddress.LIVE_INSTRUMENT_REMOTE.address + ":" + PROBE_ID,
+                    ProbeAddress.LIVE_INSTRUMENT_REMOTE + ":" + PROBE_ID,
                     JsonObject(),
                     tcpSocket
                 )
                 consumer.unregister()
             }
             FrameHelper.sendFrame(
-                BridgeEventType.SEND.name.lowercase(), PlatformAddress.PROBE_CONNECTED.address,
+                BridgeEventType.SEND.name.lowercase(), PlatformAddress.PROBE_CONNECTED,
                 replyAddress, JsonObject(), true, JsonObject.mapFrom(pc), socket.result()
             )
         }

control/src/main/kotlin/spp/probe/control/LiveInstrumentRemote.kt

@@ -96,10 +96,10 @@ class LiveInstrumentRemote : AbstractVerticle() {
         }
 
         vertx.eventBus() //global instrument remote
-            .localConsumer<JsonObject>(ProbeAddress.LIVE_INSTRUMENT_REMOTE.address)
+            .localConsumer<JsonObject>(ProbeAddress.LIVE_INSTRUMENT_REMOTE)
             .handler { handleInstrumentationRequest(it) }
         vertx.eventBus() //probe specific instrument remote
-            .localConsumer<JsonObject>(ProbeAddress.LIVE_INSTRUMENT_REMOTE.address + ":" + SourceProbe.PROBE_ID)
+            .localConsumer<JsonObject>(ProbeAddress.LIVE_INSTRUMENT_REMOTE + ":" + SourceProbe.PROBE_ID)
             .handler { handleInstrumentationRequest(it) }
     }
 
@@ -128,7 +128,7 @@ class LiveInstrumentRemote : AbstractVerticle() {
         map["cause"] = ThrowableTransformer.INSTANCE.convert2String(ex, 4000)
 
         FrameHelper.sendFrame(
-            BridgeEventType.PUBLISH.name.lowercase(), PlatformAddress.LIVE_INSTRUMENT_REMOVED.address,
+            BridgeEventType.PUBLISH.name.lowercase(), PlatformAddress.LIVE_INSTRUMENT_REMOVED,
             JsonObject.mapFrom(map), SourceProbe.tcpSocket
         )
     }

services/src/main/kotlin/spp/probe/services/instrument/LiveInstrumentService.kt

@@ -117,7 +117,7 @@ object LiveInstrumentService {
                 instrument.isLive = true
                 if (!instrument.isRemoval) {
                     instrumentEventConsumer!!.accept(
-                        PlatformAddress.LIVE_INSTRUMENT_APPLIED.address,
+                        PlatformAddress.LIVE_INSTRUMENT_APPLIED,
                         ModelSerializer.INSTANCE.toJson(instrument.instrument)
                     )
                 }
@@ -227,7 +227,7 @@ object LiveInstrumentService {
         }
 
         instrumentEventConsumer!!.accept(
-            PlatformAddress.LIVE_INSTRUMENT_REMOVED.address,
+            PlatformAddress.LIVE_INSTRUMENT_REMOVED,
             ModelSerializer.INSTANCE.toJson(map)
         )
     }