diff --git a/spring-binding/src/main/java/org/springframework/binding/collection/CompositeIterator.java b/spring-binding/src/main/java/org/springframework/binding/collection/CompositeIterator.java index 6ba48529..cd617be2 100644 --- a/spring-binding/src/main/java/org/springframework/binding/collection/CompositeIterator.java +++ b/spring-binding/src/main/java/org/springframework/binding/collection/CompositeIterator.java @@ -27,7 +27,9 @@ import org.springframework.util.Assert; * 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 implements Iterator { private List> iterators = new LinkedList>(); @@ -74,4 +76,4 @@ public class CompositeIterator implements Iterator { public void remove() { throw new UnsupportedOperationException("Remove is not supported"); } -} +} diff --git a/spring-binding/src/test/java/org/springframework/binding/collection/CompositeIteratorTests.java b/spring-binding/src/test/java/org/springframework/binding/collection/CompositeIteratorTests.java index 790a7484..0907ac11 100644 --- a/spring-binding/src/test/java/org/springframework/binding/collection/CompositeIteratorTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/collection/CompositeIteratorTests.java @@ -27,6 +27,7 @@ import junit.framework.TestCase; * * @author Erwin Vervaet */ +@Deprecated public class CompositeIteratorTests extends TestCase { public void testNoIterators() { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletRequestParameterMap.java b/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletRequestParameterMap.java index 91c24213..cbb8b369 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletRequestParameterMap.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletRequestParameterMap.java @@ -19,9 +19,9 @@ import java.util.Iterator; 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; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/HttpServletRequestParameterMap.java b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/HttpServletRequestParameterMap.java index 5df5aa53..f647ca4c 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/HttpServletRequestParameterMap.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/HttpServletRequestParameterMap.java @@ -19,9 +19,9 @@ import java.util.Iterator; 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;