Merge "Clean up netconf-parent root pom"

[netconf.git] / restconf / restconf-nb-rfc8040 / src / main / java / org / opendaylight / restconf / nb / rfc8040 / streams / listeners / ListenerAdapter.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java
index 7e2d89b6ffd8056a8eddc4e8e63312828d2934b4..815f4b413e46ceac7b92fdaaff6ecfdd53f4f003 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapter.java
@@ -71,11 +71,12 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements DOMData
 
         this.outputType = Preconditions.checkNotNull(outputType);
         this.path = Preconditions.checkNotNull(path);
-        Preconditions.checkArgument((streamName != null) && !streamName.isEmpty());
+        Preconditions.checkArgument(streamName != null && !streamName.isEmpty());
         this.streamName = streamName;
     }
 
     @Override
+    @SuppressWarnings("checkstyle:hiddenField")
     public void onDataChanged(final AsyncDataChangeEvent<YangInstanceIdentifier, NormalizedNode<?, ?>> change) {
         this.change = change;
         final String xml = prepareXml();
@@ -163,6 +164,7 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements DOMData
      * @param change
      *            {@link AsyncDataChangeEvent}
      */
+    @SuppressWarnings("checkstyle:hiddenField")
     private void addValuesToDataChangedNotificationEventElement(final Document doc,
             final Element dataChangedNotificationEventElement,
             final AsyncDataChangeEvent<YangInstanceIdentifier, NormalizedNode<?, ?>> change,
@@ -197,12 +199,12 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements DOMData
     private void addValuesFromDataToElement(final Document doc, final Set<YangInstanceIdentifier> data,
             final Element element, final Operation operation, final SchemaContext schemaContext,
             final DataSchemaContextTree dataSchemaContextTree) {
-        if ((data == null) || data.isEmpty()) {
+        if (data == null || data.isEmpty()) {
             return;
         }
-        for (final YangInstanceIdentifier path : data) {
-            if (!dataSchemaContextTree.getChild(path).isMixin()) {
-                final Node node = createDataChangeEventElement(doc, path, operation, schemaContext);
+        for (final YangInstanceIdentifier yiid : data) {
+            if (!dataSchemaContextTree.getChild(yiid).isMixin()) {
+                final Node node = createDataChangeEventElement(doc, yiid, operation, schemaContext);
                 element.appendChild(node);
             }
         }
@@ -212,7 +214,7 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements DOMData
             final Set<Entry<YangInstanceIdentifier, NormalizedNode<?, ?>>> data, final Element element,
             final Operation operation, final SchemaContext schemaContext,
             final DataSchemaContextTree dataSchemaContextTree) {
-        if ((data == null) || data.isEmpty()) {
+        if (data == null || data.isEmpty()) {
             return;
         }
         for (final Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> entry : data) {
@@ -238,11 +240,11 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements DOMData
      *            schema context
      * @return {@link Node} node represented by changed event element.
      */
-    private Node createDataChangeEventElement(final Document doc, final YangInstanceIdentifier path,
+    private Node createDataChangeEventElement(final Document doc, final YangInstanceIdentifier eventPath,
             final Operation operation, final SchemaContext schemaContext) {
         final Element dataChangeEventElement = doc.createElement("data-change-event");
         final Element pathElement = doc.createElement("path");
-        addPathAsValueToElement(path, pathElement, schemaContext);
+        addPathAsValueToElement(eventPath, pathElement, schemaContext);
         dataChangeEventElement.appendChild(pathElement);
 
         final Element operationElement = doc.createElement("operation");
@@ -257,8 +259,8 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements DOMData
             final SchemaContext schemaContext, final DataSchemaContextTree dataSchemaContextTree) {
         final Element dataChangeEventElement = doc.createElement("data-change-event");
         final Element pathElement = doc.createElement("path");
-        final YangInstanceIdentifier path = entry.getKey();
-        addPathAsValueToElement(path, pathElement, schemaContext);
+        final YangInstanceIdentifier eventPath = entry.getKey();
+        addPathAsValueToElement(eventPath, pathElement, schemaContext);
         dataChangeEventElement.appendChild(pathElement);
 
         final Element operationElement = doc.createElement("operation");
@@ -268,10 +270,10 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements DOMData
         try {
             SchemaPath nodePath;
             final NormalizedNode<?, ?> normalized = entry.getValue();
-            if ((normalized instanceof MapEntryNode) || (normalized instanceof UnkeyedListEntryNode)) {
-                nodePath = dataSchemaContextTree.getChild(path).getDataSchemaNode().getPath();
+            if (normalized instanceof MapEntryNode || normalized instanceof UnkeyedListEntryNode) {
+                nodePath = dataSchemaContextTree.getChild(eventPath).getDataSchemaNode().getPath();
             } else {
-                nodePath = dataSchemaContextTree.getChild(path).getDataSchemaNode().getPath().getParent();
+                nodePath = dataSchemaContextTree.getChild(eventPath).getDataSchemaNode().getPath().getParent();
             }
             final DOMResult domResult = writeNormalizedNode(normalized, schemaContext, nodePath);
             final Node result = doc.importNode(domResult.getNode().getFirstChild(), true);
@@ -290,7 +292,7 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements DOMData
     /**
      * Adds path as value to element.
      *
-     * @param path
+     * @param eventPath
      *            Path to data in data store.
      * @param element
      *            {@link Element}
@@ -298,11 +300,11 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements DOMData
      *            schema context
      */
     @SuppressWarnings("rawtypes")
-    private void addPathAsValueToElement(final YangInstanceIdentifier path, final Element element,
+    private void addPathAsValueToElement(final YangInstanceIdentifier eventPath, final Element element,
             final SchemaContext schemaContext) {
         final StringBuilder textContent = new StringBuilder();
 
-        for (final PathArgument pathArgument : path.getPathArguments()) {
+        for (final PathArgument pathArgument : eventPath.getPathArguments()) {
             if (pathArgument instanceof YangInstanceIdentifier.AugmentationIdentifier) {
                 continue;
             }
@@ -343,8 +345,7 @@ public class ListenerAdapter extends AbstractCommonSubscriber implements DOMData
      */
     private static void writeIdentifierWithNamespacePrefix(final Element element, final StringBuilder textContent,
             final QName qualifiedName, final SchemaContext schemaContext) {
-        final Module module = schemaContext.findModuleByNamespaceAndRevision(qualifiedName.getNamespace(),
-                qualifiedName.getRevision());
+        final Module module = schemaContext.findModule(qualifiedName.getModule()).get();
 
         textContent.append(module.getName());
         textContent.append(":");