Merge "Bug 460 - Fix warning throughout netconf subsystem"

[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..dcc2fa15439b01ecd15eca5144f15eaa3a77086b 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,11 @@
 
 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.api.NetconfDocumentedException;
 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
@@ -41,19 +40,18 @@ public class AttributeConfigElement {
     }
 
     public void resolveValue(AttributeResolvingStrategy<?, ? extends OpenType<?>> attributeResolvingStrategy,
-            String attrName) {
+            String attrName) throws NetconfDocumentedException {
         resolvedValue = attributeResolvingStrategy.parseAttribute(attrName, value);
         Optional<?> resolvedDefault = attributeResolvingStrategy.parseAttribute(attrName, dafaultValue);
         resolvedDefaultValue = resolvedDefault.isPresent() ? resolvedDefault.get() : null;
-
     }
 
-    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() {