diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java index 2fcb080b5c..331481ce92 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java @@ -103,7 +103,7 @@ public class AutoConfigurationReportLoggingInitializer + "debug logging (start with --debug)%n%n")); } if (this.logger.isDebugEnabled()) { - this.logger.debug(new ConditionEvalutionReportMessage(this.report)); + this.logger.debug(new ConditionEvaluationReportMessage(this.report)); } } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvalutionReportMessage.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportMessage.java similarity index 97% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvalutionReportMessage.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportMessage.java index 8426c75fbf..0ac510fdd3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvalutionReportMessage.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportMessage.java @@ -35,11 +35,11 @@ import org.springframework.util.StringUtils; * @author Phillip Webb * @since 1.4.0 */ -public class ConditionEvalutionReportMessage { +public class ConditionEvaluationReportMessage { private StringBuilder message; - public ConditionEvalutionReportMessage(ConditionEvaluationReport report) { + public ConditionEvaluationReportMessage(ConditionEvaluationReport report) { this.message = getLogMessage(report); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java index 29df53aeaa..59cf0c0af0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java @@ -47,14 +47,14 @@ public class ImportAutoConfigurationTests { config); String shortName = ClassUtils.getShortName(ImportAutoConfigurationTests.class); int beginIndex = shortName.length() + 1; - List orderdConfigBeans = new ArrayList(); + List orderedConfigBeans = new ArrayList(); for (String bean : context.getBeanDefinitionNames()) { if (bean.contains("$Config")) { String shortBeanName = ClassUtils.getShortName(bean); - orderdConfigBeans.add(shortBeanName.substring(beginIndex)); + orderedConfigBeans.add(shortBeanName.substring(beginIndex)); } } - assertThat(orderdConfigBeans).containsExactly("ConfigA", "ConfigB", "ConfigC", + assertThat(orderedConfigBeans).containsExactly("ConfigA", "ConfigB", "ConfigC", "ConfigD"); context.close(); } diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 159f4e7e06..406fe4d4b1 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -4306,7 +4306,7 @@ If you use the the following provided libraries: * http://junit.org[JUnit] -- The de-facto standard for unit testing Java applications. -* {spring-reference}/#integration-testing.html[Spring Test] & Spring Boot Test -- utilties and integration test support for Spring Boot +* {spring-reference}/#integration-testing.html[Spring Test] & Spring Boot Test -- utilities and integration test support for Spring Boot applications. * http://joel-costigliola.github.io/assertj/[AssertJ] - A fluent assertion library. * http://hamcrest.org/JavaHamcrest/[Hamcrest] -- A library of matcher objects (also known @@ -4599,7 +4599,7 @@ a little too much for tests. It's often helpful to load only the parts of the configuration that are required to test a '`slice`' of your application. For example, you might want to test that Spring MVC controllers are mapping URLs correctly, and you don't want to involve and database calls in those tests; or you _might be wanting_ to test JPA -entites, and you're not interested in web layer when those tests run. +entities, and you're not interested in web layer when those tests run. The `spring-boot-test-autoconfigure` module includes a number of annotations that can be used to automatically configure such '`slices`'. Each of them work in a similar way, @@ -4615,7 +4615,7 @@ TIP: It's also possible to use the `@AutoConfigure...` annotations with the stan [[boot-features-testing-spring-boot-applications-testing-autoconfigured-json-tests]] ==== Auto-configured JSON tests -To test that Object JSON serilization and deserialization is working as expected you can +To test that Object JSON serialization and deserialization is working as expected you can use the `@JsonTest` annotation. `@JsonTest` will auto-configure Jackson ObjectMappers, any `@JsonComponent` beans and any Jackson `Modules`. It also configures `Gson` if you happen to be using that instead of, or as well as, Jackson. If you need to diff --git a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerApplicationTests.java b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerApplicationTests.java index 12732c802b..68ed522676 100644 --- a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerApplicationTests.java @@ -66,7 +66,7 @@ public class UserVehicleControllerApplicationTests { } @Test - public void welcomeCommandLineRunnerShouldBeAvailble() throws Exception { + public void welcomeCommandLineRunnerShouldBeAvailable() throws Exception { // Since we're a @SpringApplicationTest all beans should be available assertThat(this.applicationContext.getBean(WelcomeCommandLineRunner.class)) .isNotNull(); diff --git a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerTests.java b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerTests.java index 8a4575053a..4e6612a567 100644 --- a/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerTests.java +++ b/spring-boot-samples/spring-boot-sample-test/src/test/java/sample/test/web/UserVehicleControllerTests.java @@ -101,7 +101,7 @@ public class UserVehicleControllerTests { } @Test(expected = NoSuchBeanDefinitionException.class) - public void welcomeCommandLineRunnerShouldBeAvailble() throws Exception { + public void welcomeCommandLineRunnerShouldBeAvailable() throws Exception { // Since we're a @WebMvcTest WelcomeCommandLineRunner should not be available assertThat(this.applicationContext.getBean(WelcomeCommandLineRunner.class)); } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/AutoConfigureReportTestExecutionListener.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/AutoConfigureReportTestExecutionListener.java index 892db7cf02..1cc0622494 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/AutoConfigureReportTestExecutionListener.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/AutoConfigureReportTestExecutionListener.java @@ -17,7 +17,7 @@ package org.springframework.boot.test.autoconfigure; import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport; -import org.springframework.boot.autoconfigure.logging.ConditionEvalutionReportMessage; +import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportMessage; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.TestContext; @@ -50,7 +50,7 @@ class AutoConfigureReportTestExecutionListener extends AbstractTestExecutionList if (context instanceof ConfigurableApplicationContext) { ConditionEvaluationReport report = ConditionEvaluationReport .get(((ConfigurableApplicationContext) context).getBeanFactory()); - System.err.println(new ConditionEvalutionReportMessage(report)); + System.err.println(new ConditionEvaluationReportMessage(report)); } throw ex; } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java index 9ad37b1811..e044dcd257 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfiguration.java @@ -28,7 +28,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; /** * Annotation that can be used to override * {@link EnableAutoConfiguration @EnableAutoConfiguration}. Often used in combination - * with {@link ImportAutoConfiguration} to limit the auto-configutation classes that are + * with {@link ImportAutoConfiguration} to limit the auto-configuration classes that are * loaded. * * @author Phillip Webb diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java index f5e72f5022..64327ce493 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java @@ -70,7 +70,7 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud protected boolean defaultInclude(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException { - for (Class include : getDefaultIncudes()) { + for (Class include : getDefaultIncludes()) { if (isTypeOrAnnotated(metadataReader, metadataReaderFactory, include)) { return true; } @@ -101,7 +101,7 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud protected abstract boolean isUseDefaultFilters(); - protected abstract Set> getDefaultIncudes(); + protected abstract Set> getDefaultIncludes(); protected static enum FilterType { INCLUDE, EXCLUDE diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotations.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotations.java index fa5da39467..9fe45562b8 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotations.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/FilterAnnotations.java @@ -72,13 +72,13 @@ public class FilterAnnotations implements Iterable { switch (filterType) { case ANNOTATION: Assert.isAssignable(Annotation.class, filterClass, - "An error occured while processing a ANNOTATION type filter: "); + "An error occurred while processing a ANNOTATION type filter: "); return new AnnotationTypeFilter((Class) filterClass); case ASSIGNABLE_TYPE: return new AssignableTypeFilter(filterClass); case CUSTOM: Assert.isAssignable(TypeFilter.class, filterClass, - "An error occured while processing a CUSTOM type filter: "); + "An error occurred while processing a CUSTOM type filter: "); return BeanUtils.instantiateClass(filterClass, TypeFilter.class); } throw new IllegalArgumentException( diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java index 0e5a73efe0..cf070bad92 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonExcludeFilter.java @@ -73,7 +73,7 @@ class JsonExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { } @Override - protected Set> getDefaultIncudes() { + protected Set> getDefaultIncludes() { return DEFAULT_INCLUDES; } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTesterInitializationTestExecutionListener.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTesterInitializationTestExecutionListener.java index 26d9eb8338..32e4d5a879 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTesterInitializationTestExecutionListener.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTesterInitializationTestExecutionListener.java @@ -49,14 +49,14 @@ public class JsonTesterInitializationTestExecutionListener private static final String ASSERTJ_CLASS = "org.assertj.core.api.Assert"; - private static final Map> INITALIZERS; + private static final Map> INITIALIZERS; static { Map> initializers = new LinkedHashMap>(); initializers.put("com.fasterxml.jackson.databind.ObjectMapper", JacksonInitializer.class); initializers.put("com.google.gson.Gson", GsonInitializer.class); - INITALIZERS = Collections.unmodifiableMap(initializers); + INITIALIZERS = Collections.unmodifiableMap(initializers); } @Override @@ -101,7 +101,7 @@ public class JsonTesterInitializationTestExecutionListener private void initializeJsonMarshalTesterFields(ClassLoader classLoader, TestContext testContext) { - for (Map.Entry> entry : INITALIZERS.entrySet()) { + for (Map.Entry> entry : INITIALIZERS.entrySet()) { if (ClassUtils.isPresent(entry.getKey(), classLoader)) { initializeJsonMarshalTesterFields(classLoader, testContext, entry.getKey(), entry.getValue()); diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTypeExcludeFilter.java index cc8063654b..616182b021 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTypeExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTypeExcludeFilter.java @@ -69,7 +69,7 @@ class DataJpaTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { } @Override - protected Set> getDefaultIncudes() { + protected Set> getDefaultIncludes() { return Collections.emptySet(); } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java index 5bb62ab7a1..2dce7952a9 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManager.java @@ -103,7 +103,7 @@ public class TestEntityManager { * {@link #getId(Object) entity ID}. *

* Helpful when ensuring that entity data is actually written and read from the - * underling database correctly. + * underlying database correctly. * @param the entity type * @param entity the entity to persist * @return the entity found using the ID of the persisted entity @@ -226,7 +226,7 @@ public class TestEntityManager { @SuppressWarnings("unchecked") public T getId(Object entity, Class idType) { Object id = getId(entity); - Assert.isInstanceOf(idType, id, "ID missmatch"); + Assert.isInstanceOf(idType, id, "ID mismatch"); return (T) id; } @@ -238,7 +238,7 @@ public class TestEntityManager { public final EntityManager getEntityManager() { EntityManager manager = EntityManagerFactoryUtils .getTransactionalEntityManager(this.entityManagerFactory); - Assert.state(manager != null, "No transactional EnitiyManager found"); + Assert.state(manager != null, "No transactional EntityManager found"); return manager; } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java index 568024909f..9aedc6768c 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java @@ -48,7 +48,7 @@ import org.springframework.test.web.servlet.MockMvc; * By default, tests annotated with {@code @WebMvcTest} will also auto-configure * {@link MockMvc} (include support for HtmlUnit WebDriver and Selenium WebClient). For * more fine-grained control of MockMVC that - * {@link AutoConfigureMockMvc @AutoConfigureMockMvc} annotation cab be used. + * {@link AutoConfigureMockMvc @AutoConfigureMockMvc} annotation can be used. *

* Typically {@code @WebMvcTest} is used in combination with {@link MockBean @MockBean} or * {@link Import @Import} to create any collaborators required by your {@code @Controller} diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java index 8f604cfc18..179b406c04 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java @@ -108,7 +108,7 @@ class WebMvcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { } @Override - protected Set> getDefaultIncudes() { + protected Set> getDefaultIncludes() { if (ObjectUtils.isEmpty(this.annotation.controllers())) { return DEFAULT_INCLUDES_AND_CONTROLLER; } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/AutoConfigureReportTestExecutionListenerTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/AutoConfigureReportTestExecutionListenerTests.java index 10cdf7a511..e4196b919d 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/AutoConfigureReportTestExecutionListenerTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/AutoConfigureReportTestExecutionListenerTests.java @@ -55,7 +55,7 @@ public class AutoConfigureReportTestExecutionListenerTests { } @Test - public void prepareFialingTestInstanceShouldPrintReport() throws Exception { + public void prepareFailingTestInstanceShouldPrintReport() throws Exception { TestContext testContext = mock(TestContext.class); given(testContext.getTestInstance()).willThrow(new IllegalStateException()); SpringApplication application = new SpringApplication(Config.class); diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledTrueIntegrationTest.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledTrueIntegrationTest.java index 9997f6269f..e10ec20dc4 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledTrueIntegrationTest.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationEnabledTrueIntegrationTest.java @@ -45,7 +45,7 @@ public class OverrideAutoConfigurationEnabledTrueIntegrationTest { private ApplicationContext context; @Test - public void autoconfiguredContext() throws Exception { + public void autoConfiguredContext() throws Exception { ApplicationContext context = this.context; assertThat(context.getBean(ExampleSpringBootApplication.class)).isNotNull(); assertThat(context.getBean(ConfigurationPropertiesBindingPostProcessor.class)) diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/ExampleJsonComponent.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/ExampleJsonComponent.java index 8813e4b031..64a079ebc7 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/ExampleJsonComponent.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/ExampleJsonComponent.java @@ -47,10 +47,10 @@ public class ExampleJsonComponent { } - public static class Deserialzer extends JsonObjectDeserializer { + public static class Deserializer extends JsonObjectDeserializer { @Override - protected ExampleCustomObject deserializeObject(JsonParser jasonParser, + protected ExampleCustomObject deserializeObject(JsonParser jsonParser, DeserializationContext context, ObjectCodec codec, JsonNode tree) throws IOException { return new ExampleCustomObject( diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManagerTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManagerTests.java index 965dc2489a..760b8ef519 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManagerTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestEntityManagerTests.java @@ -202,7 +202,7 @@ public class TestEntityManagerTests { public void getIdForTypeWhenTypeIsWrongShouldThrowException() throws Exception { TestEntity entity = new TestEntity(); given(this.persistenceUnitUtil.getIdentifier(entity)).willReturn(123); - this.thrown.expectMessage("ID missmatch Object of class [java.lang.Integer] " + this.thrown.expectMessage("ID mismatch Object of class [java.lang.Integer] " + "must be an instance of class java.lang.Long"); this.testEntityManager.getId(entity, Long.class); } @@ -225,7 +225,7 @@ public class TestEntityManagerTests { @Test public void getEntityManagerWhenNotSetShouldThrowException() throws Exception { this.thrown.expect(IllegalStateException.class); - this.thrown.expectMessage("No transactional EnitiyManager found"); + this.thrown.expectMessage("No transactional EntityManager found"); this.testEntityManager.getEntityManager(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySourceTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySourceTests.java index c7fadb22ab..bec497f5c3 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySourceTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySourceTests.java @@ -104,7 +104,7 @@ public class AnnotationsPropertySourceTests { } @Test - public void propertiesWhenCountainsArryasShouldExpandNames() throws Exception { + public void propertiesWhenContainsArraysShouldExpandNames() throws Exception { AnnotationsPropertySource source = new AnnotationsPropertySource(Arrays.class); assertThat(source.getPropertyNames()).contains("strings[0]", "strings[1]", "classes[0]", "classes[1]", "ints[0]", "ints[1]", "longs[0]", "longs[1]", diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/ExampleMapping.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/ExampleMapping.java index 782d89a06d..3f64a55d10 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/ExampleMapping.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/ExampleMapping.java @@ -20,7 +20,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; /** - * Example {@link PropertyMapping} annotation for use wuth {@link PropertyMappingTests}. + * Example {@link PropertyMapping} annotation for use with {@link PropertyMappingTests}. * * @author Phillip Webb */ diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java index a25f53df03..70f95c286c 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizerFactoryTests.java @@ -78,7 +78,7 @@ public class PropertyMappingContextCustomizerFactoryTests { } @Test - public void hashCodeAndEqualsShoudBeBasedOnPropertyValues() throws Exception { + public void hashCodeAndEqualsShouldBeBasedOnPropertyValues() throws Exception { ContextCustomizer customizer1 = this.factory .createContextCustomizer(TypeMapping.class, null); ContextCustomizer customizer2 = this.factory diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingTests.java index 34df32ea40..d90fb4e1a4 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingTests.java @@ -26,7 +26,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link PropertyMapping @PropertyMapping} annotaions. + * Integration tests for {@link PropertyMapping @PropertyMapping} annotations. * * @author Phillip Webb */ diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java index 7dcc79f5ee..918ac60ef4 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java @@ -118,7 +118,7 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr * differentiate regular tests and bootstrapped tests. Without this property a cached * context could be returned that wasn't created by this bootstrapper. By default uses * the bootstrapper class as a property. - * @return the differentator or {@code null} + * @return the differentiator or {@code null} */ protected String getDifferentiatorPropertySourceProperty() { return getClass().getName() + "=true"; diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java index f6d3640375..a6c4c5d9b6 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockBean.java @@ -103,7 +103,7 @@ public @interface MockBean { * When {@code @MockBean} also defines a {@code name} this attribute can only contain * a single value. *

- * If this is the only attribute specified consider using the {@code value} alais + * If this is the only attribute specified consider using the {@code value} alias * instead. */ @AliasFor("value") diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java index fd8f4c2ad8..9e2e5f14d5 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentAssertTests.java @@ -289,95 +289,95 @@ public class JsonContentAssertTests { } @Test - public void isEqualToJsonWhenStringIsMatchingAndLienientShouldPass() + public void isEqualToJsonWhenStringIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(LENIENT_SAME, JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isEqualToJsonWhenStringIsNotMatchingAndLienientShouldFail() + public void isEqualToJsonWhenStringIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(DIFFERENT, JSONCompareMode.LENIENT); } @Test - public void isEqualToJsonWhenResourcePathIsMatchingAndLienientShouldPass() + public void isEqualToJsonWhenResourcePathIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson("lenient-same.json", JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isEqualToJsonWhenResourcePathIsNotMatchingAndLienientShouldFail() + public void isEqualToJsonWhenResourcePathIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson("different.json", JSONCompareMode.LENIENT); } @Test - public void isEqualToJsonWhenResourcePathAndClassIsMatchingAndLienientShouldPass() + public void isEqualToJsonWhenResourcePathAndClassIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson("lenient-same.json", getClass(), JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isEqualToJsonWhenResourcePathAndClassIsNotMatchingAndLienientShouldFail() + public void isEqualToJsonWhenResourcePathAndClassIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson("different.json", getClass(), JSONCompareMode.LENIENT); } @Test - public void isEqualToJsonWhenBytesAreMatchingAndLienientShouldPass() + public void isEqualToJsonWhenBytesAreMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(LENIENT_SAME.getBytes(), JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isEqualToJsonWhenBytesAreNotMatchingAndLienientShouldFail() + public void isEqualToJsonWhenBytesAreNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(DIFFERENT.getBytes(), JSONCompareMode.LENIENT); } @Test - public void isEqualToJsonWhenFileIsMatchingAndLienientShouldPass() throws Exception { + public void isEqualToJsonWhenFileIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(createFile(LENIENT_SAME), JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isEqualToJsonWhenFileIsNotMatchingAndLienientShouldFail() + public void isEqualToJsonWhenFileIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(createFile(DIFFERENT), JSONCompareMode.LENIENT); } @Test - public void isEqualToJsonWhenInputStreamIsMatchingAndLienientShouldPass() + public void isEqualToJsonWhenInputStreamIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(createInputStream(LENIENT_SAME), JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isEqualToJsonWhenInputStreamIsNotMatchingAndLienientShouldFail() + public void isEqualToJsonWhenInputStreamIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(createInputStream(DIFFERENT), JSONCompareMode.LENIENT); } @Test - public void isEqualToJsonWhenResourceIsMatchingAndLienientShouldPass() + public void isEqualToJsonWhenResourceIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(createResource(LENIENT_SAME), JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isEqualToJsonWhenResourceIsNotMatchingAndLienientShouldFail() + public void isEqualToJsonWhenResourceIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isEqualToJson(createResource(DIFFERENT), JSONCompareMode.LENIENT); @@ -712,97 +712,97 @@ public class JsonContentAssertTests { } @Test(expected = AssertionError.class) - public void isNotEqualToJsonWhenStringIsMatchingAndLienientShouldPass() + public void isNotEqualToJsonWhenStringIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson(LENIENT_SAME, JSONCompareMode.LENIENT); } @Test - public void isNotEqualToJsonWhenStringIsNotMatchingAndLienientShouldFail() + public void isNotEqualToJsonWhenStringIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson(DIFFERENT, JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isNotEqualToJsonWhenResourcePathIsMatchingAndLienientShouldPass() + public void isNotEqualToJsonWhenResourcePathIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson("lenient-same.json", JSONCompareMode.LENIENT); } @Test - public void isNotEqualToJsonWhenResourcePathIsNotMatchingAndLienientShouldFail() + public void isNotEqualToJsonWhenResourcePathIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson("different.json", JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isNotEqualToJsonWhenResourcePathAndClassIsMatchingAndLienientShouldPass() + public void isNotEqualToJsonWhenResourcePathAndClassIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson("lenient-same.json", getClass(), JSONCompareMode.LENIENT); } @Test - public void isNotEqualToJsonWhenResourcePathAndClassIsNotMatchingAndLienientShouldFail() + public void isNotEqualToJsonWhenResourcePathAndClassIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson("different.json", getClass(), JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isNotEqualToJsonWhenBytesAreMatchingAndLienientShouldPass() + public void isNotEqualToJsonWhenBytesAreMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson(LENIENT_SAME.getBytes(), JSONCompareMode.LENIENT); } @Test - public void isNotEqualToJsonWhenBytesAreNotMatchingAndLienientShouldFail() + public void isNotEqualToJsonWhenBytesAreNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson(DIFFERENT.getBytes(), JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isNotEqualToJsonWhenFileIsMatchingAndLienientShouldPass() + public void isNotEqualToJsonWhenFileIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson(createFile(LENIENT_SAME), JSONCompareMode.LENIENT); } @Test - public void isNotEqualToJsonWhenFileIsNotMatchingAndLienientShouldFail() + public void isNotEqualToJsonWhenFileIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson(createFile(DIFFERENT), JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isNotEqualToJsonWhenInputStreamIsMatchingAndLienientShouldPass() + public void isNotEqualToJsonWhenInputStreamIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson(createInputStream(LENIENT_SAME), JSONCompareMode.LENIENT); } @Test - public void isNotEqualToJsonWhenInputStreamIsNotMatchingAndLienientShouldFail() + public void isNotEqualToJsonWhenInputStreamIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson(createInputStream(DIFFERENT), JSONCompareMode.LENIENT); } @Test(expected = AssertionError.class) - public void isNotEqualToJsonWhenResourceIsMatchingAndLienientShouldPass() + public void isNotEqualToJsonWhenResourceIsMatchingAndLenientShouldPass() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson(createResource(LENIENT_SAME), JSONCompareMode.LENIENT); } @Test - public void isNotEqualToJsonWhenResourceIsNotMatchingAndLienientShouldFail() + public void isNotEqualToJsonWhenResourceIsNotMatchingAndLenientShouldFail() throws Exception { assertThat(forJson(SOURCE)).isNotEqualToJson(createResource(DIFFERENT), JSONCompareMode.LENIENT); @@ -924,13 +924,13 @@ public class JsonContentAssertTests { } @Test - public void hasJsonPathValueForIndefinatePathWithResults() throws Exception { + public void hasJsonPathValueForIndefinitePathWithResults() throws Exception { assertThat(forJson(SIMPSONS)) .hasJsonPathValue("$.familyMembers[?(@.name == 'Bart')]"); } @Test - public void hasJsonPathValueForIndefinatePathWithEmptyResults() throws Exception { + public void hasJsonPathValueForIndefinitePathWithEmptyResults() throws Exception { String expression = "$.familyMembers[?(@.name == 'Dilbert')]"; this.thrown.expect(AssertionError.class); this.thrown.expectMessage("No value at JSON path \"" + expression + "\""); @@ -961,7 +961,7 @@ public class JsonContentAssertTests { } @Test - public void doesNotHaveJsonPathValueForIndefinatePathWithResults() throws Exception { + public void doesNotHaveJsonPathValueForIndefinitePathWithResults() throws Exception { String expression = "$.familyMembers[?(@.name == 'Bart')]"; this.thrown.expect(AssertionError.class); this.thrown.expectMessage("Expected no value at JSON path \"" + expression @@ -970,7 +970,7 @@ public class JsonContentAssertTests { } @Test - public void doesNotHaveJsonPathValueForIndefinatePathWithEmptyResults() + public void doesNotHaveJsonPathValueForIndefinitePathWithEmptyResults() throws Exception { assertThat(forJson(SIMPSONS)) .doesNotHaveJsonPathValue("$.familyMembers[?(@.name == 'Dilbert')]"); @@ -992,14 +992,14 @@ public class JsonContentAssertTests { } @Test - public void hasEmptyJsonPathValueForIndefinatePathWithEmptyResults() + public void hasEmptyJsonPathValueForIndefinitePathWithEmptyResults() throws Exception { assertThat(forJson(SIMPSONS)) .hasEmptyJsonPathValue("$.familyMembers[?(@.name == 'Dilbert')]"); } @Test - public void hasEmptyJsonPathValueForIndefinatePathWithResults() throws Exception { + public void hasEmptyJsonPathValueForIndefinitePathWithResults() throws Exception { String expression = "$.familyMembers[?(@.name == 'Bart')]"; this.thrown.expect(AssertionError.class); this.thrown.expectMessage("Expected an empty value at JSON path \"" + expression @@ -1042,14 +1042,14 @@ public class JsonContentAssertTests { } @Test - public void doesNotHaveEmptyJsonPathValueForIndefinatePathWithResults() + public void doesNotHaveEmptyJsonPathValueForIndefinitePathWithResults() throws Exception { assertThat(forJson(SIMPSONS)) .doesNotHaveEmptyJsonPathValue("$.familyMembers[?(@.name == 'Bart')]"); } @Test - public void doesNotHaveEmptyJsonPathValueForIndefinatePathWithEmptyResults() + public void doesNotHaveEmptyJsonPathValueForIndefinitePathWithEmptyResults() throws Exception { String expression = "$.familyMembers[?(@.name == 'Dilbert')]"; this.thrown.expect(AssertionError.class); diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java index a6fec97388..9c6ca14c5c 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessorTests.java @@ -38,7 +38,7 @@ public class MockitoPostProcessorTests { public ExpectedException thrown = ExpectedException.none(); @Test - public void cannotMockMulipleBeans() { + public void cannotMockMultipleBeans() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); MockitoPostProcessor.register(context); context.register(MultipleBeans.class); diff --git a/spring-boot/src/main/java/org/springframework/boot/context/TypeExcludeFilter.java b/spring-boot/src/main/java/org/springframework/boot/context/TypeExcludeFilter.java index a1b2ecac0d..eb17d03480 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/TypeExcludeFilter.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/TypeExcludeFilter.java @@ -39,7 +39,7 @@ import org.springframework.core.type.filter.TypeFilter; * override the {@link #match(MetadataReader, MetadataReaderFactory)} method. *

* Note that {@code TypeExcludeFilters} are initialized very early in the application - * lifecyle, they should generally not have dependencies on any other beans. They and are + * lifecycle, they should generally not have dependencies on any other beans. They and are * primarily used internally to support {@code spring-boot-test}. * * @author Phillip Webb diff --git a/spring-boot/src/main/java/org/springframework/boot/context/web/LocalServerPort.java b/spring-boot/src/main/java/org/springframework/boot/context/web/LocalServerPort.java index 5b08632c26..242790de1a 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/web/LocalServerPort.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/web/LocalServerPort.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Value; /** * Annotation at the field or method/constructor parameter level that injects the HTTP - * port that got allocated at runtime. Privdes a convenient alternative for + * port that got allocated at runtime. Provides a convenient alternative for * @Value("${local.server.port}"). * * @author Anand Shah diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java index bb4d36b75e..d89f445062 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java @@ -170,7 +170,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem { } protected final void applySystemProperties(Environment environment, LogFile logFile) { - new LoggingSytemProperties(environment).apply(logFile); + new LoggingSystemProperties(environment).apply(logFile); } } diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java index 95fc799480..a7779cb755 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java @@ -102,12 +102,12 @@ public class LoggingApplicationListener implements GenericApplicationListener { /** * The name of the System property that contains the process ID. */ - public static final String PID_KEY = LoggingSytemProperties.PID_KEY; + public static final String PID_KEY = LoggingSystemProperties.PID_KEY; /** * The name of the System property that contains the exception conversion word. */ - public static final String EXCEPTION_CONVERSION_WORD = LoggingSytemProperties.EXCEPTION_CONVERSION_WORD; + public static final String EXCEPTION_CONVERSION_WORD = LoggingSystemProperties.EXCEPTION_CONVERSION_WORD; /** * The name of the System property that contains the log file. @@ -122,17 +122,17 @@ public class LoggingApplicationListener implements GenericApplicationListener { /** * The name of the System property that contains the console log pattern. */ - public static final String CONSOLE_LOG_PATTERN = LoggingSytemProperties.CONSOLE_LOG_PATTERN; + public static final String CONSOLE_LOG_PATTERN = LoggingSystemProperties.CONSOLE_LOG_PATTERN; /** * The name of the System property that contains the file log pattern. */ - public static final String FILE_LOG_PATTERN = LoggingSytemProperties.FILE_LOG_PATTERN; + public static final String FILE_LOG_PATTERN = LoggingSystemProperties.FILE_LOG_PATTERN; /** * The name of the System property that contains the log level pattern. */ - public static final String LOG_LEVEL_PATTERN = LoggingSytemProperties.LOG_LEVEL_PATTERN; + public static final String LOG_LEVEL_PATTERN = LoggingSystemProperties.LOG_LEVEL_PATTERN; /** * The name of the {@link LoggingSystem} bean. @@ -247,7 +247,7 @@ public class LoggingApplicationListener implements GenericApplicationListener { */ protected void initialize(ConfigurableEnvironment environment, ClassLoader classLoader) { - new LoggingSytemProperties(environment).apply(); + new LoggingSystemProperties(environment).apply(); LogFile logFile = LogFile.get(environment); if (logFile != null) { logFile.applyToSystemProperties(); diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSytemProperties.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java similarity index 96% rename from spring-boot/src/main/java/org/springframework/boot/logging/LoggingSytemProperties.java rename to spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java index d0d196e286..14337f2037 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSytemProperties.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java @@ -26,7 +26,7 @@ import org.springframework.core.env.Environment; * @author Andy Wilkinson * @author Phillip Webb */ -class LoggingSytemProperties { +class LoggingSystemProperties { static final String PID_KEY = "PID"; @@ -40,7 +40,7 @@ class LoggingSytemProperties { private final Environment environment; - LoggingSytemProperties(Environment environment) { + LoggingSystemProperties(Environment environment) { this.environment = environment; } diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java index 70d6bb5b89..f86188ef84 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java @@ -304,7 +304,7 @@ public class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { } @Test - public void reinitializeShouldSetSytemProperty() throws Exception { + public void reinitializeShouldSetSystemProperty() throws Exception { // gh-5491 this.loggingSystem.beforeInitialize(); this.logger.info("Hidden");