formatting

Mmuzaf · Mmuzaf · commit d122b3a1c59f · 2026-02-01T13:24:03.000+01:00
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
@@ -1153,6 +1153,7 @@ start_native_transport_management: false
 # For security reasons, you should not expose this port to the internet.
 # Firewall it if needed.
 native_transport_management_port: 11211
+
 # The maximum threads for handling management requests are set
 # separately from regular requests to allow better isolation and
 # prioritization of management operations. This is important to
diff --git a/conf/cassandra_latest.yaml b/conf/cassandra_latest.yaml
@@ -1142,6 +1142,7 @@ start_native_transport_management: false
 # For security reasons, you should not expose this port to the internet.
 # Firewall it if needed.
 native_transport_management_port: 11211
+
 # The maximum threads for handling management requests are set
 # separately from regular requests to allow better isolation and
 # prioritization of management operations. This is important to
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -41,7 +41,7 @@
 import org.apache.cassandra.tools.nodetool.JmxConnect;
 import org.apache.cassandra.tools.nodetool.NodetoolCommand;
 import org.apache.cassandra.tools.nodetool.layout.CassandraCliHelpLayout;
-import org.apache.cassandra.tools.nodetool.strategy.CommandExecutionStraregy;
+import org.apache.cassandra.tools.nodetool.strategy.CommandExecutionStrategy;
 import org.apache.cassandra.tools.nodetool.strategy.ProtocolAwareExecutionStrategy;
 import org.apache.cassandra.utils.FBUtilities;
 
