Skip to content

Commit 1c2a43d

Browse files
scottfrederickscottfrederick
committed
Merge branch '3.1.x' into 3.2.x
Closes gh-40165
2 parents f176342 + e2ec066 commit 1c2a43d

File tree

23 files changed

+76
-78
lines changed

23 files changed

+76
-78
lines changed

‎buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/version/AbstractDependencyVersion.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ public int compareTo(DependencyVersion other) {
4040

4141
@Override
4242
public boolean isUpgrade(DependencyVersion candidate, boolean movingToSnapshots) {
43-
ComparableVersion comparableCandidate = (candidate instanceof AbstractDependencyVersion)
44-
? ((AbstractDependencyVersion) candidate).comparableVersion
45-
: new ComparableVersion(candidate.toString());
43+
ComparableVersion comparableCandidate = (candidate instanceof AbstractDependencyVersion abstractDependencyVersion)
44+
? abstractDependencyVersion.comparableVersion : new ComparableVersion(candidate.toString());
4645
return comparableCandidate.compareTo(this.comparableVersion) > 0;
4746
}
4847

‎spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/graphql/tester/HttpGraphQlTesterContextCustomizer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
6666

6767
private void registerHttpGraphQlTester(ConfigurableApplicationContext context) {
6868
ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
69-
if (beanFactory instanceof BeanDefinitionRegistry) {
70-
registerHttpGraphQlTester((BeanDefinitionRegistry) beanFactory);
69+
if (beanFactory instanceof BeanDefinitionRegistry beanDefinitionRegistry) {
70+
registerHttpGraphQlTester(beanDefinitionRegistry);
7171
}
7272
}
7373

‎spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ static ModifiedClassPathClassLoader get(Class<?> testClass, Method testMethod, L
116116
private static Collection<AnnotatedElement> getAnnotatedElements(Object[] array) {
117117
Set<AnnotatedElement> result = new LinkedHashSet<>();
118118
for (Object item : array) {
119-
if (item instanceof AnnotatedElement) {
120-
result.add((AnnotatedElement) item);
119+
if (item instanceof AnnotatedElement annotatedElement) {
120+
result.add(annotatedElement);
121121
}
122122
else if (ObjectUtils.isArray(item)) {
123123
result.addAll(getAnnotatedElements(ObjectUtils.toObjectArray(item)));

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ private static class ClassExcludeFilter extends AbstractTypeHierarchyTraversingF
305305
ClassExcludeFilter(Object... sources) {
306306
super(false, false);
307307
for (Object source : sources) {
308-
if (source instanceof Class<?>) {
309-
this.classNames.add(((Class<?>) source).getName());
308+
if (source instanceof Class<?> classSource) {
309+
this.classNames.add(classSource.getName());
310310
}
311311
}
312312
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public void printBanner(Environment environment, Class<?> sourceClass, PrintStre
8686
*/
8787
protected List<PropertyResolver> getPropertyResolvers(Environment environment, Class<?> sourceClass) {
8888
MutablePropertySources sources = new MutablePropertySources();
89-
if (environment instanceof ConfigurableEnvironment) {
90-
((ConfigurableEnvironment) environment).getPropertySources().forEach(sources::addLast);
89+
if (environment instanceof ConfigurableEnvironment configurableEnvironment) {
90+
configurableEnvironment.getPropertySources().forEach(sources::addLast);
9191
}
9292
sources.addLast(getTitleSource(sourceClass));
9393
sources.addLast(getAnsiSource());

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/ApplicationAvailabilityBean.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private String getSourceDescription(Object source) {
9898

9999
@SuppressWarnings("unchecked")
100100
private Class<? extends AvailabilityState> getStateType(AvailabilityState state) {
101-
Class<?> type = (state instanceof Enum) ? ((Enum<?>) state).getDeclaringClass() : state.getClass();
101+
Class<?> type = (state instanceof Enum<?> enumState) ? enumState.getDeclaringClass() : state.getClass();
102102
return (Class<? extends AvailabilityState>) type;
103103
}
104104

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/availability/AvailabilityChangeEvent.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public ResolvableType getResolvableType() {
6060

6161
private Class<?> getStateType() {
6262
S state = getState();
63-
if (state instanceof Enum) {
64-
return ((Enum<?>) state).getDeclaringClass();
63+
if (state instanceof Enum<?> enumState) {
64+
return enumState.getDeclaringClass();
6565
}
6666
return state.getClass();
6767
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudPlatform.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ private boolean isAutoDetected(ConfigurableEnvironment environment) {
127127
&& environmentPropertySource.containsProperty(KUBERNETES_SERVICE_PORT)) {
128128
return true;
129129
}
130-
if (environmentPropertySource instanceof EnumerablePropertySource) {
131-
return isAutoDetected((EnumerablePropertySource<?>) environmentPropertySource);
130+
if (environmentPropertySource instanceof EnumerablePropertySource<?> enumerablePropertySource) {
131+
return isAutoDetected(enumerablePropertySource);
132132
}
133133
}
134134
return false;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ else if (event instanceof ApplicationEnvironmentPreparedEvent environmentPrepare
225225
else if (event instanceof ApplicationPreparedEvent preparedEvent) {
226226
onApplicationPreparedEvent(preparedEvent);
227227
}
228-
else if (event instanceof ContextClosedEvent) {
229-
onContextClosedEvent((ContextClosedEvent) event);
228+
else if (event instanceof ContextClosedEvent contextClosedEvent) {
229+
onContextClosedEvent(contextClosedEvent);
230230
}
231231
else if (event instanceof ApplicationFailedEvent) {
232232
onApplicationFailedEvent();

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySource.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ private static boolean hasSystemEnvironmentName(PropertySource<?> source) {
167167

168168
private static boolean isFullEnumerable(PropertySource<?> source) {
169169
PropertySource<?> rootSource = getRootSource(source);
170-
if (rootSource.getSource() instanceof Map) {
170+
if (rootSource.getSource() instanceof Map<?, ?> map) {
171171
// Check we're not security restricted
172172
try {
173-
((Map<?, ?>) rootSource.getSource()).size();
173+
map.size();
174174
}
175175
catch (UnsupportedOperationException ex) {
176176
return false;
@@ -180,8 +180,8 @@ private static boolean isFullEnumerable(PropertySource<?> source) {
180180
}
181181

182182
private static PropertySource<?> getRootSource(PropertySource<?> source) {
183-
while (source.getSource() != null && source.getSource() instanceof PropertySource) {
184-
source = (PropertySource<?>) source.getSource();
183+
while (source.getSource() != null && source.getSource() instanceof PropertySource<?> propertySource) {
184+
source = propertySource;
185185
}
186186
return source;
187187
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySources.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ private ConfigurationPropertySource adapt(PropertySource<?> source) {
6767
return result;
6868
}
6969
result = SpringConfigurationPropertySource.from(source);
70-
if (source instanceof OriginLookup) {
71-
result = result.withPrefix(((OriginLookup<?>) source).getPrefix());
70+
if (source instanceof OriginLookup<?> originLookup) {
71+
result = result.withPrefix(originLookup.getPrefix());
7272
}
7373
this.cache.put(source, result);
7474
return result;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ private Mappings updateMappings(Mappings mappings) {
169169

170170
private boolean isImmutablePropertySource() {
171171
EnumerablePropertySource<?> source = getPropertySource();
172-
if (source instanceof OriginLookup) {
173-
return ((OriginLookup<?>) source).isImmutable();
172+
if (source instanceof OriginLookup<?> originLookup) {
173+
return originLookup.isImmutable();
174174
}
175175
if (StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME.equals(source.getName())) {
176176
return source.getSource() == System.getenv();

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public class UnboundElementsSourceFilter implements Function<ConfigurationProper
4343
@Override
4444
public Boolean apply(ConfigurationPropertySource configurationPropertySource) {
4545
Object underlyingSource = configurationPropertySource.getUnderlyingSource();
46-
if (underlyingSource instanceof PropertySource) {
47-
String name = ((PropertySource<?>) underlyingSource).getName();
46+
if (underlyingSource instanceof PropertySource<?> propertySource) {
47+
String name = propertySource.getName();
4848
return !BENIGN_PROPERTY_SOURCE_NAMES.contains(name);
4949
}
5050
return true;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/ApplicationConversionService.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -278,20 +278,20 @@ public static void addBeans(FormatterRegistry registry, ListableBeanFactory bean
278278
beans.addAll(beanFactory.getBeansOfType(Printer.class).values());
279279
beans.addAll(beanFactory.getBeansOfType(Parser.class).values());
280280
for (Object bean : beans) {
281-
if (bean instanceof GenericConverter) {
282-
registry.addConverter((GenericConverter) bean);
281+
if (bean instanceof GenericConverter genericConverter) {
282+
registry.addConverter(genericConverter);
283283
}
284-
else if (bean instanceof Converter) {
285-
registry.addConverter((Converter<?, ?>) bean);
284+
else if (bean instanceof Converter<?, ?> converter) {
285+
registry.addConverter(converter);
286286
}
287-
else if (bean instanceof Formatter) {
288-
registry.addFormatter((Formatter<?>) bean);
287+
else if (bean instanceof Formatter<?> formatter) {
288+
registry.addFormatter(formatter);
289289
}
290-
else if (bean instanceof Printer) {
291-
registry.addPrinter((Printer<?>) bean);
290+
else if (bean instanceof Printer<?> printer) {
291+
registry.addPrinter(printer);
292292
}
293-
else if (bean instanceof Parser) {
294-
registry.addParser((Parser<?>) bean);
293+
else if (bean instanceof Parser<?> parser) {
294+
registry.addParser(parser);
295295
}
296296
}
297297
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -126,20 +126,20 @@ private void flatten(String prefix, Map<String, Object> result, Map<String, Obje
126126

127127
@SuppressWarnings("unchecked")
128128
private void extract(String name, Map<String, Object> result, Object value) {
129-
if (value instanceof Map) {
130-
if (CollectionUtils.isEmpty((Map<?, ?>) value)) {
129+
if (value instanceof Map<?, ?> map) {
130+
if (CollectionUtils.isEmpty(map)) {
131131
result.put(name, value);
132132
return;
133133
}
134134
flatten(name, result, (Map<String, Object>) value);
135135
}
136-
else if (value instanceof Collection) {
137-
if (CollectionUtils.isEmpty((Collection<?>) value)) {
136+
else if (value instanceof Collection<?> collection) {
137+
if (CollectionUtils.isEmpty(collection)) {
138138
result.put(name, value);
139139
return;
140140
}
141141
int index = 0;
142-
for (Object object : (Collection<Object>) value) {
142+
for (Object object : collection) {
143143
extract(name + "[" + index + "]", result, object);
144144
index++;
145145
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonComponentModule.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ private void addJsonBean(Object bean) {
102102
}
103103

104104
private void addJsonBean(Object bean, Class<?>[] types, Scope scope) {
105-
if (bean instanceof JsonSerializer) {
106-
addJsonSerializerBean((JsonSerializer<?>) bean, scope, types);
105+
if (bean instanceof JsonSerializer<?> jsonSerializer) {
106+
addJsonSerializerBean(jsonSerializer, scope, types);
107107
}
108-
else if (bean instanceof JsonDeserializer) {
109-
addJsonDeserializerBean((JsonDeserializer<?>) bean, types);
108+
else if (bean instanceof JsonDeserializer<?> jsonDeserializer) {
109+
addJsonDeserializerBean(jsonDeserializer, types);
110110
}
111-
else if (bean instanceof KeyDeserializer) {
112-
addKeyDeserializerBean((KeyDeserializer) bean, types);
111+
else if (bean instanceof KeyDeserializer keyDeserializer) {
112+
addKeyDeserializerBean(keyDeserializer, types);
113113
}
114114
for (Class<?> innerClass : bean.getClass().getDeclaredClasses()) {
115115
if (isSuitableInnerClass(innerClass)) {

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/OptionsCapableConnectionFactory.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ public ConnectionFactory unwrap() {
7878
* @since 2.5.1
7979
*/
8080
public static OptionsCapableConnectionFactory unwrapFrom(ConnectionFactory connectionFactory) {
81-
if (connectionFactory instanceof OptionsCapableConnectionFactory) {
82-
return (OptionsCapableConnectionFactory) connectionFactory;
81+
if (connectionFactory instanceof OptionsCapableConnectionFactory optionsCapableConnectionFactory) {
82+
return optionsCapableConnectionFactory;
8383
}
84-
if (connectionFactory instanceof Wrapped) {
85-
Object unwrapped = ((Wrapped<?>) connectionFactory).unwrap();
86-
if (unwrapped instanceof ConnectionFactory) {
87-
return unwrapFrom((ConnectionFactory) unwrapped);
84+
if (connectionFactory instanceof Wrapped<?> wrappedConnectionFactory) {
85+
Object unwrapped = wrappedConnectionFactory.unwrap();
86+
if (unwrapped instanceof ConnectionFactory unwrappedConnectionFactory) {
87+
return unwrapFrom(unwrappedConnectionFactory);
8888
}
8989
}
9090
return null;

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/ForwardHeadersCustomizer.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ public void customize(Server server) {
3434
ForwardedRequestCustomizer customizer = new ForwardedRequestCustomizer();
3535
for (Connector connector : server.getConnectors()) {
3636
for (ConnectionFactory connectionFactory : connector.getConnectionFactories()) {
37-
if (connectionFactory instanceof HttpConfiguration.ConnectionFactory) {
38-
((HttpConfiguration.ConnectionFactory) connectionFactory).getHttpConfiguration()
39-
.addCustomizer(customizer);
37+
if (connectionFactory instanceof HttpConfiguration.ConnectionFactory jettyConnectionFactory) {
38+
jettyConnectionFactory.getHttpConfiguration().addCustomizer(customizer);
4039
}
4140
}
4241
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/CompressionConnectorCustomizer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ class CompressionConnectorCustomizer implements TomcatConnectorCustomizer {
4141
public void customize(Connector connector) {
4242
if (this.compression != null && this.compression.getEnabled()) {
4343
ProtocolHandler handler = connector.getProtocolHandler();
44-
if (handler instanceof AbstractHttp11Protocol) {
45-
customize((AbstractHttp11Protocol<?>) handler);
44+
if (handler instanceof AbstractHttp11Protocol<?> abstractHttp11Protocol) {
45+
customize(abstractHttp11Protocol);
4646
}
4747
}
4848
}

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ protected void customizeConnector(Connector connector) {
193193
if (StringUtils.hasText(getServerHeader())) {
194194
connector.setProperty("server", getServerHeader());
195195
}
196-
if (connector.getProtocolHandler() instanceof AbstractProtocol) {
197-
customizeProtocol((AbstractProtocol<?>) connector.getProtocolHandler());
196+
if (connector.getProtocolHandler() instanceof AbstractProtocol<?> abstractProtocol) {
197+
customizeProtocol(abstractProtocol);
198198
}
199199
invokeProtocolHandlerCustomizers(connector.getProtocolHandler());
200200
if (getUriEncoding() != null) {

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,8 @@ protected void customizeConnector(Connector connector) {
335335
if (StringUtils.hasText(getServerHeader())) {
336336
connector.setProperty("server", getServerHeader());
337337
}
338-
if (connector.getProtocolHandler() instanceof AbstractProtocol) {
339-
customizeProtocol((AbstractProtocol<?>) connector.getProtocolHandler());
338+
if (connector.getProtocolHandler() instanceof AbstractProtocol<?> abstractProtocol) {
339+
customizeProtocol(abstractProtocol);
340340
}
341341
invokeProtocolHandlerCustomizers(connector.getProtocolHandler());
342342
if (getUriEncoding() != null) {

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -102,21 +102,21 @@ private void addServletContextInitializerBeans(ListableBeanFactory beanFactory)
102102

103103
private void addServletContextInitializerBean(String beanName, ServletContextInitializer initializer,
104104
ListableBeanFactory beanFactory) {
105-
if (initializer instanceof ServletRegistrationBean) {
106-
Servlet source = ((ServletRegistrationBean<?>) initializer).getServlet();
107-
addServletContextInitializerBean(Servlet.class, beanName, initializer, beanFactory, source);
105+
if (initializer instanceof ServletRegistrationBean<?> servletRegistrationBean) {
106+
Servlet source = servletRegistrationBean.getServlet();
107+
addServletContextInitializerBean(Servlet.class, beanName, servletRegistrationBean, beanFactory, source);
108108
}
109-
else if (initializer instanceof FilterRegistrationBean) {
110-
Filter source = ((FilterRegistrationBean<?>) initializer).getFilter();
111-
addServletContextInitializerBean(Filter.class, beanName, initializer, beanFactory, source);
109+
else if (initializer instanceof FilterRegistrationBean<?> filterRegistrationBean) {
110+
Filter source = filterRegistrationBean.getFilter();
111+
addServletContextInitializerBean(Filter.class, beanName, filterRegistrationBean, beanFactory, source);
112112
}
113-
else if (initializer instanceof DelegatingFilterProxyRegistrationBean) {
114-
String source = ((DelegatingFilterProxyRegistrationBean) initializer).getTargetBeanName();
115-
addServletContextInitializerBean(Filter.class, beanName, initializer, beanFactory, source);
113+
else if (initializer instanceof DelegatingFilterProxyRegistrationBean registrationBean) {
114+
String source = registrationBean.getTargetBeanName();
115+
addServletContextInitializerBean(Filter.class, beanName, registrationBean, beanFactory, source);
116116
}
117-
else if (initializer instanceof ServletListenerRegistrationBean) {
118-
EventListener source = ((ServletListenerRegistrationBean<?>) initializer).getListener();
119-
addServletContextInitializerBean(EventListener.class, beanName, initializer, beanFactory, source);
117+
else if (initializer instanceof ServletListenerRegistrationBean<?> registrationBean) {
118+
EventListener source = registrationBean.getListener();
119+
addServletContextInitializerBean(EventListener.class, beanName, registrationBean, beanFactory, source);
120120
}
121121
else {
122122
addServletContextInitializerBean(ServletContextInitializer.class, beanName, initializer, beanFactory,

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1462,8 +1462,8 @@ void shouldStopKeepAliveThreadIfContextIsClosed() {
14621462

14631463
private <S extends AvailabilityState> ArgumentMatcher<ApplicationEvent> isAvailabilityChangeEventWithState(
14641464
S state) {
1465-
return (argument) -> (argument instanceof AvailabilityChangeEvent<?>)
1466-
&& ((AvailabilityChangeEvent<?>) argument).getState().equals(state);
1465+
return (argument) -> (argument instanceof AvailabilityChangeEvent<?> availabilityChangeEvent)
1466+
&& availabilityChangeEvent.getState().equals(state);
14671467
}
14681468

14691469
private <E extends ApplicationEvent> AtomicReference<E> addListener(SpringApplication application,

0 commit comments

Comments
 (0)