Fix a few sonar warnings

- redundant and misordered modifiers
- use java.util.Objects instead of Guava

Change-Id: Idfa45254bb30b4f308c51869b50b2883a56a85ed
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodes.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodes.java
index 3cc1202a26b83b86276145eb413dc616066fcc73..8145bfe711884fbe1a72fba28ee7c19eb8ef1469 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodes.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNodes.java
@@ -67,7 +67,7 @@ public final class DataTreeCandidateNodes {
         }
     }
 
-    private static abstract class AbstractNodeIterator {
+    private abstract static class AbstractNodeIterator {
         private final Iterator<DataTreeCandidateNode> iterator;
 
         AbstractNodeIterator(final Iterator<DataTreeCandidateNode> iterator) {
@@ -122,7 +122,6 @@ public final class DataTreeCandidateNodes {
         protected AbstractNodeIterator getParent() {
             return null;
         }
-
     }
 
     private static final class ExitingNodeIterator extends AbstractNodeIterator {
@@ -141,9 +140,8 @@ public final class DataTreeCandidateNodes {
         }
 
         @Override
-        protected final void exitNode(final DataTreeModificationCursor cursor) {
+        protected void exitNode(final DataTreeModificationCursor cursor) {
             cursor.exit();
         }
-
     }
 }

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DefaultDataTreeCandidate.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DefaultDataTreeCandidate.java
index 10a10f210654e021babe8718cb65768f7ed5a461..8d68ce7d23062f1f96f611c52cc1d5eed38507d9 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DefaultDataTreeCandidate.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DefaultDataTreeCandidate.java
@@ -34,7 +34,7 @@ final class DefaultDataTreeCandidate implements DataTreeCandidate {
     }
 
     @Override
-    public final String toString() {
+    public String toString() {
         return MoreObjects.toStringHelper(this).add("rootPath", getRootPath()).add("rootNode", getRootNode()).toString();
     }
 }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContext.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContext.java
index 4762290e601764a7d37f8b87aeb38c69d0021b8a..cb33d9c6d7429b0a04ff99a4d11f92ff14858219 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContext.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContext.java
@@ -38,20 +38,17 @@ final public class LeafRefContext {
         this.currentNodePath = leafRefContextBuilder.getCurrentNodePath();
         this.schemaContext = leafRefContextBuilder.getSchemaContext();
         this.leafRefTargetPath = leafRefContextBuilder.getLeafRefTargetPath();
-        this.absoluteLeafRefTargetPath = leafRefContextBuilder
-                .getAbsoluteLeafRefTargetPath();
-        this.leafRefTargetPathString = leafRefContextBuilder
-                .getLeafRefTargetPathString();
+        this.absoluteLeafRefTargetPath = leafRefContextBuilder.getAbsoluteLeafRefTargetPath();
+        this.leafRefTargetPathString = leafRefContextBuilder.getLeafRefTargetPathString();
         this.isReferencedBy = leafRefContextBuilder.isReferencedBy();
         this.isReferencing = leafRefContextBuilder.isReferencing();
         this.referencingChilds = ImmutableMap.copyOf(leafRefContextBuilder.getReferencingChilds());
         this.referencedByChilds = ImmutableMap.copyOf(leafRefContextBuilder.getReferencedByChilds());
-        this.referencedByLeafRefCtx = ImmutableMap.copyOf(leafRefContextBuilder
-                .getAllReferencedByLeafRefCtxs());
+        this.referencedByLeafRefCtx = ImmutableMap.copyOf(leafRefContextBuilder.getAllReferencedByLeafRefCtxs());
         this.module = leafRefContextBuilder.getLeafRefContextModule();
     }
 
-    public static final LeafRefContext create(final SchemaContext ctx) {
+    public static LeafRefContext create(final SchemaContext ctx) {
         try {
             return new LeafRefContextTreeBuilder(ctx).buildLeafRefContextTree();
         } catch (IOException | LeafRefYangSyntaxErrorException e) {

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java
index ecf8fe1536c21f232ed28755ad76c82d58debba6..6fbcc6967257c1854cc0bf6937fe9cdb00dd12cf 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNode.java
@@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema.nodes;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import java.util.Objects;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.AttributesContainer;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
@@ -52,7 +53,7 @@ public abstract class AbstractImmutableNormalizedValueAttrNode<K extends PathArg
         // We can not call directly getValue.equals because of Empty Type
         // Definition leaves which allways have NULL value
 
-        if (!java.util.Objects.deepEquals(getValue(), other.getValue())) {
+        if (!Objects.deepEquals(getValue(), other.getValue())) {
             return false;
         }
 

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListEntryModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListEntryModificationStrategy.java
index 98a14e1dc56d979d66362210f29a02a366521378..71f23f0715450ac29c559accb558c7cf306960f6 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListEntryModificationStrategy.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListEntryModificationStrategy.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.yang.data.impl.schema.tree;
 
 import static com.google.common.base.Preconditions.checkArgument;
-
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
@@ -23,7 +22,7 @@ final class ListEntryModificationStrategy extends AbstractDataNodeContainerModif
 
     @Override
     @SuppressWarnings("rawtypes")
-    protected final DataContainerNodeBuilder createBuilder(final NormalizedNode<?, ?> original) {
+    protected DataContainerNodeBuilder createBuilder(final NormalizedNode<?, ?> original) {
         checkArgument(original instanceof MapEntryNode);
         return ImmutableMapEntryNodeBuilder.create((MapEntryNode) original);
     }

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
index 331ec0d204cc4a555c956680e89c188e07ed9bcf..ec6d023b7195017d2820f937fe36559944c0d3e9 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
@@ -61,12 +61,12 @@ public final class StmtContextUtils {
     }
 
     @SuppressWarnings("unchecked")
-    public static final <E extends EffectiveStatement<?, ?>> Function<StmtContext<?, ?, ? extends E>, E> buildEffective() {
+    public static <E extends EffectiveStatement<?, ?>> Function<StmtContext<?, ?, ? extends E>, E> buildEffective() {
         return Function.class.cast(BUILD_EFFECTIVE);
     }
 
     @SuppressWarnings("unchecked")
-    public static final <AT, DT extends DeclaredStatement<AT>> AT firstAttributeOf(
+    public static <AT, DT extends DeclaredStatement<AT>> AT firstAttributeOf(
             final Iterable<? extends StmtContext<?, ?, ?>> contexts, final Class<DT> declaredType) {
         for (StmtContext<?, ?, ?> ctx : contexts) {
             if (producesDeclared(ctx, declaredType)) {
@@ -77,13 +77,13 @@ public final class StmtContextUtils {
     }
 
     @SuppressWarnings("unchecked")
-    public static final <AT, DT extends DeclaredStatement<AT>> AT firstAttributeOf(final StmtContext<?, ?, ?> ctx,
+    public static <AT, DT extends DeclaredStatement<AT>> AT firstAttributeOf(final StmtContext<?, ?, ?> ctx,
             final Class<DT> declaredType) {
         return producesDeclared(ctx, declaredType) ? (AT) ctx.getStatementArgument() : null;
     }
 
     @SuppressWarnings("unchecked")
-    public static final <AT,DT extends DeclaredStatement<AT>> StmtContext<AT, ?, ?> findFirstDeclaredSubstatement(
+    public static <AT,DT extends DeclaredStatement<AT>> StmtContext<AT, ?, ?> findFirstDeclaredSubstatement(
             final StmtContext<?, ?, ?> stmtContext, final Class<DT> declaredType) {
         for (StmtContext<?, ?, ?> subStmtContext : stmtContext.declaredSubstatements()) {
             if (producesDeclared(subStmtContext,declaredType)) {
@@ -93,7 +93,7 @@ public final class StmtContextUtils {
         return null;
     }
 
-    public static final StmtContext<?, ?, ?> findFirstDeclaredSubstatement(final StmtContext<?, ?, ?> stmtContext,
+    public static StmtContext<?, ?, ?> findFirstDeclaredSubstatement(final StmtContext<?, ?, ?> stmtContext,
             int startIndex, final Class<? extends DeclaredStatement<?>>... types) {
         if (startIndex >= types.length) {
             return null;
@@ -112,7 +112,7 @@ public final class StmtContextUtils {
         return null;
     }
 
-    public static final <DT extends DeclaredStatement<?>> StmtContext<?, ?, ?> findFirstDeclaredSubstatementOnSublevel(
+    public static <DT extends DeclaredStatement<?>> StmtContext<?, ?, ?> findFirstDeclaredSubstatementOnSublevel(
             final StmtContext<?, ?, ?> stmtContext, final Class<DT> declaredType, int sublevel) {
         for (StmtContext<?, ?, ?> subStmtContext : stmtContext.declaredSubstatements()) {
             if (sublevel == 1 && producesDeclared(subStmtContext, declaredType)) {
@@ -130,7 +130,7 @@ public final class StmtContextUtils {
         return null;
     }
 
-    public static final <DT extends DeclaredStatement<?>> StmtContext<?, ?, ?> findDeepFirstDeclaredSubstatement(
+    public static <DT extends DeclaredStatement<?>> StmtContext<?, ?, ?> findDeepFirstDeclaredSubstatement(
             final StmtContext<?, ?, ?> stmtContext, final Class<DT> declaredType) {
         for (StmtContext<?, ?, ?> subStmtContext : stmtContext.declaredSubstatements()) {
             if (producesDeclared(subStmtContext, declaredType)) {
@@ -146,7 +146,7 @@ public final class StmtContextUtils {
         return null;
     }
 
-    public static final boolean producesDeclared(final StmtContext<?, ?, ?> ctx,
+    public static boolean producesDeclared(final StmtContext<?, ?, ?> ctx,
             final Class<? extends DeclaredStatement<?>> type) {
         return type.isAssignableFrom(ctx.getPublicDefinition().getDeclaredRepresentationClass());
     }

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java
index 14f3300c84d20e54c60355fb061930c8967ca104..c4bbb76f004a6417f456a791a49001063e14948c 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/NamespaceBehaviourWithListeners.java
@@ -7,59 +7,55 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.reactor;
 
-import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
-
 import com.google.common.base.Optional;
-import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleIdentifierImpl;
-import java.util.Collection;
-import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
+import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
+import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
 import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleIdentifierImpl;
 import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour;
 
 final class NamespaceBehaviourWithListeners<K,V, N extends IdentifierNamespace<K, V>> extends NamespaceBehaviour<K, V, N> {
 
-    static abstract class ValueAddedListener {
+    abstract static class ValueAddedListener {
+        private final NamespaceStorageNode ctxNode;
 
-        private org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.NamespaceStorageNode ctxNode;
-
-        public ValueAddedListener(NamespaceStorageNode contextNode) {
+        public ValueAddedListener(final NamespaceStorageNode contextNode) {
             this.ctxNode = contextNode;
         }
 
         abstract void onValueAdded(Object key, Object value);
-
     }
 
     private final NamespaceBehaviour<K, V, N> delegate;
     private final Multimap<K, ValueAddedListener> listeners = HashMultimap.create();
 
-    protected NamespaceBehaviourWithListeners(NamespaceBehaviour<K, V, N> delegate) {
+    protected NamespaceBehaviourWithListeners(final NamespaceBehaviour<K, V, N> delegate) {
         super(delegate.getIdentifier());
         this.delegate = delegate;
     }
 
     @Override
-    public void addTo(NamespaceBehaviour.NamespaceStorageNode storage,
-            K key, V value) {
+    public void addTo(final NamespaceStorageNode storage, final K key, final V value) {
         delegate.addTo(storage, key, value);
 
         Iterator<ValueAddedListener> keyListeners = listeners.get(key).iterator();
-        while(keyListeners.hasNext()) {
+        while (keyListeners.hasNext()) {
             ValueAddedListener listener = keyListeners.next();
-            if(listener.ctxNode == storage || hasIdentiticalValue(listener.ctxNode,key,value)) {
+            if (listener.ctxNode == storage || hasIdentiticalValue(listener.ctxNode,key,value)) {
                 keyListeners.remove();
                 listener.onValueAdded(key, value);
             }
         }
 
-        if(key instanceof ModuleIdentifier && !listeners.isEmpty()) {
+        if (key instanceof ModuleIdentifier && !listeners.isEmpty()) {
             Collection<ValueAddedListener> defaultImportListeners = getDefaultImportListeners((ModuleIdentifier) key);
             Iterator<ValueAddedListener> defaultImportsIterator = defaultImportListeners.iterator();
-            while(defaultImportsIterator.hasNext()) {
+            while (defaultImportsIterator.hasNext()) {
                 ValueAddedListener listener = defaultImportsIterator.next();
                 if(listener.ctxNode == storage || hasIdentiticalValue(listener.ctxNode,key,value)) {
                     defaultImportsIterator.remove();
@@ -69,25 +65,22 @@ final class NamespaceBehaviourWithListeners<K,V, N extends IdentifierNamespace<K
         }
     }
 
-    private Collection<ValueAddedListener> getDefaultImportListeners(
-            ModuleIdentifier key) {
-        ModuleIdentifier defaultImportKey = new ModuleIdentifierImpl(
-                key.getName(), Optional.fromNullable(key.getNamespace()),
-                Optional.of(SimpleDateFormatUtil.DEFAULT_DATE_IMP));
+    private Collection<ValueAddedListener> getDefaultImportListeners(final ModuleIdentifier key) {
+        ModuleIdentifier defaultImportKey = new ModuleIdentifierImpl(key.getName(),
+            Optional.fromNullable(key.getNamespace()), Optional.of(SimpleDateFormatUtil.DEFAULT_DATE_IMP));
         return listeners.get((K)defaultImportKey);
     }
 
-    private boolean hasIdentiticalValue(NamespaceBehaviour.NamespaceStorageNode ctxNode, K key, V value) {
+    private boolean hasIdentiticalValue(final NamespaceStorageNode ctxNode, final K key, final V value) {
         return getFrom(ctxNode, key) == value;
     }
 
-    void addValueListener(K key, ValueAddedListener listener) {
+    void addValueListener(final K key, final ValueAddedListener listener) {
         listeners.put(key, listener);
     }
 
     @Override
-    public V getFrom(NamespaceBehaviour.NamespaceStorageNode storage,
-            K key) {
+    public V getFrom(final NamespaceStorageNode storage, final K key) {
         return delegate.getFrom(storage, key);
     }
 

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementIdentifier.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementIdentifier.java
index 4ebc2c21b7e517e85b4080105668b6c45afd27c9..acabbcd981fa6d955cc721344c7bda3bf2e711ed 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementIdentifier.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementIdentifier.java
@@ -7,27 +7,27 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.reactor;
 
-import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
+import java.util.Objects;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
 
 class StatementIdentifier {
 
-    private final @Nonnull QName name;
-    private final @Nullable String argument;
+    private final QName name;
+    private final String argument;
 
-    StatementIdentifier(QName name, String argument) {
+    StatementIdentifier(@Nonnull final QName name, @Nullable final String argument) {
         this.name = Preconditions.checkNotNull(name);
         this.argument = argument;
     }
 
-    QName getName() {
+    @Nonnull QName getName() {
         return name;
     }
 
-    String getArgument() {
+    @Nullable String getArgument() {
         return argument;
     }
 
@@ -35,13 +35,13 @@ class StatementIdentifier {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result +  name.hashCode();
-        result = prime * result + ((argument == null) ? 0 : argument.hashCode());
+        result = prime * result + name.hashCode();
+        result = prime * result + Objects.hashCode(argument);
         return result;
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
@@ -55,16 +55,11 @@ class StatementIdentifier {
         if (!name.equals(other.name)) {
             return false;
         }
-        if (!Objects.equal(argument, other.argument)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(argument, other.argument);
     }
 
     @Override
     public String toString() {
         return "StatementIdentifier [name=" + name + ", argument=" + argument + "]";
     }
-
-
 }