Merge branch 'master' of https://github.com/spring-projects/spring-framework into read_yuyang

* 'master' of https://github.com/spring-projects/spring-framework:
  Update copyright date
  Hoist concatenation of two constant Strings out of loops
  Avoid setting special Content-* response headers for Tomcat
  Consistent use of AnnotationUtils.rethrowAnnotationConfigurationException()
  Fix Checkstyle violation
  Introduce @disabled regression test for spring-projectsgh-24375
  Polishing contribution
  Expose proxyPing Reactor Netty WebSocket
  Updates to Validation section in reference
  HttpWebHandlerAdapter#formatRequest is protected
  Fix issue with new line handling in StompDecoder
  Simplify getCache() implementation in CaffeineCacheManager
  Publish a build scan only if authenticated
  Update Artifactory plugin to 4.12.0

Author: yuyang

build.gradle

@@ -6,7 +6,7 @@ plugins {
 	id 'io.spring.nohttp' version '0.0.4.RELEASE'
 	id 'de.undercouch.download' version '4.0.0'
 	id 'com.gradle.build-scan' version '3.1.1'
-	id "com.jfrog.artifactory" version '4.11.0' apply false
+	id "com.jfrog.artifactory" version '4.12.0' apply false
 	id "io.freefair.aspectj" version "4.1.1" apply false
 	id "com.github.ben-manes.versions" version "0.24.0"
 }
@@ -17,7 +17,8 @@ buildScan {
 	obfuscation {
 		ipAddresses { addresses -> addresses.collect { address -> '0.0.0.0'} }
 	}
-	publishAlwaysIf(System.getenv('GRADLE_ENTERPRISE_URL') != null)
+	publishAlways()
+	publishIfAuthenticated()
 	server = 'https://ge.spring.io'
 }
 

spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -422,10 +422,13 @@ protected void registerBeanDefinition(String beanName, Map<?, ?> map, String pre
 		ConstructorArgumentValues cas = new ConstructorArgumentValues();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 
+		String prefixWithSep = prefix + SEPARATOR;
+		int beginIndex = prefix.length() + SEPARATOR.length();
+
 		for (Map.Entry<?, ?> entry : map.entrySet()) {
 			String key = StringUtils.trimWhitespace((String) entry.getKey());
-			if (key.startsWith(prefix + SEPARATOR)) {
-				String property = key.substring(prefix.length() + SEPARATOR.length());
+			if (key.startsWith(prefixWithSep)) {
+				String property = key.substring(beginIndex);
 				if (CLASS_KEY.equals(property)) {
 					className = StringUtils.trimWhitespace((String) entry.getValue());
 				}

spring-context-support/src/main/java/org/springframework/cache/caffeine/CaffeineCacheManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -50,6 +50,7 @@
  * @author Ben Manes
  * @author Juergen Hoeller
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 4.3
  * @see CaffeineCache
  */
@@ -178,17 +179,8 @@ public Collection<String> getCacheNames() {
 	@Override
 	@Nullable
 	public Cache getCache(String name) {
-		Cache cache = this.cacheMap.get(name);
-		if (cache == null && this.dynamic) {
-			synchronized (this.cacheMap) {
-				cache = this.cacheMap.get(name);
-				if (cache == null) {
-					cache = createCaffeineCache(name);
-					this.cacheMap.put(name, cache);
-				}
-			}
-		}
-		return cache;
+		return this.cacheMap.computeIfAbsent(name, cacheName ->
+				this.dynamic ? createCaffeineCache(cacheName) : null);
 	}
 
 	/**

spring-context/src/test/java/example/gh24375/A.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2002-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package example.gh24375;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface A {
+
+	@AliasFor("value")
+	B other() default @B;
+
+	@AliasFor("other")
+	B value() default @B;
+}

spring-context/src/test/java/example/gh24375/B.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2002-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package example.gh24375;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.ANNOTATION_TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface B {
+
+	String name() default "";
+}

spring-context/src/test/java/example/gh24375/MyComponent.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2002-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package example.gh24375;
+
+import org.springframework.stereotype.Component;
+
+@Component
+@A(other = @B)
+public class MyComponent {
+}

spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -21,6 +21,7 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import example.gh24375.MyComponent;
 import example.profilescan.DevComponent;
 import example.profilescan.ProfileAnnotatedComponent;
 import example.profilescan.ProfileMetaAnnotatedComponent;
@@ -38,6 +39,7 @@
 import example.scannable.StubFooDao;
 import example.scannable.sub.BarComponent;
 import org.aspectj.lang.annotation.Aspect;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
@@ -500,6 +502,16 @@ public void testIntegrationWithAnnotationConfigApplicationContext_metaProfile()
 		}
 	}
 
+	@Test
+	@Disabled("Disabled until gh-24375 is resolved")
+	public void gh24375() {
+		ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(true);
+		Set<BeanDefinition> components = provider.findCandidateComponents(MyComponent.class.getPackage().getName());
+		assertThat(components).hasSize(1);
+		assertThat(components.iterator().next().getBeanClassName()).isEqualTo(MyComponent.class.getName());
+	}
+
+
 	private boolean containsBeanClass(Set<BeanDefinition> candidates, Class<?> beanClass) {
 		for (BeanDefinition candidate : candidates) {
 			if (beanClass.getName().equals(candidate.getBeanClassName())) {

spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMappings.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -116,9 +116,7 @@ private void addIfPossible(Deque<AnnotationTypeMapping> queue, @Nullable Annotat
 			queue.addLast(new AnnotationTypeMapping(source, annotationType, ann));
 		}
 		catch (Exception ex) {
-			if (ex instanceof AnnotationConfigurationException) {
-				throw (AnnotationConfigurationException) ex;
-			}
+			AnnotationUtils.rethrowAnnotationConfigurationException(ex);
 			if (failureLogger.isEnabled()) {
 				failureLogger.log("Failed to introspect meta-annotation " + annotationType.getName(),
 						(source != null ? source.getAnnotationType() : null), ex);

spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -1076,7 +1076,7 @@ public static Object getValue(@Nullable Annotation annotation, @Nullable String
 	 * <p>Otherwise, this method does nothing.
 	 * @param ex the throwable to inspect
 	 */
-	private static void rethrowAnnotationConfigurationException(Throwable ex) {
+	static void rethrowAnnotationConfigurationException(Throwable ex) {
 		if (ex instanceof AnnotationConfigurationException) {
 			throw (AnnotationConfigurationException) ex;
 		}

spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -672,9 +672,7 @@ private static <A extends Annotation> TypeMappedAnnotation<A> createIfPossible(
 					valueExtractor, aggregateIndex);
 		}
 		catch (Exception ex) {
-			if (ex instanceof AnnotationConfigurationException) {
-				throw (AnnotationConfigurationException) ex;
-			}
+			AnnotationUtils.rethrowAnnotationConfigurationException(ex);
 			if (logger.isEnabled()) {
 				String type = mapping.getAnnotationType().getName();
 				String item = (mapping.getDistance() == 0 ? "annotation " + type :

spring-core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -166,9 +166,10 @@ public MultiValueMap<String, Object> getAllAnnotationAttributes(String annotatio
 		if (attributes == null) {
 			return null;
 		}
+		String annotatedElement = "class '" + getClassName() + "'";
 		for (AnnotationAttributes raw : attributes) {
 			for (Map.Entry<String, Object> entry : AnnotationReadingVisitorUtils.convertClassValues(
-					"class '" + getClassName() + "'", this.classLoader, raw, classValuesAsString).entrySet()) {
+					annotatedElement, this.classLoader, raw, classValuesAsString).entrySet()) {
 				allAttributes.add(entry.getKey(), entry.getValue());
 			}
 		}

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -114,6 +114,10 @@ public List<Message<byte[]>> decode(ByteBuffer byteBuffer,
 			Message<byte[]> message = decodeMessage(byteBuffer, partialMessageHeaders);
 			if (message != null) {
 				messages.add(message);
+				skipEol(byteBuffer);
+				if (!byteBuffer.hasRemaining()) {
+					break;
+				}
 			}
 			else {
 				break;
@@ -128,7 +132,7 @@ public List<Message<byte[]>> decode(ByteBuffer byteBuffer,
 	@Nullable
 	private Message<byte[]> decodeMessage(ByteBuffer byteBuffer, @Nullable MultiValueMap<String, String> headers) {
 		Message<byte[]> decodedMessage = null;
-		skipLeadingEol(byteBuffer);
+		skipEol(byteBuffer);
 
 		// Explicit mark/reset access via Buffer base type for compatibility
 		// with covariant return type on JDK 9's ByteBuffer...
@@ -196,9 +200,10 @@ private void initHeaders(StompHeaderAccessor headerAccessor) {
 
 	/**
 	 * Skip one ore more EOL characters at the start of the given ByteBuffer.
-	 * Those are STOMP heartbeat frames.
+	 * STOMP, section 2.1 says: "The NULL octet can be optionally followed by
+	 * multiple EOLs."
 	 */
-	protected void skipLeadingEol(ByteBuffer byteBuffer) {
+	protected void skipEol(ByteBuffer byteBuffer) {
 		while (true) {
 			if (!tryConsumeEndOfLine(byteBuffer)) {
 				break;

spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -16,7 +16,6 @@
 
 package org.springframework.messaging.simp.stomp;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.util.List;
 
@@ -78,7 +77,7 @@ public void decodeFrameWithNoBody() {
 	}
 
 	@Test
-	public void decodeFrame() throws UnsupportedEncodingException {
+	public void decodeFrame() {
 		Message<byte[]> frame = decode("SEND\ndestination:test\n\nThe body of the message\0");
 		StompHeaderAccessor headers = StompHeaderAccessor.wrap(frame);
 
@@ -166,6 +165,17 @@ public void decodeFrameBodyNotAllowed() {
 				decode("CONNECT\naccept-version:1.2\n\nThe body of the message\0"));
 	}
 
+	@Test // gh-23713
+	public void decodeFramesWithExtraNewLines() {
+		String frame1 = "SEND\ndestination:test\n\nbody\0\n\n\n";
+		ByteBuffer buffer = ByteBuffer.wrap((frame1).getBytes());
+
+		final List<Message<byte[]>> messages = decoder.decode(buffer);
+
+		assertThat(messages.size()).isEqualTo(1);
+		assertThat(StompHeaderAccessor.wrap(messages.get(0)).getCommand()).isEqualTo(StompCommand.SEND);
+	}
+
 	@Test
 	public void decodeMultipleFramesFromSameBuffer() {
 		String frame1 = "SEND\ndestination:test\n\nThe body of the message\0";
@@ -179,9 +189,7 @@ public void decodeMultipleFramesFromSameBuffer() {
 		assertThat(StompHeaderAccessor.wrap(messages.get(1)).getCommand()).isEqualTo(StompCommand.DISCONNECT);
 	}
 
-	// SPR-13111
-
-	@Test
+	@Test // SPR-13111
 	public void decodeFrameWithHeaderWithEmptyValue() {
 		String accept = "accept-version:1.1\n";
 		String valuelessKey = "key:\n";

spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java

@@ -216,6 +216,7 @@ protected void applyHeaders() {
 			if (response.getContentType() == null && contentType != null) {
 				response.setContentType(contentType.toString());
 			}
+			getHeaders().remove(HttpHeaders.CONTENT_TYPE);
 			Charset charset = (contentType != null ? contentType.getCharset() : null);
 			if (response.getCharacterEncoding() == null && charset != null) {
 				response.setCharacterEncoding(charset.name());
@@ -224,6 +225,7 @@ protected void applyHeaders() {
 			if (contentLength != -1) {
 				response.setContentLengthLong(contentLength);
 			}
+			getHeaders().remove(HttpHeaders.CONTENT_LENGTH);
 		}
 
 		@Override