Upgrade to spring-javaformat 0.0.43

Closes gh-41853
This commit is contained in:
Moritz Halbritter 2024-08-14 12:32:42 +02:00
parent b43d97b359
commit 1d45016d8c
34 changed files with 38 additions and 23 deletions

View File

@ -1 +1 @@
javaFormatVersion=0.0.41
javaFormatVersion=0.0.43

View File

@ -37,6 +37,6 @@ public enum InfoContributorFallback {
/**
* Do not fall back, thereby disabling the info contributor.
*/
DISABLE;
DISABLE
}

View File

@ -116,7 +116,7 @@ public class SignalFxProperties extends StepRegistryProperties {
/**
* Delta histogram.
*/
DELTA;
DELTA
}

View File

@ -241,7 +241,7 @@ public class TracingProperties {
* <a href="https://github.com/openzipkin/b3-propagation#multiple-headers">B3
* multiple headers</a> propagation.
*/
B3_MULTI;
B3_MULTI
}

View File

@ -31,6 +31,7 @@ import static org.mockito.Mockito.mock;
* Tests for {@link InfluxDbHealthContributorAutoConfiguration}.
*
* @author Eddú Meléndez
* @deprecated since 3.2.0 for removal in 3.4.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.2.0", forRemoval = true)

View File

