Fix various warnings

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

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java
index 0518de3f8f75107ebbb63f223eab21a077616427..0202b722cc5d29cb1d78a468a0ce66751f09742a 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java
@@ -212,11 +212,11 @@ public class RestCodec {
             final IdentityValuesDTO identityValuesDTO = new IdentityValuesDTO();
             for (final PathArgument pathArgument : data.getPathArguments()) {
                 final IdentityValue identityValue = qNameToIdentityValue(pathArgument.getNodeType());
-                if ((pathArgument instanceof NodeIdentifierWithPredicates) && (identityValue != null)) {
+                if (pathArgument instanceof NodeIdentifierWithPredicates && identityValue != null) {
                     final List<Predicate> predicates =
                             keyValuesToPredicateList(((NodeIdentifierWithPredicates) pathArgument).getKeyValues());
                     identityValue.setPredicates(predicates);
-                } else if ((pathArgument instanceof NodeWithValue) && (identityValue != null)) {
+                } else if (pathArgument instanceof NodeWithValue && identityValue != null) {
                     final List<Predicate> predicates = new ArrayList<>();
                     final String value = String.valueOf(((NodeWithValue) pathArgument).getValue());
                     predicates.add(new Predicate(null, value));
@@ -266,7 +266,7 @@ public class RestCodec {
                                     String.valueOf(identityValue.getValue()));
                             return null;
                         }
-                        pathArgument = new NodeWithValue(qName, leafListPredicate.getValue());
+                        pathArgument = new NodeWithValue<>(qName, leafListPredicate.getValue());
                     } else if (node instanceof ListSchemaNode) { // predicates are keys of list
                         final DataNodeContainer listNode = (DataNodeContainer) node;
                         final Map<QName, Object> predicatesMap = new HashMap<>();
@@ -286,7 +286,7 @@ public class RestCodec {
                     }
                 }
                 result.add(pathArgument);
-                if (i < (identities.size() - 1)) { // last element in instance-identifier can be other than
+                if (i < identities.size() - 1) { // last element in instance-identifier can be other than
                     // DataNodeContainer
                     if (node instanceof DataNodeContainer) {
                         parentContainer = (DataNodeContainer) node;