Fix various warnings

[netconf.git] / restconf / sal-rest-connector / src / main / java / org / opendaylight / netconf / sal / rest / impl / JsonToPatchBodyReader.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java
index aa7c32a1cf7cedd26e319df613482efc1f65645c..d922a5aa94c1dc87d3a9c5f67d9ecb50e1afdc32 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java
@@ -122,7 +122,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider
                 ErrorTag.MALFORMED_MESSAGE, exception);
     }
 
-    private List<PatchEntity> read(final JsonReader in, final InstanceIdentifierContext path) throws IOException {
+    private List<PatchEntity> read(final JsonReader in, final InstanceIdentifierContext<?> path) throws IOException {
         final List<PatchEntity> resultCollection = new ArrayList<>();
         final StringModuleInstanceIdentifierCodec codec = new StringModuleInstanceIdentifierCodec(
                 path.getSchemaContext());
@@ -178,7 +178,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider
      * @throws IOException if operation fails
      */
     private void parseByName(@Nonnull final String name, @Nonnull final PatchEdit edit,
-                             @Nonnull final JsonReader in, @Nonnull final InstanceIdentifierContext path,
+                             @Nonnull final JsonReader in, @Nonnull final InstanceIdentifierContext<?> path,
                              @Nonnull final StringModuleInstanceIdentifierCodec codec,
                              @Nonnull final List<PatchEntity> resultCollection) throws IOException {
         switch (name) {
@@ -217,7 +217,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider
      * @throws IOException if operation fails
      */
     private void readEditDefinition(@Nonnull final PatchEdit edit, @Nonnull final JsonReader in,
-                                    @Nonnull final InstanceIdentifierContext path,
+                                    @Nonnull final InstanceIdentifierContext<?> path,
                                     @Nonnull final StringModuleInstanceIdentifierCodec codec) throws IOException {
         final StringBuffer value = new StringBuffer();
         in.beginObject();
@@ -358,8 +358,8 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider
      * @param in reader JsonReader reader
      * @return NormalizedNode representing data
      */
-    private static NormalizedNode readEditData(@Nonnull final JsonReader in, @Nonnull final SchemaNode targetSchemaNode,
-                                        @Nonnull final InstanceIdentifierContext path) {
+    private static NormalizedNode<?, ?> readEditData(@Nonnull final JsonReader in,
+            @Nonnull final SchemaNode targetSchemaNode, @Nonnull final InstanceIdentifierContext<?> path) {
         final NormalizedNodeResult resultHolder = new NormalizedNodeResult();
         final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder);
         JsonParserStream.create(writer, path.getSchemaContext(), targetSchemaNode).parse(in);
@@ -373,8 +373,8 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider
      * @return PatchEntity Patch entity
      */
     private static PatchEntity prepareEditOperation(@Nonnull final PatchEdit edit) {
-        if ((edit.getOperation() != null) && (edit.getTargetSchemaNode() != null)
-                && checkDataPresence(edit.getOperation(), (edit.getData() != null))) {
+        if (edit.getOperation() != null && edit.getTargetSchemaNode() != null
+                && checkDataPresence(edit.getOperation(), edit.getData() != null)) {
             if (isPatchOperationWithValue(edit.getOperation())) {
                 // for lists allow to manipulate with list items through their parent
                 final YangInstanceIdentifier targetNode;
@@ -385,9 +385,9 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider
                 }
 
                 return new PatchEntity(edit.getId(), edit.getOperation(), targetNode, edit.getData());
-            } else {
-                return new PatchEntity(edit.getId(), edit.getOperation(), edit.getTarget());
             }
+
+            return new PatchEntity(edit.getId(), edit.getOperation(), edit.getTarget());
         }
 
         throw new RestconfDocumentedException("Error parsing input", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
@@ -401,11 +401,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider
      *     allow it, false otherwise
      */
     private static boolean checkDataPresence(@Nonnull final String operation, final boolean hasData) {
-        if (isPatchOperationWithValue(operation)) {
-            return hasData;
-        } else  {
-            return !hasData;
-        }
+        return isPatchOperationWithValue(operation) == hasData;
     }
 
     /**
@@ -416,7 +412,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider
         private String operation;
         private YangInstanceIdentifier target;
         private SchemaNode targetSchemaNode;
-        private NormalizedNode data;
+        private NormalizedNode<?, ?> data;
 
         public String getId() {
             return this.id;
@@ -450,11 +446,11 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider
             this.targetSchemaNode = targetSchemaNode;
         }
 
-        public NormalizedNode getData() {
+        public NormalizedNode<?, ?> getData() {
             return this.data;
         }
 
-        public void setData(final NormalizedNode data) {
+        public void setData(final NormalizedNode<?, ?> data) {
             this.data = data;
         }