Polishing

jhoeller · jhoeller · commit 3e45b7613249 · 2024-05-23T17:21:34.000+02:00
(cherry picked from commit 6c08d93)
diff --git a/integration-tests/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java b/integration-tests/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java
@@ -63,7 +63,7 @@ void repositoryUsesAspectJAdviceMode() {
 		// attempt was made to look up the AJ aspect. It's due to classpath issues
 		// in .integration-tests that it's not found.
 		assertThatException().isThrownBy(ctx::refresh)
-			.withMessageContaining("AspectJCachingConfiguration");
+				.withMessageContaining("AspectJCachingConfiguration");
 	}
 
 
diff --git a/integration-tests/src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java b/integration-tests/src/test/java/org/springframework/core/env/EnvironmentSystemIntegrationTests.java
@@ -561,8 +561,7 @@ void abstractApplicationContextValidatesRequiredPropertiesOnRefresh() {
 		{
 			ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext();
 			ctx.getEnvironment().setRequiredProperties("foo", "bar");
-			assertThatExceptionOfType(MissingRequiredPropertiesException.class).isThrownBy(
-					ctx::refresh);
+			assertThatExceptionOfType(MissingRequiredPropertiesException.class).isThrownBy(ctx::refresh);
 		}
 
 		{
diff --git a/integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
@@ -97,7 +97,7 @@ void repositoryUsesAspectJAdviceMode() {
 		ctx.register(Config.class, AspectJTxConfig.class);
 		// this test is a bit fragile, but gets the job done, proving that an
 		// attempt was made to look up the AJ aspect. It's due to classpath issues
-		// in .integration-tests that it's not found.
+		// in integration-tests that it's not found.
 		assertThatException()
 			.isThrownBy(ctx::refresh)
 			.withMessageContaining("AspectJJtaTransactionManagementConfiguration");
diff --git a/spring-aspects/src/test/resources/org/springframework/cache/config/annotation-jcache-aspectj.xml b/spring-aspects/src/test/resources/org/springframework/cache/config/annotation-jcache-aspectj.xml
@@ -24,8 +24,7 @@
 		</property>
 	</bean>
 
-	<bean id="defaultCache"
-		  class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean">
+	<bean id="defaultCache" class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean">
 		<property name="name" value="default"/>
 	</bean>
 
diff --git a/spring-aspects/src/test/resources/org/springframework/scheduling/aspectj/annotationDrivenContext.xml b/spring-aspects/src/test/resources/org/springframework/scheduling/aspectj/annotationDrivenContext.xml
@@ -7,12 +7,10 @@
 				http://www.springframework.org/schema/task
 				https://www.springframework.org/schema/task/spring-task.xsd">
 
-	<task:annotation-driven mode="aspectj" executor="testExecutor"
-							exception-handler="testExceptionHandler"/>
+	<task:annotation-driven mode="aspectj" executor="testExecutor" exception-handler="testExceptionHandler"/>
 
 	<task:executor id="testExecutor"/>
 
-	<bean id="testExceptionHandler"
-		  class="org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler"/>
+	<bean id="testExceptionHandler" class="org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler"/>
 
 </beans>

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void repositoryUsesAspectJAdviceMode() {`
`63`	`63`	`// attempt was made to look up the AJ aspect. It's due to classpath issues`
`64`	`64`	`// in .integration-tests that it's not found.`
`65`	`65`	`assertThatException().isThrownBy(ctx::refresh)`
`66`		`- .withMessageContaining("AspectJCachingConfiguration");`
	`66`	`+ .withMessageContaining("AspectJCachingConfiguration");`
`67`	`67`	`}`
`68`	`68`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -561,8 +561,7 @@ void abstractApplicationContextValidatesRequiredPropertiesOnRefresh() {`
`561`	`561`	`{`
`562`	`562`	`ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext();`
`563`	`563`	`ctx.getEnvironment().setRequiredProperties("foo", "bar");`
`564`		`- assertThatExceptionOfType(MissingRequiredPropertiesException.class).isThrownBy(`
`565`		`- ctx::refresh);`
	`564`	`+ assertThatExceptionOfType(MissingRequiredPropertiesException.class).isThrownBy(ctx::refresh);`
`566`	`565`	`}`
`567`	`566`
`568`	`567`	`{`