This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new e7bb682aee Mark methods static in shell.core (#2623)
e7bb682aee is described below
commit e7bb682aeefb2904bbd719b7b3387b87fdd98cf3
Author: Robert Varga <[email protected]>
AuthorDate: Fri May 1 13:21:49 2026 +0200
Mark methods static in shell.core (#2623)
We have a number of methods which can be made static, this patch updates
them all.
Signed-off-by: Robert Varga <[email protected]>
---
.../karaf/shell/impl/action/command/ArgumentCompleter.java | 2 +-
.../shell/impl/action/command/DefaultActionPreparator.java | 12 ++++++------
.../apache/karaf/shell/impl/console/CommandsCompleter.java | 2 +-
.../apache/karaf/shell/impl/console/ConsoleSessionImpl.java | 10 +++++-----
.../org/apache/karaf/shell/impl/console/JLineTerminal.java | 4 ++--
.../apache/karaf/shell/impl/console/commands/Procedural.java | 10 +++++-----
.../impl/console/commands/help/CommandListHelpProvider.java | 2 +-
.../impl/console/commands/help/CommandsHelpProvider.java | 2 +-
.../karaf/shell/impl/console/commands/help/HelpCommand.java | 2 +-
.../shell/impl/console/commands/help/ShellHelpProvider.java | 2 +-
.../org/apache/karaf/shell/impl/console/osgi/Converters.java | 12 ++++++------
.../karaf/shell/impl/console/osgi/LocalConsoleManager.java | 2 +-
.../org/apache/karaf/shell/impl/console/standalone/Main.java | 2 +-
.../apache/karaf/shell/support/completers/UriCompleter.java | 8 ++++----
.../karaf/shell/support/converter/DefaultConverter.java | 2 +-
.../org/apache/karaf/shell/support/parsing/GogoParser.java | 2 +-
.../org/apache/karaf/shell/support/table/ShellTable.java | 4 ++--
.../org/apache/karaf/shell/support/table/ShellTableTest.java | 4 ++--
18 files changed, 42 insertions(+), 42 deletions(-)
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
index 0a4a5e1966..def85b39b5 100644
---
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 class ArgumentCompleter implements Completer {
@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
index a26b8143c6..81f570af13 100644
---
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 @@ public class DefaultActionPreparator {
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 class DefaultActionPreparator {
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 class DefaultActionPreparator {
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 class DefaultActionPreparator {
}
}
- 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 @@ public class DefaultActionPreparator {
}
}
- 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
index 06dbd0df37..26eed93849 100644
---
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 class CommandsCompleter extends
org.apache.karaf.shell.support.completers
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
index 61a6aaec0c..32e2cb6506 100644
---
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 class ConsoleSessionImpl implements Session {
}
- 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 @@ public class ConsoleSessionImpl implements Session {
}
}
- 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 class ConsoleSessionImpl implements Session {
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 @@ public class ConsoleSessionImpl implements Session {
}
}
- 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
index cd84035f87..58641681ef 100644
---
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 class JLineTerminal implements Terminal,
org.jline.terminal.Terminal {
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 @@ public class JLineTerminal implements Terminal,
org.jline.terminal.Terminal {
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
index c5ca41bb2d..2799328390 100644
---
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 @@ public class Procedural {
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 @@ public class Procedural {
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 @@ public class Procedural {
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
index 86bec7e6c9..384a9f1dff 100644
---
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 class CommandListHelpProvider implements HelpProvider {
}
}
- 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
index 44ada7795c..dca3738e02 100644
---
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 class CommandsHelpProvider implements HelpProvider {
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
index 83696f583e..dbf283a83f 100644
---
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 class HelpCommand implements Command {
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
index ab45585687..66d8b1af7e 100644
---
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 class ShellHelpProvider implements HelpProvider {
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
index aa231a5d4d..ebf07ca79f 100644
---
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 class Converters implements Converter
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 @@ public class Converters implements Converter
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 @@ public class Converters implements Converter
return sb;
}
- private CharSequence getShortNames(String[] list)
+ private static CharSequence getShortNames(String[] list)
{
StringBuilder sb = new StringBuilder();
String del = "";
@@ -84,7 +84,7 @@ public class Converters implements Converter
return sb;
}
- private CharSequence getShortName(String name)
+ private static CharSequence getShortName(String name)
{
int n = name.lastIndexOf('.');
if (n < 0)
@@ -98,7 +98,7 @@ public class Converters implements Converter
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 class Converters implements 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
index 3cf7b175b5..8a423b1c49 100644
---
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 @@ public class LocalConsoleManager {
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
index 8ad5f1d600..03d2948f85 100644
---
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 @@ public class Main {
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
index 515ce1faf9..f7bf773adc 100644
---
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 class UriCompleter implements Completer {
}
}
- 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 @@ public class UriCompleter implements Completer {
}
}
- 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
index 99ce31151b..8deae52127 100644
---
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 @@ public class DefaultConverter
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
index 27de543b0b..617c1899d5 100644
---
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 class GogoParser {
}
}
- 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
index d74eab15a2..cdcc9af01b 100644
---
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 @@ public class ShellTable {
&& 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 @@ public class ShellTable {
}
- 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
index cba441b560..b3e6110835 100644
---
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 class ShellTableTest {
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 class ShellTableTest {
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");
}
}