X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fmapping%2Fattributes%2Ffromxml%2FSimpleAttributeReadingStrategy.java;h=a8605243af3f77f587563d453ea69d51401f2aa4;hb=03abf047ba966c53f4901d36ae5198156d66dc05;hp=c5c287ffe2acf7561864dc5044d59eaaebce7bfe;hpb=a92d9d6a21a0f6ca8d2153795721f500eaf29ee9;p=controller.git diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleAttributeReadingStrategy.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleAttributeReadingStrategy.java index c5c287ffe2..a8605243af 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleAttributeReadingStrategy.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/attributes/fromxml/SimpleAttributeReadingStrategy.java @@ -9,23 +9,14 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.attributes.fromxml; import com.google.common.base.Preconditions; -import org.opendaylight.controller.config.yangjmxgenerator.attribute.AttributeIfc; import org.opendaylight.controller.netconf.util.xml.XmlElement; -import javax.management.openmbean.OpenType; import java.util.List; -public class SimpleAttributeReadingStrategy extends AbstractAttributeReadingStrategy { +public class SimpleAttributeReadingStrategy extends AbstractAttributeReadingStrategy { - public SimpleAttributeReadingStrategy(AttributeIfc attributeIfc) { - super(attributeIfc); - } - - /** - * @param elementOpenType - */ - public SimpleAttributeReadingStrategy(OpenType elementOpenType) { - super(new AttributeIfcWrapper(elementOpenType)); + public SimpleAttributeReadingStrategy(String nullableDefault) { + super(nullableDefault); } @Override @@ -37,50 +28,17 @@ public class SimpleAttributeReadingStrategy extends AbstractAttributeReadingStra String textContent = xmlElement.getTextContent(); Preconditions.checkNotNull(textContent, "This element should contain text %s", xmlElement); - return AttributeConfigElement.create(getAttributeIfc(), textContent); + return AttributeConfigElement.create(postprocessNullableDefault(getNullableDefault()), + postprocessParsedValue(textContent)); } - /** - * Wrapper for JavaAttribute inner element attributes (in case JavaAttribute - * is array) - */ - static class AttributeIfcWrapper implements AttributeIfc { - - private final OpenType elementOpenType; - - public AttributeIfcWrapper(OpenType elementOpenType) { - this.elementOpenType = elementOpenType; - } - - @Override - public String getAttributeYangName() { - return null; - } - - @Override - public String getNullableDescription() { - return null; - } - - @Override - public String getNullableDefault() { - return null; - } - - @Override - public String getUpperCaseCammelCase() { - return null; - } - - @Override - public String getLowerCaseCammelCase() { - return null; - } - - @Override - public OpenType getOpenType() { - return elementOpenType; - } + @Override + protected Object postprocessNullableDefault(String nullableDefault) { + return nullableDefault; + } + protected Object postprocessParsedValue(String textContent) { + return textContent; } + }