Mark methods static in shell.core (#2623)

rovarga · web-flow · commit e7bb682aeefb · 2026-05-01T13:21:49.000+02:00
We have a number of methods which can be made static, this patch updates
them all.

Signed-off-by: Robert Varga &lt;robert.varga@pantheon.tech&gt;
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ArgumentCompleter.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ArgumentCompleter.java
@@ -174,7 +174,7 @@ public ArgumentCompleter(ActionCommand command, boolean scoped) {
     @SuppressWarnings({
      "unchecked", "rawtypes"
     })
-    private Completer getDefaultCompleter(Field field, boolean multi) {
+    private static Completer getDefaultCompleter(Field field, boolean multi) {
         Completer completer = null;
         Class<?> type = field.getType();
         GenericType genericType = new GenericType(field.getGenericType());
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
@@ -252,7 +252,7 @@ protected Object convert(Action action, Object value, Type toType) throws Except
         return new DefaultConverter(action.getClass().getClassLoader()).convert(value, toType);
     }
 
-    private Argument replaceDefaultArgument(Field field, Argument argument) {
+    private static Argument replaceDefaultArgument(Field field, Argument argument) {
         if (Argument.DEFAULT.equals(argument.name())) {
             final Argument delegate = argument;
             final String name = field.getName();
@@ -299,7 +299,7 @@ public char mask() {
         return argument;
     }
 
-    private void assertIndexesAreCorrect(Class<? extends Action> actionClass, List<Argument> orderedArguments) {
+    private static void assertIndexesAreCorrect(Class<? extends Action> actionClass, List<Argument> orderedArguments) {
         for (int i = 0; i < orderedArguments.size(); i++) {
             if (orderedArguments.get(i) == null) {
                 throw new IllegalArgumentException("Missing argument for index: " + i + " on Action " + actionClass.getName());
@@ -427,7 +427,7 @@ public Object getDefaultValue(Action action, Field field) {
         return null;
     }
 
-    private String loadDescription(Class<?> clazz, String desc) {
+    private static String loadDescription(Class<?> clazz, String desc) {
         if (desc != null && desc.startsWith("classpath:")) {
             desc = loadClassPathResource(clazz, desc.substring("classpath:".length()));
         }
@@ -444,11 +444,11 @@ public String getDefaultValueString(Object o) {
         }
     }
 
-    private void printDefaultsTo(PrintStream out, String value) {
+    private static void printDefaultsTo(PrintStream out, String value) {
         out.println("                (defaults to " + value + ")");
     }
 
-    private void printMeta(PrintStream out, boolean required, boolean multivalued) {
+    private static void printMeta(PrintStream out, boolean required, boolean multivalued) {
         if (required || multivalued) {
             String text = "                (";
             if (required) {
@@ -493,7 +493,7 @@ static void printFormatted(String prefix, String str, int termWidth, PrintStream
         }
     }
 
-    private String loadClassPathResource(Class<?> clazz, String path) {
+    private static String loadClassPathResource(Class<?> clazz, String path) {
         InputStream is = clazz.getResourceAsStream(path);
         if (is == null) {
             is = clazz.getClassLoader().getResourceAsStream(path);
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandsCompleter.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandsCompleter.java
@@ -328,7 +328,7 @@ public int complete(Session session, CommandLine commandLine, List<String> candi
 
         protected abstract Collection<String> getNames(Session session);
 
-        private boolean verifyCompleter(Session session, Completer completer, String argument) {
+        private static boolean verifyCompleter(Session session, Completer completer, String argument) {
             List<String> candidates = new ArrayList<>();
             return completer.complete(session, new ArgumentCommandLine(argument, argument.length()), candidates) != -1 && !candidates.isEmpty();
         }
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
@@ -233,7 +233,7 @@ public ConsoleSessionImpl(SessionFactory factory,
 
     }
 
-    private void merge(List<Candidate> candidates) {
+    private static void merge(List<Candidate> candidates) {
         Map<String, Candidate> map = new HashMap<>();
         for (Candidate c : candidates) {
             map.merge(c.value(), c, (c1, c2) -> c1.descr() != null ? c1 : c2);
@@ -493,7 +493,7 @@ private void doExecute(CharSequence command) {
         }
     }
 
-    private String getStatusLine(Job job, int width, String status) {
+    private static String getStatusLine(Job job, int width, String status) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < width - 1; i++) {
             sb.append(' ');
@@ -565,12 +565,12 @@ public String readLine(String prompt, Character mask) throws IOException {
         return reader.readLine(prompt, mask);
     }
 
-    private String loadCompletionMode() {
+    private static String loadCompletionMode() {
         return ShellUtil.loadPropertyFromShellCfg("completionMode", java.util.function.Function.identity(),
                 Session.COMPLETION_MODE_GLOBAL);
     }
 
-    private boolean loadDisableEofExit() {
+    private static boolean loadDisableEofExit() {
         return ShellUtil.loadPropertyFromShellCfg("disableEofExit", Boolean::parseBoolean, false);
     }
 
@@ -660,7 +660,7 @@ protected String doGetPrompt(String var, String def) {
         }
     }
 
-    private String getPid() {
+    private static String getPid() {
         String name = ManagementFactory.getRuntimeMXBean().getName();
         String[] parts = name.split("@");
         return parts[0];
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
@@ -256,7 +256,7 @@ public MouseEvent readMouseEvent(IntSupplier supplier) {
         return terminal.readMouseEvent(supplier);
     }
 
-    private Signal signal(org.apache.karaf.shell.api.console.Signal sig) {
+    private static Signal signal(org.apache.karaf.shell.api.console.Signal sig) {
         switch (sig) {
             case INT:
                 return Signal.INT;
@@ -272,7 +272,7 @@ private Signal signal(org.apache.karaf.shell.api.console.Signal sig) {
         throw new UnsupportedOperationException();
     }
 
-    private org.apache.karaf.shell.api.console.Signal signal(Signal sig) {
+    private static org.apache.karaf.shell.api.console.Signal signal(Signal sig) {
         switch (sig) {
             case INT:
                 return org.apache.karaf.shell.api.console.Signal.INT;
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/Procedural.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/Procedural.java
@@ -535,12 +535,12 @@ protected Object doContinue(CommandSession session, Process process, Object[] ar
         throw new ContinueException();
     }
 
-    private boolean isTrue(CommandSession session, Function function) throws Exception {
+    private static boolean isTrue(CommandSession session, Function function) throws Exception {
         checkInterrupt();
         return isTrue(function.execute(session, null));
     }
 
-    private boolean isTrue(Object result) throws InterruptedException {
+    private static boolean isTrue(Object result) throws InterruptedException {
         checkInterrupt();
 
         if (result == null)
@@ -563,13 +563,13 @@ private boolean isTrue(Object result) throws InterruptedException {
         return true;
     }
 
-    private void checkInterrupt() throws InterruptedException {
+    private static void checkInterrupt() throws InterruptedException {
         if (Thread.currentThread().isInterrupted())
             throw new InterruptedException("interrupted");
     }
 
     @SuppressWarnings("unchecked")
-    private Collection<Object> getElements(Options opt) {
+    private static Collection<Object> getElements(Options opt) {
         Collection<Object> elements = null;
         if (opt.argObjects().size() > 0) {
             Object o = opt.argObjects().remove(0);
@@ -582,7 +582,7 @@ private Collection<Object> getElements(Options opt) {
         return elements;
     }
 
-    private List<Function> getFunctions(Options opt) {
+    private static List<Function> getFunctions(Options opt) {
         List<Function> functions = new ArrayList<>();
         for (Object o : opt.argObjects()) {
             if (o instanceof Function) {
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/CommandListHelpProvider.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/CommandListHelpProvider.java
@@ -80,7 +80,7 @@ public String getHelp(Session session, String path) {
         }
     }
 
-    private Set<Command> getCommands(Session session, String path) {
+    private static Set<Command> getCommands(Session session, String path) {
         // TODO: this is not really clean
 
         List<Command> commands = session.getRegistry().getCommands();
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/CommandsHelpProvider.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/CommandsHelpProvider.java
@@ -45,7 +45,7 @@ public String getHelp(Session session, String path) {
         return baos.toString();
     }
 
-    private Set<Command> getCommands(Session session, String path) {
+    private static Set<Command> getCommands(Session session, String path) {
         // TODO: this is not really clean
 
         List<Command> commands = session.getRegistry().getCommands();
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/HelpCommand.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/HelpCommand.java
@@ -190,7 +190,7 @@ public String getHelp(final Session session, String path) {
         return props.get("data");
     }
 
-    private String removeNewLine(String help) {
+    private static String removeNewLine(String help) {
         if (help != null && help.endsWith("\n")) {
             help = help.substring(0, help.length() - 1);
         }
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/ShellHelpProvider.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/ShellHelpProvider.java
@@ -94,7 +94,7 @@ public String getHelp(Session session, String path) {
         return null;
     }
 
-    private Set<Command> getCommands(Session session, String path) {
+    private static Set<Command> getCommands(Session session, String path) {
         // TODO: this is not really clean
 
         List<Command> commands = session.getRegistry().getCommands();
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Converters.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Converters.java
@@ -44,7 +44,7 @@ public Converters(BundleContext context)
         this.context = context;
     }
 
-    private CharSequence print(Bundle bundle)
+    private static CharSequence print(Bundle bundle)
     {
         // [ ID ] [STATE      ] [ SL ] symname
         int level = bundle.adapt(BundleStartLevel.class).getStartLevel();
@@ -53,7 +53,7 @@ private CharSequence print(Bundle bundle)
             getState(bundle), level, bundle.getSymbolicName(), bundle.getVersion());
     }
 
-    private CharSequence print(ServiceReference ref)
+    private static CharSequence print(ServiceReference ref)
     {
         StringBuilder sb = new StringBuilder();
         Formatter f = new Formatter(sb);
@@ -72,7 +72,7 @@ private CharSequence print(ServiceReference ref)
         return sb;
     }
 
-    private CharSequence getShortNames(String[] list)
+    private static CharSequence getShortNames(String[] list)
     {
         StringBuilder sb = new StringBuilder();
         String del = "";
@@ -84,7 +84,7 @@ private CharSequence getShortNames(String[] list)
         return sb;
     }
 
-    private CharSequence getShortName(String name)
+    private static CharSequence getShortName(String name)
     {
         int n = name.lastIndexOf('.');
         if (n < 0)
@@ -98,7 +98,7 @@ private CharSequence getShortName(String name)
         return name.subSequence(n, name.length());
     }
 
-    private String getState(Bundle bundle)
+    private static String getState(Bundle bundle)
     {
         switch (bundle.getState())
         {
@@ -254,7 +254,7 @@ public CharSequence format(Object target, int level, Converter converter)
         return null;
     }
 
-    private CharSequence read(InputStream in) throws IOException
+    private static CharSequence read(InputStream in) throws IOException
     {
         int c;
         StringBuilder sb = new StringBuilder();
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/LocalConsoleManager.java
@@ -141,7 +141,7 @@ static String extractEncodingFromCtype(String ctype) {
         return null;
     }
 
-    private Subject createLocalKarafSubject() {
+    private static Subject createLocalKarafSubject() {
 
         String userName = System.getProperty(KARAF_LOCAL_USER);
         if (userName == null) {
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
@@ -149,7 +149,7 @@ private void run(ThreadIO threadio, String[] args, InputStream in, PrintStream o
         run(sessionFactory, sb.toString(), in, out, err, cl);
     }
 
-    private List<URL> getJarsInJars(List<URL> urls) throws IOException, URISyntaxException {
+    private static List<URL> getJarsInJars(List<URL> urls) throws IOException, URISyntaxException {
         List<URL> result = new ArrayList<>();
         for (URL url : urls) {
             try (JarFile jarFile = new JarFile(url.toURI().getPath())) {
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/completers/UriCompleter.java b/shell/core/src/main/java/org/apache/karaf/shell/support/completers/UriCompleter.java
@@ -47,7 +47,7 @@ public void completeCandidates(Session session, CommandLine commandLine, List<Ca
         }
     }
 
-    private void file(Session session, CommandLine commandLine, List<Candidate> candidates) {
+    private static void file(Session session, CommandLine commandLine, List<Candidate> candidates) {
         String buffer = commandLine.getCursorArgument();
         String path = buffer.substring("file:".length(), commandLine.getArgumentPosition());
 
@@ -88,15 +88,15 @@ private void file(Session session, CommandLine commandLine, List<Candidate> cand
         }
     }
 
-    private String encode(String s) {
+    private static String encode(String s) {
         return s.replaceAll(" ", "%20");
     }
 
-    private String decode(String s) {
+    private static String decode(String s) {
         return s.replaceAll("%20", " ");
     }
 
-    private void maven(Session session, CommandLine commandLine, List<Candidate> candidates) {
+    private static void maven(Session session, CommandLine commandLine, List<Candidate> candidates) {
         String repo = System.getProperty("user.home") + "/.m2/repository";
         String buffer = commandLine.getCursorArgument();
         String mvn = buffer.substring("mvn:".length(), commandLine.getArgumentPosition());
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/converter/DefaultConverter.java b/shell/core/src/main/java/org/apache/karaf/shell/support/converter/DefaultConverter.java
@@ -409,7 +409,7 @@ private static boolean hasDefaultConstructor(Class type) {
         primitives.put(boolean.class, Boolean.class);
     }
 
-    private Class toClass(ReifiedType type) {
+    private static Class toClass(ReifiedType type) {
         return type.getRawClass();
     }
 
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/parsing/GogoParser.java b/shell/core/src/main/java/org/apache/karaf/shell/support/parsing/GogoParser.java
@@ -62,7 +62,7 @@ public void ws() {
         }
     }
 
-    private boolean isWhitespace(char ch) {
+    private static boolean isWhitespace(char ch) {
         return ch != '\n' && Character.isWhitespace(ch);
     }
 
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/table/ShellTable.java b/shell/core/src/main/java/org/apache/karaf/shell/support/table/ShellTable.java
@@ -173,7 +173,7 @@ private boolean supportsUnicode(PrintStream out, Charset charset) {
             && encoder.canEncode(SEP_CROSS);
     }
 
-    private Charset getEncoding(PrintStream ps) {
+    private static Charset getEncoding(PrintStream ps) {
         if (ps.getClass() == ThreadPrintStream.class) {
             try {
                 return ((Terminal) Job.Utils.current().session().get(".jline.terminal")).encoding();
@@ -215,7 +215,7 @@ private void adjustSize() {
 
     }
 
-    private String underline(int length, boolean crossAtBeg, boolean supported) {
+    private static String underline(int length, boolean crossAtBeg, boolean supported) {
         char[] exmarks = new char[length];
         Arrays.fill(exmarks,  supported ? SEP_HORIZONTAL : SEP_HORIZONTAL_ASCII);
         if (crossAtBeg) {
diff --git a/shell/core/src/test/java/org/apache/karaf/shell/support/table/ShellTableTest.java b/shell/core/src/test/java/org/apache/karaf/shell/support/table/ShellTableTest.java
@@ -81,7 +81,7 @@ public void testANSI() throws Exception {
         testNonUtf8("ANSI_X3.4-1968");
     }
 
-    private void testNonUtf8(String encoding)  throws Exception {
+    private static void testNonUtf8(String encoding)  throws Exception {
         ShellTable table = new ShellTable();
         table.column("col1");
         table.column("col2").maxSize(-1).wrap();
@@ -180,7 +180,7 @@ public void testNoFormatSeparatorUtf8Default() {
         assertEquals(String.format("%s%n","my first column value\tmy second column value is quite long"), baos.toString());
     }
 
-    private String getString(ByteArrayOutputStream stream) {
+    private static String getString(ByteArrayOutputStream stream) {
         return stream.toString().replace("\r\n", "\n");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ protected Object convert(Action action, Object value, Type toType) throws Except`
`252`	`252`	`return new DefaultConverter(action.getClass().getClassLoader()).convert(value, toType);`
`253`	`253`	`}`
`254`	`254`
`255`		`- private Argument replaceDefaultArgument(Field field, Argument argument) {`
	`255`	`+ private static Argument replaceDefaultArgument(Field field, Argument argument) {`
`256`	`256`	`if (Argument.DEFAULT.equals(argument.name())) {`
`257`	`257`	`final Argument delegate = argument;`
`258`	`258`	`final String name = field.getName();`
`@@ -299,7 +299,7 @@ public char mask() {`
`299`	`299`	`return argument;`
`300`	`300`	`}`
`301`	`301`
`302`		`- private void assertIndexesAreCorrect(Class<? extends Action> actionClass, List<Argument> orderedArguments) {`
	`302`	`+ private static void assertIndexesAreCorrect(Class<? extends Action> actionClass, List<Argument> orderedArguments) {`
`303`	`303`	`for (int i = 0; i < orderedArguments.size(); i++) {`
`304`	`304`	`if (orderedArguments.get(i) == null) {`
`305`	`305`	`throw new IllegalArgumentException("Missing argument for index: " + i + " on Action " + actionClass.getName());`
`@@ -427,7 +427,7 @@ public Object getDefaultValue(Action action, Field field) {`
`427`	`427`	`return null;`
`428`	`428`	`}`
`429`	`429`
`430`		`- private String loadDescription(Class<?> clazz, String desc) {`
	`430`	`+ private static String loadDescription(Class<?> clazz, String desc) {`
`431`	`431`	`if (desc != null && desc.startsWith("classpath:")) {`
`432`	`432`	`desc = loadClassPathResource(clazz, desc.substring("classpath:".length()));`
`433`	`433`	`}`
`@@ -444,11 +444,11 @@ public String getDefaultValueString(Object o) {`
`444`	`444`	`}`
`445`	`445`	`}`
`446`	`446`
`447`		`- private void printDefaultsTo(PrintStream out, String value) {`
	`447`	`+ private static void printDefaultsTo(PrintStream out, String value) {`
`448`	`448`	`out.println(" (defaults to " + value + ")");`
`449`	`449`	`}`
`450`	`450`
`451`		`- private void printMeta(PrintStream out, boolean required, boolean multivalued) {`
	`451`	`+ private static void printMeta(PrintStream out, boolean required, boolean multivalued) {`
`452`	`452`	`if (required \|\| multivalued) {`
`453`	`453`	`String text = " (";`
`454`	`454`	`if (required) {`
`@@ -493,7 +493,7 @@ static void printFormatted(String prefix, String str, int termWidth, PrintStream`
`493`	`493`	`}`
`494`	`494`	`}`
`495`	`495`
`496`		`- private String loadClassPathResource(Class<?> clazz, String path) {`
	`496`	`+ private static String loadClassPathResource(Class<?> clazz, String path) {`
`497`	`497`	`InputStream is = clazz.getResourceAsStream(path);`
`498`	`498`	`if (is == null) {`
`499`	`499`	`is = clazz.getClassLoader().getResourceAsStream(path);`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ public int complete(Session session, CommandLine commandLine, List<String> candi`
`328`	`328`
`329`	`329`	`protected abstract Collection<String> getNames(Session session);`
`330`	`330`
`331`		`- private boolean verifyCompleter(Session session, Completer completer, String argument) {`
	`331`	`+ private static boolean verifyCompleter(Session session, Completer completer, String argument) {`
`332`	`332`	`List<String> candidates = new ArrayList<>();`
`333`	`333`	`return completer.complete(session, new ArgumentCommandLine(argument, argument.length()), candidates) != -1 && !candidates.isEmpty();`
`334`	`334`	`}`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public ConsoleSessionImpl(SessionFactory factory,`
`233`	`233`
`234`	`234`	`}`
`235`	`235`
`236`		`- private void merge(List<Candidate> candidates) {`
	`236`	`+ private static void merge(List<Candidate> candidates) {`
`237`	`237`	`Map<String, Candidate> map = new HashMap<>();`
`238`	`238`	`for (Candidate c : candidates) {`
`239`	`239`	`map.merge(c.value(), c, (c1, c2) -> c1.descr() != null ? c1 : c2);`
`@@ -493,7 +493,7 @@ private void doExecute(CharSequence command) {`
`493`	`493`	`}`
`494`	`494`	`}`
`495`	`495`
`496`		`- private String getStatusLine(Job job, int width, String status) {`
	`496`	`+ private static String getStatusLine(Job job, int width, String status) {`
`497`	`497`	`StringBuilder sb = new StringBuilder();`
`498`	`498`	`for (int i = 0; i < width - 1; i++) {`
`499`	`499`	`sb.append(' ');`
`@@ -565,12 +565,12 @@ public String readLine(String prompt, Character mask) throws IOException {`
`565`	`565`	`return reader.readLine(prompt, mask);`
`566`	`566`	`}`
`567`	`567`
`568`		`- private String loadCompletionMode() {`
	`568`	`+ private static String loadCompletionMode() {`
`569`	`569`	`return ShellUtil.loadPropertyFromShellCfg("completionMode", java.util.function.Function.identity(),`
`570`	`570`	`Session.COMPLETION_MODE_GLOBAL);`
`571`	`571`	`}`
`572`	`572`
`573`		`- private boolean loadDisableEofExit() {`
	`573`	`+ private static boolean loadDisableEofExit() {`
`574`	`574`	`return ShellUtil.loadPropertyFromShellCfg("disableEofExit", Boolean::parseBoolean, false);`
`575`	`575`	`}`
`576`	`576`
`@@ -660,7 +660,7 @@ protected String doGetPrompt(String var, String def) {`
`660`	`660`	`}`
`661`	`661`	`}`
`662`	`662`
`663`		`- private String getPid() {`
	`663`	`+ private static String getPid() {`
`664`	`664`	`String name = ManagementFactory.getRuntimeMXBean().getName();`
`665`	`665`	`String[] parts = name.split("@");`
`666`	`666`	`return parts[0];`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public String getHelp(Session session, String path) {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`83`		`- private Set<Command> getCommands(Session session, String path) {`
	`83`	`+ private static Set<Command> getCommands(Session session, String path) {`
`84`	`84`	`// TODO: this is not really clean`
`85`	`85`
`86`	`86`	`List<Command> commands = session.getRegistry().getCommands();`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public String getHelp(Session session, String path) {`
`45`	`45`	`return baos.toString();`
`46`	`46`	`}`
`47`	`47`
`48`		`- private Set<Command> getCommands(Session session, String path) {`
	`48`	`+ private static Set<Command> getCommands(Session session, String path) {`
`49`	`49`	`// TODO: this is not really clean`
`50`	`50`
`51`	`51`	`List<Command> commands = session.getRegistry().getCommands();`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public String getHelp(final Session session, String path) {`
`190`	`190`	`return props.get("data");`
`191`	`191`	`}`
`192`	`192`
`193`		`- private String removeNewLine(String help) {`
	`193`	`+ private static String removeNewLine(String help) {`
`194`	`194`	`if (help != null && help.endsWith("\n")) {`
`195`	`195`	`help = help.substring(0, help.length() - 1);`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public String getHelp(Session session, String path) {`
`94`	`94`	`return null;`
`95`	`95`	`}`
`96`	`96`
`97`		`- private Set<Command> getCommands(Session session, String path) {`
	`97`	`+ private static Set<Command> getCommands(Session session, String path) {`
`98`	`98`	`// TODO: this is not really clean`
`99`	`99`
`100`	`100`	`List<Command> commands = session.getRegistry().getCommands();`