Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
Closes gh-39093
This commit is contained in:
Andy Wilkinson
2024-01-11 11:25:26 +00:00
parent 5b6e3fab2c 7087897507
commit 17e9f0cb8e
151 changed files with 354 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -380,7 +380,7 @@ public class SpringBootContextLoader extends AbstractContextLoader implements Ao
/**
* Inner class to configure {@link WebMergedContextConfiguration}.
*/
private static class WebConfigurer {
private static final class WebConfigurer {
void configure(MergedContextConfiguration mergedConfig, List<ApplicationContextInitializer<?>> initializers) {
WebMergedContextConfiguration webMergedConfig = (WebMergedContextConfiguration) mergedConfig;

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa
return new DuplicateJsonObjectContextCustomizer();
}
private static class DuplicateJsonObjectContextCustomizer implements ContextCustomizer {
private static final class DuplicateJsonObjectContextCustomizer implements ContextCustomizer {
private final Log logger = LogFactory.getLog(DuplicateJsonObjectContextCustomizer.class);

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -121,7 +121,7 @@ public class MockitoTestExecutionListener extends AbstractTestExecutionListener
/**
* {@link FieldCallback} to collect Mockito annotations.
*/
private static class MockitoAnnotationCollection implements FieldCallback {
private static final class MockitoAnnotationCollection implements FieldCallback {
private final Set<Annotation> annotations = new LinkedHashSet<>();

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1077,7 +1077,7 @@ public class TestRestTemplate {
}
private static class NoOpResponseErrorHandler extends DefaultResponseErrorHandler {
private static final class NoOpResponseErrorHandler extends DefaultResponseErrorHandler {
@Override
public void handleError(ClientHttpResponse response) throws IOException {

5
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -474,7 +474,8 @@ class SpringBootContextLoaderTests {
}
private static class ContextLoaderApplicationContextFailureProcessor implements ApplicationContextFailureProcessor {
private static final class ContextLoaderApplicationContextFailureProcessor
implements ApplicationContextFailureProcessor {
static ApplicationContext failedContext;

4
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpringBootMockResolverTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ class SpringBootMockResolverTests {
}
private static class MyServiceImpl implements MyService {
private static final class MyServiceImpl implements MyService {
@Override
public int a() {

4
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizerWithoutWebfluxIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ class WebTestClientContextCustomizerWithoutWebfluxIntegrationTests {
}
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
private static class TestClass {
private static final class TestClass {
}