Use Iterators.asEnumeration()

There is no point in open-coding an implementation, use Guava instead.

Change-Id: I8cad2cec9501178d69916636263f116cec8f7750
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-filterchain/src/main/java/org/opendaylight/aaa/filterchain/configuration/impl/CustomFilterAdapterConfigurationImpl.java b/aaa-filterchain/src/main/java/org/opendaylight/aaa/filterchain/configuration/impl/CustomFilterAdapterConfigurationImpl.java
index 1aa2dac62f30f1b72706b0a0f71da3c6c22fed63..0b1ec8a571f5ef9e1a80b8c185aff6817827f01f 100644 (file)
--- a/aaa-filterchain/src/main/java/org/opendaylight/aaa/filterchain/configuration/impl/CustomFilterAdapterConfigurationImpl.java
+++ b/aaa-filterchain/src/main/java/org/opendaylight/aaa/filterchain/configuration/impl/CustomFilterAdapterConfigurationImpl.java
@@ -11,12 +11,12 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterators;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -236,19 +236,8 @@ public final class CustomFilterAdapterConfigurationImpl implements CustomFilterA
 
         @Override
         public Enumeration<String> getInitParameterNames() {
-            return filterConfig != null ? new Enumeration<>() {
-                final Iterator<String> keySet = filterConfig.keySet().iterator();
-
-                @Override
-                public boolean hasMoreElements() {
-                    return keySet.hasNext();
-                }
-
-                @Override
-                public String nextElement() {
-                    return keySet.next();
-                }
-            } : Collections.emptyEnumeration();
+            return filterConfig != null ? Iterators.asEnumeration(filterConfig.keySet().iterator())
+                : Collections.emptyEnumeration();
         }
 
         @Override