Merge branch '3.1.x' into 3.2.x

Closes gh-39091
This commit is contained in:
Andy Wilkinson
2024-01-11 09:56:35 +00:00
150 changed files with 358 additions and 353 deletions

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.
@@ -298,7 +298,7 @@ public class LiveReloadServer {
/**
* {@link ThreadFactory} to create the worker threads.
*/
private static class WorkerThreadFactory implements ThreadFactory {
private static final class WorkerThreadFactory implements ThreadFactory {
private final AtomicInteger threadNumber = new AtomicInteger(1);

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.
@@ -212,7 +212,7 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe
* {@link ResourcePatternResolverFactory} to be used when the classloader can access
* {@link WebApplicationContext}.
*/
private static class WebResourcePatternResolverFactory extends ResourcePatternResolverFactory {
private static final class WebResourcePatternResolverFactory extends ResourcePatternResolverFactory {
@Override
public ResourcePatternResolver getResourcePatternResolver(AbstractApplicationContext applicationContext,

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.
@@ -37,7 +37,7 @@ public class RestartScopeInitializer implements ApplicationContextInitializer<Co
/**
* {@link Scope} that stores beans as {@link Restarter} attributes.
*/
private static class RestartScope implements Scope {
private static final class RestartScope implements Scope {
@Override
public Object get(String name, ObjectFactory<?> objectFactory) {

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.
@@ -617,7 +617,7 @@ public class Restarter {
/**
* {@link ThreadFactory} that creates a leak safe thread.
*/
private class LeakSafeThreadFactory implements ThreadFactory {
private final class LeakSafeThreadFactory implements ThreadFactory {
@Override
public Thread newThread(Runnable runnable) {

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 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.
@@ -92,7 +92,7 @@ class SilentExitExceptionHandler implements UncaughtExceptionHandler {
throw new SilentExitException();
}
private static class SilentExitException extends RuntimeException {
private static final class SilentExitException extends RuntimeException {
}

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.
@@ -186,7 +186,7 @@ class DevToolsR2dbcAutoConfigurationTests {
}
private static class MockConnectionFactory implements ConnectionFactory {
private static final class MockConnectionFactory implements ConnectionFactory {
@Override
public Publisher<? extends Connection> create() {

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.
@@ -326,7 +326,7 @@ class FileSystemWatcherTests {
return file;
}
private static class TestSnapshotStateRepository implements SnapshotStateRepository {
private static final class TestSnapshotStateRepository implements SnapshotStateRepository {
private Object state;

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.
@@ -127,7 +127,7 @@ class RestartApplicationListenerTests {
}
}
private static class ImplicitlyEnabledRestartApplicationListener extends RestartApplicationListener {
private static final class ImplicitlyEnabledRestartApplicationListener extends RestartApplicationListener {
@Override
boolean implicitlyEnableRestart() {