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 90ecccb8141..ce2493b8183 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. @@ -298,9 +298,9 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker * @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) { return BeanFactoryAnnotationUtils.qualifiedBeanOfType(this.beanFactory, expectedType, beanName); @@ -329,8 +329,8 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker /** * 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 376d2a16473..1e4d4028416 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 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. @@ -25,13 +25,14 @@ import java.util.Collection; * source level, or elsewhere. * * @author Costin Leau + * @author Juergen Hoeller * @since 3.1 */ public interface CacheOperationSource { /** - * 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 a18db38b1d5..3ffc459b070 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 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. @@ -28,6 +28,7 @@ import org.springframework.util.Assert; * over a given array of {@code CacheOperationSource} instances. * * @author Costin Leau + * @author Juergen Hoeller * @since 3.1 */ @SuppressWarnings("serial") @@ -41,7 +42,7 @@ public class CompositeCacheOperationSource implements CacheOperationSource, Seri * @param cacheOperationSources the CacheOperationSource instances to combine */ public CompositeCacheOperationSource(CacheOperationSource... cacheOperationSources) { - Assert.notEmpty(cacheOperationSources, "cacheOperationSources array must not be empty"); + Assert.notEmpty(cacheOperationSources, "CacheOperationSource array must not be empty"); this.cacheOperationSources = cacheOperationSources; } @@ -53,20 +54,20 @@ public class CompositeCacheOperationSource implements CacheOperationSource, Seri return this.cacheOperationSources; } + @Override public Collection getCacheOperations(Method method, Class targetClass) { Collection ops = null; - for (CacheOperationSource source : this.cacheOperationSources) { Collection cacheOperations = source.getCacheOperations(method, targetClass); if (cacheOperations != null) { if (ops == null) { ops = new ArrayList(); } - ops.addAll(cacheOperations); } } 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 f8bc2365c39..78e88ede02f 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-2016 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. @@ -33,7 +33,7 @@ import org.springframework.util.StringUtils; /** * {@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}; @@ -140,6 +140,7 @@ public class StandardScriptFactory implements ScriptFactory, BeanClassLoaderAwar if (script instanceof Class ? !requestedIfc.isAssignableFrom((Class) script) : !requestedIfc.isInstance(script)) { adaptationRequired = true; + break; } } if (adaptationRequired) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java index e285f1b45bd..41a8ab70e11 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.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. @@ -116,7 +116,7 @@ public abstract class RdbmsOperation implements InitializingBean { * large result sets: Setting this higher than the default value will increase * processing speed at the cost of memory consumption; setting this lower can * avoid transferring row data that will never be read by the application. - *

Default is 0, indicating to use the driver's default. + *

Default is -1, indicating to use the driver's default. * @see org.springframework.jdbc.core.JdbcTemplate#setFetchSize */ public void setFetchSize(int fetchSize) { @@ -127,7 +127,7 @@ public abstract class RdbmsOperation implements InitializingBean { * Set the maximum number of rows for this RDBMS operation. This is important * for processing subsets of large result sets, avoiding to read and hold * the entire result set in the database or in the JDBC driver. - *

Default is 0, indicating to use the driver's default. + *

Default is -1, indicating to use the driver's default. * @see org.springframework.jdbc.core.JdbcTemplate#setMaxRows */ public void setMaxRows(int maxRows) { @@ -136,7 +136,7 @@ public abstract class RdbmsOperation implements InitializingBean { /** * Set the query timeout for statements that this RDBMS operation executes. - *

Default is 0, indicating to use the JDBC driver's default. + *

Default is -1, indicating to use the JDBC driver's default. *

Note: Any timeout specified here will be overridden by the remaining * transaction timeout when executing within a transaction that has a * timeout specified at the transaction level. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java index a0f1a193b59..1454e577311 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 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. @@ -38,7 +38,7 @@ public class CompositeTransactionAttributeSource implements TransactionAttribute * Create a new CompositeTransactionAttributeSource for the given sources. * @param transactionAttributeSources the TransactionAttributeSource instances to combine */ - public CompositeTransactionAttributeSource(TransactionAttributeSource[] transactionAttributeSources) { + public CompositeTransactionAttributeSource(TransactionAttributeSource... transactionAttributeSources) { Assert.notNull(transactionAttributeSources, "TransactionAttributeSource array must not be null"); this.transactionAttributeSources = transactionAttributeSources; } @@ -54,10 +54,10 @@ public class CompositeTransactionAttributeSource implements TransactionAttribute @Override public TransactionAttribute getTransactionAttribute(Method method, Class targetClass) { - for (TransactionAttributeSource tas : this.transactionAttributeSources) { - TransactionAttribute ta = tas.getTransactionAttribute(method, targetClass); - if (ta != null) { - return ta; + for (TransactionAttributeSource source : this.transactionAttributeSources) { + TransactionAttribute attr = source.getTransactionAttribute(method, targetClass); + if (attr != null) { + return attr; } } return null; 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 a6a9250fce4..3033bddeb03 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-2012 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. @@ -25,6 +25,7 @@ import java.lang.reflect.Method; * 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 @@ -36,10 +37,9 @@ public interface TransactionAttributeSource { * Return the transaction attribute for the given method, * or {@code null} if the method is non-transactional. * @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. - * @return TransactionAttribute the matching transaction attribute, - * or {@code null} if none found + * @param targetClass the target class (may be {@code null}, + * in which case the declaring class of the method must be used) + * @return the matching transaction attribute, or {@code null} if none found */ TransactionAttribute getTransactionAttribute(Method method, Class targetClass); 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 88564526132..b08ef460947 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. @@ -33,8 +33,8 @@ 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. */ Principal getPrincipal();