Polishing (backported from several master changes)

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java

@@ -139,7 +139,7 @@ public static String[] beanNamesIncludingAncestors(ListableBeanFactory lbf) {
 	 * @param type the type that beans must match
 	 * @return the array of matching bean names, or an empty array if none
 	 */
-	public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lbf, Class type) {
+	public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lbf, Class<?> type) {
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForType(type);
 		if (lbf instanceof HierarchicalBeanFactory) {
@@ -181,7 +181,7 @@ public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lb
 	 * @return the array of matching bean names, or an empty array if none
 	 */
 	public static String[] beanNamesForTypeIncludingAncestors(
-			ListableBeanFactory lbf, Class type, boolean includeNonSingletons, boolean allowEagerInit) {
+			ListableBeanFactory lbf, Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
 
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForType(type, includeNonSingletons, allowEagerInit);

spring-context/src/main/java/org/springframework/context/event/AbstractApplicationEventMulticaster.java

@@ -130,7 +130,7 @@ protected Collection<ApplicationListener> getApplicationListeners() {
 	protected Collection<ApplicationListener> getApplicationListeners(ApplicationEvent event) {
 		Class<? extends ApplicationEvent> eventType = event.getClass();
 		Object source = event.getSource();
-		Class sourceType = (source == null ? null : source.getClass());
+		Class<?> sourceType = (source != null ? source.getClass() : null);
 		ListenerCacheKey cacheKey = new ListenerCacheKey(eventType, sourceType);
 		ListenerRetriever retriever = this.retrieverCache.get(cacheKey);
 		if (retriever != null) {
@@ -193,11 +193,11 @@ protected boolean supportsEvent(
 	 */
 	private static class ListenerCacheKey {
 
-		private final Class eventType;
+		private final Class<?> eventType;
 
-		private final Class sourceType;
+		private final Class<?> sourceType;
 
-		public ListenerCacheKey(Class eventType, Class sourceType) {
+		public ListenerCacheKey(Class<?> eventType, Class<?> sourceType) {
 			this.eventType = eventType;
 			this.sourceType = sourceType;
 		}
@@ -208,14 +208,13 @@ public boolean equals(Object other) {
 				return true;
 			}
 			ListenerCacheKey otherKey = (ListenerCacheKey) other;
-			return ObjectUtils.nullSafeEquals(this.eventType, otherKey.eventType)
-					&& ObjectUtils.nullSafeEquals(this.sourceType, otherKey.sourceType);
+			return ObjectUtils.nullSafeEquals(this.eventType, otherKey.eventType) &&
+					ObjectUtils.nullSafeEquals(this.sourceType, otherKey.sourceType);
 		}
 
 		@Override
 		public int hashCode() {
-			return ObjectUtils.nullSafeHashCode(this.eventType) * 29
-					+ ObjectUtils.nullSafeHashCode(this.sourceType);
+			return ObjectUtils.nullSafeHashCode(this.eventType) * 29 + ObjectUtils.nullSafeHashCode(this.sourceType);
 		}
 	}
 

spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -48,16 +48,15 @@
  * references at any time, so it may appear that an unknown thread is silently removing
  * entries.
  *
- * <p>If not explicitly specified this implementation will use
+ * <p>If not explicitly specified, this implementation will use
  * {@linkplain SoftReference soft entry references}.
  *
  * @param <K> The key type
  * @param <V> The value type
  * @author Phillip Webb
  * @since 3.2
  */
-public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implements
-		ConcurrentMap<K, V> {
+public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implements ConcurrentMap<K, V> {
 
 	private static final int DEFAULT_INITIAL_CAPACITY = 16;
 
@@ -82,6 +81,9 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 	 */
 	private final float loadFactor;
 
+	/**
+	 * The reference type: SOFT or WEAK.
+	 */
 	private final ReferenceType referenceType;
 
 	/**
@@ -99,17 +101,15 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 	 * Create a new {@code ConcurrentReferenceHashMap} instance.
 	 */
 	public ConcurrentReferenceHashMap() {
-		this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,
-				DEFAULT_REFERENCE_TYPE);
+		this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
 	}
 
 	/**
 	 * Create a new {@code ConcurrentReferenceHashMap} instance.
 	 * @param initialCapacity the initial capacity of the map
 	 */
 	public ConcurrentReferenceHashMap(int initialCapacity) {
-		this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,
-				DEFAULT_REFERENCE_TYPE);
+		this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
 	}
 
 	/**
@@ -119,45 +119,44 @@ public ConcurrentReferenceHashMap(int initialCapacity) {
 	 *        exceeds this value resize will be attempted
 	 */
 	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor) {
-		this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL,
-				DEFAULT_REFERENCE_TYPE);
+		this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL, DEFAULT_REFERENCE_TYPE);
 	}
 
 	/**
 	 * Create a new {@code ConcurrentReferenceHashMap} instance.
 	 * @param initialCapacity the initial capacity of the map
-	 * @param concurrencyLevel the expected number of threads that will concurrently write
-	 *        to the map
+	 * @param concurrencyLevel the expected number of threads that will concurrently
+	 * write to the map
 	 */
 	public ConcurrentReferenceHashMap(int initialCapacity, int concurrencyLevel) {
-		this(initialCapacity, DEFAULT_LOAD_FACTOR, concurrencyLevel,
-				DEFAULT_REFERENCE_TYPE);
+		this(initialCapacity, DEFAULT_LOAD_FACTOR, concurrencyLevel, DEFAULT_REFERENCE_TYPE);
 	}
 
 	/**
 	 * Create a new {@code ConcurrentReferenceHashMap} instance.
 	 * @param initialCapacity the initial capacity of the map
-	 * @param loadFactor the load factor. When the average number of references per table
-	 *        exceeds this value resize will be attempted
-	 * @param concurrencyLevel the expected number of threads that will concurrently write
-	 *        to the map
+	 * @param loadFactor the load factor. When the average number of references per
+	 * table exceeds this value, resize will be attempted.
+	 * @param concurrencyLevel the expected number of threads that will concurrently
+	 * write to the map
 	 */
-	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor,
-			int concurrencyLevel) {
+	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor, int concurrencyLevel) {
 		this(initialCapacity, loadFactor, concurrencyLevel, DEFAULT_REFERENCE_TYPE);
 	}
 
 	/**
 	 * Create a new {@code ConcurrentReferenceHashMap} instance.
 	 * @param initialCapacity the initial capacity of the map
-	 * @param loadFactor the load factor. When the average number of references per table
-	 *        exceeds this value resize will be attempted
-	 * @param concurrencyLevel the expected number of threads that will concurrently write
-	 *        to the map
+	 * @param loadFactor the load factor. When the average number of references per
+	 * table exceeds this value, resize will be attempted.
+	 * @param concurrencyLevel the expected number of threads that will concurrently
+	 * write to the map
 	 * @param referenceType the reference type used for entries
 	 */
-	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor,
-			int concurrencyLevel, ReferenceType referenceType) {
+	@SuppressWarnings("unchecked")
+	public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor, int concurrencyLevel,
+			ReferenceType referenceType) {
+
 		Assert.isTrue(concurrencyLevel > 0, "ConcurrencyLevel must be positive");
 		Assert.isTrue(initialCapacity >= 0, "InitialCapacity must not be negative");
 		Assert.isTrue(loadFactor > 0f, "LoadFactor must be positive");
@@ -167,17 +166,12 @@ public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor,
 		int size = 1 << this.shift;
 		this.referenceType = referenceType;
 		int roundedUpSegmentCapactity = (int) ((initialCapacity + size - 1L) / size);
-		this.segments = createSegmentsArray(size);
+		this.segments = (Segment[]) Array.newInstance(Segment.class, size);
 		for (int i = 0; i < this.segments.length; i++) {
 			this.segments[i] = new Segment(roundedUpSegmentCapactity);
 		}
 	}
 
-	@SuppressWarnings("unchecked")
-	private Segment[] createSegmentsArray(int size) {
-		return (Segment[]) Array.newInstance(Segment.class, size);
-	}
-
 
 	protected final float getLoadFactor() {
 		return this.loadFactor;
@@ -222,7 +216,7 @@ protected int getHash(Object o) {
 	public V get(Object key) {
 		Reference<K, V> reference = getReference(key, Restructure.WHEN_NECESSARY);
 		Entry<K, V> entry = (reference == null ? null : reference.get());
-		return (entry == null ? null : entry.getValue());
+		return (entry != null ? entry.getValue() : null);
 	}
 
 	@Override
@@ -388,7 +382,7 @@ public static enum ReferenceType {
 		/**
 		 * Use {@link WeakReference}s.
 		 */
-		WEAK;
+		WEAK
 	}
 
 
@@ -421,14 +415,12 @@ protected final class Segment extends ReentrantLock {
 		 */
 		private int resizeThreshold;
 
-
 		public Segment(int initialCapacity) {
 			this.referenceManager = createReferenceManager();
 			this.initialSize = 1 << calculateShift(initialCapacity, MAXIMUM_SEGMENT_SIZE);
 			setReferences(createReferenceArray(this.initialSize));
 		}
 
-
 		public Reference<K, V> getReference(Object key, int hash, Restructure restructure) {
 			if (restructure == Restructure.WHEN_NECESSARY) {
 				restructureIfNecessary(false);
@@ -452,17 +444,13 @@ public Reference<K, V> getReference(Object key, int hash, Restructure restructur
 		 * @return the result of the operation
 		 */
 		public <T> T doTask(final int hash, final Object key, final Task<T> task) {
-
 			boolean resize = task.hasOption(TaskOption.RESIZE);
-
 			if (task.hasOption(TaskOption.RESTRUCTURE_BEFORE)) {
 				restructureIfNecessary(resize);
 			}
-
 			if (task.hasOption(TaskOption.SKIP_IF_EMPTY) && (this.count == 0)) {
 				return task.execute(null, null, null);
 			}
-
 			lock();
 			try {
 				final int index = getIndex(hash, this.references);
@@ -480,7 +468,8 @@ public void add(V value) {
 					}
 				};
 				return task.execute(reference, entry, entries);
-			} finally {
+			}
+			finally {
 				unlock();
 				if (task.hasOption(TaskOption.RESTRUCTURE_AFTER)) {
 					restructureIfNecessary(resize);
@@ -569,8 +558,7 @@ private void restructureIfNecessary(boolean allowResize) {
 			}
 		}
 
-		private Reference<K, V> findInChain(Reference<K, V> reference, Object key,
-				int hash) {
+		private Reference<K, V> findInChain(Reference<K, V> reference, Object key, int hash) {
 			while (reference != null) {
 				if (reference.getHash() == hash) {
 					Entry<K, V> entry = reference.get();
@@ -752,6 +740,7 @@ protected T execute(Reference<K, V> reference, Entry<K, V> entry) {
 	 * Various options supported by a {@link Task}.
 	 */
 	private static enum TaskOption {
+
 		RESTRUCTURE_BEFORE, RESTRUCTURE_AFTER, SKIP_IF_EMPTY, RESIZE
 	}
 
@@ -783,8 +772,7 @@ public Iterator<Map.Entry<K, V>> iterator() {
 		public boolean contains(Object o) {
 			if (o != null && o instanceof Map.Entry<?, ?>) {
 				Map.Entry<?, ?> entry = (java.util.Map.Entry<?, ?>) o;
-				Reference<K, V> reference = ConcurrentReferenceHashMap.this.getReference(
-						entry.getKey(), Restructure.NEVER);
+				Reference<K, V> reference = ConcurrentReferenceHashMap.this.getReference(entry.getKey(), Restructure.NEVER);
 				Entry<K, V> other = (reference == null ? null : reference.get());
 				if (other != null) {
 					return ObjectUtils.nullSafeEquals(entry.getValue(), other.getValue());
@@ -797,8 +785,7 @@ public boolean contains(Object o) {
 		public boolean remove(Object o) {
 			if (o instanceof Map.Entry<?, ?>) {
 				Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
-				return ConcurrentReferenceHashMap.this.remove(entry.getKey(),
-						entry.getValue());
+				return ConcurrentReferenceHashMap.this.remove(entry.getKey(), entry.getValue());
 			}
 			return false;
 		}
@@ -897,6 +884,7 @@ public void remove() {
 	 * The types of restructuring that can be performed.
 	 */
 	protected static enum Restructure {
+
 		WHEN_NECESSARY, NEVER
 	}
 
@@ -916,8 +904,7 @@ protected class ReferenceManager {
 		 * @param next the next reference in the chain or {@code null}
 		 * @return a new {@link Reference}
 		 */
-		public Reference<K, V> createReference(Entry<K, V> entry, int hash,
-				Reference<K, V> next) {
+		public Reference<K, V> createReference(Entry<K, V> entry, int hash, Reference<K, V> next) {
 			if (ConcurrentReferenceHashMap.this.referenceType == ReferenceType.WEAK) {
 				return new WeakEntryReference<K, V>(entry, hash, next, this.queue);
 			}
@@ -941,15 +928,13 @@ public Reference<K, V> pollForPurge() {
 	/**
 	 * Internal {@link Reference} implementation for {@link SoftReference}s.
 	 */
-	private static final class SoftEntryReference<K, V> extends
-			SoftReference<Entry<K, V>> implements Reference<K, V> {
+	private static final class SoftEntryReference<K, V> extends SoftReference<Entry<K, V>> implements Reference<K, V> {
 
 		private final int hash;
 
 		private final Reference<K, V> nextReference;
 
-		public SoftEntryReference(Entry<K, V> entry, int hash, Reference<K, V> next,
-				ReferenceQueue<Entry<K, V>> queue) {
+		public SoftEntryReference(Entry<K, V> entry, int hash, Reference<K, V> next, ReferenceQueue<Entry<K, V>> queue) {
 			super(entry, queue);
 			this.hash = hash;
 			this.nextReference = next;
@@ -973,15 +958,13 @@ public void release() {
 	/**
 	 * Internal {@link Reference} implementation for {@link WeakReference}s.
 	 */
-	private static final class WeakEntryReference<K, V> extends
-			WeakReference<Entry<K, V>> implements Reference<K, V> {
+	private static final class WeakEntryReference<K, V> extends WeakReference<Entry<K, V>> implements Reference<K, V> {
 
 		private final int hash;
 
 		private final Reference<K, V> nextReference;
 
-		public WeakEntryReference(Entry<K, V> entry, int hash, Reference<K, V> next,
-				ReferenceQueue<Entry<K, V>> queue) {
+		public WeakEntryReference(Entry<K, V> entry, int hash, Reference<K, V> next, ReferenceQueue<Entry<K, V>> queue) {
 			super(entry, queue);
 			this.hash = hash;
 			this.nextReference = next;
@@ -1000,4 +983,5 @@ public void release() {
 			clear();
 		}
 	}
+
 }