moved collection utilities to util

org.springframework.core/src/main/java/org/springframework/core/collection/package-info.java

@@ -1,6 +0,0 @@
-
-/**
- * Collection extensions used in the framework.
- */
-package org.springframework.core.collection;
-

org.springframework.core/src/main/java/org/springframework/util/CompositeIterator.java

@@ -13,18 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.core.collection;
+package org.springframework.util;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import org.springframework.util.Assert;
-
 /**
- * Iterator that combines multiple other iterators. This is a simple implementation that just maintains a list of
- * iterators which are invoked in sequence untill all iterators are exhausted.
+ * Iterator that combines multiple other iterators.
+ * This implementation maintains a list of iterators which are invoked in sequence until all iterators are exhausted.
  * @author Erwin Vervaet
  */
 public class CompositeIterator<E> implements Iterator<E> {

org.springframework.core/src/main/java/org/springframework/util/SharedMap.java

@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.core.collection;
+package org.springframework.util;
 
 import java.util.Map;
 
 /**
  * A simple subinterface of {@link Map} that exposes a mutex that application code can synchronize on.
  * <p>
- * Expected to be implemented by Maps that are backed by shared objects that require synchronization between multiple
- * threads. An example would be the HTTP session map.
- * 
+ * Expected to be implemented by Maps that are backed by shared objects that require synchronization between multiple threads.
+ * An example would be the HTTP session map.
  * @author Keith Donald
  */
 public interface SharedMap<K, V> extends Map<K, V> {

org.springframework.core/src/main/java/org/springframework/util/SharedMapDecorator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.core.collection;
+package org.springframework.util;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -23,9 +23,9 @@ import java.util.Set;
 import org.springframework.core.style.ToStringCreator;
 
 /**
- * A map decorator that implements <code>SharedMap</code>. By default, simply returns the map itself as the mutex.
+ * A map decorator that implements <code>SharedMap</code>.
+ * By default, simply returns the map itself as the mutex.
  * Subclasses may override to return a different mutex object.
- * 
  * @author Keith Donald
  */
 @SuppressWarnings("serial")

org.springframework.core/src/main/java/org/springframework/util/StringKeyedMapAdapter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.core.collection;
+package org.springframework.util;
 
 import java.util.AbstractSet;
 import java.util.Collection;
@@ -23,9 +23,8 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 
 /**
- * Base class for map adapters whose keys are String values. Concrete classes need only implement the abstract hook
- * methods defined by this class.
- * 
+ * Base class for map adapters whose keys are String values.
+ * Concrete classes need only implement the abstract hook methods defined by this class.
  * @author Keith Donald
  */
 public abstract class StringKeyedMapAdapter<V> implements Map<String, V> {