@@ -181,7 +181,7 @@ private static void getCommandsWithoutRoot(CommandLine cli, List<String> command
     public static CommandLine createCommandLine(CommandLine.IFactory factory) throws Exception
     {
         CommandLine commandLine = new CommandLine(new NodetoolCommand(), factory);
-        CommandExecutionStraregy.Type strategyType = ProtocolAwareExecutionStrategy.getExecutionStrategyTypeFromEnvAndSys();
+        CommandExecutionStrategy.Type strategyType = ProtocolAwareExecutionStrategy.getExecutionStrategyTypeFromEnvAndSys();
         switch (strategyType)
         {
             case CQL:
diff --git a/src/java/org/apache/cassandra/tools/RemoteJmxMBeanAccessor.java b/src/java/org/apache/cassandra/tools/RemoteJmxMBeanAccessor.java
@@ -86,7 +86,6 @@
 import org.apache.cassandra.net.MessagingServiceMBean;
 import org.apache.cassandra.profiler.AsyncProfilerMBean;
 import org.apache.cassandra.service.ActiveRepairServiceMBean;
-import org.apache.cassandra.service.AsyncProfilerService;
 import org.apache.cassandra.service.AutoRepairService;
 import org.apache.cassandra.service.AutoRepairServiceMBean;
 import org.apache.cassandra.service.CacheService;
diff --git a/src/java/org/apache/cassandra/tools/nodetool/strategy/CommandExecutionStrategy.java b/src/java/org/apache/cassandra/tools/nodetool/strategy/CommandExecutionStrategy.java
@@ -20,7 +20,7 @@
 
 import picocli.CommandLine;
 
-public interface CommandExecutionStraregy extends CommandLine.IExecutionStrategy, AutoCloseable
+public interface CommandExecutionStrategy extends CommandLine.IExecutionStrategy, AutoCloseable
 {
     @Override
     default void close() throws ExecutionStrategyCloseException {}
diff --git a/src/java/org/apache/cassandra/tools/nodetool/strategy/CommandMBeanExecutionStrategy.java b/src/java/org/apache/cassandra/tools/nodetool/strategy/CommandMBeanExecutionStrategy.java
@@ -37,7 +37,7 @@
 
 import picocli.CommandLine;
 
-public class CommandMBeanExecutionStrategy implements CommandExecutionStraregy
+public class CommandMBeanExecutionStrategy implements CommandExecutionStrategy
 {
     private static final String MBEAN_DOMAIN = "org.apache.cassandra.management";
     private static final String MBEAN_TYPE_COMMAND = "Command";
diff --git a/src/java/org/apache/cassandra/tools/nodetool/strategy/CqlCommandExecutionStrategy.java b/src/java/org/apache/cassandra/tools/nodetool/strategy/CqlCommandExecutionStrategy.java
@@ -48,7 +48,7 @@
 import static org.apache.cassandra.management.api.ParameterMetadata.COMMAND_POSITIONAL_PARAM_PREFIX;
 import static org.apache.cassandra.tools.nodetool.strategy.CommandMBeanExecutionStrategy.extractCommandName;
 
-public class CqlCommandExecutionStrategy implements CommandExecutionStraregy
+public class CqlCommandExecutionStrategy implements CommandExecutionStrategy
 {
     private final CqlConnect connect;
 
diff --git a/src/java/org/apache/cassandra/tools/nodetool/strategy/ProtocolAwareExecutionStrategy.java b/src/java/org/apache/cassandra/tools/nodetool/strategy/ProtocolAwareExecutionStrategy.java
@@ -28,7 +28,7 @@
 
 import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized;
 
-public class ProtocolAwareExecutionStrategy implements CommandExecutionStraregy
+public class ProtocolAwareExecutionStrategy implements CommandExecutionStrategy
 {
     public static int executionStrategy(CommandLine.ParseResult parseResult)
     {
@@ -52,7 +52,7 @@ public int execute(CommandLine.ParseResult parseResult)
         if (connectCmd == null)
             throw new CommandLine.InitializationException("No 'connection' command found in the top-level hierarchy");
 
-        try (CommandExecutionStraregy invoker = createInvoker(connectCmd.userObject()))
+        try (CommandExecutionStrategy invoker = createInvoker(connectCmd.userObject()))
         {
             return invoker.execute(parseResult);
         }
@@ -77,7 +77,7 @@ public static Type getExecutionStrategyTypeFromEnvAndSys()
         return strategyEnv != defaultStrategy ? strategyEnv : strategySys;
     }
 
-    static CommandExecutionStraregy createInvoker(Object connectCmd)
+    static CommandExecutionStrategy createInvoker(Object connectCmd)
     {
         Type strategy = getExecutionStrategyTypeFromEnvAndSys();
         switch (strategy)
diff --git a/src/java/org/apache/cassandra/tools/nodetool/strategy/StaticMBeanExecutionStrategy.java b/src/java/org/apache/cassandra/tools/nodetool/strategy/StaticMBeanExecutionStrategy.java
@@ -25,7 +25,7 @@
 
 import picocli.CommandLine;
 
-public class StaticMBeanExecutionStrategy implements CommandExecutionStraregy
+public class StaticMBeanExecutionStrategy implements CommandExecutionStrategy
 {
     private final JmxConnect connect;
 
diff --git a/test/distributed/org/apache/cassandra/distributed/mock/nodetool/InternalNodeProbe.java b/test/distributed/org/apache/cassandra/distributed/mock/nodetool/InternalNodeProbe.java
@@ -52,8 +52,8 @@
 import org.apache.cassandra.net.MessagingServiceMBean;
 import org.apache.cassandra.profiler.AsyncProfilerMBean;
 import org.apache.cassandra.service.ActiveRepairService;
-import org.apache.cassandra.service.AsyncProfilerService;
 import org.apache.cassandra.service.ActiveRepairServiceMBean;
+import org.apache.cassandra.service.AsyncProfilerService;
 import org.apache.cassandra.service.CacheService;
 import org.apache.cassandra.service.CacheServiceMBean;
 import org.apache.cassandra.service.GCInspector;
diff --git a/test/unit/org/apache/cassandra/cql3/CQLNodetoolProtocolTester.java b/test/unit/org/apache/cassandra/cql3/CQLNodetoolProtocolTester.java
@@ -29,19 +29,19 @@
 import org.apache.cassandra.distributed.shared.WithProperties;
 import org.apache.cassandra.tools.NodeTool;
 import org.apache.cassandra.tools.ToolRunner;
-import org.apache.cassandra.tools.nodetool.strategy.CommandExecutionStraregy;
+import org.apache.cassandra.tools.nodetool.strategy.CommandExecutionStrategy;
 
 @RunWith(Parameterized.class)
 public abstract class CQLNodetoolProtocolTester extends CQLTester
 {
     @Parameterized.Parameter
-    public CommandExecutionStraregy.Type strategy;
+    public CommandExecutionStrategy.Type strategy;
 
     @Parameterized.Parameters(name = "runner={0}")
     public static Collection<Object[]> data()
     {
         List<Object[]> params = new ArrayList<>();
-        for (CommandExecutionStraregy.Type type : CommandExecutionStraregy.Type.values())
+        for (CommandExecutionStrategy.Type type : CommandExecutionStrategy.Type.values())
             params.add(new Object[]{type});
         return params;
     }
@@ -55,7 +55,7 @@ public ToolRunner.ToolResult invokeNodetool(String... args)
                                                             strategy.name().toLowerCase()))
         {
             return ToolRunner.invokeNodetoolInJvm(NodeTool::new,
-                                                  strategy == CommandExecutionStraregy.Type.CQL ?
+                                                  strategy == CommandExecutionStrategy.Type.CQL ?
                                                   CQLTester::buildNodetoolCqlArgs :
                                                   CQLTester::buildNodetoolArgs,
                                                   args);

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`import picocli.CommandLine;`
`22`	`22`
`23`		`-public interface CommandExecutionStraregy extends CommandLine.IExecutionStrategy, AutoCloseable`
	`23`	`+public interface CommandExecutionStrategy extends CommandLine.IExecutionStrategy, AutoCloseable`
`24`	`24`	`{`
`25`	`25`	`@Override`
`26`	`26`	`default void close() throws ExecutionStrategyCloseException {}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`
`38`	`38`	`import picocli.CommandLine;`
`39`	`39`
`40`		`-public class CommandMBeanExecutionStrategy implements CommandExecutionStraregy`
	`40`	`+public class CommandMBeanExecutionStrategy implements CommandExecutionStrategy`
`41`	`41`	`{`
`42`	`42`	`private static final String MBEAN_DOMAIN = "org.apache.cassandra.management";`
`43`	`43`	`private static final String MBEAN_TYPE_COMMAND = "Command";`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`import static org.apache.cassandra.management.api.ParameterMetadata.COMMAND_POSITIONAL_PARAM_PREFIX;`
`49`	`49`	`import static org.apache.cassandra.tools.nodetool.strategy.CommandMBeanExecutionStrategy.extractCommandName;`
`50`	`50`
`51`		`-public class CqlCommandExecutionStrategy implements CommandExecutionStraregy`
	`51`	`+public class CqlCommandExecutionStrategy implements CommandExecutionStrategy`
`52`	`52`	`{`
`53`	`53`	`private final CqlConnect connect;`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`
`29`	`29`	`import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized;`
`30`	`30`
`31`		`-public class ProtocolAwareExecutionStrategy implements CommandExecutionStraregy`
	`31`	`+public class ProtocolAwareExecutionStrategy implements CommandExecutionStrategy`
`32`	`32`	`{`
`33`	`33`	`public static int executionStrategy(CommandLine.ParseResult parseResult)`
`34`	`34`	`{`
`@@ -52,7 +52,7 @@ public int execute(CommandLine.ParseResult parseResult)`
`52`	`52`	`if (connectCmd == null)`
`53`	`53`	`throw new CommandLine.InitializationException("No 'connection' command found in the top-level hierarchy");`
`54`	`54`
`55`		`- try (CommandExecutionStraregy invoker = createInvoker(connectCmd.userObject()))`
	`55`	`+ try (CommandExecutionStrategy invoker = createInvoker(connectCmd.userObject()))`
`56`	`56`	`{`
`57`	`57`	`return invoker.execute(parseResult);`
`58`	`58`	`}`
`@@ -77,7 +77,7 @@ public static Type getExecutionStrategyTypeFromEnvAndSys()`
`77`	`77`	`return strategyEnv != defaultStrategy ? strategyEnv : strategySys;`
`78`	`78`	`}`
`79`	`79`
`80`		`- static CommandExecutionStraregy createInvoker(Object connectCmd)`
	`80`	`+ static CommandExecutionStrategy createInvoker(Object connectCmd)`
`81`	`81`	`{`
`82`	`82`	`Type strategy = getExecutionStrategyTypeFromEnvAndSys();`
`83`	`83`	`switch (strategy)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`import picocli.CommandLine;`
`27`	`27`
`28`		`-public class StaticMBeanExecutionStrategy implements CommandExecutionStraregy`
	`28`	`+public class StaticMBeanExecutionStrategy implements CommandExecutionStrategy`
`29`	`29`	`{`
`30`	`30`	`private final JmxConnect connect;`
`31`	`31`