Skip to content

Commit 9e7972a

Browse files
philwebbphilwebb
committed
Polish code with code cleanup rules
1 parent 1edc997 commit 9e7972a

File tree

19 files changed

+72
-54
lines changed

19 files changed

+72
-54
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy;
3333
import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
3434
import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
35-
import org.hibernate.cfg.AvailableSettings;
35+
import org.hibernate.cfg.ManagedBeanSettings;
3636

3737
import org.springframework.aot.hint.MemberCategory;
3838
import org.springframework.aot.hint.RuntimeHints;
@@ -121,7 +121,7 @@ private List<HibernatePropertiesCustomizer> determineHibernatePropertiesCustomiz
121121
List<HibernatePropertiesCustomizer> customizers = new ArrayList<>();
122122
if (ClassUtils.isPresent("org.hibernate.resource.beans.container.spi.BeanContainer",
123123
getClass().getClassLoader())) {
124-
customizers.add((properties) -> properties.put(AvailableSettings.BEAN_CONTAINER,
124+
customizers.add((properties) -> properties.put(ManagedBeanSettings.BEAN_CONTAINER,
125125
new SpringBeanContainer(beanFactory)));
126126
}
127127
if (physicalNamingStrategy != null || implicitNamingStrategy != null) {

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateProperties.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
import java.util.function.Supplier;
2323

2424
import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy;
25-
import org.hibernate.cfg.AvailableSettings;
25+
import org.hibernate.cfg.MappingSettings;
26+
import org.hibernate.cfg.PersistenceSettings;
27+
import org.hibernate.cfg.SchemaToolingSettings;
2628

2729
import org.springframework.boot.context.properties.ConfigurationProperties;
2830
import org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy;
@@ -86,10 +88,10 @@ private Map<String, Object> getAdditionalProperties(Map<String, String> existing
8688
getNaming().applyNamingStrategies(result);
8789
String ddlAuto = determineDdlAuto(existing, settings::getDdlAuto);
8890
if (StringUtils.hasText(ddlAuto) && !"none".equals(ddlAuto)) {
89-
result.put(AvailableSettings.HBM2DDL_AUTO, ddlAuto);
91+
result.put(SchemaToolingSettings.HBM2DDL_AUTO, ddlAuto);
9092
}
9193
else {
92-
result.remove(AvailableSettings.HBM2DDL_AUTO);
94+
result.remove(SchemaToolingSettings.HBM2DDL_AUTO);
9395
}
9496
Collection<HibernatePropertiesCustomizer> customizers = settings.getHibernatePropertiesCustomizers();
9597
if (!ObjectUtils.isEmpty(customizers)) {
@@ -99,20 +101,20 @@ private Map<String, Object> getAdditionalProperties(Map<String, String> existing
99101
}
100102

101103
private void applyScanner(Map<String, Object> result) {
102-
if (!result.containsKey(AvailableSettings.SCANNER) && ClassUtils.isPresent(DISABLED_SCANNER_CLASS, null)) {
103-
result.put(AvailableSettings.SCANNER, DISABLED_SCANNER_CLASS);
104+
if (!result.containsKey(PersistenceSettings.SCANNER) && ClassUtils.isPresent(DISABLED_SCANNER_CLASS, null)) {
105+
result.put(PersistenceSettings.SCANNER, DISABLED_SCANNER_CLASS);
104106
}
105107
}
106108

107109
private String determineDdlAuto(Map<String, String> existing, Supplier<String> defaultDdlAuto) {
108-
String ddlAuto = existing.get(AvailableSettings.HBM2DDL_AUTO);
110+
String ddlAuto = existing.get(SchemaToolingSettings.HBM2DDL_AUTO);
109111
if (ddlAuto != null) {
110112
return ddlAuto;
111113
}
112114
if (this.ddlAuto != null) {
113115
return this.ddlAuto;
114116
}
115-
if (existing.get(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION) != null) {
117+
if (existing.get(SchemaToolingSettings.JAKARTA_HBM2DDL_DATABASE_ACTION) != null) {
116118
return null;
117119
}
118120
return defaultDdlAuto.get();
@@ -147,9 +149,9 @@ public void setPhysicalStrategy(String physicalStrategy) {
147149
}
148150

149151
private void applyNamingStrategies(Map<String, Object> properties) {
150-
applyNamingStrategy(properties, AvailableSettings.IMPLICIT_NAMING_STRATEGY, this.implicitStrategy,
152+
applyNamingStrategy(properties, MappingSettings.IMPLICIT_NAMING_STRATEGY, this.implicitStrategy,
151153
SpringImplicitNamingStrategy.class::getName);
152-
applyNamingStrategy(properties, AvailableSettings.PHYSICAL_NAMING_STRATEGY, this.physicalStrategy,
154+
applyNamingStrategy(properties, MappingSettings.PHYSICAL_NAMING_STRATEGY, this.physicalStrategy,
153155
CamelCaseToUnderscoresNamingStrategy.class::getName);
154156
}
155157

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,20 @@ private OAuth2TokenValidator<Jwt> getValidators(OAuth2TokenValidator<Jwt> defaul
115115
List<OAuth2TokenValidator<Jwt>> validators = new ArrayList<>();
116116
validators.add(defaultValidator);
117117
if (!CollectionUtils.isEmpty(audiences)) {
118-
validators.add(new JwtClaimValidator<List<String>>(JwtClaimNames.AUD,
119-
(aud) -> aud != null && !Collections.disjoint(aud, audiences)));
118+
validators.add(audValidator(audiences));
120119
}
121120
validators.addAll(this.additionalValidators);
122121
return new DelegatingOAuth2TokenValidator<>(validators);
123122
}
124123

124+
private JwtClaimValidator<List<String>> audValidator(List<String> audiences) {
125+
return new JwtClaimValidator<>(JwtClaimNames.AUD, (aud) -> nullSafeDisjoint(aud, audiences));
126+
}
127+
128+
private boolean nullSafeDisjoint(List<String> c1, List<String> c2) {
129+
return c1 != null && !Collections.disjoint(c1, c2);
130+
}
131+
125132
@Bean
126133
@Conditional(KeyValueCondition.class)
127134
NimbusReactiveJwtDecoder jwtDecoderByPublicKeyValue() throws Exception {

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,20 @@ private OAuth2TokenValidator<Jwt> getValidators(OAuth2TokenValidator<Jwt> defaul
114114
List<OAuth2TokenValidator<Jwt>> validators = new ArrayList<>();
115115
validators.add(defaultValidator);
116116
if (!CollectionUtils.isEmpty(audiences)) {
117-
validators.add(new JwtClaimValidator<List<String>>(JwtClaimNames.AUD,
118-
(aud) -> aud != null && !Collections.disjoint(aud, audiences)));
117+
validators.add(audValidator(audiences));
119118
}
120119
validators.addAll(this.additionalValidators);
121120
return new DelegatingOAuth2TokenValidator<>(validators);
122121
}
123122

123+
private JwtClaimValidator<List<String>> audValidator(List<String> audiences) {
124+
return new JwtClaimValidator<>(JwtClaimNames.AUD, (aud) -> nullSafeDisjoint(aud, audiences));
125+
}
126+
127+
private boolean nullSafeDisjoint(List<String> c1, List<String> c2) {
128+
return c1 != null && !Collections.disjoint(c1, c2);
129+
}
130+
124131
@Bean
125132
@Conditional(KeyValueCondition.class)
126133
JwtDecoder jwtDecoderByPublicKeyValue() throws Exception {

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void renderTemplate() throws Exception {
162162
MarkupTemplateEngine engine = config.getTemplateEngine();
163163
Writer writer = new StringWriter();
164164
engine.createTemplate(new ClassPathResource("templates/message.tpl").getFile())
165-
.make(new HashMap<String, Object>(Collections.singletonMap("greeting", "Hello World")))
165+
.make(new HashMap<>(Collections.singletonMap("greeting", "Hello World")))
166166
.writeTo(writer);
167167
assertThat(writer.toString()).contains("Hello World");
168168
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernatePropertiesTests.java

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
import java.util.function.Supplier;
2222

2323
import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy;
24-
import org.hibernate.cfg.AvailableSettings;
24+
import org.hibernate.cfg.MappingSettings;
25+
import org.hibernate.cfg.PersistenceSettings;
26+
import org.hibernate.cfg.SchemaToolingSettings;
2527
import org.junit.jupiter.api.Test;
2628
import org.junit.jupiter.api.extension.ExtendWith;
2729
import org.mockito.Mock;
@@ -59,9 +61,9 @@ class HibernatePropertiesTests {
5961
void noCustomNamingStrategy() {
6062
this.contextRunner.run(assertHibernateProperties((hibernateProperties) -> {
6163
assertThat(hibernateProperties).doesNotContainKeys("hibernate.ejb.naming_strategy");
62-
assertThat(hibernateProperties).containsEntry(AvailableSettings.PHYSICAL_NAMING_STRATEGY,
64+
assertThat(hibernateProperties).containsEntry(MappingSettings.PHYSICAL_NAMING_STRATEGY,
6365
CamelCaseToUnderscoresNamingStrategy.class.getName());
64-
assertThat(hibernateProperties).containsEntry(AvailableSettings.IMPLICIT_NAMING_STRATEGY,
66+
assertThat(hibernateProperties).containsEntry(MappingSettings.IMPLICIT_NAMING_STRATEGY,
6567
SpringImplicitNamingStrategy.class.getName());
6668
}));
6769
}
@@ -73,8 +75,8 @@ void hibernate5CustomNamingStrategies() {
7375
"spring.jpa.hibernate.naming.physical-strategy:com.example.Physical")
7476
.run(assertHibernateProperties((hibernateProperties) -> {
7577
assertThat(hibernateProperties).contains(
76-
entry(AvailableSettings.IMPLICIT_NAMING_STRATEGY, "com.example.Implicit"),
77-
entry(AvailableSettings.PHYSICAL_NAMING_STRATEGY, "com.example.Physical"));
78+
entry(MappingSettings.IMPLICIT_NAMING_STRATEGY, "com.example.Implicit"),
79+
entry(MappingSettings.PHYSICAL_NAMING_STRATEGY, "com.example.Physical"));
7880
assertThat(hibernateProperties).doesNotContainKeys("hibernate.ejb.naming_strategy");
7981
}));
8082
}
@@ -87,24 +89,24 @@ void hibernate5CustomNamingStrategiesViaJpaProperties() {
8789
.run(assertHibernateProperties((hibernateProperties) -> {
8890
// You can override them as we don't provide any default
8991
assertThat(hibernateProperties).contains(
90-
entry(AvailableSettings.IMPLICIT_NAMING_STRATEGY, "com.example.Implicit"),
91-
entry(AvailableSettings.PHYSICAL_NAMING_STRATEGY, "com.example.Physical"));
92+
entry(MappingSettings.IMPLICIT_NAMING_STRATEGY, "com.example.Implicit"),
93+
entry(MappingSettings.PHYSICAL_NAMING_STRATEGY, "com.example.Physical"));
9294
assertThat(hibernateProperties).doesNotContainKeys("hibernate.ejb.naming_strategy");
9395
}));
9496
}
9597

9698
@Test
9799
void scannerUsesDisabledScannerByDefault() {
98100
this.contextRunner.run(assertHibernateProperties((hibernateProperties) -> assertThat(hibernateProperties)
99-
.containsEntry(AvailableSettings.SCANNER, "org.hibernate.boot.archive.scan.internal.DisabledScanner")));
101+
.containsEntry(PersistenceSettings.SCANNER, "org.hibernate.boot.archive.scan.internal.DisabledScanner")));
100102
}
101103

102104
@Test
103105
void scannerCanBeCustomized() {
104106
this.contextRunner.withPropertyValues(
105107
"spring.jpa.properties.hibernate.archive.scanner:org.hibernate.boot.archive.scan.internal.StandardScanner")
106-
.run(assertHibernateProperties((hibernateProperties) -> assertThat(hibernateProperties)
107-
.containsEntry(AvailableSettings.SCANNER, "org.hibernate.boot.archive.scan.internal.StandardScanner")));
108+
.run(assertHibernateProperties((hibernateProperties) -> assertThat(hibernateProperties).containsEntry(
109+
PersistenceSettings.SCANNER, "org.hibernate.boot.archive.scan.internal.StandardScanner")));
108110
}
109111

110112
@Test
@@ -125,16 +127,16 @@ void defaultDdlAutoIsNotInvokedAndDdlAutoIsNotSetIfJpaDbActionPropertyIsSet() {
125127
.withPropertyValues(
126128
"spring.jpa.properties.jakarta.persistence.schema-generation.database.action=drop-and-create")
127129
.run(assertHibernateProperties((hibernateProperties) -> {
128-
assertThat(hibernateProperties).doesNotContainKey(AvailableSettings.HBM2DDL_AUTO);
129-
assertThat(hibernateProperties).containsEntry(AvailableSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
130+
assertThat(hibernateProperties).doesNotContainKey(SchemaToolingSettings.HBM2DDL_AUTO);
131+
assertThat(hibernateProperties).containsEntry(SchemaToolingSettings.JAKARTA_HBM2DDL_DATABASE_ACTION,
130132
"drop-and-create");
131133
then(this.ddlAutoSupplier).should(never()).get();
132134
}));
133135
}
134136

135137
private ContextConsumer<AssertableApplicationContext> assertDefaultDdlAutoNotInvoked(String expectedDdlAuto) {
136138
return assertHibernateProperties((hibernateProperties) -> {
137-
assertThat(hibernateProperties).containsEntry(AvailableSettings.HBM2DDL_AUTO, expectedDdlAuto);
139+
assertThat(hibernateProperties).containsEntry(SchemaToolingSettings.HBM2DDL_AUTO, expectedDdlAuto);
138140
then(this.ddlAutoSupplier).should(never()).get();
139141
});
140142
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/pulsar/PulsarConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import org.assertj.core.api.MapAssert;
3535
import org.junit.jupiter.api.Nested;
3636
import org.junit.jupiter.api.Test;
37+
import org.mockito.ArgumentMatchers;
3738
import org.mockito.InOrder;
38-
import org.mockito.Mockito;
3939

4040
import org.springframework.boot.autoconfigure.AutoConfigurations;
4141
import org.springframework.boot.test.context.TestConfiguration;
@@ -143,7 +143,7 @@ void whenHasUserDefinedFailoverPropertiesAddsToClient() {
143143
.getField(clientFactory, "customizer");
144144
customizeAction.accept(pulsarClientBuilderCustomizer, target);
145145
InOrder ordered = inOrder(target);
146-
ordered.verify(target).serviceUrlProvider(Mockito.any(AutoClusterFailover.class));
146+
ordered.verify(target).serviceUrlProvider(ArgumentMatchers.any(AutoClusterFailover.class));
147147
assertThat(pulsarProperties.getClient().getFailover().getDelay()).isEqualTo(Duration.ofSeconds(15));
148148
assertThat(pulsarProperties.getClient().getFailover().getSwitchBackDelay())
149149
.isEqualTo(Duration.ofSeconds(30));

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void wrapLocalValidatorFactoryBean() {
5656
this.contextRunner.withUserConfiguration(LocalValidatorFactoryBeanConfig.class).run((context) -> {
5757
ValidatorAdapter wrapper = context.getBean(ValidatorAdapter.class);
5858
assertThat(wrapper.supports(SampleData.class)).isTrue();
59-
MapBindingResult errors = new MapBindingResult(new HashMap<String, Object>(), "test");
59+
MapBindingResult errors = new MapBindingResult(new HashMap<>(), "test");
6060
wrapper.validate(new SampleData(40), errors);
6161
assertThat(errors.getErrorCount()).isOne();
6262
});

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ private static BeanDefinition getOrAddBeanDefinition(BeanDefinitionRegistry regi
421421
RootBeanDefinition definition = new RootBeanDefinition(postProcessor);
422422
definition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
423423
ConstructorArgumentValues constructorArguments = definition.getConstructorArgumentValues();
424-
constructorArguments.addIndexedArgumentValue(0, new LinkedHashSet<MockDefinition>());
424+
constructorArguments.addIndexedArgumentValue(0, new LinkedHashSet<>());
425425
registry.registerBeanDefinition(BEAN_NAME, definition);
426426
return definition;
427427
}

‎spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,13 +270,13 @@ void deleteHandlesRelativeUris() throws IOException {
270270
@Test
271271
void exchangeWithRequestEntityAndClassHandlesRelativeUris() throws IOException {
272272
verifyRelativeUriHandling((testRestTemplate, relativeUri) -> testRestTemplate
273-
.exchange(new RequestEntity<String>(HttpMethod.GET, relativeUri), String.class));
273+
.exchange(new RequestEntity<>(HttpMethod.GET, relativeUri), String.class));
274274
}
275275

276276
@Test
277277
void exchangeWithRequestEntityAndParameterizedTypeReferenceHandlesRelativeUris() throws IOException {
278278
verifyRelativeUriHandling((testRestTemplate, relativeUri) -> testRestTemplate
279-
.exchange(new RequestEntity<String>(HttpMethod.GET, relativeUri), new ParameterizedTypeReference<String>() {
279+
.exchange(new RequestEntity<>(HttpMethod.GET, relativeUri), new ParameterizedTypeReference<String>() {
280280
}));
281281
}
282282

‎spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/StringSequence.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public StringSequence subSequence(int start, int end) {
7676
* Returns {@code true} if the sequence is empty. Public to be compatible with JDK 15.
7777
* @return {@code true} if {@link #length()} is {@code 0}, otherwise {@code false}
7878
*/
79+
@Override
7980
public boolean isEmpty() {
8081
return length() == 0;
8182
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ private void registerServletContainerInitializerToDriveServletContextInitializer
369369
ServletContextInitializer[] mergedInitializers = mergeInitializers(initializers);
370370
Initializer initializer = new Initializer(mergedInitializers);
371371
deployment.addServletContainerInitializer(new ServletContainerInitializerInfo(Initializer.class,
372-
new ImmediateInstanceFactory<ServletContainerInitializer>(initializer), NO_CLASSES));
372+
new ImmediateInstanceFactory<>(initializer), NO_CLASSES));
373373
}
374374

375375
private ClassLoader getServletClassLoader() {

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBeanTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ void addServletRegistrationBeanMustNotBeNull() {
139139
void setServletRegistrationBeanReplacesValue() throws Exception {
140140
given(this.servletContext.addFilter(anyString(), any(Filter.class))).willReturn(this.registration);
141141
AbstractFilterRegistrationBean<?> bean = createFilterRegistrationBean(mockServletRegistration("a"));
142-
bean.setServletRegistrationBeans(
143-
new LinkedHashSet<ServletRegistrationBean<?>>(Collections.singletonList(mockServletRegistration("b"))));
142+
bean.setServletRegistrationBeans(new LinkedHashSet<>(Collections.singletonList(mockServletRegistration("b"))));
144143
bean.onStartup(this.servletContext);
145144
then(this.registration).should().addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST), false, "b");
146145
}

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/src/test/java/smoketest/actuator/ui/SampleActuatorUiApplicationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void testHome() {
5050
HttpHeaders headers = new HttpHeaders();
5151
headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
5252
ResponseEntity<String> entity = this.restTemplate.withBasicAuth("user", getPassword())
53-
.exchange("/", HttpMethod.GET, new HttpEntity<Void>(headers), String.class);
53+
.exchange("/", HttpMethod.GET, new HttpEntity<>(headers), String.class);
5454
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
5555
assertThat(entity.getBody()).contains("<title>Hello");
5656
}
@@ -74,7 +74,7 @@ void testError() {
7474
HttpHeaders headers = new HttpHeaders();
7575
headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
7676
ResponseEntity<String> entity = this.restTemplate.withBasicAuth("user", getPassword())
77-
.exchange("/error", HttpMethod.GET, new HttpEntity<Void>(headers), String.class);
77+
.exchange("/error", HttpMethod.GET, new HttpEntity<>(headers), String.class);
7878
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
7979
assertThat(entity.getBody()).contains("<html>")
8080
.contains("<body>")

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-servlet/src/test/java/smoketest/servlet/SampleServletApplicationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class SampleServletApplicationTests {
4848
void testHomeIsSecure() {
4949
HttpHeaders headers = new HttpHeaders();
5050
headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
51-
ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<Void>(headers),
51+
ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<>(headers),
5252
String.class);
5353
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
5454
}

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/src/test/java/smoketest/security/method/SampleMethodSecurityApplicationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class SampleMethodSecurityApplicationTests {
5656
void testHome() {
5757
HttpHeaders headers = new HttpHeaders();
5858
headers.setAccept(Collections.singletonList(MediaType.TEXT_HTML));
59-
ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<Void>(headers),
59+
ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<>(headers),
6060
String.class);
6161
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
6262
}
@@ -87,7 +87,7 @@ void testDenied() {
8787
String cookie = entity.getHeaders().getFirst("Set-Cookie");
8888
headers.set("Cookie", cookie);
8989
ResponseEntity<String> page = this.restTemplate.exchange(entity.getHeaders().getLocation(), HttpMethod.GET,
90-
new HttpEntity<Void>(headers), String.class);
90+
new HttpEntity<>(headers), String.class);
9191
assertThat(page.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN);
9292
assertThat(page.getBody()).contains("Access denied");
9393
}
@@ -97,7 +97,7 @@ void testManagementProtected() {
9797
HttpHeaders headers = new HttpHeaders();
9898
headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
9999
ResponseEntity<String> entity = this.restTemplate.exchange("/actuator/beans", HttpMethod.GET,
100-
new HttpEntity<Void>(headers), String.class);
100+
new HttpEntity<>(headers), String.class);
101101
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.UNAUTHORIZED);
102102
}
103103

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/src/test/java/smoketest/web/secure/custom/SampleWebSecureCustomApplicationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class SampleWebSecureCustomApplicationTests {
5555
void testHome() {
5656
HttpHeaders headers = new HttpHeaders();
5757
headers.setAccept(Collections.singletonList(MediaType.TEXT_HTML));
58-
ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<Void>(headers),
58+
ResponseEntity<String> entity = this.restTemplate.exchange("/", HttpMethod.GET, new HttpEntity<>(headers),
5959
String.class);
6060
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
6161
assertThat(entity.getHeaders().getLocation().toString()).endsWith(this.port + "/login");
@@ -65,8 +65,8 @@ void testHome() {
6565
void testLoginPage() {
6666
HttpHeaders headers = new HttpHeaders();
6767
headers.setAccept(Collections.singletonList(MediaType.TEXT_HTML));
68-
ResponseEntity<String> entity = this.restTemplate.exchange("/login", HttpMethod.GET,
69-
new HttpEntity<Void>(headers), String.class);
68+
ResponseEntity<String> entity = this.restTemplate.exchange("/login", HttpMethod.GET, new HttpEntity<>(headers),
69+
String.class);
7070
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
7171
assertThat(entity.getBody()).contains("<title>Login</title>");
7272
}

0 commit comments

Comments
 (0)