From bb0bc3d415d4466d09e7d022ae8555f289c28339 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 22 Dec 2015 16:19:26 +0100 Subject: [PATCH] Polishing --- .../factory/groovy/GroovyBeanDefinitionReader.java | 12 ++++++------ .../main/java/org/springframework/cache/Cache.java | 7 +++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java index bcbe1985d17..43d68233319 100644 --- a/spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java +++ b/spring-beans-groovy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java @@ -31,7 +31,6 @@ import groovy.lang.GroovyObjectSupport; import groovy.lang.GroovyShell; import groovy.lang.GroovySystem; import groovy.lang.MetaClass; - import org.codehaus.groovy.runtime.DefaultGroovyMethods; import org.codehaus.groovy.runtime.InvokerHelper; @@ -337,8 +336,8 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp if (uri == null) { throw new IllegalArgumentException("Namespace definition must supply a non-null URI"); } - NamespaceHandler namespaceHandler = this.groovyDslXmlBeanDefinitionReader.getNamespaceHandlerResolver().resolve( - uri); + NamespaceHandler namespaceHandler = + this.groovyDslXmlBeanDefinitionReader.getNamespaceHandlerResolver().resolve(uri); if (namespaceHandler == null) { throw new BeanDefinitionParsingException(new Problem("No namespace handler found for URI: " + uri, new Location(new DescriptiveResource(("Groovy"))))); @@ -375,7 +374,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp throw new IllegalArgumentException("Argument to ref() is not a valid bean or was not found"); if (args[0] instanceof RuntimeBeanReference) { - refName = ((RuntimeBeanReference)args[0]).getBeanName(); + refName = ((RuntimeBeanReference) args[0]).getBeanName(); } else { refName = args[0].toString(); @@ -388,7 +387,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp } return new RuntimeBeanReference(refName, parentRef); } - else if (this.namespaces.containsKey(name) && args.length > 0 && (args[0] instanceof Closure)) { + else if (this.namespaces.containsKey(name) && args.length > 0 && args[0] instanceof Closure) { GroovyDynamicElementReader reader = createDynamicElementReader(name); reader.invokeMethod("doCall", args); } @@ -396,7 +395,8 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp // abstract bean definition return invokeBeanDefiningMethod(name, args); } - else if (args.length > 0 && (args[0] instanceof Class || args[0] instanceof RuntimeBeanReference || args[0] instanceof Map)) { + else if (args.length > 0 && + (args[0] instanceof Class || args[0] instanceof RuntimeBeanReference || args[0] instanceof Map)) { return invokeBeanDefiningMethod(name, args); } else if (args.length > 1 && args[args.length -1] instanceof Closure) { diff --git a/spring-context/src/main/java/org/springframework/cache/Cache.java b/spring-context/src/main/java/org/springframework/cache/Cache.java index c3d5dca64a3..07352fb69fc 100644 --- a/spring-context/src/main/java/org/springframework/cache/Cache.java +++ b/spring-context/src/main/java/org/springframework/cache/Cache.java @@ -152,8 +152,11 @@ public interface Cache { Object get(); } + /** - * TODO + * Wrapper exception to be thrown from {@link #get(Object, Callable)} + * in case of the value loader callback failing with an exception. + * @since 4.3 */ @SuppressWarnings("serial") class ValueRetrievalException extends RuntimeException { @@ -167,7 +170,7 @@ public interface Cache { } public Object getKey() { - return key; + return this.key; } }