refactor: line number option

Author: BFergerson

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

@@ -42,7 +42,7 @@ class AddBreakpoint : CliktCommand(name = "breakpoint", help = "Add a live break
 
     private val log = LoggerFactory.getLogger(AddBreakpoint::class.java)
     val source by argument(help = "Qualified class name")
-    val line by argument(help = "Line number").int()
+    val line by option("-line", "-l", help = "Line number").int()
     val id by option("-id", "-i", help = "Breakpoint identifier")
     val condition by option("-condition", "-c", help = "Trigger condition")
     val expiresAt by option("-expiresAt", "-e", help = "Expiration time (epoch time [ms])").long()
@@ -53,7 +53,7 @@ class AddBreakpoint : CliktCommand(name = "breakpoint", help = "Add a live break
 
     override fun run() = runBlocking {
         val input = LiveBreakpointInput(
-            location = LiveSourceLocationInput(source, line),
+            location = LiveSourceLocationInput(source, Optional.presentIfNotNull(line)),
             condition = Optional.Present(condition),
             expiresAt = Optional.Present(expiresAt),
             hitLimit = Optional.Present(hitLimit),

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

@@ -41,8 +41,8 @@ import spp.protocol.instrument.throttle.ThrottleStep
 class AddLog : CliktCommand(name = "log", help = "Add a live log instrument") {
 
     val source by argument(help = "Qualified class name")
-    val line by argument(help = "Line number").int()
     val logFormat by argument(help = "Log format")
+    val line by option("-line", "-l", help = "Line number").int()
     val logArguments by option("-logArgument", "-l", help = "Log argument").multiple()
     val id by option("-id", "-i", help = "Log identifier")
     val condition by option("-condition", "-c", help = "Trigger condition")
@@ -56,7 +56,7 @@ class AddLog : CliktCommand(name = "log", help = "Add a live log instrument") {
         val input = LiveLogInput(
             logFormat = logFormat,
             logArguments = Optional.Present(logArguments),
-            location = LiveSourceLocationInput(source, line),
+            location = LiveSourceLocationInput(source, Optional.presentIfNotNull(line)),
             condition = Optional.Present(condition),
             expiresAt = Optional.Present(expiresAt),
             hitLimit = Optional.Present(hitLimit),

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

@@ -43,9 +43,9 @@ import spp.protocol.instrument.throttle.ThrottleStep
 class AddMeter : CliktCommand(name = "meter", help = "Add a live meter instrument") {
 
     val source by argument(help = "Qualified class name")
-    val line by argument(help = "Line number").int()
     val meterType by argument(help = "Meter type").enum<MeterType>()
     val valueType by argument(help = "Metric value type").enum<MetricValueType>()
+    val line by option("-line", "-l", help = "Line number").int()
     val value by option("-value", "-v", help = "Metric value")
     val id by option("-id", "-i", help = "Meter identifier")
     val condition by option("-condition", "-c", help = "Trigger condition")
@@ -63,7 +63,7 @@ class AddMeter : CliktCommand(name = "meter", help = "Add a live meter instrumen
                 value = Optional.presentIfNotNull(value)
             ),
             id = Optional.presentIfNotNull(id),
-            location = LiveSourceLocationInput(source, line),
+            location = LiveSourceLocationInput(source, Optional.presentIfNotNull(line)),
             condition = Optional.Present(condition),
             expiresAt = Optional.Present(expiresAt),
             hitLimit = Optional.Present(hitLimit),