Default is "", meaning the method is always cached. + * Spring Expression Language (SpEL) attribute used for making the cache + * eviction operation conditional. + *
Default is "", meaning the cache eviction is always performed. */ String condition() default ""; diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java index 13b94c4f8f..6b284797af 100644 --- a/spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java +++ b/spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 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. @@ -78,7 +78,8 @@ public @interface CachePut { String cacheResolver() default ""; /** - * Spring Expression Language (SpEL) attribute used for conditioning the cache update. + * Spring Expression Language (SpEL) attribute used for making the cache + * put operation conditional. *
Default is "", meaning the method result is always cached. */ String condition() default ""; diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java index 90b93eea36..50edf7b795 100644 --- a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java +++ b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 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. @@ -34,7 +34,7 @@ import java.lang.annotation.Target; * can replace the default one ({@link #keyGenerator()}). * *
If no value is found in the cache for the computed key, the method is executed - * and the returned instance is used as the cache value. + * and the returned value is used as the cache value. * * @author Costin Leau * @author Phillip Webb @@ -83,8 +83,9 @@ public @interface Cacheable { String cacheResolver() default ""; /** - * Spring Expression Language (SpEL) attribute used for conditioning the method caching. - *
Default is "", meaning the method is always cached. + * Spring Expression Language (SpEL) attribute used for making the method + * caching conditional. + *
Default is "", meaning the method result is always cached. */ String condition() default ""; diff --git a/spring-context/src/main/java/org/springframework/context/event/EventListener.java b/spring-context/src/main/java/org/springframework/context/event/EventListener.java index 85c3e98823..88f78c11ce 100644 --- a/spring-context/src/main/java/org/springframework/context/event/EventListener.java +++ b/spring-context/src/main/java/org/springframework/context/event/EventListener.java @@ -55,7 +55,8 @@ import org.springframework.context.ApplicationEvent; public @interface EventListener { /** - * Spring Expression Language (SpEL) attribute used for conditioning the event handling. + * Spring Expression Language (SpEL) attribute used for making the event + * handling conditional. *
Default is "", meaning the event is always handled. */ String condition() default ""; diff --git a/spring-tx/src/main/java/org/springframework/transaction/event/TransactionalEventListener.java b/spring-tx/src/main/java/org/springframework/transaction/event/TransactionalEventListener.java index 2cccb39900..49b1744718 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/event/TransactionalEventListener.java +++ b/spring-tx/src/main/java/org/springframework/transaction/event/TransactionalEventListener.java @@ -26,13 +26,13 @@ import org.springframework.context.event.EventListener; /** * An {@link EventListener} that is invoked according to a {@link TransactionPhase}. - *
- * If the event is not published in the boundaries of a managed transaction, the event + * + *
If the event is not published within the boundaries of a managed transaction, the event * is discarded unless the {@link #fallbackExecution()} flag is explicitly set. If a * transaction is running, the event is processed according to its {@link TransactionPhase}. - *
- * Adding {@link org.springframework.core.annotation.Order @Order} on your annotated method - * allows you to prioritize that listener amongst other listeners running on the same phase. + * + *
Adding {@link org.springframework.core.annotation.Order @Order} on your annotated method + * allows you to prioritize that listener amongst other listeners running in the same phase. * * @author Stephane Nicoll * @since 4.2 @@ -45,7 +45,7 @@ public @interface TransactionalEventListener { /** * Phase to bind the handling of an event to. If no transaction is in progress, the - * event is not processed at all unless {@link #fallbackExecution()} has been + * event is not processed at all unless {@link #fallbackExecution} has been * enabled explicitly. */ TransactionPhase phase() default TransactionPhase.AFTER_COMMIT; @@ -56,9 +56,10 @@ public @interface TransactionalEventListener { boolean fallbackExecution() default false; /** - * Spring Expression Language (SpEL) attribute used for conditioning the event handling. + * Spring Expression Language (SpEL) attribute used for making the event + * handling conditional. *
Default is "", meaning the event is always handled. - * @see EventListener#condition() + * @see EventListener#condition */ String condition() default "";