Scalafmt

cjmx · Aug 13, 2023 · a03c3ad · a03c3ad
1 parent 60000f9
commit a03c3ad
Show file tree

Hide file tree

Showing 38 changed files with 731 additions and 580 deletions.
diff --git a/src/main/scala/cjmx/App.scala b/src/main/scala/cjmx/App.scala
@@ -47,7 +47,7 @@ object App {
     val reader: Parser[_] => LineReader = if (args.isEmpty) {
       consoleReader
     } else {
-      val firstArgAsConnect = Try(args.head.toInt).toOption.map { pid => "connect -q " + pid }
+      val firstArgAsConnect = Try(args.head.toInt).toOption.map(pid => "connect -q " + pid)
       firstArgAsConnect match {
         case None =>
           val r = constReader(args :+ "exit")
@@ -72,11 +72,15 @@ object App {
     }
   }
 
-  private def prefixedReader(first: Array[String], next: Parser[_] => LineReader): Parser[_] => LineReader = {
+  private def prefixedReader(
+      first: Array[String],
+      next: Parser[_] => LineReader
+  ): Parser[_] => LineReader = {
     val firstReader = constReader(first)
-    p => new LineReader {
-      override def readLine(prompt: String, mask: Option[Char]) =
-        firstReader.readLine(prompt, mask) orElse (next(p).readLine(prompt, mask))
-    }
+    p =>
+      new LineReader {
+        override def readLine(prompt: String, mask: Option[Char]) =
+          firstReader.readLine(prompt, mask).orElse(next(p).readLine(prompt, mask))
+      }
   }
 }
diff --git a/src/main/scala/cjmx/Main.scala b/src/main/scala/cjmx/Main.scala
@@ -31,7 +31,6 @@
 package cjmx
 
 object Main {
-  def main(args: Array[String]) = {
+  def main(args: Array[String]) =
     System.exit(App.run(args))
-  }
 }
diff --git a/src/main/scala/cjmx/cli/ActionContext.scala b/src/main/scala/cjmx/cli/ActionContext.scala
@@ -65,15 +65,16 @@ trait ActionContext {
 
 object ActionContext {
   private case class DefaultActionContext(
-    runState: RunState,
-    connectionState: ConnectionState,
-    formatter: MessageFormatter,
-    lastStatusCode: Int,
-    lineReader: (String, Option[Char]) => Option[String]
+      runState: RunState,
+      connectionState: ConnectionState,
+      formatter: MessageFormatter,
+      lastStatusCode: Int,
+      lineReader: (String, Option[Char]) => Option[String]
   ) extends ActionContext {
     override def withRunState(rs: RunState) = copy(runState = rs)
     override def exit(statusCode: Int) = withRunState(RunState.Exit(statusCode))
-    override def connected(connection: JMXConnection) = copy(connectionState = ConnectionState.Connected(connection))
+    override def connected(connection: JMXConnection) =
+      copy(connectionState = ConnectionState.Connected(connection))
     override def disconnected = copy(connectionState = ConnectionState.Disconnected)
     override def withFormatter(fmt: MessageFormatter) = copy(formatter = fmt)
     override def withStatusCode(statusCode: Int) = copy(lastStatusCode = statusCode)
@@ -82,14 +83,29 @@ object ActionContext {
 
   val noOpLineReader: (String, Option[Char]) => Option[String] = (x, y) => None
 
-  /** Provides an instance of `ActionContext` that does not require input from the console. **/
-  def embedded(runState: RunState = RunState.Running, connectionState: ConnectionState = ConnectionState.Disconnected, formatter: MessageFormatter = TextMessageFormatter, statusCode: Int = 0): ActionContext =
+  /** Provides an instance of `ActionContext` that does not require input from the console. * */
+  def embedded(
+      runState: RunState = RunState.Running,
+      connectionState: ConnectionState = ConnectionState.Disconnected,
+      formatter: MessageFormatter = TextMessageFormatter,
+      statusCode: Int = 0
+  ): ActionContext =
     withLineReader(runState, connectionState, formatter, statusCode, lineReader = noOpLineReader)
 
-  def apply(runState: RunState = RunState.Running, connectionState: ConnectionState = ConnectionState.Disconnected, formatter: MessageFormatter = TextMessageFormatter, statusCode: Int = 0): ActionContext =
+  def apply(
+      runState: RunState = RunState.Running,
+      connectionState: ConnectionState = ConnectionState.Disconnected,
+      formatter: MessageFormatter = TextMessageFormatter,
+      statusCode: Int = 0
+  ): ActionContext =
     embedded(runState, connectionState, formatter, statusCode)
 
-  def withLineReader(runState: RunState = RunState.Running, connectionState: ConnectionState = ConnectionState.Disconnected, formatter: MessageFormatter = TextMessageFormatter, statusCode: Int = 0, lineReader: (String, Option[Char]) => Option[String]): ActionContext =
+  def withLineReader(
+      runState: RunState = RunState.Running,
+      connectionState: ConnectionState = ConnectionState.Disconnected,
+      formatter: MessageFormatter = TextMessageFormatter,
+      statusCode: Int = 0,
+      lineReader: (String, Option[Char]) => Option[String]
+  ): ActionContext =
     DefaultActionContext(runState, connectionState, formatter, statusCode, lineReader)
 }
-
diff --git a/src/main/scala/cjmx/cli/InvocationResult.scala b/src/main/scala/cjmx/cli/InvocationResult.scala
@@ -44,9 +44,10 @@ object InvocationResult {
   final case object NoSuchOperation extends InvocationResult {
     override def toString = "no such operation"
   }
-  final case class NoOperationWithSignature(signature: Seq[Class[_]], validSignatures: Seq[String]) extends InvocationResult {
+  final case class NoOperationWithSignature(signature: Seq[Class[_]], validSignatures: Seq[String])
+      extends InvocationResult {
     override def toString = "no operation with signature (%s) - valid signatures:%n  %s".format(
-      signature.map { _.getSimpleName },
+      signature.map(_.getSimpleName),
       validSignatures.mkString("%n  ".format())
     )
   }