Fix warnings

jvalkeal · jvalkeal · commit ee7a9da4aab7 · 2022-11-19T15:08:49.000Z
- Fix some potential NPE cases. - Fix warnings for missing @nullable
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/ConfirmationInput.java b/spring-shell-core/src/main/java/org/springframework/shell/component/ConfirmationInput.java
@@ -72,9 +72,11 @@ public ConfirmationInputContext getThisContext(ComponentContext<?> context) {
 		}
 		currentContext = ConfirmationInputContext.of(defaultValue);
 		currentContext.setName(getName());
-		context.stream().forEach(e -> {
-			currentContext.put(e.getKey(), e.getValue());
-		});
+		if (context != null) {
+			context.stream().forEach(e -> {
+				currentContext.put(e.getKey(), e.getValue());
+			});
+		}
 		return currentContext;
 	}
 
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/MultiItemSelector.java b/spring-shell-core/src/main/java/org/springframework/shell/component/MultiItemSelector.java
@@ -63,9 +63,11 @@ public MultiItemSelectorContext<T, I> getThisContext(ComponentContext<?> context
 		if (currentContext.getItems() == null) {
 			currentContext.setItems(getItems());
 		}
-		context.stream().forEach(e -> {
-			currentContext.put(e.getKey(), e.getValue());
-		});
+		if (context != null) {
+			context.stream().forEach(e -> {
+				currentContext.put(e.getKey(), e.getValue());
+			});
+		}
 		return currentContext;
 	}
 
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/PathInput.java b/spring-shell-core/src/main/java/org/springframework/shell/component/PathInput.java
@@ -69,9 +69,11 @@ public PathInputContext getThisContext(ComponentContext<?> context) {
 		}
 		currentContext = PathInputContext.empty();
 		currentContext.setName(getName());
-		context.stream().forEach(e -> {
-			currentContext.put(e.getKey(), e.getValue());
-		});
+		if (context != null) {
+			context.stream().forEach(e -> {
+				currentContext.put(e.getKey(), e.getValue());
+			});
+		}
 		return currentContext;
 	}
 
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/PathSearch.java b/spring-shell-core/src/main/java/org/springframework/shell/component/PathSearch.java
@@ -124,9 +124,11 @@ public PathSearchContext getThisContext(ComponentContext<?> context) {
 		currentContext.setTerminalWidth(getTerminal().getWidth());
 		currentContext.setPathSearchConfig(this.config);
 		currentContext.setMessage("Type '<path> <pattern>' to search", MessageLevel.INFO);
-		context.stream().forEach(e -> {
-			currentContext.put(e.getKey(), e.getValue());
-		});
+		if (context != null) {
+			context.stream().forEach(e -> {
+				currentContext.put(e.getKey(), e.getValue());
+			});
+		}
 		return currentContext;
 	}
 
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/SingleItemSelector.java b/spring-shell-core/src/main/java/org/springframework/shell/component/SingleItemSelector.java
@@ -63,9 +63,11 @@ public SingleItemSelectorContext<T, I> getThisContext(ComponentContext<?> contex
 		if (currentContext.getItems() == null) {
 			currentContext.setItems(getItems());
 		}
-		context.stream().forEach(e -> {
-			currentContext.put(e.getKey(), e.getValue());
-		});
+		if (context != null) {
+			context.stream().forEach(e -> {
+				currentContext.put(e.getKey(), e.getValue());
+			});
+		}
 		return currentContext;
 	}
 
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/component/StringInput.java b/spring-shell-core/src/main/java/org/springframework/shell/component/StringInput.java
@@ -77,9 +77,11 @@ public StringInputContext getThisContext(ComponentContext<?> context) {
 		}
 		currentContext = StringInputContext.of(defaultValue, maskCharacter);
 		currentContext.setName(getName());
-		context.stream().forEach(e -> {
-			currentContext.put(e.getKey(), e.getValue());
-		});
+		if (context != null) {
+			context.stream().forEach(e -> {
+				currentContext.put(e.getKey(), e.getValue());
+			});
+		}
 		return currentContext;
 	}
 
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/jline/ExtendedDefaultParser.java b/spring-shell-core/src/main/java/org/springframework/shell/jline/ExtendedDefaultParser.java
@@ -125,23 +125,24 @@ else if (!isEscapeChar(line, i)) {
 			}
 		}
 
