Merge "Added conflict handling between configuration and state choice nodes. -unique...

[controller.git] / opendaylight / netconf / config-netconf-connector / src / main / java / org / opendaylight / controller / netconf / confignetconfconnector / mapping / attributes / fromxml / AttributeConfigElement.java

diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java
index fa249da7f2c81d98d27d2940c17c314bec8dc55e..a1f46dde54ff078596b709e12e0eeeb8914e7056 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/AttributeConfigElement.java
@@ -8,12 +8,10 @@
 
 package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml;
 
-import javax.management.openmbean.OpenType;
-
-import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc;
+import com.google.common.base.Optional;
 import org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.resolving.AttributeResolvingStrategy;
 
-import com.google.common.base.Optional;
+import javax.management.openmbean.OpenType;
 
 /**
  * Parsed xml element containing configuration for one attribute of an instance
@@ -48,12 +46,12 @@ public class AttributeConfigElement {
 
     }
 
-    public static AttributeConfigElement create(AttributeIfc attributeIfc, Object value) {
-        return new AttributeConfigElement(attributeIfc.getNullableDefault(), value);
+    public static AttributeConfigElement create(Object nullableDefault, Object value) {
+        return new AttributeConfigElement(nullableDefault, value);
     }
 
-    public static AttributeConfigElement createNullValue(AttributeIfc attributeIfc) {
-        return new AttributeConfigElement(attributeIfc.getNullableDefault(), null);
+    public static AttributeConfigElement createNullValue(Object nullableDefault) {
+        return new AttributeConfigElement(nullableDefault, null);
     }
 
     public Object getValue() {