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
This commit is contained in:
@@ -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<E> implements Iterator<E> {
|
||||
|
||||
private List<Iterator<E>> iterators = new LinkedList<Iterator<E>>();
|
||||
@@ -74,4 +76,4 @@ public class CompositeIterator<E> implements Iterator<E> {
|
||||
public void remove() {
|
||||
throw new UnsupportedOperationException("Remove is not supported");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ import junit.framework.TestCase;
|
||||
*
|
||||
* @author Erwin Vervaet
|
||||
*/
|
||||
@Deprecated
|
||||
public class CompositeIteratorTests extends TestCase {
|
||||
|
||||
public void testNoIterators() {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user