-		if (current.length() > 0 || cursor == line.length()) {
+		if (current.length() > 0 || (line != null && cursor == line.length())) {
 			words.add(current.toString());
 		}
 
-		if (cursor == line.length()) {
+		if (line != null && cursor == line.length()) {
 			wordIndex = words.size() - 1;
 			wordCursor = words.get(words.size() - 1).length();
 		}
 
-		if (eofOnEscapedNewLine && isEscapeChar(line, line.length() - 1)) {
+		if (eofOnEscapedNewLine && (line != null && isEscapeChar(line, line.length() - 1))) {
 			throw new EOFError(-1, -1, "Escaped new line", "newline");
 		}
 		if (eofOnUnclosedQuote && quoteStart >= 0 && context != ParseContext.COMPLETE) {
-			throw new EOFError(-1, -1, "Missing closing quote", line.charAt(quoteStart) == '\'' ? "quote" : "dquote");
+			throw new EOFError(-1, -1, "Missing closing quote",
+					(line != null && line.charAt(quoteStart) == '\'') ? "quote" : "dquote");
 		}
 
-		String openingQuote = quoteStart >= 0 ? line.substring(quoteStart, quoteStart + 1) : null;
+		String openingQuote = (quoteStart >= 0 && line != null) ? line.substring(quoteStart, quoteStart + 1) : null;
 		return wrap(new ExtendedArgumentList(line, words, wordIndex, wordCursor, cursor, openingQuote));
 	}
 
diff --git a/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Stacktrace.java b/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Stacktrace.java
@@ -54,8 +54,11 @@ public Stacktrace(ObjectProvider<ThrowableResultHandler> throwableResultHandler)
 			value = "Display the full stacktrace of the last error.",
 			interactionMode = InteractionMode.INTERACTIVE)
 	public void stacktrace() {
-		if (throwableResultHandler.getIfAvailable().getLastError() != null) {
-			throwableResultHandler.getIfAvailable().getLastError().printStackTrace(getTerminal().writer());
+		ThrowableResultHandler handler = throwableResultHandler.getIfAvailable();
+		if (handler != null) {
+			if (handler.getLastError() != null) {
+				handler.getLastError().printStackTrace(getTerminal().writer());
+			}
 		}
 	}
 }
diff --git a/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/StandardCommandsModelsRuntimeHints.java b/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/StandardCommandsModelsRuntimeHints.java
@@ -23,6 +23,7 @@
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeReference;
+import org.springframework.lang.Nullable;
 
 /**
  * {@link RuntimeHintsRegistrar} for Shell Standard Commands temlate model classes.
@@ -32,7 +33,7 @@
 class StandardCommandsModelsRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 		ReflectionHints reflection = hints.reflection();
 		registerForDeclaredMethodsInvocation(reflection, CommandAvailabilityInfoModel.class, CommandInfoModel.class,
 				CommandParameterInfoModel.class, GroupCommandInfoModel.class, GroupsInfoModel.class);
diff --git a/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/StandardCommandsResourcesRuntimeHints.java b/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/StandardCommandsResourcesRuntimeHints.java
@@ -17,6 +17,7 @@
 
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.lang.Nullable;
 
 /**
  * {@link RuntimeHintsRegistrar} for Shell Standard Commands resources.
@@ -26,7 +27,7 @@
 class StandardCommandsResourcesRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 		hints.resources()
 			.registerPattern("template/*.st")
 			.registerPattern("template/*.stg");
diff --git a/spring-shell-standard/src/main/java/org/springframework/shell/standard/ShellOptionMethodArgumentResolver.java b/spring-shell-standard/src/main/java/org/springframework/shell/standard/ShellOptionMethodArgumentResolver.java
@@ -50,7 +50,9 @@ public boolean supportsParameter(MethodParameter parameter) {
 	protected NamedValueInfo createNamedValueInfo(MethodParameter parameter) {
 		ShellOption annot = parameter.getParameterAnnotation(ShellOption.class);
 		Assert.state(annot != null, "No ShellOption annotation");
-		List<String> names = Arrays.stream(annot.value()).map(v -> StringUtils.trimLeadingCharacter(v, '-')).collect(Collectors.toList());
+		List<String> names = Arrays.stream(annot != null ? annot.value() : new String[0])
+			.map(v -> StringUtils.trimLeadingCharacter(v, '-'))
+			.collect(Collectors.toList());
 		return new HeaderNamedValueInfo(annot, names);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,11 @@ public ConfirmationInputContext getThisContext(ComponentContext<?> context) {`
`72`	`72`	`}`
`73`	`73`	`currentContext = ConfirmationInputContext.of(defaultValue);`
`74`	`74`	`currentContext.setName(getName());`
`75`		`- context.stream().forEach(e -> {`
`76`		`- currentContext.put(e.getKey(), e.getValue());`
`77`		`- });`
	`75`	`+ if (context != null) {`
	`76`	`+ context.stream().forEach(e -> {`
	`77`	`+ currentContext.put(e.getKey(), e.getValue());`
	`78`	`+ });`
	`79`	`+ }`
`78`	`80`	`return currentContext;`
`79`	`81`	`}`
`80`	`82`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,11 @@ public MultiItemSelectorContext<T, I> getThisContext(ComponentContext<?> context`
`63`	`63`	`if (currentContext.getItems() == null) {`
`64`	`64`	`currentContext.setItems(getItems());`
`65`	`65`	`}`
`66`		`- context.stream().forEach(e -> {`
`67`		`- currentContext.put(e.getKey(), e.getValue());`
`68`		`- });`
	`66`	`+ if (context != null) {`
	`67`	`+ context.stream().forEach(e -> {`
	`68`	`+ currentContext.put(e.getKey(), e.getValue());`
	`69`	`+ });`
	`70`	`+ }`
`69`	`71`	`return currentContext;`
`70`	`72`	`}`
`71`	`73`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,11 @@ public PathInputContext getThisContext(ComponentContext<?> context) {`
`69`	`69`	`}`
`70`	`70`	`currentContext = PathInputContext.empty();`
`71`	`71`	`currentContext.setName(getName());`
`72`		`- context.stream().forEach(e -> {`
`73`		`- currentContext.put(e.getKey(), e.getValue());`
`74`		`- });`
	`72`	`+ if (context != null) {`
	`73`	`+ context.stream().forEach(e -> {`
	`74`	`+ currentContext.put(e.getKey(), e.getValue());`
	`75`	`+ });`
	`76`	`+ }`
`75`	`77`	`return currentContext;`
`76`	`78`	`}`
`77`	`79`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,11 @@ public SingleItemSelectorContext<T, I> getThisContext(ComponentContext<?> contex`
`63`	`63`	`if (currentContext.getItems() == null) {`
`64`	`64`	`currentContext.setItems(getItems());`
`65`	`65`	`}`
`66`		`- context.stream().forEach(e -> {`
`67`		`- currentContext.put(e.getKey(), e.getValue());`
`68`		`- });`
	`66`	`+ if (context != null) {`
	`67`	`+ context.stream().forEach(e -> {`
	`68`	`+ currentContext.put(e.getKey(), e.getValue());`
	`69`	`+ });`
	`70`	`+ }`
`69`	`71`	`return currentContext;`
`70`	`72`	`}`
`71`	`73`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,11 @@ public StringInputContext getThisContext(ComponentContext<?> context) {`
`77`	`77`	`}`
`78`	`78`	`currentContext = StringInputContext.of(defaultValue, maskCharacter);`
`79`	`79`	`currentContext.setName(getName());`
`80`		`- context.stream().forEach(e -> {`
`81`		`- currentContext.put(e.getKey(), e.getValue());`
`82`		`- });`
	`80`	`+ if (context != null) {`
	`81`	`+ context.stream().forEach(e -> {`
	`82`	`+ currentContext.put(e.getKey(), e.getValue());`
	`83`	`+ });`
	`84`	`+ }`
`83`	`85`	`return currentContext;`
`84`	`86`	`}`
`85`	`87`
Original file line number	Diff line number	Diff line change
`@@ -125,23 +125,24 @@ else if (!isEscapeChar(line, i)) {`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`- if (current.length() > 0 \|\| cursor == line.length()) {`
	`128`	`+ if (current.length() > 0 \|\| (line != null && cursor == line.length())) {`
`129`	`129`	`words.add(current.toString());`
`130`	`130`	`}`
`131`	`131`
`132`		`- if (cursor == line.length()) {`
	`132`	`+ if (line != null && cursor == line.length()) {`
`133`	`133`	`wordIndex = words.size() - 1;`
`134`	`134`	`wordCursor = words.get(words.size() - 1).length();`
`135`	`135`	`}`
`136`	`136`
`137`		`- if (eofOnEscapedNewLine && isEscapeChar(line, line.length() - 1)) {`
	`137`	`+ if (eofOnEscapedNewLine && (line != null && isEscapeChar(line, line.length() - 1))) {`
`138`	`138`	`throw new EOFError(-1, -1, "Escaped new line", "newline");`
`139`	`139`	`}`
`140`	`140`	`if (eofOnUnclosedQuote && quoteStart >= 0 && context != ParseContext.COMPLETE) {`
`141`		`- throw new EOFError(-1, -1, "Missing closing quote", line.charAt(quoteStart) == '\'' ? "quote" : "dquote");`
	`141`	`+ throw new EOFError(-1, -1, "Missing closing quote",`
	`142`	`+ (line != null && line.charAt(quoteStart) == '\'') ? "quote" : "dquote");`
`142`	`143`	`}`
`143`	`144`
`144`		`- String openingQuote = quoteStart >= 0 ? line.substring(quoteStart, quoteStart + 1) : null;`
	`145`	`+ String openingQuote = (quoteStart >= 0 && line != null) ? line.substring(quoteStart, quoteStart + 1) : null;`
`145`	`146`	`return wrap(new ExtendedArgumentList(line, words, wordIndex, wordCursor, cursor, openingQuote));`
`146`	`147`	`}`
`147`	`148`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,11 @@ public Stacktrace(ObjectProvider<ThrowableResultHandler> throwableResultHandler)`
`54`	`54`	`value = "Display the full stacktrace of the last error.",`
`55`	`55`	`interactionMode = InteractionMode.INTERACTIVE)`
`56`	`56`	`public void stacktrace() {`
`57`		`- if (throwableResultHandler.getIfAvailable().getLastError() != null) {`
`58`		`- throwableResultHandler.getIfAvailable().getLastError().printStackTrace(getTerminal().writer());`
	`57`	`+ ThrowableResultHandler handler = throwableResultHandler.getIfAvailable();`
	`58`	`+ if (handler != null) {`
	`59`	`+ if (handler.getLastError() != null) {`
	`60`	`+ handler.getLastError().printStackTrace(getTerminal().writer());`
	`61`	`+ }`
`59`	`62`	`}`
`60`	`63`	`}`
`61`	`64`	`}`