Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve null-safety to fix some Spring Boot warnings

Browse Source 
Issue: SPR-15540
This commit is contained in:
Sebastien Deleuze
2017-05-31 16:55:57 +02:00
parent b47d713e14
commit c3e6afb879
19 changed files with 59 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
View File

@@ -19,6 +19,7 @@ package org.springframework.web.context;
import javax.servlet.ServletContext;
import org.springframework.context.ApplicationContext;
import org.springframework.lang.Nullable;
/**
* Interface to provide configuration for a web application. This is read-only while
@@ -100,6 +101,7 @@ public interface WebApplicationContext extends ApplicationContext {
* Return the standard Servlet API ServletContext for this application.
* <p>Also available for a Portlet application, in addition to the PortletContext.
*/
@Nullable
ServletContext getServletContext();
}

15
spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
View File

@@ -16,6 +16,7 @@
package org.springframework.web.util;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
@@ -58,7 +59,7 @@ public abstract class HtmlUtils {
* @param input the (unescaped) input string
* @return the escaped string
*/
public static String htmlEscape(String input) {
public static String htmlEscape(@Nullable String input) {
return htmlEscape(input, WebUtils.DEFAULT_CHARACTER_ENCODING);
}
@@ -78,7 +79,7 @@ public abstract class HtmlUtils {
* @return the escaped string
* @since 4.1.2
*/
public static String htmlEscape(String input, String encoding) {
public static String htmlEscape(@Nullable String input, String encoding) {
Assert.notNull(encoding, "Encoding is required");
if (input == null) {
return null;
@@ -109,7 +110,7 @@ public abstract class HtmlUtils {
* @param input the (unescaped) input string
* @return the escaped string
*/
public static String htmlEscapeDecimal(String input) {
public static String htmlEscapeDecimal(@Nullable String input) {
return htmlEscapeDecimal(input, WebUtils.DEFAULT_CHARACTER_ENCODING);
}
@@ -129,7 +130,7 @@ public abstract class HtmlUtils {
* @return the escaped string
* @since 4.1.2
*/
public static String htmlEscapeDecimal(String input, String encoding) {
public static String htmlEscapeDecimal(@Nullable String input, String encoding) {
Assert.notNull(encoding, "Encoding is required");
if (input == null) {
return null;
@@ -161,7 +162,7 @@ public abstract class HtmlUtils {
* @param input the (unescaped) input string
* @return the escaped string
*/
public static String htmlEscapeHex(String input) {
public static String htmlEscapeHex(@Nullable String input) {
return htmlEscapeHex(input, WebUtils.DEFAULT_CHARACTER_ENCODING);
}
@@ -181,7 +182,7 @@ public abstract class HtmlUtils {
* @return the escaped string
* @since 4.1.2
*/
public static String htmlEscapeHex(String input, String encoding) {
public static String htmlEscapeHex(@Nullable String input, String encoding) {
Assert.notNull(encoding, "Encoding is required");
if (input == null) {
return null;
@@ -220,7 +221,7 @@ public abstract class HtmlUtils {
* @param input the (escaped) input string
* @return the unescaped string
*/
public static String htmlUnescape(String input) {
public static String htmlUnescape(@Nullable String input) {
if (input == null) {
return null;
}