Polishing

Author: jhoeller

spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -17,6 +17,7 @@
 package org.springframework.cache.jcache;
 
 import java.util.concurrent.Callable;
+import javax.cache.Cache;
 import javax.cache.processor.EntryProcessor;
 import javax.cache.processor.EntryProcessorException;
 import javax.cache.processor.MutableEntry;
@@ -36,14 +37,14 @@
  */
 public class JCacheCache extends AbstractValueAdaptingCache {
 
-	private final javax.cache.Cache<Object, Object> cache;
+	private final Cache<Object, Object> cache;
 
 
 	/**
 	 * Create an {@link org.springframework.cache.jcache.JCacheCache} instance.
 	 * @param jcache backing JCache Cache instance
 	 */
-	public JCacheCache(javax.cache.Cache<Object, Object> jcache) {
+	public JCacheCache(Cache<Object, Object> jcache) {
 		this(jcache, true);
 	}
 
@@ -52,7 +53,7 @@ public JCacheCache(javax.cache.Cache<Object, Object> jcache) {
 	 * @param jcache backing JCache Cache instance
 	 * @param allowNullValues whether to accept and convert null values for this cache
 	 */
-	public JCacheCache(javax.cache.Cache<Object, Object> jcache, boolean allowNullValues) {
+	public JCacheCache(Cache<Object, Object> jcache, boolean allowNullValues) {
 		super(allowNullValues);
 		Assert.notNull(jcache, "Cache must not be null");
 		this.cache = jcache;
@@ -65,7 +66,7 @@ public final String getName() {
 	}
 
 	@Override
-	public final javax.cache.Cache<Object, Object> getNativeCache() {
+	public final Cache<Object, Object> getNativeCache() {
 		return this.cache;
 	}
 

spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2017 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 @@
  */
 public class JCacheCacheManager extends AbstractTransactionSupportingCacheManager {
 
-	private javax.cache.CacheManager cacheManager;
+	private CacheManager cacheManager;
 
 	private boolean allowNullValues = true;
 
@@ -60,14 +60,14 @@ public JCacheCacheManager(CacheManager cacheManager) {
 	/**
 	 * Set the backing JCache {@link javax.cache.CacheManager}.
 	 */
-	public void setCacheManager(javax.cache.CacheManager cacheManager) {
+	public void setCacheManager(CacheManager cacheManager) {
 		this.cacheManager = cacheManager;
 	}
 
 	/**
 	 * Return the backing JCache {@link javax.cache.CacheManager}.
 	 */
-	public javax.cache.CacheManager getCacheManager() {
+	public CacheManager getCacheManager() {
 		return this.cacheManager;
 	}
 

spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -58,7 +58,7 @@ public Collection<CacheOperation> parseCacheAnnotations(Method method) {
 		return parseCacheAnnotations(defaultConfig, method);
 	}
 
-	protected Collection<CacheOperation> parseCacheAnnotations(DefaultCacheConfig cachingConfig, AnnotatedElement ae) {
+	private Collection<CacheOperation> parseCacheAnnotations(DefaultCacheConfig cachingConfig, AnnotatedElement ae) {
 		Collection<CacheOperation> ops = null;
 
 		Collection<Cacheable> cacheables = AnnotatedElementUtils.getAllMergedAnnotations(ae, Cacheable.class);
@@ -68,20 +68,23 @@ protected Collection<CacheOperation> parseCacheAnnotations(DefaultCacheConfig ca
 				ops.add(parseCacheableAnnotation(ae, cachingConfig, cacheable));
 			}
 		}
+
 		Collection<CacheEvict> evicts = AnnotatedElementUtils.getAllMergedAnnotations(ae, CacheEvict.class);
 		if (!evicts.isEmpty()) {
 			ops = lazyInit(ops);
 			for (CacheEvict evict : evicts) {
 				ops.add(parseEvictAnnotation(ae, cachingConfig, evict));
 			}
 		}
+
 		Collection<CachePut> puts = AnnotatedElementUtils.getAllMergedAnnotations(ae, CachePut.class);
 		if (!puts.isEmpty()) {
 			ops = lazyInit(ops);
 			for (CachePut put : puts) {
 				ops.add(parsePutAnnotation(ae, cachingConfig, put));
 			}
 		}
+
 		Collection<Caching> cachings = AnnotatedElementUtils.getAllMergedAnnotations(ae, Caching.class);
 		if (!cachings.isEmpty()) {
 			ops = lazyInit(ops);
@@ -283,7 +286,6 @@ else if (StringUtils.hasText(this.cacheManager)) {
 				builder.setCacheManager(this.cacheManager);
 			}
 		}
-
 	}
 
 }

spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -145,7 +145,7 @@ public final void parse(InputSource ignored) throws SAXException {
 	 * Parse the StAX XML reader passed at construction-time.
 	 * <p><b>NOTE:</b>: The given system identifier is not read, but ignored.
 	 * @param ignored is ignored
-	 * @throws SAXException A SAX exception, possibly wrapping a {@code XMLStreamException}
+	 * @throws SAXException a SAX exception, possibly wrapping a {@code XMLStreamException}
 	 */
 	@Override
 	public final void parse(String ignored) throws SAXException {
@@ -182,13 +182,10 @@ private void parse() throws SAXException {
 	 * @see org.xml.sax.ContentHandler#startPrefixMapping(String, String)
 	 */
 	protected void startPrefixMapping(String prefix, String namespace) throws SAXException {
-		if (getContentHandler() != null) {
+		if (getContentHandler() != null && StringUtils.hasLength(namespace)) {
 			if (prefix == null) {
 				prefix = "";
 			}
-			if (!StringUtils.hasLength(namespace)) {
-				return;
-			}
 			if (!namespace.equals(this.namespaces.get(prefix))) {
 				getContentHandler().startPrefixMapping(prefix, namespace);
 				this.namespaces.put(prefix, namespace);
@@ -201,11 +198,9 @@ protected void startPrefixMapping(String prefix, String namespace) throws SAXExc
 	 * @see org.xml.sax.ContentHandler#endPrefixMapping(String)
 	 */
 	protected void endPrefixMapping(String prefix) throws SAXException {
-		if (getContentHandler() != null) {
-			if (this.namespaces.containsKey(prefix)) {
-				getContentHandler().endPrefixMapping(prefix);
-				this.namespaces.remove(prefix);
-			}
+		if (getContentHandler() != null && this.namespaces.containsKey(prefix)) {
+			getContentHandler().endPrefixMapping(prefix);
+			this.namespaces.remove(prefix);
 		}
 	}
 

spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2018 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,8 +21,6 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.springframework.util.Assert;
-
 /**
  * Abstract base class for {@code XMLStreamReader}s.
  *
@@ -34,7 +32,7 @@ abstract class AbstractXMLStreamReader implements XMLStreamReader {
 	@Override
 	public String getElementText() throws XMLStreamException {
 		if (getEventType() != XMLStreamConstants.START_ELEMENT) {
-			throw new XMLStreamException("parser must be on START_ELEMENT to read next text", getLocation());
+			throw new XMLStreamException("Parser must be on START_ELEMENT to read next text", getLocation());
 		}
 		int eventType = next();
 		StringBuilder builder = new StringBuilder();
@@ -48,11 +46,11 @@ else if (eventType == XMLStreamConstants.PROCESSING_INSTRUCTION ||
 				// skipping
 			}
 			else if (eventType == XMLStreamConstants.END_DOCUMENT) {
-				throw new XMLStreamException("unexpected end of document when reading element text content",
+				throw new XMLStreamException("Unexpected end of document when reading element text content",
 						getLocation());
 			}
 			else if (eventType == XMLStreamConstants.START_ELEMENT) {
-				throw new XMLStreamException("element text content may not contain START_ELEMENT", getLocation());
+				throw new XMLStreamException("Element text content may not contain START_ELEMENT", getLocation());
 			}
 			else {
 				throw new XMLStreamException("Unexpected event type " + eventType, getLocation());
@@ -84,22 +82,21 @@ public String getNamespaceURI() {
 			return getName().getNamespaceURI();
 		}
 		else {
-			throw new IllegalStateException("parser must be on START_ELEMENT or END_ELEMENT state");
+			throw new IllegalStateException("Parser must be on START_ELEMENT or END_ELEMENT state");
 		}
 	}
 
 	@Override
 	public String getNamespaceURI(String prefix) {
-		Assert.notNull(prefix, "No prefix given");
 		return getNamespaceContext().getNamespaceURI(prefix);
 	}
 
 	@Override
 	public boolean hasText() {
 		int eventType = getEventType();
-		return eventType == XMLStreamConstants.SPACE || eventType == XMLStreamConstants.CHARACTERS ||
+		return (eventType == XMLStreamConstants.SPACE || eventType == XMLStreamConstants.CHARACTERS ||
 				eventType == XMLStreamConstants.COMMENT || eventType == XMLStreamConstants.CDATA ||
-				eventType == XMLStreamConstants.ENTITY_REFERENCE;
+				eventType == XMLStreamConstants.ENTITY_REFERENCE);
 	}
 
 	@Override
@@ -109,14 +106,14 @@ public String getPrefix() {
 			return getName().getPrefix();
 		}
 		else {
-			throw new IllegalStateException("parser must be on START_ELEMENT or END_ELEMENT state");
+			throw new IllegalStateException("Parser must be on START_ELEMENT or END_ELEMENT state");
 		}
 	}
 
 	@Override
 	public boolean hasName() {
 		int eventType = getEventType();
-		return eventType == XMLStreamConstants.START_ELEMENT || eventType == XMLStreamConstants.END_ELEMENT;
+		return (eventType == XMLStreamConstants.START_ELEMENT || eventType == XMLStreamConstants.END_ELEMENT);
 	}
 
 	@Override
@@ -174,7 +171,7 @@ public String getAttributeValue(String namespaceURI, String localName) {
 	}
 
 	@Override
-	public boolean hasNext() throws XMLStreamException {
+	public boolean hasNext() {
 		return getEventType() != END_DOCUMENT;
 	}
 
@@ -189,8 +186,7 @@ public char[] getTextCharacters() {
 	}
 
 	@Override
-	public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length)
-			throws XMLStreamException {
+	public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length) {
 		char[] source = getTextCharacters();
 		length = Math.min(length, source.length);
 		System.arraycopy(source, sourceStart, target, targetStart, length);
@@ -201,4 +197,5 @@ public int getTextCharacters(int sourceStart, char[] target, int targetStart, in
 	public int getTextLength() {
 		return getText().length();
 	}
+
 }