X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fmapping%2Fattributes%2Ffromxml%2FSimpleAttributeReadingStrategy.java;h=8f6a7cd1e4d2e4f19918d97fdfbb8f928060a696;hp=cb8f66081b7dee8b0205b34132ed0b131dac98c6;hb=d42fc809d1d74240b7933d74cdbaff428773ad26;hpb=b2d51144854503513151435f164510ef0dd47b1f 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 cb8f66081b..8f6a7cd1e4 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 @@ -12,13 +12,8 @@ import com.google.common.base.Preconditions; import java.util.List; import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.util.xml.XmlElement; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class SimpleAttributeReadingStrategy extends AbstractAttributeReadingStrategy { - private static final Logger logger = LoggerFactory.getLogger(SimpleAttributeReadingStrategy.class); - - public SimpleAttributeReadingStrategy(String nullableDefault) { super(nullableDefault); } @@ -29,20 +24,7 @@ public class SimpleAttributeReadingStrategy extends AbstractAttributeReadingStra Preconditions.checkState(configNodes.size() == 1, "This element should be present only once " + xmlElement + " but was " + configNodes.size()); - String textContent = ""; - try{ - textContent = readElementContent(xmlElement); - }catch(IllegalStateException | NullPointerException e) { - // yuma sends for empty value instead of - logger.warn("Ignoring exception caused by failure to read text element", e); - } - - if (null == textContent){ - throw new NetconfDocumentedException(String.format("This element should contain text %s", xmlElement), - NetconfDocumentedException.ErrorType.application, - NetconfDocumentedException.ErrorTag.invalid_value, - NetconfDocumentedException.ErrorSeverity.error); - } + String textContent = readElementContent(xmlElement); return AttributeConfigElement.create(postprocessNullableDefault(getNullableDefault()), postprocessParsedValue(textContent)); }