diff --git a/build.gradle b/build.gradle index cd66c9a54b9b..b21c908de8b0 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ ext { junit5Version = "5.4.0" kotlinVersion = "1.3.21" log4jVersion = "2.11.2" - nettyVersion = "4.1.33.Final" + nettyVersion = "4.1.34.Final" quartzVersion = "2.3.0" reactorVersion = "Californium-SR5" rxjavaVersion = "1.3.8" diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java index f8156ab095db..3c7d5fe999b9 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.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. @@ -313,9 +313,9 @@ else if (StringUtils.hasText(operation.getCacheManager())) { * @param expectedType type for the bean * @return the bean matching that name * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException if such bean does not exist - * @see CacheOperation#keyGenerator - * @see CacheOperation#cacheManager - * @see CacheOperation#cacheResolver + * @see CacheOperation#getKeyGenerator() + * @see CacheOperation#getCacheManager() + * @see CacheOperation#getCacheResolver() */ protected T getBean(String beanName, Class expectedType) { if (this.beanFactory == null) { @@ -353,8 +353,8 @@ protected Object execute(CacheOperationInvoker invoker, Object target, Method me /** * Execute the underlying operation (typically in case of cache miss) and return - * the result of the invocation. If an exception occurs it will be wrapped in - * a {@link CacheOperationInvoker.ThrowableWrapper}: the exception can be handled + * the result of the invocation. If an exception occurs it will be wrapped in a + * {@link CacheOperationInvoker.ThrowableWrapper}: the exception can be handled * or modified but it must be wrapped in a * {@link CacheOperationInvoker.ThrowableWrapper} as well. * @param invoker the invoker handling the operation being cached diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSource.java index 40e27ff24a62..c682da041338 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSource.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSource.java @@ -51,8 +51,8 @@ default boolean isCandidateClass(Class targetClass) { } /** - * Return the collection of cache operations for this method, or {@code null} - * if the method contains no cacheable annotations. + * Return the collection of cache operations for this method, + * or {@code null} if the method contains no cacheable annotations. * @param method the method to introspect * @param targetClass the target class (may be {@code null}, in which case * the declaring class of the method must be used) diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java index 4c9fdf43be9a..5c3f880d22b8 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java @@ -81,4 +81,5 @@ public Collection getCacheOperations(Method method, @Nullable Cl } return ops; } + } diff --git a/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java index a8414d9ea55e..5420312ec1e1 100644 --- a/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java +++ b/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 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. @@ -36,7 +36,7 @@ /** * {@link org.springframework.scripting.ScriptFactory} implementation based * on the JSR-223 script engine abstraction (as included in Java 6+). - * Supports JavaScript, Groovy, JRuby and other JSR-223 compliant engines. + * Supports JavaScript, Groovy, JRuby, and other JSR-223 compliant engines. * *

Typically used in combination with a * {@link org.springframework.scripting.support.ScriptFactoryPostProcessor}; diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java index 2d1c97ad27b3..d54f9a703ba8 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.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. @@ -27,6 +27,7 @@ * metadata attributes at source level (such as Java 5 annotations), or anywhere else. * * @author Rod Johnson + * @author Juergen Hoeller * @since 15.04.2003 * @see TransactionInterceptor#setTransactionAttributeSource * @see TransactionProxyFactoryBean#setTransactionAttributeSource diff --git a/spring-web/src/main/java/org/springframework/http/server/ServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServerHttpRequest.java index 88564526132c..3c4dbac78c90 100644 --- a/spring-web/src/main/java/org/springframework/http/server/ServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/ServerHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 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. @@ -21,6 +21,7 @@ import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpRequest; +import org.springframework.lang.Nullable; /** * Represents a server-side HTTP request. @@ -33,9 +34,10 @@ public interface ServerHttpRequest extends HttpRequest, HttpInputMessage { /** * Return a {@link java.security.Principal} instance containing the name of the - * authenticated user. If the user has not been authenticated, the method returns - * null. + * authenticated user. + *

If the user has not been authenticated, the method returns null. */ + @Nullable Principal getPrincipal(); /**