Permalink
Browse files

Deprecate CompositeIterator in favor Spring core.

Deprecate existing class and refactor internal code to use the org.spring.util version that 
has been available since Spring 3.0

Issues: SWF-1532
  • Loading branch information...
1 parent 22289e4 commit b7342dbc20e244d884fade9b40addd8667a62af0 Phillip Webb committed Apr 12, 2012
@@ -27,7 +27,9 @@
* iterators which are invoked in sequence untill all iterators are exhausted.
*
* @author Erwin Vervaet
+ * @deprecated in favor of {@link org.springframework.util.CompositeIterator}
*/
+@Deprecated
public class CompositeIterator<E> implements Iterator<E> {
private List<Iterator<E>> iterators = new LinkedList<Iterator<E>>();
@@ -74,4 +76,4 @@ public E next() {
public void remove() {
throw new UnsupportedOperationException("Remove is not supported");
}
-}
+}
@@ -27,6 +27,7 @@
*
* @author Erwin Vervaet
*/
+@Deprecated
public class CompositeIteratorTests extends TestCase {
public void testNoIterators() {
@@ -19,9 +19,9 @@
import javax.portlet.PortletRequest;
-import org.springframework.binding.collection.CompositeIterator;
import org.springframework.binding.collection.StringKeyedMapAdapter;
import org.springframework.util.Assert;
+import org.springframework.util.CompositeIterator;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.portlet.multipart.MultipartActionRequest;
import org.springframework.webflow.core.collection.CollectionUtils;
@@ -19,9 +19,9 @@
import javax.servlet.http.HttpServletRequest;
-import org.springframework.binding.collection.CompositeIterator;
import org.springframework.binding.collection.StringKeyedMapAdapter;
import org.springframework.util.Assert;
+import org.springframework.util.CompositeIterator;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.webflow.core.collection.CollectionUtils;

0 comments on commit b7342db

Please sign in to comment.