@ -62,10 +62,10 @@ import org.springframework.web.filter.OncePerRequestFilter;
* @author Andy Wilkinson
* @see JerseyEndpointResourceFactory
*/
public class JerseyWebEndpointIntegrationTests
class JerseyWebEndpointIntegrationTests
extends AbstractWebEndpointIntegrationTests<AnnotationConfigServletWebServerApplicationContext> {
public JerseyWebEndpointIntegrationTests() {
JerseyWebEndpointIntegrationTests() {
super(JerseyWebEndpointIntegrationTests::createApplicationContext,
JerseyWebEndpointIntegrationTests::applyAuthenticatedConfiguration);
}

View File

@ -35,6 +35,7 @@ import static org.mockito.Mockito.mock;
* Tests for {@link InfluxDbHealthIndicator}.
*
* @author Eddú Meléndez
* @deprecated since 3.2.0 for removal in 3.4.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.2.0", forRemoval = true)

View File

@ -482,7 +482,7 @@ public class CassandraProperties {
/**
* No compression.
*/
NONE;
NONE
}

View File

@ -224,7 +224,7 @@ public class JacksonProperties {
* Refuse to decide implicit mode and instead throw an InvalidDefinitionException
* for ambiguous cases.
*/
EXPLICIT_ONLY;
EXPLICIT_ONLY
}

View File

@ -463,6 +463,7 @@ public class ServerProperties {
/**
* Whether to reject requests with illegal header names or values.
* @deprecated since 2.7.12 for removal in 3.3.0
*/
@Deprecated(since = "2.7.12", forRemoval = true) // Remove in 3.3
private boolean rejectIllegalHeader = true;

View File

@ -41,6 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Moritz Halbritter
* @author Andy Wilkinson
* @author Phillip Webb
* @deprecated since 3.2.0 for removal in 3.4.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.2.0", forRemoval = true)

View File

@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Andy Wilkinson
*/
public class LiquibasePropertiesTests {
class LiquibasePropertiesTests {
@Test
void valuesOfShowSummaryMatchValuesOfUpdateSummaryEnum() {

View File

@ -31,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link MongoPropertiesClientSettingsBuilderCustomizer}.
*
* @author Scott Frederick
* @deprecated since 3.1.0 for removal in 3.3.0
*/
@Deprecated(since = "3.1.0", forRemoval = true)
class MongoPropertiesClientSettingsBuilderCustomizerTests {

View File

@ -211,7 +211,7 @@ public @interface SpringBootTest {
* that class does not have a main method, a test-specific
* {@link SpringApplication} will be used.
*/
WHEN_AVAILABLE;
WHEN_AVAILABLE
}

View File

@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest
@DisabledIfDockerUnavailable
@ImportTestcontainers(LoadTimeWeaverAwareConsumerContainers.class)
public class LoadTimeWeaverAwareConsumerImportTestcontainersTests implements LoadTimeWeaverAwareConsumerContainers {
class LoadTimeWeaverAwareConsumerImportTestcontainersTests implements LoadTimeWeaverAwareConsumerContainers {
@Autowired
private LoadTimeWeaverAwareConsumer consumer;

View File

@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@TestPropertySource(properties = "spring.testcontainers.beans.startup=parallel")
@DisabledIfDockerUnavailable
@ExtendWith(OutputCaptureExtension.class)
public class TestContainersParallelStartupIntegrationTests {
class TestContainersParallelStartupIntegrationTests {
@Test
void startsInParallel(CapturedOutput out) {

View File

@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@DisabledIfDockerUnavailable
@ExtendWith(OutputCaptureExtension.class)
@ImportTestcontainers(Containers.class)
public class TestContainersParallelStartupWithImportTestcontainersIntegrationTests {
class TestContainersParallelStartupWithImportTestcontainersIntegrationTests {
@Test
void startsInParallel(CapturedOutput out) {

View File

@ -25,6 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
* Deprecated configuration properties.
*
* @author Stephane Nicoll
* @deprecated deprecated
*/
@Getter
@Setter

View File

@ -22,6 +22,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
* Sample for testing method configuration with deprecated class.
*
* @author Stephane Nicoll
* @deprecated deprecated
*/
@Deprecated
public class DeprecatedClassMethodConfig {

View File

@ -22,6 +22,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
* Deprecated configuration properties.
*
* @author Stephane Nicoll
* @deprecated deprecated
*/
@Deprecated
@ConfigurationProperties(prefix = "deprecated")

View File

@ -37,7 +37,7 @@ import org.junit.jupiter.api.io.TempDir;
* @author Phillip Webb
*/
@Disabled("Only used for manual testing")
public class VirtualZipPerformanceTests {
class VirtualZipPerformanceTests {
@TempDir
Path temp;

View File

@ -280,7 +280,7 @@ public final class ConfigData {
* profile specific sibling imports.
* @since 2.4.5
*/
PROFILE_SPECIFIC;
PROFILE_SPECIFIC
}

View File

@ -470,7 +470,7 @@ class ConfigDataEnvironmentContributor implements Iterable<ConfigDataEnvironment
/**
* A valid location that contained nothing to load.
*/
EMPTY_LOCATION;
EMPTY_LOCATION
}

View File

@ -326,7 +326,7 @@ class ConfigDataEnvironmentContributors implements Iterable<ConfigDataEnvironmen
/**
* Throw an exception if an inactive contributor contains a bound value.
*/
FAIL_ON_BIND_TO_INACTIVE_SOURCE;
FAIL_ON_BIND_TO_INACTIVE_SOURCE
}

View File

@ -32,6 +32,6 @@ public enum BindMethod {
/**
* Value object using constructor binding.
*/
VALUE_OBJECT;
VALUE_OBJECT
}

View File

@ -223,6 +223,8 @@ public final class ClientHttpRequestFactories {
/**
* Support for
* {@link org.springframework.http.client.OkHttp3ClientHttpRequestFactory}.
*
* @deprecated since 3.2.0 for removal in 3.4.0
*/
@Deprecated(since = "3.2.0", forRemoval = true)
@SuppressWarnings("removal")

View File

@ -39,6 +39,6 @@ public enum GracefulShutdownResult {
/**
* The server was shutdown immediately, ignoring any active requests.
*/
IMMEDIATE;
IMMEDIATE
}

View File

@ -33,6 +33,6 @@ public enum Shutdown {
/**
* The {@link WebServer} should shut down immediately.
*/
IMMEDIATE;
IMMEDIATE
}

View File

@ -35,6 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
* Tests for {@link DelegatingApplicationContextInitializer}.
*
* @author Phillip Webb
* @deprecated since 3.2.0 for removal in 3.4.0
*/
@Deprecated(since = "3.2.0", forRemoval = true)
@SuppressWarnings("removal")

View File

@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link DelegatingApplicationListener}.
*
* @author Dave Syer
* @deprecated since 3.2.0 for removal in 3.4.0
*/
@Deprecated(since = "3.2.0", forRemoval = true)
@SuppressWarnings("removal")

View File

@ -33,10 +33,11 @@ import static org.assertj.core.api.Assertions.assertThat;
* client.
*
* @author Andy Wilkinson
* @deprecated since 3.2.0 for removal in 3.4.0
*/
@ClassPathOverrides("com.squareup.okhttp3:okhttp:3.14.9")
@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar" })
@Deprecated(since = "3.2.0")
@Deprecated(since = "3.2.0", forRemoval = true)
@SuppressWarnings("removal")
class ClientHttpRequestFactoriesOkHttp3Tests
extends AbstractClientHttpRequestFactoriesTests<OkHttp3ClientHttpRequestFactory> {

View File

@ -32,9 +32,10 @@ import static org.assertj.core.api.Assertions.assertThat;
* client.
*
* @author Andy Wilkinson
* @deprecated since 3.2.0 for removal in 3.4.0
*/
@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar" })
@Deprecated(since = "3.2.0")
@Deprecated(since = "3.2.0", forRemoval = true)
@SuppressWarnings("removal")
class ClientHttpRequestFactoriesOkHttp4Tests
extends AbstractClientHttpRequestFactoriesTests<OkHttp3ClientHttpRequestFactory> {

View File

@ -30,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
* Tests for {@link SslConfigurationValidator}.
*
* @author Chris Bono
* @deprecated since 3.1.0 for removal in 3.3.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.1.0", forRemoval = true)

View File

@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer
* @author Phillip Webb
*/
public class SampleAntApplicationIT {
class SampleAntApplicationIT {
@Test
void runJar() throws Exception {