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

@Nullable all the way: null-safety at field level

Browse Source 
This commits extends nullability declarations to the field level, formalizing the interaction between methods and their underlying fields and therefore avoiding any nullability mismatch.

Issue: SPR-15720
This commit is contained in:
Juergen Hoeller
2017-06-30 01:53:45 +02:00
parent c4694c3f5c
commit cc74a2891a
936 changed files with 6090 additions and 2806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
View File

@@ -44,13 +44,15 @@ public class UrlTagTests extends AbstractTagTests {
private MockPageContext context;
@Before
public void setUp() throws Exception {
public void setup() throws Exception {
context = createPageContext();
tag = new UrlTag();
tag.setPageContext(context);
}
@Test
public void paramSupport() {
assertThat(tag, instanceOf(ParamAware.class));
@@ -66,7 +68,6 @@ public class UrlTagTests extends AbstractTagTests {
@Test
public void doEndTag() throws JspException {
tag.setValue("url/path");
tag.doStartTag();
int action = tag.doEndTag();
@@ -77,12 +78,10 @@ public class UrlTagTests extends AbstractTagTests {
public void varDefaultScope() throws JspException {
tag.setValue("url/path");
tag.setVar("var");
tag.doStartTag();
tag.doEndTag();
assertEquals("url/path", context.getAttribute("var",
PageContext.PAGE_SCOPE));
assertEquals("url/path", context.getAttribute("var", PageContext.PAGE_SCOPE));
}
@Test
@@ -90,19 +89,16 @@ public class UrlTagTests extends AbstractTagTests {
tag.setValue("url/path");
tag.setVar("var");
tag.setScope("request");
tag.doStartTag();
tag.doEndTag();
assertEquals("url/path", context.getAttribute("var",
PageContext.REQUEST_SCOPE));
assertEquals("url/path", context.getAttribute("var", PageContext.REQUEST_SCOPE));
}
@Test
public void setHtmlEscapeDefault() throws JspException {
tag.setValue("url/path");
tag.setVar("var");
tag.doStartTag();
Param param = new Param();
@@ -116,9 +112,7 @@ public class UrlTagTests extends AbstractTagTests {
tag.addParam(param);
tag.doEndTag();
assertEquals("url/path?n%20me=v%26l%3De&name=value2", context
.getAttribute("var"));
assertEquals("url/path?n%20me=v%26l%3De&name=value2", context.getAttribute("var"));
}
@Test
@@ -140,9 +134,7 @@ public class UrlTagTests extends AbstractTagTests {
tag.addParam(param);
tag.doEndTag();
assertEquals("url/path?n%20me=v%26l%3De&name=value2", context
.getAttribute("var"));
assertEquals("url/path?n%20me=v%26l%3De&name=value2", context.getAttribute("var"));
}
@Test
@@ -150,7 +142,6 @@ public class UrlTagTests extends AbstractTagTests {
tag.setValue("url/path");
tag.setVar("var");
tag.setHtmlEscape(true);
tag.doStartTag();
Param param = new Param();
@@ -164,9 +155,7 @@ public class UrlTagTests extends AbstractTagTests {
tag.addParam(param);
tag.doEndTag();
assertEquals("url/path?n%20me=v%26l%3De&name=value2", context
.getAttribute("var"));
assertEquals("url/path?n%20me=v%26l%3De&name=value2", context.getAttribute("var"));
}
@Test
@@ -174,7 +163,6 @@ public class UrlTagTests extends AbstractTagTests {
tag.setValue("url/path");
tag.setVar("var");
tag.setJavaScriptEscape(true);
tag.doStartTag();
Param param = new Param();
@@ -188,9 +176,7 @@ public class UrlTagTests extends AbstractTagTests {
tag.addParam(param);
tag.doEndTag();
assertEquals("url\\/path?n%20me=v%26l%3De&name=value2", context
.getAttribute("var"));
assertEquals("url\\/path?n%20me=v%26l%3De&name=value2", context.getAttribute("var"));
}
@Test
@@ -199,7 +185,6 @@ public class UrlTagTests extends AbstractTagTests {
tag.setVar("var");
tag.setHtmlEscape(true);
tag.setJavaScriptEscape(true);
tag.doStartTag();
Param param = new Param();
@@ -213,9 +198,7 @@ public class UrlTagTests extends AbstractTagTests {
tag.addParam(param);
tag.doEndTag();
assertEquals("url\\/path?n%20me=v%26l%3De&name=value2", context
.getAttribute("var"));
assertEquals("url\\/path?n%20me=v%26l%3De&name=value2", context.getAttribute("var"));
}
@Test
@@ -224,7 +207,6 @@ public class UrlTagTests extends AbstractTagTests {
Set<String> usedParams = new HashSet<>();
String queryString = tag.createQueryString(params, usedParams, true);
assertEquals("", queryString);
}
@@ -239,13 +221,11 @@ public class UrlTagTests extends AbstractTagTests {
params.add(param);
String queryString = tag.createQueryString(params, usedParams, true);
assertEquals("?name=value", queryString);
}
@Test
public void createQueryStringOneParamForExsistingQueryString()
throws JspException {
public void createQueryStringOneParamForExsistingQueryString() throws JspException {
List<Param> params = new LinkedList<>();
Set<String> usedParams = new HashSet<>();
@@ -255,7 +235,6 @@ public class UrlTagTests extends AbstractTagTests {
params.add(param);
String queryString = tag.createQueryString(params, usedParams, false);
assertEquals("&name=value", queryString);
}
@@ -270,7 +249,6 @@ public class UrlTagTests extends AbstractTagTests {
params.add(param);
String queryString = tag.createQueryString(params, usedParams, true);
assertEquals("?name=", queryString);
}
@@ -285,7 +263,6 @@ public class UrlTagTests extends AbstractTagTests {
params.add(param);
String queryString = tag.createQueryString(params, usedParams, true);
assertEquals("?name", queryString);
}
@@ -298,11 +275,9 @@ public class UrlTagTests extends AbstractTagTests {
param.setName("name");
param.setValue("value");
params.add(param);
usedParams.add("name");
String queryString = tag.createQueryString(params, usedParams, true);
assertEquals("", queryString);
}
@@ -322,7 +297,6 @@ public class UrlTagTests extends AbstractTagTests {
params.add(param);
String queryString = tag.createQueryString(params, usedParams, true);
assertEquals("?name=value&name=value2", queryString);
}
@@ -342,7 +316,6 @@ public class UrlTagTests extends AbstractTagTests {
params.add(param);
String queryString = tag.createQueryString(params, usedParams, true);
assertEquals("?n%20me=v%26l%3De&name=value2", queryString);
}
@@ -357,7 +330,6 @@ public class UrlTagTests extends AbstractTagTests {
params.add(param);
String queryString = tag.createQueryString(params, usedParams, true);
assertEquals("", queryString);
}
@@ -372,7 +344,6 @@ public class UrlTagTests extends AbstractTagTests {
params.add(param);
String queryString = tag.createQueryString(params, usedParams, true);
assertEquals("", queryString);
}
@@ -381,29 +352,23 @@ public class UrlTagTests extends AbstractTagTests {
List<Param> params = new LinkedList<>();
Set<String> usedParams = new HashSet<>();
String uri = tag.replaceUriTemplateParams("url/path", params,
usedParams);
String uri = tag.replaceUriTemplateParams("url/path", params, usedParams);
assertEquals("url/path", uri);
assertEquals(0, usedParams.size());
}
@Test
public void replaceUriTemplateParamsTemplateWithoutParamMatch()
throws JspException {
public void replaceUriTemplateParamsTemplateWithoutParamMatch() throws JspException {
List<Param> params = new LinkedList<>();
Set<String> usedParams = new HashSet<>();
String uri = tag.replaceUriTemplateParams("url/{path}", params,
usedParams);
String uri = tag.replaceUriTemplateParams("url/{path}", params, usedParams);
assertEquals("url/{path}", uri);
assertEquals(0, usedParams.size());
}
@Test
public void replaceUriTemplateParamsTemplateWithParamMatch()
throws JspException {
public void replaceUriTemplateParamsTemplateWithParamMatch() throws JspException {
List<Param> params = new LinkedList<>();
Set<String> usedParams = new HashSet<>();
@@ -412,17 +377,14 @@ public class UrlTagTests extends AbstractTagTests {
param.setValue("value");
params.add(param);
String uri = tag.replaceUriTemplateParams("url/{name}", params,
usedParams);
String uri = tag.replaceUriTemplateParams("url/{name}", params, usedParams);
assertEquals("url/value", uri);
assertEquals(1, usedParams.size());
assertTrue(usedParams.contains("name"));
}
@Test
public void replaceUriTemplateParamsTemplateWithParamMatchNamePreEncoding()
throws JspException {
public void replaceUriTemplateParamsTemplateWithParamMatchNamePreEncoding() throws JspException {
List<Param> params = new LinkedList<>();
Set<String> usedParams = new HashSet<>();
@@ -431,17 +393,14 @@ public class UrlTagTests extends AbstractTagTests {
param.setValue("value");
params.add(param);
String uri = tag.replaceUriTemplateParams("url/{n me}", params,
usedParams);
String uri = tag.replaceUriTemplateParams("url/{n me}", params, usedParams);
assertEquals("url/value", uri);
assertEquals(1, usedParams.size());
assertTrue(usedParams.contains("n me"));
}
@Test
public void replaceUriTemplateParamsTemplateWithParamMatchValueEncoded()
throws JspException {
public void replaceUriTemplateParamsTemplateWithParamMatchValueEncoded() throws JspException {
List<Param> params = new LinkedList<>();
Set<String> usedParams = new HashSet<>();
@@ -458,11 +417,8 @@ public class UrlTagTests extends AbstractTagTests {
assertTrue(usedParams.contains("name"));
}
// SPR-11401
@Test
public void replaceUriTemplateParamsTemplateWithPathSegment()
throws JspException {
@Test // SPR-11401
public void replaceUriTemplateParamsTemplateWithPathSegment() throws JspException {
List<Param> params = new LinkedList<>();
Set<String> usedParams = new HashSet<>();
@@ -479,8 +435,7 @@ public class UrlTagTests extends AbstractTagTests {
}
@Test
public void replaceUriTemplateParamsTemplateWithPath()
throws JspException {
public void replaceUriTemplateParamsTemplateWithPath() throws JspException {
List<Param> params = new LinkedList<>();
Set<String> usedParams = new HashSet<>();
@@ -490,7 +445,6 @@ public class UrlTagTests extends AbstractTagTests {
params.add(param);
String uri = tag.replaceUriTemplateParams("url/{name}", params, usedParams);
assertEquals("url/my/Id", uri);
assertEquals(1, usedParams.size());
assertTrue(usedParams.contains("name"));
@@ -499,89 +453,71 @@ public class UrlTagTests extends AbstractTagTests {
@Test
public void createUrlRemoteServer() throws JspException {
tag.setValue("http://www.springframework.org/");
tag.doStartTag();
// String uri = tag.createUrl();
String uri = invokeCreateUrl(tag);
String uri = tag.createUrl();
assertEquals("http://www.springframework.org/", uri);
}
@Test
public void createUrlRelative() throws JspException {
tag.setValue("url/path");
tag.doStartTag();
String uri = invokeCreateUrl(tag);
String uri = tag.createUrl();
assertEquals("url/path", uri);
}
@Test
public void createUrlLocalContext() throws JspException {
((MockHttpServletRequest) context.getRequest())
.setContextPath("/app-context");
((MockHttpServletRequest) context.getRequest()).setContextPath("/app-context");
tag.setValue("/url/path");
tag.doStartTag();
String uri = invokeCreateUrl(tag);
String uri = tag.createUrl();
assertEquals("/app-context/url/path", uri);
}
@Test
public void createUrlRemoteContext() throws JspException {
((MockHttpServletRequest) context.getRequest())
.setContextPath("/app-context");
((MockHttpServletRequest) context.getRequest()).setContextPath("/app-context");
tag.setValue("/url/path");
tag.setContext("some-other-context");
tag.doStartTag();
String uri = invokeCreateUrl(tag);
String uri = tag.createUrl();
assertEquals("/some-other-context/url/path", uri);
}
@Test
public void createUrlRemoteContextWithSlash() throws JspException {
((MockHttpServletRequest) context.getRequest())
.setContextPath("/app-context");
((MockHttpServletRequest) context.getRequest()).setContextPath("/app-context");
tag.setValue("/url/path");
tag.setContext("/some-other-context");
tag.doStartTag();
String uri = invokeCreateUrl(tag);
String uri = tag.createUrl();
assertEquals("/some-other-context/url/path", uri);
}
@Test
public void createUrlRemoteContextSingleSlash() throws JspException {
((MockHttpServletRequest) context.getRequest())
.setContextPath("/app-context");
((MockHttpServletRequest) context.getRequest()).setContextPath("/app-context");
tag.setValue("/url/path");
tag.setContext("/");
tag.doStartTag();
String uri = invokeCreateUrl(tag);
String uri = tag.createUrl();
assertEquals("/url/path", uri);
}
@Test
public void createUrlWithParams() throws JspException {
tag.setValue("url/path");
tag.doStartTag();
Param param = new Param();
@@ -594,15 +530,13 @@ public class UrlTagTests extends AbstractTagTests {
param.setValue("v lue");
tag.addParam(param);
String uri = invokeCreateUrl(tag);
String uri = tag.createUrl();
assertEquals("url/path?name=value&n%20me=v%20lue", uri);
}
@Test
public void createUrlWithTemplateParams() throws JspException {
tag.setValue("url/{name}");
tag.doStartTag();
Param param = new Param();
@@ -615,16 +549,13 @@ public class UrlTagTests extends AbstractTagTests {
param.setValue("v lue");
tag.addParam(param);
String uri = invokeCreateUrl(tag);
String uri = tag.createUrl();
assertEquals("url/value?n%20me=v%20lue", uri);
}
@Test
public void createUrlWithParamAndExsistingQueryString()
throws JspException {
public void createUrlWithParamAndExistingQueryString() throws JspException {
tag.setValue("url/path?foo=bar");
tag.doStartTag();
Param param = new Param();
@@ -632,29 +563,8 @@ public class UrlTagTests extends AbstractTagTests {
param.setValue("value");
tag.addParam(param);
String uri = invokeCreateUrl(tag);
String uri = tag.createUrl();
assertEquals("url/path?foo=bar&name=value", uri);
}
@Test
public void jspWriterOutput() {
// TODO assert that the output to the JspWriter is the expected output
}
@Test
public void servletRepsonseEncodeUrl() {
// TODO assert that HttpServletResponse.encodeURL(String) is invoked for
// non absolute urls
}
// support methods
private String invokeCreateUrl(UrlTag tag) {
Method createUrl = ReflectionUtils.findMethod(tag.getClass(),
"createUrl");
ReflectionUtils.makeAccessible(createUrl);
return (String) ReflectionUtils.invokeMethod(createUrl, tag);
}
}

8
spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import java.io.FileWriter;
import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
@@ -27,7 +28,6 @@ import freemarker.template.Configuration;
import freemarker.template.SimpleHash;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import org.junit.Before;
import org.junit.Test;
@@ -69,12 +69,14 @@ public class FreeMarkerMacroTests {
@Before
public void setUp() throws Exception {
ServletContext sc = new MockServletContext();
wac = new StaticWebApplicationContext();
wac.setServletContext(new MockServletContext());
wac.setServletContext(sc);
// final Template expectedTemplate = new Template();
fc = new FreeMarkerConfigurer();
fc.setTemplateLoaderPaths("classpath:/", "file://" + System.getProperty("java.io.tmpdir"));
fc.setServletContext(sc);
fc.afterPropertiesSet();
wac.getDefaultListableBeanFactory().registerSingleton("freeMarkerConfigurer", fc);

19
spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,10 @@ import java.util.Locale;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import freemarker.ext.servlet.AllHttpScopesHashModel;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -42,11 +46,6 @@ import org.springframework.web.servlet.view.AbstractView;
import org.springframework.web.servlet.view.InternalResourceView;
import org.springframework.web.servlet.view.RedirectView;
import freemarker.ext.servlet.AllHttpScopesHashModel;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
@@ -61,6 +60,7 @@ public class FreeMarkerViewTests {
@Rule
public final ExpectedException exception = ExpectedException.none();
@Test
public void noFreeMarkerConfig() throws Exception {
FreeMarkerView fv = new FreeMarkerView();
@@ -95,6 +95,7 @@ public class FreeMarkerViewTests {
Map<String, FreeMarkerConfig> configs = new HashMap<>();
FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
configurer.setConfiguration(new TestConfiguration());
configurer.setServletContext(sc);
configs.put("configurer", configurer);
given(wac.getBeansOfType(FreeMarkerConfig.class, true, false)).willReturn(configs);
given(wac.getServletContext()).willReturn(sc);
@@ -125,6 +126,7 @@ public class FreeMarkerViewTests {
Map<String, FreeMarkerConfig> configs = new HashMap<>();
FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
configurer.setConfiguration(new TestConfiguration());
configurer.setServletContext(sc);
configs.put("configurer", configurer);
given(wac.getBeansOfType(FreeMarkerConfig.class, true, false)).willReturn(configs);
given(wac.getServletContext()).willReturn(sc);
@@ -148,11 +150,14 @@ public class FreeMarkerViewTests {
@Test
public void freeMarkerViewResolver() throws Exception {
MockServletContext sc = new MockServletContext();
FreeMarkerConfigurer configurer = new FreeMarkerConfigurer();
configurer.setConfiguration(new TestConfiguration());
configurer.setServletContext(sc);
StaticWebApplicationContext wac = new StaticWebApplicationContext();
wac.setServletContext(new MockServletContext());
wac.setServletContext(sc);
wac.getBeanFactory().registerSingleton("configurer", configurer);
wac.refresh();