Skip to content

Commit 68aec8b

Browse files
philwebbphilwebb
committed
Polish
1 parent 23a923d commit 68aec8b

File tree

21 files changed

+76
-47
lines changed

21 files changed

+76
-47
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpoint.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
* @author Stephane Nicoll
9191
* @since 2.0.0
9292
* @see Endpoint
93-
* @deprecated as of 2.2.0 in favor of {@link ConditionalOnAvailableEndpoint}
93+
* @deprecated as of 2.2.0 in favor of
94+
* {@link ConditionalOnAvailableEndpoint @ConditionalOnAvailableEndpoint}
9495
*/
9596
@Retention(RetentionPolicy.RUNTIME)
9697
@Target({ ElementType.METHOD, ElementType.TYPE })

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.springframework.boot.autoconfigure.data.neo4j.Neo4jRepositoriesAutoConfiguration;
3232
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
3333
import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
34-
import org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration;
3534
import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
3635
import org.springframework.boot.builder.SpringApplicationBuilder;
3736
import org.springframework.boot.test.util.ApplicationContextTestUtils;
@@ -73,8 +72,7 @@ public void testChild() {
7372
MongoDataAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class,
7473
Neo4jDataAutoConfiguration.class, Neo4jRepositoriesAutoConfiguration.class,
7574
RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class,
76-
FlywayAutoConfiguration.class, JestAutoConfiguration.class,
77-
MetricsAutoConfiguration.class },
75+
FlywayAutoConfiguration.class, MetricsAutoConfiguration.class },
7876
excludeName = {
7977
"org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration" })
8078
public static class Child {
@@ -87,8 +85,7 @@ public static class Child {
8785
MongoDataAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class,
8886
Neo4jDataAutoConfiguration.class, Neo4jRepositoriesAutoConfiguration.class,
8987
RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class,
90-
FlywayAutoConfiguration.class, JestAutoConfiguration.class,
91-
MetricsAutoConfiguration.class },
88+
FlywayAutoConfiguration.class, MetricsAutoConfiguration.class },
9289
excludeName = {
9390
"org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration" })
9491
public static class Parent {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnEnabledEndpointTests.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* @author Andy Wilkinson
3636
*/
3737
@Deprecated
38+
@SuppressWarnings("deprecation")
3839
public class ConditionalOnEnabledEndpointTests {
3940

4041
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner();

‎spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Autotime.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,6 @@ public Autotime(boolean enabled, boolean percentilesHistogram,
5454
? percentiles.stream().mapToDouble(Double::doubleValue).toArray() : null;
5555
}
5656

57-
/**
58-
* Create an instance that disable auto-timed requests.
59-
* @return an instance that disable auto-timed requests
60-
*/
61-
public static Autotime disabled() {
62-
return new Autotime(false, false, null);
63-
}
64-
6557
public boolean isEnabled() {
6658
return this.enabled;
6759
}
@@ -86,4 +78,12 @@ public void setPercentiles(double[] percentiles) {
8678
this.percentiles = percentiles;
8779
}
8880

81+
/**
82+
* Create an instance that disable auto-timed requests.
83+
* @return an instance that disable auto-timed requests
84+
*/
85+
public static Autotime disabled() {
86+
return new Autotime(false, false, null);
87+
}
88+
8989
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketStrategiesAutoConfiguration.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@ public RSocketStrategies rSocketStrategies(
7575
@ConditionalOnClass({ ObjectMapper.class, CBORFactory.class })
7676
protected static class JacksonCborStrategyConfiguration {
7777

78+
private static final MediaType[] SUPPORTED_TYPES = { MediaType.APPLICATION_CBOR };
79+
7880
@Bean
7981
@Order(0)
8082
@ConditionalOnBean(Jackson2ObjectMapperBuilder.class)
8183
public RSocketStrategiesCustomizer jacksonCborStrategyCustomizer(
8284
Jackson2ObjectMapperBuilder builder) {
8385
return (strategy) -> {
8486
ObjectMapper objectMapper = builder.factory(new CBORFactory()).build();
85-
MediaType[] supportedTypes = new MediaType[] {
86-
MediaType.APPLICATION_CBOR };
87-
strategy.decoder(new Jackson2CborDecoder(objectMapper, supportedTypes));
88-
strategy.encoder(new Jackson2CborEncoder(objectMapper, supportedTypes));
87+
strategy.decoder(new Jackson2CborDecoder(objectMapper, SUPPORTED_TYPES));
88+
strategy.encoder(new Jackson2CborEncoder(objectMapper, SUPPORTED_TYPES));
8989
};
9090
}
9191

@@ -95,16 +95,17 @@ public RSocketStrategiesCustomizer jacksonCborStrategyCustomizer(
9595
@ConditionalOnClass(ObjectMapper.class)
9696
protected static class JacksonJsonStrategyConfiguration {
9797

98+
private static final MediaType[] SUPPORTED_TYPES = { MediaType.APPLICATION_JSON,
99+
new MediaType("application", "*+json") };
100+
98101
@Bean
99102
@Order(1)
100103
@ConditionalOnBean(ObjectMapper.class)
101104
public RSocketStrategiesCustomizer jacksonJsonStrategyCustomizer(
102105
ObjectMapper objectMapper) {
103106
return (strategy) -> {
104-
MediaType[] supportedTypes = new MediaType[] { MediaType.APPLICATION_JSON,
105-
new MediaType("application", "*+json") };
106-
strategy.decoder(new Jackson2JsonDecoder(objectMapper, supportedTypes));
107-
strategy.encoder(new Jackson2JsonEncoder(objectMapper, supportedTypes));
107+
strategy.decoder(new Jackson2JsonDecoder(objectMapper, SUPPORTED_TYPES));
108+
strategy.encoder(new Jackson2JsonEncoder(objectMapper, SUPPORTED_TYPES));
108109
};
109110
}
110111

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ResourcePropertiesTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.http.CacheControl;
2626

2727
import static org.assertj.core.api.Assertions.assertThat;
28-
import static org.hamcrest.CoreMatchers.endsWith;
28+
import static org.hamcrest.Matchers.endsWith;
2929

3030
/**
3131
* Tests for {@link ResourceProperties}.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/JettyWebServerFactoryCustomizerTests.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.io.IOException;
2121
import java.util.ArrayList;
2222
import java.util.List;
23-
import java.util.TimeZone;
2423

2524
import org.eclipse.jetty.server.Connector;
2625
import org.eclipse.jetty.server.CustomRequestLog;
@@ -88,7 +87,6 @@ public void defaultUseForwardHeaders() {
8887
@Test
8988
public void accessLogCanBeCustomized() throws IOException {
9089
File logFile = File.createTempFile("jetty_log", ".log");
91-
String timezone = TimeZone.getDefault().getID();
9290
bind("server.jetty.accesslog.enabled=true",
9391
"server.jetty.accesslog.format=extended_ncsa",
9492
"server.jetty.accesslog.filename="

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/function/client/ClientHttpConnectorConfigurationTests.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ public void jettyClientHttpConnectorAppliesJettyResourceFactory() {
4646
jettyResourceFactory.setExecutor(executor);
4747
jettyResourceFactory.setByteBufferPool(byteBufferPool);
4848
jettyResourceFactory.setScheduler(scheduler);
49-
JettyClientHttpConnector connector = new ClientHttpConnectorConfiguration.JettyClient()
50-
.jettyClientHttpConnector(jettyResourceFactory);
49+
JettyClientHttpConnector connector = getClientHttpConnector(jettyResourceFactory);
5150
HttpClient httpClient = (HttpClient) ReflectionTestUtils.getField(connector,
5251
"httpClient");
5352
assertThat(httpClient.getExecutor()).isSameAs(executor);
@@ -59,11 +58,18 @@ public void jettyClientHttpConnectorAppliesJettyResourceFactory() {
5958
public void JettyResourceFactoryHasSslContextFactory() {
6059
// gh-16810
6160
JettyResourceFactory jettyResourceFactory = new JettyResourceFactory();
62-
JettyClientHttpConnector connector = new ClientHttpConnectorConfiguration.JettyClient()
63-
.jettyClientHttpConnector(jettyResourceFactory);
61+
JettyClientHttpConnector connector = getClientHttpConnector(jettyResourceFactory);
6462
HttpClient httpClient = (HttpClient) ReflectionTestUtils.getField(connector,
6563
"httpClient");
6664
assertThat(httpClient.getSslContextFactory()).isNotNull();
6765
}
6866

67+
private JettyClientHttpConnector getClientHttpConnector(
68+
JettyResourceFactory jettyResourceFactory) {
69+
ClientHttpConnectorConfiguration.JettyClient jettyClient = new ClientHttpConnectorConfiguration.JettyClient();
70+
// We shouldn't usually call this method directly since it's on a non-proxy config
71+
return ReflectionTestUtils.invokeMethod(jettyClient, "jettyClientHttpConnector",
72+
jettyResourceFactory);
73+
}
74+
6975
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/error/BasicErrorControllerMockMvcTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
6464

6565
/**
66-
* Tests for {@link BasicErrorController} using {@link MockMvc} and {@link SpringRunner}.
66+
* Tests for {@link BasicErrorController} using {@link MockMvc} and
67+
* {@link SpringBootTest @SpringBootTest}.
6768
*
6869
* @author Dave Syer
6970
*/

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfigurationTests.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ private List<MessageConverter> getCustomizedConverters() {
133133

134134
@SuppressWarnings("unchecked")
135135
private List<MessageConverter> getDefaultConverters() {
136-
CompositeMessageConverter compositeDefaultConverter = new DelegatingWebSocketMessageBrokerConfiguration()
137-
.brokerMessageConverter();
136+
DelegatingWebSocketMessageBrokerConfiguration configuration = new DelegatingWebSocketMessageBrokerConfiguration();
137+
// We shouldn't usually call this method directly since it's on a non-proxy config
138+
CompositeMessageConverter compositeDefaultConverter = ReflectionTestUtils
139+
.invokeMethod(configuration, "brokerMessageConverter");
138140
return (List<MessageConverter>) ReflectionTestUtils
139141
.getField(compositeDefaultConverter, "converters");
140142
}

0 commit comments

Comments
 (0)