Use Optional.isEmpty()

[netconf.git] / netconf / mdsal-netconf-connector / src / main / java / org / opendaylight / netconf / mdsal / connector / ops / CopyConfig.java

diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java
index dd3889eec94e3a0fcfd32468f0526c49524a465e..341f84bb3a25e5a7c6160289e1aa88e88e36417d 100644 (file)
--- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java
+++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java
@@ -104,7 +104,7 @@ public final class CopyConfig extends AbstractEdit {
         // <copy-config>, unlike <edit-config>, always replaces entire configuration,
         // so remove old configuration first:
         final DOMDataTreeReadWriteTransaction rwTx = transactionProvider.getOrCreateTransaction();
-        rwTx.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, EMPTY_ROOT_NODE);
+        rwTx.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty(), EMPTY_ROOT_NODE);
 
         // Then create nodes present in the <config> element:
         for (final XmlElement element : configElements) {
@@ -121,7 +121,7 @@ public final class CopyConfig extends AbstractEdit {
 
     private static XmlElement getSourceElement(final XmlElement parent) throws DocumentedException {
         final Optional<XmlElement> sourceElement = parent.getOnlyChildElementOptionally(SOURCE_KEY);
-        if (!sourceElement.isPresent()) {
+        if (sourceElement.isEmpty()) {
             throw new DocumentedException("<source> element is missing",
                 DocumentedException.ErrorType.PROTOCOL,
                 DocumentedException.ErrorTag.MISSING_ELEMENT,
@@ -169,7 +169,7 @@ public final class CopyConfig extends AbstractEdit {
     private ContainerNode readData(final XmlElement source) throws DocumentedException {
         final Datastore sourceDatastore = getDatastore(source);
         final DOMDataTreeReadWriteTransaction rwTx = getTransaction(sourceDatastore);
-        final YangInstanceIdentifier dataRoot = YangInstanceIdentifier.EMPTY;
+        final YangInstanceIdentifier dataRoot = YangInstanceIdentifier.empty();
         try {
             final Optional<NormalizedNode<?, ?>> normalizedNodeOptional = rwTx.read(
                 LogicalDatastoreType.CONFIGURATION, dataRoot).get();