Merge "Removing { } from NormalizedNodeJsonBodyWriter"

[controller.git] / opendaylight / netconf / config-netconf-connector / src / main / java / org / opendaylight / controller / netconf / confignetconfconnector / operations / Validate.java

diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java
index 1a7d50e5fabbc91f1359a3295a80f3f0418d6340..6fc7165ed7b490861d03f0ffbae0e0aa253486fa 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/Validate.java
@@ -9,29 +9,28 @@
 package org.opendaylight.controller.netconf.confignetconfconnector.operations;
 
 import com.google.common.base.Optional;
+import java.util.HashMap;
+import java.util.Map;
 import org.opendaylight.controller.config.api.ValidationException;
 import org.opendaylight.controller.config.util.ConfigRegistryClient;
 import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
 import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorSeverity;
 import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorTag;
 import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorType;
+import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.controller.netconf.confignetconfconnector.transactions.TransactionProvider;
 import org.opendaylight.controller.netconf.util.xml.XmlElement;
-import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants;
 import org.opendaylight.controller.netconf.util.xml.XmlUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class Validate extends AbstractConfigNetconfOperation {
 
     public static final String VALIDATE = "validate";
 
-    private static final Logger logger = LoggerFactory.getLogger(Validate.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Validate.class);
 
     private final TransactionProvider transactionProvider;
 
@@ -70,10 +69,10 @@ public class Validate extends AbstractConfigNetconfOperation {
         try {
             transactionProvider.validateTransaction();
         } catch (ValidationException e) {
-            logger.warn("Validation failed", e);
+            LOG.warn("Validation failed", e);
             throw NetconfDocumentedException.wrap(e);
         } catch (IllegalStateException e) {
-            logger.warn("Validation failed", e);
+            LOG.warn("Validation failed", e);
             final Map<String, String> errorInfo = new HashMap<>();
             errorInfo
                     .put(ErrorTag.operation_failed.name(),
@@ -83,7 +82,7 @@ public class Validate extends AbstractConfigNetconfOperation {
 
         }
 
-        logger.trace("Datastore {} validated successfully", Datastore.candidate);
+        LOG.trace("Datastore {} validated successfully", Datastore.candidate);
 
         return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.<String>absent());
     }