Polish contribution

See gh-23923

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java

@@ -21,6 +21,7 @@ import org.junit.jupiter.api.Test;
 import test.aop.PerTargetAspect;
 
 import org.springframework.aop.Pointcut;
+import org.springframework.aop.aspectj.AspectJExpressionPointcut;
 import org.springframework.aop.aspectj.annotation.AbstractAspectJAdvisorFactoryTests.ExceptionAspect;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -30,36 +31,43 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
  * @since 2.0
  * @author Rod Johnson
  * @author Chris Beams
+ * @author Sam Brannen
  */
-public class AspectMetadataTests {
+class AspectMetadataTests {
 
 	@Test
-	public void testNotAnAspect() {
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				new AspectMetadata(String.class,"someBean"));
+	void notAnAspect() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new AspectMetadata(String.class, "someBean"));
 	}
 
 	@Test
-	public void testSingletonAspect() {
-		AspectMetadata am = new AspectMetadata(ExceptionAspect.class,"someBean");
+	void singletonAspect() {
+		AspectMetadata am = new AspectMetadata(ExceptionAspect.class, "someBean");
 		assertThat(am.isPerThisOrPerTarget()).isFalse();
 		assertThat(am.getPerClausePointcut()).isSameAs(Pointcut.TRUE);
 		assertThat(am.getAjType().getPerClause().getKind()).isEqualTo(PerClauseKind.SINGLETON);
 	}
 
 	@Test
-	public void testPerTargetAspect() {
-		AspectMetadata am = new AspectMetadata(PerTargetAspect.class,"someBean");
+	void perTargetAspect() {
+		AspectMetadata am = new AspectMetadata(PerTargetAspect.class, "someBean");
 		assertThat(am.isPerThisOrPerTarget()).isTrue();
 		assertThat(am.getPerClausePointcut()).isNotSameAs(Pointcut.TRUE);
 		assertThat(am.getAjType().getPerClause().getKind()).isEqualTo(PerClauseKind.PERTARGET);
+		assertThat(am.getPerClausePointcut()).isInstanceOf(AspectJExpressionPointcut.class);
+		assertThat(((AspectJExpressionPointcut) am.getPerClausePointcut()).getExpression())
+			.isEqualTo("execution(* *.getSpouse())");
 	}
 
 	@Test
-	public void testPerThisAspect() {
-		AspectMetadata am = new AspectMetadata(PerThisAspect.class,"someBean");
+	void perThisAspect() {
+		AspectMetadata am = new AspectMetadata(PerThisAspect.class, "someBean");
 		assertThat(am.isPerThisOrPerTarget()).isTrue();
 		assertThat(am.getPerClausePointcut()).isNotSameAs(Pointcut.TRUE);
 		assertThat(am.getAjType().getPerClause().getKind()).isEqualTo(PerClauseKind.PERTHIS);
+		assertThat(am.getPerClausePointcut()).isInstanceOf(AspectJExpressionPointcut.class);
+		assertThat(((AspectJExpressionPointcut) am.getPerClausePointcut()).getExpression())
+			.isEqualTo("execution(* *.getSpouse())");
 	}
+
 }

spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -190,7 +190,6 @@ public class CssLinkResourceTransformer extends ResourceTransformerSupport {
 				}
 				else {
 					position = extractUnquotedLink(position, content, result);
-
 				}
 			}
 		}
@@ -203,7 +202,7 @@ public class CssLinkResourceTransformer extends ResourceTransformerSupport {
 		}
 
 		/**
-		 * Invoked after a keyword match, after whitespaces removed, and when
+		 * Invoked after a keyword match, after whitespace has been removed, and when
 		 * the next char is neither a single nor double quote.
 		 */
 		protected abstract int extractUnquotedLink(int position, String content,
@@ -222,7 +221,7 @@ public class CssLinkResourceTransformer extends ResourceTransformerSupport {
 		@Override
 		protected int extractUnquotedLink(int position, String content, Set<ContentChunkInfo> result) {
 			if (content.startsWith("url(", position)) {
-				// Ignore, UrlFunctionContentParser will take care
+				// Ignore: UrlFunctionLinkParser will handle it.
 			}
 			else if (logger.isTraceEnabled()) {
 				logger.trace("Unexpected syntax for @import link at index " + position);

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/CssLinkResourceTransformer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -153,7 +153,6 @@ public class CssLinkResourceTransformer extends ResourceTransformerSupport {
 				}
 				else {
 					position = extractLink(position, content, result);
-
 				}
 			}
 		}
@@ -166,7 +165,7 @@ public class CssLinkResourceTransformer extends ResourceTransformerSupport {
 		}
 
 		/**
-		 * Invoked after a keyword match, after whitespaces removed, and when
+		 * Invoked after a keyword match, after whitespace has been removed, and when
 		 * the next char is neither a single nor double quote.
 		 */
 		protected abstract int extractLink(int index, String content, SortedSet<ContentChunkInfo> linksToAdd);
@@ -183,7 +182,7 @@ public class CssLinkResourceTransformer extends ResourceTransformerSupport {
 		@Override
 		protected int extractLink(int index, String content, SortedSet<ContentChunkInfo> linksToAdd) {
 			if (content.startsWith("url(", index)) {
-				// Ignore, UrlLinkParser will take care
+				// Ignore: UrlFunctionLinkParser will handle it.
 			}
 			else if (logger.isTraceEnabled()) {
 				logger.trace("Unexpected syntax for @import link at index " + index);

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java

@@ -472,7 +472,7 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
 	private boolean validatePath(ServerHttpRequest request) {
 		String path = request.getURI().getPath();
 		int index = path.lastIndexOf('/') + 1;
-		return path.indexOf(';', index) == -1;
+		return (path.indexOf(';', index) == -1);
 	}
 
 	protected boolean checkOrigin(ServerHttpRequest request, ServerHttpResponse response, HttpMethod... httpMethods)