Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-2453 (De)Serialize enum values as defined in yang
[controller.git]
/
opendaylight
/
netconf
/
config-netconf-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
confignetconfconnector
/
mapping
/
runtime
/
ModuleRuntime.java
diff --git
a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/ModuleRuntime.java
b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/ModuleRuntime.java
index 4d67c75893a59cc9160902b35a9af34309d74936..ca2c0193424880776abacfb54219c3125d3deb81 100644
(file)
--- a/
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/ModuleRuntime.java
+++ b/
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/ModuleRuntime.java
@@
-13,6
+13,7
@@
import java.util.Collection;
import java.util.Set;
import javax.management.ObjectName;
import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.ModuleConfig;
import java.util.Set;
import javax.management.ObjectName;
import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.ModuleConfig;
+import org.opendaylight.controller.netconf.confignetconfconnector.osgi.EnumResolver;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@
-34,9
+35,9
@@
public class ModuleRuntime {
}
public Element toXml(String namespace, Collection<ObjectName> runtimeBeanOns,
}
public Element toXml(String namespace, Collection<ObjectName> runtimeBeanOns,
- Document document, ModuleConfig moduleConfig, ObjectName configBeanON) {
+ Document document, ModuleConfig moduleConfig, ObjectName configBeanON
, final EnumResolver enumResolver
) {
- Element moduleElement = moduleConfig.toXml(configBeanON, document, namespace);
+ Element moduleElement = moduleConfig.toXml(configBeanON, document, namespace
, enumResolver
);
ObjectName rootName = findRoot(runtimeBeanOns);
ObjectName rootName = findRoot(runtimeBeanOns);
@@
-44,7
+45,7
@@
public class ModuleRuntime {
childrenRuntimeBeans.remove(rootName);
// FIXME: why is this called and not used?
childrenRuntimeBeans.remove(rootName);
// FIXME: why is this called and not used?
- instanceRuntime.toXml(rootName, childrenRuntimeBeans, document, moduleElement, namespace);
+ instanceRuntime.toXml(rootName, childrenRuntimeBeans, document, moduleElement, namespace
, enumResolver
);
return moduleElement;
}
return moduleElement;
}