config-manager-facade-xml: use lambdas

[controller.git] / opendaylight / config / config-manager-facade-xml / src / main / java / org / opendaylight / controller / config / facade / xml / mapping / config / Config.java

diff --git a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/Config.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/Config.java
index 7aec4946e1af524e5fe5938ad20993cdf1dc2989..1b62183be1bf2b509d40623af9bfb48ee6317370 100644 (file)
--- a/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/Config.java
+++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/mapping/config/Config.java
@@ -151,14 +151,14 @@ public class Config {
 
         Map<String, Multimap<String, ModuleElementResolved>> retVal = Maps.newHashMap();
 
-        for (XmlElement moduleElement : moduleElements) {
-            ResolvingStrategy<ModuleElementResolved> resolvingStrategy = (moduleMapping, moduleElement1,
-                    serviceTracker1, instanceName, moduleNamespace,
-                    defaultStrategy) -> moduleMapping.fromXml(moduleElement1, serviceTracker1, instanceName,
-                            moduleNamespace, defaultStrategy, identityMap, enumResolver);
+        ResolvingStrategy<ModuleElementResolved> resolvingStrategy = (moduleMapping, moduleElement, serviceTracker1,
+                instanceName, moduleNamespace, defaultStrategy) -> moduleMapping.fromXml(moduleElement, serviceTracker1,
+                        instanceName, moduleNamespace, defaultStrategy, identityMap, enumResolver);
 
+        for (XmlElement moduleElement : moduleElements) {
             resolveModule(retVal, serviceTracker, moduleElement, defaultEditStrategyType, resolvingStrategy);
         }
+
         return retVal;
     }
 
@@ -174,18 +174,19 @@ public class Config {
 
         Map<String, Multimap<String, ModuleElementDefinition>> retVal = Maps.newHashMap();
 
-        for (XmlElement moduleElement : moduleElements) {
-            ResolvingStrategy<ModuleElementDefinition> resolvingStrategy = (moduleMapping, moduleElement1,
-                    serviceTracker1, instanceName, moduleNamespace, defaultStrategy) -> {
-                // TODO: add check for conflicts between global and local
-                // edit strategy
-                String perInstanceEditStrategy = moduleElement1.getAttribute(XmlMappingConstants.OPERATION_ATTR_KEY,
-                        XmlMappingConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0);
-                return new ModuleElementDefinition(instanceName, perInstanceEditStrategy, defaultStrategy);
-            };
+        ResolvingStrategy<ModuleElementDefinition> resolvingStrategy = (moduleMapping, moduleElement, serviceTracker1,
+                instanceName, moduleNamespace, defaultStrategy) -> {
+            // TODO: add check for conflicts between global and local edit
+            // strategy
+            String perInstanceEditStrategy = moduleElement.getAttribute(XmlMappingConstants.OPERATION_ATTR_KEY,
+                    XmlMappingConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0);
+            return new ModuleElementDefinition(instanceName, perInstanceEditStrategy, defaultStrategy);
+        };
 
+        for (XmlElement moduleElement : moduleElements) {
             resolveModule(retVal, serviceTracker, moduleElement, defaultEditStrategyType, resolvingStrategy);
         }
+
         return retVal;
     }