SAK-32493 EnumerationIterator: @deprecated, raw (sakaiproject#4349)

alaminreaz · Apr 28, 2017 · 8c2745f · 8c2745f
1 parent 932812c
commit 8c2745f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/velocity/tool/src/java/org/sakaiproject/cheftool/Configuration.java b/velocity/tool/src/java/org/sakaiproject/cheftool/Configuration.java
@@ -25,6 +25,8 @@
 
 public class Configuration extends HashMap
 {
+	private static final long serialVersionUID = 1L;
+
 	public String getString(String name)
 	{
 		return (String) get(name);

diff --git a/velocity/tool/src/java/org/sakaiproject/cheftool/EnumerationIterator.java b/velocity/tool/src/java/org/sakaiproject/cheftool/EnumerationIterator.java
@@ -28,21 +28,23 @@
  * <p>
  * EnumerationIterator is an iterator over an enumeration.
  * </p>
+ * @deprecated use {@link org.apache.commons.collections4.iterators.EnumerationIterator} instead, this will be removed after 12.0 - May 2017
  */
-public class EnumerationIterator implements Iterator
+@Deprecated
+public class EnumerationIterator<E> implements Iterator<E>
 {
 	/** The enumeration over which this iterates. */
-	protected Enumeration m_enum = null;
+	protected Enumeration<E> m_enum = null;
 
-	public EnumerationIterator(Enumeration e)
+	public EnumerationIterator(Enumeration<E> e)
 	{
 		m_enum = e;
 
 	} // EnumerationIterator
 
-	public Object next()
+	public E next()
 	{
-		return m_enum.nextElement();
+		return (E) m_enum.nextElement();
 	}
 
 	public boolean hasNext()