diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java index f32b5a4b7e8..6b87ecce639 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java @@ -45,7 +45,7 @@ public class ManagementServerProperties implements SecurityPrerequisite { /** * Order applied to the WebSecurityConfigurerAdapter that is used to configure basic * authentication for management endpoints. If you want to add your own authentication - * for all or some of those endpoints the best thing to do is add your own + * for all or some of those endpoints the best thing to do is to add your own * WebSecurityConfigurerAdapter with lower order, for instance by using * {@code ACCESS_OVERRIDE_ORDER}. */ diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointIntegrationTests.java index 7b7c1726aec..ecd9c20f31d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointIntegrationTests.java @@ -47,7 +47,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** - * Integration tests for {@link JolokiaMvcEndpoint} + * Integration tests for {@link JolokiaMvcEndpoint}. * * @author Christian Dupuis * @author Dave Syer diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java index aae7bc75904..36d99a3fe63 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java @@ -48,7 +48,7 @@ public class SecurityProperties implements SecurityPrerequisite { /** * Order applied to the WebSecurityConfigurerAdapter that is used to configure basic * authentication for application endpoints. If you want to add your own - * authentication for all or some of those endpoints the best thing to do is add your + * authentication for all or some of those endpoints the best thing to do is to add your * own WebSecurityConfigurerAdapter with lower order. */ public static final int BASIC_AUTH_ORDER = Ordered.LOWEST_PRECEDENCE - 5; diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java index a2f71f8c59c..cc2fee07d15 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java @@ -372,7 +372,7 @@ public abstract class MainClassFinder { /** * Handle the specified main class. - * @param mainClass the mainClass + * @param mainClass the main class * @return a non-null value if processing should end or {@code null} to continue */ T doWith(MainClass mainClass); diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AbstractExecutableArchiveLauncherTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AbstractExecutableArchiveLauncherTests.java index 1c34d932205..48a2f53a2b6 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AbstractExecutableArchiveLauncherTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AbstractExecutableArchiveLauncherTests.java @@ -55,15 +55,15 @@ public class AbstractExecutableArchiveLauncherTests { jarOutputStream.putNextEntry(new JarEntry(entryPrefix + "/")); jarOutputStream.putNextEntry(new JarEntry(entryPrefix + "/classes/")); jarOutputStream.putNextEntry(new JarEntry(entryPrefix + "/lib/")); - JarEntry webInfLibFoo = new JarEntry(entryPrefix + "/lib/foo.jar"); - webInfLibFoo.setMethod(ZipEntry.STORED); + JarEntry libFoo = new JarEntry(entryPrefix + "/lib/foo.jar"); + libFoo.setMethod(ZipEntry.STORED); ByteArrayOutputStream fooJarStream = new ByteArrayOutputStream(); new JarOutputStream(fooJarStream).close(); - webInfLibFoo.setSize(fooJarStream.size()); + libFoo.setSize(fooJarStream.size()); CRC32 crc32 = new CRC32(); crc32.update(fooJarStream.toByteArray()); - webInfLibFoo.setCrc(crc32.getValue()); - jarOutputStream.putNextEntry(webInfLibFoo); + libFoo.setCrc(crc32.getValue()); + jarOutputStream.putNextEntry(libFoo); jarOutputStream.write(fooJarStream.toByteArray()); jarOutputStream.close(); return archive; diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt index f4b58092862..8ed1d734cc6 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt +++ b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt @@ -47,7 +47,7 @@ ... -+--- +--- The layout factory is provided as an implementation of <<>> (from spring-boot-loader-tools) explicitly specified in the pom. If there is only one custom diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java index 514d77326d0..85e5052edc8 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java @@ -136,13 +136,13 @@ class DefaultLogbackConfiguration { appender.setEncoder(encoder); config.start(encoder); appender.setFile(logFile); - getRollingPolicy(appender, config, logFile); - getMaxFileSize(appender, config); + setRollingPolicy(appender, config, logFile); + setMaxFileSize(appender, config); config.appender("FILE", appender); return appender; } - private void getRollingPolicy(RollingFileAppender appender, + private void setRollingPolicy(RollingFileAppender appender, LogbackConfigurator config, String logFile) { FixedWindowRollingPolicy rollingPolicy = new FixedWindowRollingPolicy(); rollingPolicy.setFileNamePattern(logFile + ".%i"); @@ -151,7 +151,7 @@ class DefaultLogbackConfiguration { config.start(rollingPolicy); } - private void getMaxFileSize(RollingFileAppender appender, + private void setMaxFileSize(RollingFileAppender appender, LogbackConfigurator config) { SizeBasedTriggeringPolicy triggeringPolicy = new SizeBasedTriggeringPolicy(); try { diff --git a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java index 070ccf3579a..bbbcadc21ae 100644 --- a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java +++ b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java @@ -77,7 +77,7 @@ public class SpringPhysicalNamingStrategy implements PhysicalNamingStrategy { } /** - * Get an the identifier for the specified details. By default his method will return + * Get an the identifier for the specified details. By default this method will return * an identifier with the name adapted based on the result of * {@link #isCaseInsensitive(JdbcEnvironment)} * @param name the name of the identifier @@ -95,7 +95,7 @@ public class SpringPhysicalNamingStrategy implements PhysicalNamingStrategy { /** * Specify whether the database is case sensitive. - * @param jdbcEnvironment The JDBC environment which can be used to determine case + * @param jdbcEnvironment the JDBC environment which can be used to determine case * @return true if the database is case insensitive sensitivity */ protected boolean isCaseInsensitive(JdbcEnvironment jdbcEnvironment) { diff --git a/spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java b/spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java index 8b2f9d57a67..f57ebc32446 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java @@ -163,7 +163,7 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit } /** - * Configure the application. Normally all you would need to do is add sources (e.g. + * Configure the application. Normally all you would need to do is to add sources (e.g. * config classes) because other settings have sensible defaults. You might choose * (for instance) to add default command line arguments, or set an active Spring * profile. diff --git a/spring-boot/src/test/java/org/springframework/boot/yaml/SpringProfileDocumentMatcherTests.java b/spring-boot/src/test/java/org/springframework/boot/yaml/SpringProfileDocumentMatcherTests.java index f5d5ebd2953..4f867ee3700 100644 --- a/spring-boot/src/test/java/org/springframework/boot/yaml/SpringProfileDocumentMatcherTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/yaml/SpringProfileDocumentMatcherTests.java @@ -67,8 +67,7 @@ public class SpringProfileDocumentMatcherTests { @Test public void matchesCommaSeparatedArray() throws IOException { DocumentMatcher matcher = new SpringProfileDocumentMatcher("foo", "bar"); - Properties properties = getProperties( - String.format("spring.profiles: [bar, spam]")); + Properties properties = getProperties("spring.profiles: [bar, spam]"); assertThat(matcher.matches(properties)).isEqualTo(MatchStatus.FOUND); }