Mark methods as static

Private methods do not take object state, so can be turned into statics.
Also perform drive-by cleanup of sonar warnings.

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java
index 7ff31d693507d5eb04e6da5477c875d4917cd746..5c02d7eb396352a079c4dfd2416674530aec9d4b 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java
@@ -91,15 +91,15 @@ public final class SchemaTracker {
         root = (DataNodeContainer) current;
     }
 
-    private Optional<SchemaNode> tryFindGroupings(final SchemaContext ctx, final QName qname) {
+    private static Optional<SchemaNode> tryFindGroupings(final SchemaContext ctx, final QName qname) {
         return Optional.<SchemaNode> fromNullable(Iterables.find(ctx.getGroupings(), new SchemaNodePredicate(qname), null));
     }
 
-    private Optional<SchemaNode> tryFindRpc(final SchemaContext ctx, final QName qname) {
+    private static Optional<SchemaNode> tryFindRpc(final SchemaContext ctx, final QName qname) {
         return Optional.<SchemaNode>fromNullable(Iterables.find(ctx.getOperations(), new SchemaNodePredicate(qname), null));
     }
 
-    private Optional<SchemaNode> tryFindNotification(final SchemaContext ctx, final QName qname) {
+    private static Optional<SchemaNode> tryFindNotification(final SchemaContext ctx, final QName qname) {
         return Optional.<SchemaNode>fromNullable(Iterables.find(ctx.getNotifications(), new SchemaNodePredicate(qname), null));
     }
 
@@ -155,7 +155,7 @@ public final class SchemaTracker {
         return schema;
     }
 
-    private SchemaNode findChildInCases(final ChoiceSchemaNode parent, final QName qname) {
+    private static SchemaNode findChildInCases(final ChoiceSchemaNode parent, final QName qname) {
         DataSchemaNode schema = null;
         for(final ChoiceCaseNode caze : parent.getCases()) {
             final DataSchemaNode potential = caze.getDataChildByName(qname);
@@ -167,7 +167,7 @@ public final class SchemaTracker {
         return schema;
     }
 
-    private SchemaNode findCaseByChild(final ChoiceSchemaNode parent, final QName qname) {
+    private static SchemaNode findCaseByChild(final ChoiceSchemaNode parent, final QName qname) {
         DataSchemaNode schema = null;
         for(final ChoiceCaseNode caze : parent.getCases()) {
             final DataSchemaNode potential = caze.getDataChildByName(qname);

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java
index a4812c7316c81593bcf8869bc7919e448d6e26b7..19122a00cb18ffdfedfa38f1bcc2d6545b96876b 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java
@@ -23,15 +23,12 @@ import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 public final class XmlDocumentUtils {
     public static final QName OPERATION_ATTRIBUTE_QNAME = QName.create(SchemaContext.NAME, "operation");
-    private static final Logger LOG = LoggerFactory.getLogger(XmlDocumentUtils.class);
 
     private XmlDocumentUtils() {
         throw new UnsupportedOperationException("Utility class should not be instantiated");

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java
index 42006157e59916fc5071c588df53176a5beaf901..c8bf9ccc99f5d29b9e8a8a40c350c24389b6e87a 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java
@@ -144,7 +144,7 @@ public class LeafRefValidatation {
 
     }
 
-    private LeafRefContext getReferencingCtxChild(
+    private static LeafRefContext getReferencingCtxChild(
             final LeafRefContext referencingCtx, final DataTreeCandidateNode childNode) {
 
         LeafRefContext childReferencingCtx = null;
@@ -167,7 +167,7 @@ public class LeafRefValidatation {
         return childReferencingCtx;
     }
 
-    private LeafRefContext getReferencedByCtxChild(
+    private static LeafRefContext getReferencedByCtxChild(
             final LeafRefContext referencedByCtx, final DataTreeCandidateNode childNode) {
 
         LeafRefContext childReferencedByCtx = null;
@@ -318,7 +318,7 @@ public class LeafRefValidatation {
         // FIXME if(node instance of UnkeyedListNode ...
     }
 
-    private LeafRefContext findReferencingCtxUnderChoice(
+    private static LeafRefContext findReferencingCtxUnderChoice(
             final LeafRefContext referencingCtx, final QName qname) {
 
         final Map<QName, LeafRefContext> referencingChilds = referencingCtx
@@ -335,7 +335,7 @@ public class LeafRefValidatation {
         return null;
     }
 
-    private LeafRefContext findReferencedByCtxUnderChoice(
+    private static LeafRefContext findReferencedByCtxUnderChoice(
             final LeafRefContext referencedByCtx, final QName qname) {
 
         final Map<QName, LeafRefContext> referencedByChilds = referencedByCtx
@@ -436,14 +436,13 @@ public class LeafRefValidatation {
         validatedLeafRefCtx.add(referencedByCtx);
     }
 
-    private StringBuilder createInvalidTargetMessage(final NormalizedNode<?, ?> leaf,
+    private static StringBuilder createInvalidTargetMessage(final NormalizedNode<?, ?> leaf,
             final HashSet<?> leafRefTargetNodeValues, final LeafRefContext leafRefContext,
             final Object leafRefsValue) {
         final StringBuilder sb = new StringBuilder();
         sb.append("Invalid leafref value [");
         sb.append(leafRefsValue);
-        sb.append("]");
-        sb.append(" allowed values ");
+        sb.append("] allowed values ");
         sb.append(leafRefTargetNodeValues);
         sb.append(" by validation of leafref TARGET node: ");
         sb.append(leaf.getNodeType());
@@ -458,13 +457,16 @@ public class LeafRefValidatation {
             final LeafRefContext referencingCtx, final ModificationType modificationType,
             final YangInstanceIdentifier current) {
 
-        final StringBuilder header_log = new StringBuilder();
+        final StringBuilder headerLog = new StringBuilder();
         final StringBuilder log = new StringBuilder();
 
-        header_log.append("Operation [" + modificationType
-                + "] validate data of LEAFREF node: name["
-                + referencingCtx.getNodeName() + "] = value["
-                + leaf.getValue() + "]");
+        headerLog.append("Operation [");
+        headerLog.append(modificationType);
+        headerLog.append("] validate data of LEAFREF node: name[");
+        headerLog.append(referencingCtx.getNodeName());
+        headerLog.append("] = value[");
+        headerLog.append(leaf.getValue());
+        headerLog.append(']');
 
         final HashSet<Object> values = new HashSet<>();
         final LeafRefPath targetPath = referencingCtx.getAbsoluteLeafRefTargetPath();
@@ -479,25 +481,25 @@ public class LeafRefValidatation {
                     referencingCtx, values);
             errorsMessages.add(sb.toString());
 
-            header_log.append(" -> FAILED");
+            headerLog.append(" -> FAILED");
             log.append(sb.toString());
         } else {
-            header_log.append(" -> OK");
+            headerLog.append(" -> OK");
         }
 
-        LOG.debug(header_log.toString());
-        if (!log.toString().equals(""))
+        LOG.debug(headerLog.toString());
+        if (log.length() != 0) {
             LOG.debug(log.toString());
+        }
     }
 
-    private StringBuilder createInvalidLeafRefMessage(
+    private static StringBuilder createInvalidLeafRefMessage(
             final NormalizedNode<?, ?> leaf, final LeafRefContext referencingCtx,
             final Set<?> values) {
         final StringBuilder sb = new StringBuilder();
         sb.append("Invalid leafref value [");
         sb.append(leaf.getValue());
-        sb.append("]");
-        sb.append(" allowed values ");
+        sb.append("] allowed values ");
         sb.append(values);
         sb.append(" of LEAFREF node: ");
         sb.append(leaf.getNodeType());
@@ -615,8 +617,7 @@ public class LeafRefValidatation {
         }
     }
 
-    private Iterable<ChoiceNode> getChoiceNodes(
-            final DataContainerNode<?> dataContainerNode) {
+    private static Iterable<ChoiceNode> getChoiceNodes(final DataContainerNode<?> dataContainerNode) {
 
         final LinkedList<ChoiceNode> choiceNodes = new LinkedList<ChoiceNode>();
 
@@ -630,7 +631,7 @@ public class LeafRefValidatation {
         return choiceNodes;
     }
 
-    private boolean isMatchingPredicate(final MapEntryNode mapEntryNode,
+    private static boolean isMatchingPredicate(final MapEntryNode mapEntryNode,
             final Map<QName, Set<?>> allowedKeyValues) {
 
         final NodeIdentifierWithPredicates identifier = mapEntryNode.getIdentifier();
@@ -671,7 +672,7 @@ public class LeafRefValidatation {
         return values;
     }
 
-    private Optional<NormalizedNode<?, ?>> findParentNode(
+    private static Optional<NormalizedNode<?, ?>> findParentNode(
             final Optional<NormalizedNode<?, ?>> root, final YangInstanceIdentifier path) {
         Optional<NormalizedNode<?, ?>> currentNode = root;
         final Iterator<PathArgument> pathIterator = path.getPathArguments()
@@ -688,12 +689,11 @@ public class LeafRefValidatation {
         return Optional.absent();
     }
 
-    private Iterable<QNameWithPredicate> nextLevel(
-            final Iterable<QNameWithPredicate> path) {
+    private static Iterable<QNameWithPredicate> nextLevel(final Iterable<QNameWithPredicate> path) {
         return Iterables.skip(path, 1);
     }
 
-    private PathArgument toPathArgument(final QName qName) {
+    private static PathArgument toPathArgument(final QName qName) {
         return YangInstanceIdentifier.of(qName).getLastPathArgument();
     }
 }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java
index 28e8d892f0dba1a9cdf9b0670d5964d4d4a30856..69618f5128b6a05f63bb68b1db2becfab28d4fb0 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToCompositeNodes.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.data.impl.schema;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
@@ -110,7 +109,6 @@ abstract class InstanceIdToCompositeNodes<T extends YangInstanceIdentifier.PathA
         return childOp;
     }
 
-    @SuppressWarnings("rawtypes")
     protected abstract NormalizedNodeContainerBuilder<?, ?, ?, ?> createBuilder(final YangInstanceIdentifier.PathArgument compositeNode);
 
     static abstract class DataContainerNormalizationOperation<T extends YangInstanceIdentifier.PathArgument> extends

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ResultAlreadySetException.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ResultAlreadySetException.java
index f73c31584b88aa295d61c6ce1cc41397b623af1b..f066f29f6c8ae5a8f036159a23b80fb11403d005 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ResultAlreadySetException.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ResultAlreadySetException.java
@@ -10,13 +10,14 @@ package org.opendaylight.yangtools.yang.data.impl.schema;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 public class ResultAlreadySetException extends IllegalStateException {
+    private static final long serialVersionUID = 1L;
     private final NormalizedNode<?, ?> resultData;
 
-    public ResultAlreadySetException(String message, NormalizedNode<?, ?> resultData) {
+    public ResultAlreadySetException(final String message, final NormalizedNode<?, ?> resultData) {
         this(message, resultData, null);
     }
 
-    public ResultAlreadySetException(String message, NormalizedNode<?, ?> resultData, Throwable cause) {
+    public ResultAlreadySetException(final String message, final NormalizedNode<?, ?> resultData, final Throwable cause) {
         super(message, cause);
         this.resultData = resultData;
     }

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java
index a5c5148548418596d13c1ef26543aa89c527aff4..755a228c91ff11fcf0ca4bb6264eb26406c28a5a 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java
@@ -23,7 +23,6 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
-import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.AugmentationTarget;
 import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
@@ -34,6 +33,7 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 public final class SchemaUtils {
 
     private SchemaUtils() {
+        throw new UnsupportedOperationException();
     }
 
     /**

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/BaseDispatcherParser.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/BaseDispatcherParser.java
index 503da680311dad4ea10cf38eb124dc3c54a5d96c..9d52ba4b1534ff31bca0f34d7424d75e6c18e6a5 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/BaseDispatcherParser.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/base/parser/BaseDispatcherParser.java
@@ -217,7 +217,7 @@ public abstract class BaseDispatcherParser<E, P extends YangInstanceIdentifier.P
         return true;
     }
 
-    private boolean isMarkedAs(final Map<QName, ?> mappedAugmentChildNodes, final QName qName) {
+    private static boolean isMarkedAs(final Map<QName, ?> mappedAugmentChildNodes, final QName qName) {
         return mappedAugmentChildNodes.containsKey(qName);
     }
 

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java
index 93e0e671eda7e72ac8a4d73efa53f4ebb2e39fd4..6c947843ccd57f989891a1442f0a81767934651d 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java
@@ -118,7 +118,7 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida
         return Verify.verifyNotNull(mod.getModificationType(), "Node %s does not have resolved modification type", mod);
     }
 
-    private Optional<NormalizedNode<?, ?>> optionalData(final TreeNode meta) {
+    private static Optional<NormalizedNode<?, ?>> optionalData(final TreeNode meta) {
         if (meta != null) {
             return Optional.<NormalizedNode<?,?>>of(meta.getData());
         } else {

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MinMaxElementsValidation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MinMaxElementsValidation.java
index 7f6831a9d0fdb612ea2cfde51a1820caa28edba9..525ff55612146323284be99d4017a32a95c515ba 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MinMaxElementsValidation.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MinMaxElementsValidation.java
@@ -37,7 +37,7 @@ final class MinMaxElementsValidation extends SchemaAwareApplyOperation {
         this.maxElements = maxElements;
     }
 
-    static final SchemaAwareApplyOperation from(final SchemaAwareApplyOperation delegate, final DataSchemaNode schema) {
+    static SchemaAwareApplyOperation from(final SchemaAwareApplyOperation delegate, final DataSchemaNode schema) {
         final ConstraintDefinition constraints = schema.getConstraints();
         if (constraints == null || (constraints.getMinElements() == null && constraints.getMaxElements() == null)) {
             return delegate;
@@ -46,25 +46,21 @@ final class MinMaxElementsValidation extends SchemaAwareApplyOperation {
 
     }
 
-    private final int findChildrenBefore(final Optional<TreeNode> current) {
-        final int children;
+    private static int findChildrenBefore(final Optional<TreeNode> current) {
         if (current.isPresent()) {
-          children = numOfChildrenFromValue(current.get().getData());
+            return numOfChildrenFromValue(current.get().getData());
         } else {
-          children = 0;
+            return 0;
         }
-        return children;
-    }
-
-    private final int findChildrenAfter(final ModifiedNode modification) {
-      final int children;
-      if (modification.getWrittenValue() != null) {
-        children = numOfChildrenFromValue(modification.getWrittenValue());
-      } else {
-        children = 0;
-      }
-      return children;
-  }
+    }
+
+    private static int findChildrenAfter(final ModifiedNode modification) {
+        if (modification.getWrittenValue() != null) {
+            return numOfChildrenFromValue(modification.getWrittenValue());
+        } else {
+            return 0;
+        }
+    }
 
     private void checkMinMaxElements(final YangInstanceIdentifier path, final NodeModification nodeMod,
             final Optional<TreeNode> current) throws DataValidationFailedException {

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtilsTest.java
index 817afccc6a6cf1a8dd790b8f74065c3c9dcf320c..a95366ae15f7ac14d6d7f3cf9f1ae0fdbd8900df 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtilsTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtilsTest.java
@@ -11,7 +11,6 @@ package org.opendaylight.yangtools.yang.data.impl.codec.xml;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-
 import com.google.common.base.Optional;
 import com.google.common.collect.Maps;
 import java.io.ByteArrayOutputStream;
@@ -143,7 +142,7 @@ public class XmlStreamUtilsTest {
         return targetBaseType;
     }
 
-    private Map<String, String> mapPrefixed(final Iterable<Map.Entry<URI, String>> prefixes) {
+    private static Map<String, String> mapPrefixed(final Iterable<Map.Entry<URI, String>> prefixes) {
         final Map<String, String> mappedPrefixes = Maps.newHashMap();
         for (final Map.Entry<URI, String> prefix : prefixes) {
             mappedPrefixes.put(prefix.getKey().toString(), prefix.getValue());
@@ -151,9 +150,8 @@ public class XmlStreamUtilsTest {
         return mappedPrefixes;
     }
 
-    private QName getAttrQName(final String namespace, final String revision, final String localName, final Optional<String> prefix) {
-
-        if(prefix.isPresent()) {
+    private static QName getAttrQName(final String namespace, final String revision, final String localName, final Optional<String> prefix) {
+        if (prefix.isPresent()) {
             final QName moduleQName = QName.create(namespace, revision, "module");
             final QNameModule module = QNameModule.create(moduleQName.getNamespace(), moduleQName.getRevision());
             return QName.create(module, localName);
@@ -179,7 +177,7 @@ public class XmlStreamUtilsTest {
         return null;
     }
 
-    private LeafrefTypeDefinition findLeafrefType(final LeafSchemaNode schemaNode) {
+    private static LeafrefTypeDefinition findLeafrefType(final LeafSchemaNode schemaNode) {
         final TypeDefinition<?> type = schemaNode.getType();
         if (type instanceof LeafrefTypeDefinition) {
             return (LeafrefTypeDefinition)type;

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java
index 9c69016e19c4a086dd2496be4523fcf9b0d02b1b..71440c23a9c7cc774fba8140a9b60315204c89ec 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java
@@ -185,7 +185,7 @@ public class NormalizedDataBuilderTest {
         // .build());
     }
 
-    private AugmentationSchema getAugmentationSchemaForChild(final ContainerSchemaNode containerNode, final QName qName) {
+    private static AugmentationSchema getAugmentationSchemaForChild(final ContainerSchemaNode containerNode, final QName qName) {
         for (AugmentationSchema augmentationSchema : containerNode.getAvailableAugmentations()) {
             if (augmentationSchema.getDataChildByName(qName) != null) {
                 return augmentationSchema;
@@ -194,16 +194,16 @@ public class NormalizedDataBuilderTest {
         throw new IllegalStateException("Unable to find child augmentation in " + containerNode);
     }
 
-    private YangInstanceIdentifier.NodeWithValue getNodeWithValueIdentifier(final String localName, final Object value) {
+    private static YangInstanceIdentifier.NodeWithValue getNodeWithValueIdentifier(final String localName, final Object value) {
         return new YangInstanceIdentifier.NodeWithValue(getQName(localName), value);
     }
 
-    private QName getQName(final String localName) {
+    private static QName getQName(final String localName) {
         String namespace = "namespace";
         return new QName(URI.create(namespace), localName);
     }
 
-    private YangInstanceIdentifier.NodeIdentifier getNodeIdentifier(final String localName) {
+    private static YangInstanceIdentifier.NodeIdentifier getNodeIdentifier(final String localName) {
         return new YangInstanceIdentifier.NodeIdentifier(getQName(localName));
     }
 

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java
index 30a9db0fbf55146b7af82b1b8b5f39076a7a5f8b..63962eb91096120c9d083b0ea165937d15202406 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java
@@ -278,7 +278,7 @@ public class NormalizedNodeXmlTranslationTest {
         XML_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, false);
     }
 
-    private void writeNormalizedNode(final NormalizedNode<?, ?> normalized, final DOMResult result, final SchemaPath schemaPath, final SchemaContext context)
+    private static void writeNormalizedNode(final NormalizedNode<?, ?> normalized, final DOMResult result, final SchemaPath schemaPath, final SchemaContext context)
             throws IOException, XMLStreamException {
         NormalizedNodeWriter normalizedNodeWriter = null;
         NormalizedNodeStreamWriter normalizedNodeStreamWriter = null;
@@ -304,7 +304,7 @@ public class NormalizedNodeXmlTranslationTest {
         }
     }
 
-    private Document loadDocument(final String xmlPath) throws Exception {
+    private static Document loadDocument(final String xmlPath) throws IOException, SAXException {
         final InputStream resourceAsStream = NormalizedDataBuilderTest.class.getResourceAsStream(xmlPath);
 
         final Document currentConfigElement = readXmlToDocument(resourceAsStream);
@@ -323,7 +323,7 @@ public class NormalizedNodeXmlTranslationTest {
         BUILDERFACTORY = factory;
     }
 
-    private Document readXmlToDocument(final InputStream xmlContent) throws IOException, SAXException {
+    private static Document readXmlToDocument(final InputStream xmlContent) throws IOException, SAXException {
         final DocumentBuilder dBuilder;
         try {
             dBuilder = BUILDERFACTORY.newDocumentBuilder();

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ConcurrentTreeModificationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ConcurrentTreeModificationTest.java
index 6812122eb494701ffb446bac29e83eac45778533..fade79591311dec54e80f4d7ebbaaf628e8f48c2 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ConcurrentTreeModificationTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ConcurrentTreeModificationTest.java
@@ -60,7 +60,7 @@ public class ConcurrentTreeModificationTest {
         inMemoryDataTree.setSchemaContext(schemaContext);
     }
 
-    private ContainerNode createFooTestContainerNode() {
+    private static ContainerNode createFooTestContainerNode() {
         return ImmutableContainerNodeBuilder
                 .create()
                 .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME))
@@ -69,7 +69,7 @@ public class ConcurrentTreeModificationTest {
                                 .withChild(FOO_NODE).build()).build();
     }
 
-    private ContainerNode createBarTestContainerNode() {
+    private static ContainerNode createBarTestContainerNode() {
         return ImmutableContainerNodeBuilder
                 .create()
                 .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME))

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java
index 2896675c156a0ddc5c2be0612d140dad75ed9c26..294bd9323c50042cd237e6e9efed5147327e47c7 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue;
 import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.mapEntry;
 import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.mapEntryBuilder;
 import static org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes.mapNodeBuilder;
-
+import com.google.common.base.Optional;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -32,13 +32,6 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
-import com.google.common.base.Optional;
-
-
-
-
-
-
 /**
  *
  * Schema structure of document is
@@ -133,7 +126,7 @@ public class ModificationMetadataTreeTest {
 
     }
 
-    private ContainerNode createTestContainer() {
+    private static ContainerNode createTestContainer() {
         return ImmutableContainerNodeBuilder
                 .create()
                 .withNodeIdentifier(new NodeIdentifier(TestModel.TEST_QNAME))

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StoreTreeNodesTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StoreTreeNodesTest.java
index 20b35b34698e0fcdb6b010d21ab20a9338f35cee..54dff7c1bd9c874b9d96ee92a247041654e00c3d 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StoreTreeNodesTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StoreTreeNodesTest.java
@@ -78,7 +78,7 @@ public class StoreTreeNodesTest {
 
     }
 
-    private ContainerNode createTestContainer() {
+    private static ContainerNode createTestContainer() {
         return ImmutableContainerNodeBuilder
                 .create()
                 .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME))