diff --git a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java index c73dbc292f..c124a922cf 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/MavenPluginPlugin.java @@ -195,10 +195,10 @@ public class MavenPluginPlugin implements Plugin { File generatedHelpMojoDir = new File(project.getBuildDir(), "generated/sources/helpMojo"); SourceSet mainSourceSet = getMainSourceSet(project); project.getTasks().withType(Javadoc.class, this::setJavadocOptions); - FormatHelpMojoSource copyFormattedHelpMojoSourceTask = createFormatHelpMojoSourceTask(project, - generateHelpMojoTask, generatedHelpMojoDir); - project.getTasks().getByName(mainSourceSet.getCompileJavaTaskName()).dependsOn(copyFormattedHelpMojoSourceTask); - mainSourceSet.java((javaSources) -> javaSources.srcDir(copyFormattedHelpMojoSourceTask)); + FormatHelpMojoSource formattedHelpMojoSource = createFormatHelpMojoSource(project, generateHelpMojoTask, + generatedHelpMojoDir); + project.getTasks().getByName(mainSourceSet.getCompileJavaTaskName()).dependsOn(formattedHelpMojoSource); + mainSourceSet.java((javaSources) -> javaSources.srcDir(formattedHelpMojoSource)); Sync pluginDescriptorInputs = createSyncPluginDescriptorInputs(project, pluginDescriptorDir, mainSourceSet); pluginDescriptorInputs.dependsOn(mainSourceSet.getClassesTaskName()); MavenExec task = createGeneratePluginDescriptorTask(project, pluginDescriptorDir); @@ -217,7 +217,7 @@ public class MavenPluginPlugin implements Plugin { options.addMultilineStringsOption("tag").setValue(Arrays.asList("goal:X", "requiresProject:X", "threadSafe:X")); } - private FormatHelpMojoSource createFormatHelpMojoSourceTask(Project project, MavenExec generateHelpMojoTask, + private FormatHelpMojoSource createFormatHelpMojoSource(Project project, MavenExec generateHelpMojoTask, File generatedHelpMojoDir) { FormatHelpMojoSource formatHelpMojoSource = project.getTasks().create("formatHelpMojoSource", FormatHelpMojoSource.class); @@ -227,7 +227,7 @@ public class MavenPluginPlugin implements Plugin { } private Sync createSyncPluginDescriptorInputs(Project project, File destination, SourceSet sourceSet) { - Sync pluginDescriptorInputs = project.getTasks().create("copyPluginDescriptorInputs", Sync.class); + Sync pluginDescriptorInputs = project.getTasks().create("syncPluginDescriptorInputs", Sync.class); pluginDescriptorInputs.setDestinationDir(destination); File pomFile = new File(project.getProjectDir(), "src/maven/resources/pom.xml"); pluginDescriptorInputs.from(pomFile, (copy) -> replaceVersionPlaceholder(copy, project)); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizer.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizer.java index bcc03ec943..55ad5b3072 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizer.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizer.java @@ -21,7 +21,7 @@ import io.micrometer.core.instrument.observation.TimerObservationHandler; import io.micrometer.observation.ObservationRegistry; /** - * Registers the {@link TimerObservationHandler} with a {@link ObservationRegistry}. + * Registers the {@link TimerObservationHandler} with an {@link ObservationRegistry}. * * @author Moritz Halbritter */ diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 048d12820b..fa1d6a147c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -59,8 +59,8 @@ org.springframework.boot.actuate.autoconfigure.metrics.export.humio.HumioMetrics org.springframework.boot.actuate.autoconfigure.metrics.export.influx.InfluxMetricsExportAutoConfiguration org.springframework.boot.actuate.autoconfigure.metrics.export.jmx.JmxMetricsExportAutoConfiguration org.springframework.boot.actuate.autoconfigure.metrics.export.kairos.KairosMetricsExportAutoConfiguration -org.springframework.boot.actuate.autoconfigure.metrics.export.otlp.OtlpMetricsExportAutoConfiguration org.springframework.boot.actuate.autoconfigure.metrics.export.newrelic.NewRelicMetricsExportAutoConfiguration +org.springframework.boot.actuate.autoconfigure.metrics.export.otlp.OtlpMetricsExportAutoConfiguration org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus.PrometheusMetricsExportAutoConfiguration org.springframework.boot.actuate.autoconfigure.metrics.export.signalfx.SignalFxMetricsExportAutoConfiguration org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java index 68f0cf89e7..03c2bec194 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerOpaqueTokenConfiguration.java @@ -30,7 +30,7 @@ import org.springframework.security.oauth2.server.resource.introspection.SpringO import org.springframework.security.web.SecurityFilterChain; /** - * Configures a {@link OpaqueTokenIntrospector} when a token introspection endpoint is + * Configures an {@link OpaqueTokenIntrospector} when a token introspection endpoint is * available. Also configures a {@link SecurityFilterChain} if a * {@link OpaqueTokenIntrospector} bean is found. * diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java index 28437ff751..710510c957 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/SpringBootWebSecurityConfiguration.java @@ -88,7 +88,7 @@ class SpringBootWebSecurityConfiguration { } /** - * Adds the{@link EnableWebSecurity @EnableWebSecurity} annotation if Spring Security + * Adds the {@link EnableWebSecurity @EnableWebSecurity} annotation if Spring Security * is on the classpath. This will make sure that the annotation is present with * default security auto-configuration and also if the user adds custom security and * forgets to add the annotation. If {@link EnableWebSecurity @EnableWebSecurity} has diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index 7fbfa7d256..6a2b360fd1 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -1330,8 +1330,8 @@ public class SpringApplication { * print stack traces of any encountered. Applies the specified * {@link ExitCodeGenerator ExitCodeGenerators} in addition to any Spring beans that * implement {@link ExitCodeGenerator}. When multiple generators are available, the - * first non-zero exit code is used. Generators ordered based on their {@link Ordered} - * implementation and {@link Order @Order} annotation. + * first non-zero exit code is used. Generators are ordered based on their + * {@link Ordered} implementation and {@link Order @Order} annotation. * @param context the context to close if possible * @param exitCodeGenerators exit code generators * @return the outcome (0 if successful) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java index ba1b25c982..ff9cf76f7d 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/LoggingApplicationListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 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. @@ -131,7 +131,7 @@ public class LoggingApplicationListener implements GenericApplicationListener { public static final String LOG_FILE_BEAN_NAME = "springBootLogFile"; /** - * The name of the{@link LoggerGroups} bean. + * The name of the {@link LoggerGroups} bean. * @since 2.2.0 */ public static final String LOGGER_GROUPS_BEAN_NAME = "springBootLoggerGroups"; diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/OriginTrackedResource.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/OriginTrackedResource.java index bb49d7035b..b31a8ef33b 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/OriginTrackedResource.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/OriginTrackedResource.java @@ -165,7 +165,7 @@ public class OriginTrackedResource implements Resource, OriginProvider { * {@link WritableResource}. * @param resource the tracked resource * @param origin the origin of the resource - * @return a {@link OriginTrackedWritableResource} instance + * @return an {@link OriginTrackedWritableResource} instance */ public static OriginTrackedWritableResource of(WritableResource resource, Origin origin) { return (OriginTrackedWritableResource) of((Resource) resource, origin); @@ -176,7 +176,7 @@ public class OriginTrackedResource implements Resource, OriginProvider { * {@link Resource}. * @param resource the tracked resource * @param origin the origin of the resource - * @return a {@link OriginTrackedResource} instance + * @return an {@link OriginTrackedResource} instance */ public static OriginTrackedResource of(Resource resource, Origin origin) { if (resource instanceof WritableResource) { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java index 7935d8634a..ad8a9a2538 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java @@ -24,7 +24,6 @@ import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; import java.util.Set; -import java.util.stream.Collectors; import org.apache.catalina.LifecycleState; import org.apache.catalina.connector.Connector; @@ -160,14 +159,7 @@ class SslConnectorCustomizerTests { customizer.customize(connector); this.tomcat.start(); SSLHostConfig sslHostConfig = connector.getProtocolHandler().findSslHostConfigs()[0]; - sslHostConfig.getCertificates(true); - SSLHostConfig sslHostConfigWithDefaults = new SSLHostConfig(); - sslHostConfigWithDefaults.getCertificates(true); assertThat(sslHostConfig.getTruststore()).isEqualTo(trustStore); - System.out.println(sslHostConfig.getCertificates(false).stream() - .map(SSLHostConfigCertificate::getCertificateFile).collect(Collectors.toList())); - System.out.println(sslHostConfigWithDefaults.getCertificates(false).stream() - .map(SSLHostConfigCertificate::getCertificateFile).collect(Collectors.toList())); } @Test