Commit 36f4d2f0 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #19000 from thelproad

* pr/19000:
  Remove redundant code

Closes gh-19000
parents 0c5bb603 65ab82b3
...@@ -190,7 +190,7 @@ class ServletManagementChildContextConfiguration { ...@@ -190,7 +190,7 @@ class ServletManagementChildContextConfiguration {
private void customizeServer(Server server) { private void customizeServer(Server server) {
RequestLog requestLog = server.getRequestLog(); RequestLog requestLog = server.getRequestLog();
if (requestLog != null && requestLog instanceof CustomRequestLog) { if (requestLog instanceof CustomRequestLog) {
customizeRequestLog((CustomRequestLog) requestLog); customizeRequestLog((CustomRequestLog) requestLog);
} }
} }
......
...@@ -51,7 +51,7 @@ public class EndpointMediaTypes { ...@@ -51,7 +51,7 @@ public class EndpointMediaTypes {
* @since 2.2.0 * @since 2.2.0
*/ */
public EndpointMediaTypes(String... producedAndConsumed) { public EndpointMediaTypes(String... producedAndConsumed) {
this((producedAndConsumed != null) ? Arrays.asList(producedAndConsumed) : (List<String>) null); this((producedAndConsumed != null) ? Arrays.asList(producedAndConsumed) : null);
} }
/** /**
......
...@@ -279,7 +279,7 @@ public class AutoConfigurationImportSelector implements DeferredImportSelector, ...@@ -279,7 +279,7 @@ public class AutoConfigurationImportSelector implements DeferredImportSelector,
protected final List<String> asList(AnnotationAttributes attributes, String name) { protected final List<String> asList(AnnotationAttributes attributes, String name) {
String[] value = attributes.getStringArray(name); String[] value = attributes.getStringArray(name);
return Arrays.asList((value != null) ? value : new String[0]); return Arrays.asList(value);
} }
private void fireAutoConfigurationImportEvents(List<String> configurations, Set<String> exclusions) { private void fireAutoConfigurationImportEvents(List<String> configurations, Set<String> exclusions) {
......
...@@ -24,7 +24,6 @@ import org.springframework.context.annotation.Condition; ...@@ -24,7 +24,6 @@ import org.springframework.context.annotation.Condition;
import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;
import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.core.type.AnnotatedTypeMetadata;
import org.springframework.util.Assert; import org.springframework.util.Assert;
...@@ -39,14 +38,11 @@ import org.springframework.util.MultiValueMap; ...@@ -39,14 +38,11 @@ import org.springframework.util.MultiValueMap;
@Order(Ordered.HIGHEST_PRECEDENCE + 20) @Order(Ordered.HIGHEST_PRECEDENCE + 20)
class OnResourceCondition extends SpringBootCondition { class OnResourceCondition extends SpringBootCondition {
private final ResourceLoader defaultResourceLoader = new DefaultResourceLoader();
@Override @Override
public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
MultiValueMap<String, Object> attributes = metadata MultiValueMap<String, Object> attributes = metadata
.getAllAnnotationAttributes(ConditionalOnResource.class.getName(), true); .getAllAnnotationAttributes(ConditionalOnResource.class.getName(), true);
ResourceLoader loader = (context.getResourceLoader() != null) ? context.getResourceLoader() ResourceLoader loader = context.getResourceLoader();
: this.defaultResourceLoader;
List<String> locations = new ArrayList<>(); List<String> locations = new ArrayList<>();
collectValues(locations, attributes.get("resources")); collectValues(locations, attributes.get("resources"));
Assert.isTrue(!locations.isEmpty(), Assert.isTrue(!locations.isEmpty(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment