Polishing

DoraALin · Dec 22, 2015 · bb0bc3d · bb0bc3d
1 parent 95d6265
commit bb0bc3d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/...vy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/...vy/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
@@ -31,7 +31,6 @@
 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 void xmlns(Map<String, String> definition) {
 				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 @@ else if ("ref".equals(name)) {
 				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,15 +387,16 @@ else if ("ref".equals(name)) {
 			}
 			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);
 		}
 		else if (args.length > 0 && args[0] instanceof Closure) {
 			// 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
@@ -152,8 +152,11 @@ interface ValueWrapper {
 		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 ValueRetrievalException(Object key, Callable<?> loader, Throwable ex) {
 		}
 
 		public Object getKey() {
-			return key;
+			return this.key;
 		}
 
 	}