Bug-4827: BGP Add-Path OpenConfig Support II

[bgpcep.git] / bgp / openconfig-impl / src / main / java / org / opendaylight / protocol / bgp / openconfig / impl / moduleconfig / TableTypesFunction.java

diff --git a/bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/TableTypesFunction.java b/bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/TableTypesFunction.java
index d2012878106c4be95d550deb7eb7611ccf56caa3..9f509abe0810551c99343a4c427d63ac04357fa0 100644 (file)
--- a/bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/TableTypesFunction.java
+++ b/bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/TableTypesFunction.java
@@ -66,14 +66,26 @@ final class TableTypesFunction {
                         }
                     }).toList();
 
-                return toTableTypes(function, afiSafis, afiSafiToModuleName(afiSafis, modules), moduleNameToService);
+                return toServices(function, afiSafis, afiSafiToModuleName(afiSafis, modules), moduleNameToService);
             }
             throw new IllegalStateException("No BgpTableType service present in configuration.");
-        } catch (ReadFailedException e) {
+        } catch (final ReadFailedException e) {
             throw new IllegalStateException("Failed to read service.", e);
         }
     }
 
+    public static <T extends ServiceRef & ChildOf<Module>> List<T> toServices(final Function<String, T> function, final List<AfiSafi> afiSafis,
+        final Map<Class<? extends AfiSafiType>, String> afiSafiToModuleName, final Map<String, String> moduleNameToService) {
+        final List<T> serives = new ArrayList<>(afiSafis.size());
+        for (final AfiSafi afiSafi : afiSafis) {
+            final String moduleName = afiSafiToModuleName.get(afiSafi.getAfiSafiName());
+            if (moduleName != null) {
+                serives.add(function.apply(moduleNameToService.get(moduleName)));
+            }
+        }
+        return serives;
+    }
+
     private static Map<Class<? extends AfiSafiType>, String> afiSafiToModuleName(final List<AfiSafi> afiSafis, final List<Module> modules) {
         final Map<Class<? extends AfiSafiType>, String> afiSafiToModuleName = new HashMap<>(afiSafis.size());
         for (final Module module : modules) {
@@ -86,16 +98,4 @@ final class TableTypesFunction {
         }
         return afiSafiToModuleName;
     }
-
-    private static <T extends ServiceRef & ChildOf<Module>> List<T> toTableTypes(final Function<String, T> function, final List<AfiSafi> afiSafis,
-        final Map<Class<? extends AfiSafiType>, String> afiSafiToModuleName, final Map<String, String> moduleNameToService) {
-        final List<T> tableTypes = new ArrayList<>(afiSafis.size());
-        for (final AfiSafi afiSafi : afiSafis) {
-            final String moduleName = afiSafiToModuleName.get(afiSafi.getAfiSafiName());
-            if (moduleName != null) {
-                tableTypes.add(function.apply(moduleNameToService.get(moduleName)));
-            }
-        }
-        return tableTypes;
-    }
 }