root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Remove redundant code 

See gh-17875
This commit is contained in:
lijuny 2019-08-15 20:20:16 +08:00 committed by Stephane Nicoll
parent 3a20b1d90c
commit d33ed84f1f
9 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/PropertySourcesPlaceholdersResolver.java
View File

@ -53,7 +53,7 @@ public class PropertySourcesPlaceholdersResolver implements PlaceholdersResolver
@Override @Override
public Object resolvePlaceholders(Object value) { public Object resolvePlaceholders(Object value) {
if (value != null && value instanceof String) { if (value instanceof String) {
return this.helper.replacePlaceholders((String) value, this::resolvePlaceholder); return this.helper.replacePlaceholders((String) value, this::resolvePlaceholder);
} }
return value; return value;

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java vendored
View File

@ -204,7 +204,7 @@ public class SpringApplicationJsonEnvironmentPostProcessor implements Environmen
public static JsonPropertyValue get(PropertySource<?> propertySource) { public static JsonPropertyValue get(PropertySource<?> propertySource) {
for (String candidate : CANDIDATES) { for (String candidate : CANDIDATES) {
Object value = propertySource.getProperty(candidate); Object value = propertySource.getProperty(candidate);
if (value != null && value instanceof String && StringUtils.hasLength((String) value)) { if (value instanceof String && StringUtils.hasLength((String) value)) {
return new JsonPropertyValue(propertySource, candidate, (String) value); return new JsonPropertyValue(propertySource, candidate, (String) value);
} }
} }

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/Origin.java
View File

@ -44,10 +44,10 @@ public interface Origin {
return (Origin) source; return (Origin) source;
} }
Origin origin = null; Origin origin = null;
if (source != null && source instanceof OriginProvider) { if (source instanceof OriginProvider) {
origin = ((OriginProvider) source).getOrigin(); origin = ((OriginProvider) source).getOrigin();
} }
if (origin == null && source != null && source instanceof Throwable) { if (origin == null && source instanceof Throwable) {
return from(((Throwable) source).getCause()); return from(((Throwable) source).getCause());
} }
return origin; return origin;

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPid.java
View File

@ -64,7 +64,7 @@ public class ApplicationPid {
if (obj == this) { if (obj == this) {
return true; return true;
} }
if (obj != null && obj instanceof ApplicationPid) { if (obj instanceof ApplicationPid) {
return ObjectUtils.nullSafeEquals(this.pid, ((ApplicationPid) obj).pid); return ObjectUtils.nullSafeEquals(this.pid, ((ApplicationPid) obj).pid);
} }
return false; return false;

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java
View File

@ -130,7 +130,7 @@ public class DefaultErrorAttributes implements ErrorAttributes, HandlerException
Throwable error = getError(webRequest); Throwable error = getError(webRequest);
if (error != null) { if (error != null) {
while (error instanceof ServletException && error.getCause() != null) { while (error instanceof ServletException && error.getCause() != null) {
error = ((ServletException) error).getCause(); error = error.getCause();
} }
if (this.includeException) { if (this.includeException) {
errorAttributes.put("exception", error.getClass().getName()); errorAttributes.put("exception", error.getClass().getName());

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
View File

@ -155,7 +155,7 @@ public class SpringApplicationBuilderTests {
ClassLoader classLoader = new URLClassLoader(new URL[0], getClass().getClassLoader()); ClassLoader classLoader = new URLClassLoader(new URL[0], getClass().getClassLoader());
application.resourceLoader(new DefaultResourceLoader(classLoader)); application.resourceLoader(new DefaultResourceLoader(classLoader));
this.context = application.run(); this.context = application.run();
assertThat(((SpyApplicationContext) this.context).getClassLoader()).isEqualTo(classLoader); assertThat(this.context.getClassLoader()).isEqualTo(classLoader);
} }
@Test @Test

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
View File

@ -303,8 +303,8 @@ public class ConfigFileApplicationListenerTests {
@Test @Test
public void defaultPropertyAsFallback() { public void defaultPropertyAsFallback() {
this.environment.getPropertySources().addLast( this.environment.getPropertySources()
new MapPropertySource("defaultProperties", Collections.singletonMap("my.fallback", (Object) "foo"))); .addLast(new MapPropertySource("defaultProperties", Collections.singletonMap("my.fallback", "foo")));
this.initializer.postProcessEnvironment(this.environment, this.application); this.initializer.postProcessEnvironment(this.environment, this.application);
String property = this.environment.getProperty("my.fallback"); String property = this.environment.getProperty("my.fallback");
assertThat(property).isEqualTo("foo"); assertThat(property).isEqualTo("foo");
@ -313,7 +313,7 @@ public class ConfigFileApplicationListenerTests {
@Test @Test
public void defaultPropertyAsFallbackDuringFileParsing() { public void defaultPropertyAsFallbackDuringFileParsing() {
this.environment.getPropertySources().addLast(new MapPropertySource("defaultProperties", this.environment.getPropertySources().addLast(new MapPropertySource("defaultProperties",
Collections.singletonMap("spring.config.name", (Object) "testproperties"))); Collections.singletonMap("spring.config.name", "testproperties")));
this.initializer.postProcessEnvironment(this.environment, this.application); this.initializer.postProcessEnvironment(this.environment, this.application);
String property = this.environment.getProperty("the.property"); String property = this.environment.getProperty("the.property");
assertThat(property).isEqualTo("frompropertiesfile"); assertThat(property).isEqualTo("frompropertiesfile");

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyNameTests.java
View File

@ -409,7 +409,7 @@ public class ConfigurationPropertyNameTests {
@Test @Test
public void appendWhenElementNameIsNullShouldReturnName() { public void appendWhenElementNameIsNullShouldReturnName() {
ConfigurationPropertyName name = ConfigurationPropertyName.of("foo"); ConfigurationPropertyName name = ConfigurationPropertyName.of("foo");
assertThat((Object) name.append((String) null)).isSameAs(name); assertThat((Object) name.append(null)).isSameAs(name);
} }
@Test @Test

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
View File

@ -788,8 +788,7 @@ public abstract class AbstractServletWebServerFactoryTests {
this.webServer = factory.getWebServer(new ServletRegistrationBean<>(new ExampleServlet(false, true), "/hello")); this.webServer = factory.getWebServer(new ServletRegistrationBean<>(new ExampleServlet(false, true), "/hello"));
this.webServer.start(); this.webServer.start();
TestGzipInputStreamFactory inputStreamFactory = new TestGzipInputStreamFactory(); TestGzipInputStreamFactory inputStreamFactory = new TestGzipInputStreamFactory();
Map<String, InputStreamFactory> contentDecoderMap = Collections.singletonMap("gzip", Map<String, InputStreamFactory> contentDecoderMap = Collections.singletonMap("gzip", inputStreamFactory);
(InputStreamFactory) inputStreamFactory);
getResponse(getLocalUrl("/hello"), new HttpComponentsClientHttpRequestFactory( getResponse(getLocalUrl("/hello"), new HttpComponentsClientHttpRequestFactory(
HttpClientBuilder.create().setContentDecoderRegistry(contentDecoderMap).build())); HttpClientBuilder.create().setContentDecoderRegistry(contentDecoderMap).build()));
assertThat(inputStreamFactory.wasCompressionUsed()).isTrue(); assertThat(inputStreamFactory.wasCompressionUsed()).isTrue();
@ -993,8 +992,7 @@ public abstract class AbstractServletWebServerFactoryTests {
HttpMethod method) throws Exception { HttpMethod method) throws Exception {
String testContent = setUpFactoryForCompression(contentSize, mimeTypes, excludedUserAgents); String testContent = setUpFactoryForCompression(contentSize, mimeTypes, excludedUserAgents);
TestGzipInputStreamFactory inputStreamFactory = new TestGzipInputStreamFactory(); TestGzipInputStreamFactory inputStreamFactory = new TestGzipInputStreamFactory();
Map<String, InputStreamFactory> contentDecoderMap = Collections.singletonMap("gzip", Map<String, InputStreamFactory> contentDecoderMap = Collections.singletonMap("gzip", inputStreamFactory);
(InputStreamFactory) inputStreamFactory);
String response = getResponse(getLocalUrl("/test.txt"), method, String response = getResponse(getLocalUrl("/test.txt"), method,
new HttpComponentsClientHttpRequestFactory(HttpClientBuilder.create().setUserAgent("testUserAgent") new HttpComponentsClientHttpRequestFactory(HttpClientBuilder.create().setUserAgent("testUserAgent")
.setContentDecoderRegistry(contentDecoderMap).build())); .setContentDecoderRegistry(contentDecoderMap).build()));