From 3680e198a70129fafa634eeb3fb49e8401fff010 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 13 Nov 2017 17:08:58 +0100 Subject: [PATCH] Fix checkstyle issues reported by odlparent-3.0.0's checkstyle This is a preparatory patch, cleaning up violations which will be enforced by odlparent-3.0.0. Change-Id: I0ea6b387c9d3095ff01c8e00d10c6d9d0c29aec9 Signed-off-by: Robert Varga Signed-off-by: Stephen Kitt --- .../util/DurationStatisticsTracker.java | 2 +- .../yangtools/util/MutableOffsetMap.java | 20 ++++----- .../yangtools/util/SharedSingletonMap.java | 2 + .../QueuedNotificationManagerTest.java | 6 +-- .../concurrent/ThreadPoolExecutorTest.java | 16 +++---- .../rfc8040/model/api/YangDataConstants.java | 2 +- .../yangtools/yang/common/QNameModule.java | 5 ++- .../yang/common/RpcResultBuilder.java | 9 ++-- .../data/api/schema/DataContainerNode.java | 2 +- .../schema/tree/DataTreeCandidateNode.java | 4 +- .../tree/EmptyDataTreeCandidateNode.java | 2 +- .../NormalizedNodeDataTreeCandidateNode.java | 5 ++- .../data/api/YangInstanceIdentifierTest.java | 15 ++++--- .../impl/leafref/LeafRefContextBuilder.java | 8 ++-- .../yang/data/impl/leafref/LeafRefPath.java | 42 +++++++++---------- .../leafref/LeafRefPathErrorListener.java | 8 ++-- ...ImmutableDataContainerNodeAttrBuilder.java | 12 +++--- ...ractImmutableDataContainerNodeBuilder.java | 8 ++-- ...bstractImmutableNormalizedNodeBuilder.java | 12 +++--- ...ImmutableAnyXmlNodeSchemaAwareBuilder.java | 6 +-- ...bleAugmentationNodeSchemaAwareBuilder.java | 2 +- ...ImmutableChoiceNodeSchemaAwareBuilder.java | 2 +- ...utableContainerNodeSchemaAwareBuilder.java | 2 +- .../impl/ImmutableLeafNodeBuilder.java | 4 +- .../ImmutableLeafNodeSchemaAwareBuilder.java | 6 +-- ...bleLeafSetEntryNodeSchemaAwareBuilder.java | 8 ++-- .../impl/ImmutableLeafSetNodeBuilder.java | 19 +++++---- ...mmutableLeafSetNodeSchemaAwareBuilder.java | 6 +-- .../impl/ImmutableMapEntryNodeBuilder.java | 6 +-- ...mutableMapEntryNodeSchemaAwareBuilder.java | 2 +- .../builder/impl/ImmutableMapNodeBuilder.java | 8 ++-- .../ImmutableMapNodeSchemaAwareBuilder.java | 2 +- .../ImmutableOrderedLeafSetNodeBuilder.java | 19 +++++---- ...eOrderedLeafSetNodeSchemaAwareBuilder.java | 6 +-- .../impl/ImmutableOrderedMapNodeBuilder.java | 9 ++-- ...tableOrderedMapNodeSchemaAwareBuilder.java | 3 +- .../impl/ImmutableUnkeyedListNodeBuilder.java | 8 ++-- .../AbstractImmutableNormalizedValueNode.java | 4 +- .../impl/schema/tree/AbstractCursorAware.java | 12 +++--- .../data/impl/schema/tree/ModifiedNode.java | 12 +++--- .../LeafRefContextTreeBuilderTest.java | 5 +-- .../data/impl/schema/tree/Bug4454Test.java | 6 +-- ...XPathStringParsingPathArgumentBuilder.java | 18 ++++---- .../plugin/GenerateSourcesTest.java | 4 +- .../yangtools/yang/model/api/SchemaPath.java | 16 +++---- .../model/api/stmt/SchemaNodeIdentifier.java | 4 +- .../repo/util/SchemaSourceTransformer.java | 10 ++--- .../type/LengthRestrictedTypeBuilder.java | 2 +- .../util/type/RangeRestrictedTypeBuilder.java | 1 + .../yang/model/util/type/RestrictedTypes.java | 4 +- .../model/util/type/StringTypeBuilder.java | 6 +-- .../util/SchemaSourceTransformerTest.java | 8 ++-- .../yang/model/util/DataNodeIteratorTest.java | 20 ++++----- .../repo/SharedSchemaContextFactory.java | 6 +-- .../repo/YangTextSchemaContextResolver.java | 1 + .../stmt/reactor/BuildGlobalContext.java | 8 ++-- .../parser/stmt/reactor/ModifierImpl.java | 11 +++-- .../stmt/reactor/RootStatementContext.java | 16 +++---- .../stmt/reactor/StatementContextBase.java | 20 ++++----- .../parser/stmt/reactor/StatementMap.java | 16 +++---- .../repo/StatementSourceReferenceHandler.java | 13 +++--- .../rfc7950/repo/YangErrorListener.java | 25 ----------- .../rfc7950/repo/YangModelDependencyInfo.java | 2 +- .../repo/YangStatementParserListenerImpl.java | 3 ++ .../rfc7950/stmt/AbstractEffectiveModule.java | 1 + .../stmt/UnknownEffectiveStatementBase.java | 3 +- .../action/ActionEffectiveStatementImpl.java | 3 +- .../AbstractModuleStatementSupport.java | 2 +- .../NotificationEffectiveStatementImpl.java | 3 +- .../yangtools/yang/stmt/OrderingTest.java | 6 +-- .../yangtools/yang/stmt/StmtTestUtils.java | 2 +- .../yang/stmt/TypesResolutionTest.java | 3 +- 72 files changed, 289 insertions(+), 285 deletions(-) diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/DurationStatisticsTracker.java b/common/util/src/main/java/org/opendaylight/yangtools/util/DurationStatisticsTracker.java index c376afc2ad..e3d121d689 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/DurationStatisticsTracker.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/DurationStatisticsTracker.java @@ -207,7 +207,7 @@ public abstract class DurationStatisticsTracker { case NANOSECONDS: return "ns"; case MICROSECONDS: - return "\u03bcs"; // μs + return "μs"; case MILLISECONDS: return "ms"; case SECONDS: diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java index 8a04f32307..648b76d99f 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/MutableOffsetMap.java @@ -63,13 +63,13 @@ public abstract class MutableOffsetMap extends AbstractMap implement } @Override - UnmodifiableMapPhase modifiedMap(final List keys, final V[] objects) { - return new ImmutableOffsetMap.Ordered<>(OffsetMapCache.orderedOffsets(keys), objects); + UnmodifiableMapPhase modifiedMap(final List keys, final V[] values) { + return new ImmutableOffsetMap.Ordered<>(OffsetMapCache.orderedOffsets(keys), values); } @Override - UnmodifiableMapPhase unmodifiedMap(final Map offsets, final V[] objects) { - return new ImmutableOffsetMap.Ordered<>(offsets, objects); + UnmodifiableMapPhase unmodifiedMap(final Map offsetMap, final V[] values) { + return new ImmutableOffsetMap.Ordered<>(offsetMap, values); } @Override @@ -97,14 +97,14 @@ public abstract class MutableOffsetMap extends AbstractMap implement } @Override - UnmodifiableMapPhase modifiedMap(final List keys, final V[] objects) { + UnmodifiableMapPhase modifiedMap(final List keys, final V[] values) { final Map offsets = OffsetMapCache.unorderedOffsets(keys); - return new ImmutableOffsetMap.Unordered<>(offsets, OffsetMapCache.adjustedArray(offsets, keys, objects)); + return new ImmutableOffsetMap.Unordered<>(offsets, OffsetMapCache.adjustedArray(offsets, keys, values)); } @Override - UnmodifiableMapPhase unmodifiedMap(final Map offsets, final V[] objects) { - return new ImmutableOffsetMap.Unordered<>(offsets, objects); + UnmodifiableMapPhase unmodifiedMap(final Map offsetMap, final V[] values) { + return new ImmutableOffsetMap.Unordered<>(offsetMap, values); } @Override @@ -179,9 +179,9 @@ public abstract class MutableOffsetMap extends AbstractMap implement abstract Object removedObject(); - abstract UnmodifiableMapPhase modifiedMap(List keys, V[] objects); + abstract UnmodifiableMapPhase modifiedMap(List keys, V[] values); - abstract UnmodifiableMapPhase unmodifiedMap(Map offsets, V[] objects); + abstract UnmodifiableMapPhase unmodifiedMap(Map offsetMap, V[] values); abstract SharedSingletonMap singletonMap(); diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java index 0b7a5900fa..8e36661c3a 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java @@ -120,6 +120,7 @@ public abstract class SharedSingletonMap implements Serializable, Unmodifi } @Override + @SuppressWarnings("checkstyle:hiddenField") public final boolean containsValue(final Object value) { return this.value.equals(value); } @@ -140,6 +141,7 @@ public abstract class SharedSingletonMap implements Serializable, Unmodifi } @Override + @SuppressWarnings("checkstyle:hiddenField") public final V put(final K key, final V value) { throw new UnsupportedOperationException(); } diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerTest.java index 8d6c9d473f..8ce87cab59 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerTest.java @@ -56,9 +56,9 @@ public class QueuedNotificationManagerTest { reset(expCount); } - void reset(final int expCount) { - this.expCount = expCount; - latch = new CountDownLatch(expCount); + void reset(final int newExpCount) { + this.expCount = newExpCount; + latch = new CountDownLatch(newExpCount); actual.clear(); } diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/ThreadPoolExecutorTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/ThreadPoolExecutorTest.java index 05c4abd0f0..3042e8457d 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/ThreadPoolExecutorTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/ThreadPoolExecutorTest.java @@ -71,10 +71,10 @@ public class ThreadPoolExecutorTest { @Test(expected = RejectedExecutionException.class) public void testCachedThreadRejectingTask() throws InterruptedException { - ExecutorService executor = SpecialExecutors.newBoundedCachedThreadPool(1, 1, "TestPool"); + ExecutorService localExecutor = SpecialExecutors.newBoundedCachedThreadPool(1, 1, "TestPool"); for (int i = 0; i < 5; i++) { - executor.execute(new Task(null, null, null, null, TimeUnit.MICROSECONDS.convert(5, TimeUnit.SECONDS))); + localExecutor.execute(new Task(null, null, null, null, TimeUnit.MICROSECONDS.convert(5, TimeUnit.SECONDS))); } } @@ -83,12 +83,12 @@ public class ThreadPoolExecutorTest { testThreadPoolExecution(SpecialExecutors.newBlockingBoundedCachedThreadPool(2, 1, "TestPool"), 1000, null, 10); } - void testThreadPoolExecution(final ExecutorService executor, final int numTasksToRun, final String expThreadPrefix, - final long taskDelay) throws InterruptedException { + void testThreadPoolExecution(final ExecutorService executorToTest, final int numTasksToRun, + final String expThreadPrefix, final long taskDelay) throws InterruptedException { - this.executor = executor; + this.executor = executorToTest; - LOG.debug("Testing {} with {} tasks.", executor.getClass().getSimpleName(), numTasksToRun); + LOG.debug("Testing {} with {} tasks.", executorToTest.getClass().getSimpleName(), numTasksToRun); final CountDownLatch tasksRunLatch = new CountDownLatch(numTasksToRun); final ConcurrentMap taskCountPerThread = new ConcurrentHashMap<>(); @@ -104,7 +104,7 @@ public class ThreadPoolExecutorTest { // Uninterruptibles.sleepUninterruptibly(20, TimeUnit.MICROSECONDS); // } - executor.execute(new Task(tasksRunLatch, taskCountPerThread, threadError, expThreadPrefix, + executorToTest.execute(new Task(tasksRunLatch, taskCountPerThread, threadError, expThreadPrefix, taskDelay)); } } @@ -127,7 +127,7 @@ public class ThreadPoolExecutorTest { LOG.debug(" {} - {} tasks", e.getKey().getName(), e.getValue()); } - LOG.debug("{}", executor); + LOG.debug("{}", executorToTest); LOG.debug("Elapsed time: {}", stopWatch); } diff --git a/yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java b/yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java index 13f52dbdcc..48a87fce5f 100644 --- a/yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java +++ b/yang/rfc8040-model-api/src/main/java/org/opendaylight/yangtools/rfc8040/model/api/YangDataConstants.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; * * @author Robert Varga */ -public class YangDataConstants { +public final class YangDataConstants { private static final String MODULE_NAME = "ietf-restconf"; private static final URI MODULE_NAMESPACE = URI.create("urn:ietf:params:xml:ns:yang:ietf-restconf"); private static final Revision RFC8040_REVISION = Revision.of("2017-01-26"); diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java index 240778136f..ef94e82aec 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java @@ -128,10 +128,11 @@ public final class QNameModule implements Comparable, Immutable, Se } /** - * Returns a namespace in form defined by section 5.6.4. of {@link https://tools.ietf.org/html/rfc6020}, for example + * Returns a namespace in form defined by section 5.6.4. of + * RFC6020, for example * {@code http://example.acme.com/system?revision=2008-04-01}. * - * @return Namespace in form defined by section 5.6.4. of {@link https://tools.ietf.org/html/rfc6020}. + * @return Namespace in form defined by section 5.6.4. of RFC6020. * @throws URISyntaxException on incorrect namespace definition * */ diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java index be6801fc86..7b877ecb2e 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcResultBuilder.java @@ -264,6 +264,7 @@ public final class RpcResultBuilder implements Builder> { * * @param result the result value */ + @SuppressWarnings("checkstyle:hiddenField") public RpcResultBuilder withResult(final T result) { this.result = result; return this; @@ -395,11 +396,11 @@ public final class RpcResultBuilder implements Builder> { /** * Adds RpcErrors. * - * @param errors the list of RpcErrors + * @param rpcErrors the list of RpcErrors */ - public RpcResultBuilder withRpcErrors(final Collection errors) { - if (errors != null) { - for (RpcError error : errors) { + public RpcResultBuilder withRpcErrors(final Collection rpcErrors) { + if (rpcErrors != null) { + for (RpcError error : rpcErrors) { addError(error); } } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DataContainerNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DataContainerNode.java index df43be8819..60210617f0 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DataContainerNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/DataContainerNode.java @@ -28,7 +28,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum * * @param {@link PathArgument} which identifies instance of {@link DataContainerNode} */ -public interface DataContainerNode extends // +public interface DataContainerNode extends NormalizedNodeContainer> { /** * Returns iteration of all child nodes. diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNode.java index 849f7ad4a6..1f5ec6a47a 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/DataTreeCandidateNode.java @@ -40,10 +40,10 @@ public interface DataTreeCandidateNode { * Returns modified child or null if child was not modified * / does not exists. * - * @param identifier Identifier of child node + * @param childIdentifier Identifier of child node * @return Modified child or null if child was not modified. */ - @Nullable DataTreeCandidateNode getModifiedChild(PathArgument identifier); + @Nullable DataTreeCandidateNode getModifiedChild(PathArgument childIdentifier); /** * Return the type of modification this node is undergoing. diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/EmptyDataTreeCandidateNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/EmptyDataTreeCandidateNode.java index 580f926f7e..b77f5c0654 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/EmptyDataTreeCandidateNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/EmptyDataTreeCandidateNode.java @@ -39,7 +39,7 @@ final class EmptyDataTreeCandidateNode implements DataTreeCandidateNode { @Nullable @Override - public DataTreeCandidateNode getModifiedChild(final PathArgument identifier) { + public DataTreeCandidateNode getModifiedChild(final PathArgument childIdentifier) { return null; } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNode.java index 546b0e88ec..68bcdc2dea 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/NormalizedNodeDataTreeCandidateNode.java @@ -51,10 +51,11 @@ final class NormalizedNodeDataTreeCandidateNode implements DataTreeCandidateNode } @Override - public DataTreeCandidateNode getModifiedChild(final PathArgument identifier) { + public DataTreeCandidateNode getModifiedChild(final PathArgument childIdentifier) { if (data instanceof NormalizedNodeContainer) { @SuppressWarnings({ "rawtypes", "unchecked" }) - final Optional> child = ((NormalizedNodeContainer)data).getChild(identifier); + final Optional> child = + ((NormalizedNodeContainer)data).getChild(childIdentifier); return child.map(input -> new NormalizedNodeDataTreeCandidateNode(input)).orElse(null); } return null; diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java index 1c18036cb7..857dd727b3 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java +++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java @@ -178,7 +178,8 @@ public class YangInstanceIdentifierTest { assertEquals("Path size", 1, newID.getPathArguments().size()); assertEquals("PathArg 1 node type", NODENAME1, newID.getPathArguments().get(0).getNodeType()); - assertNotNull(newID.toString()); // for code coverage + // for code coverage + assertNotNull(newID.toString()); } @Test @@ -243,7 +244,8 @@ public class YangInstanceIdentifierTest { assertFalse("equals", node1.equals(new NodeIdentifierWithPredicates(NODENAME1, KEY1, "bar"))); assertFalse("equals", node1.equals(new Object())); - assertNotNull(node1.toString()); // for code coverage + // for code coverage + assertNotNull(node1.toString()); assertNotNull(node1.toRelativeString(node2)); NodeIdentifierWithPredicates node3 = new NodeIdentifierWithPredicates(NODENAME1, @@ -286,7 +288,8 @@ public class YangInstanceIdentifierTest { assertFalse("equals", node1.equals(new NodeWithValue<>(NODENAME2, "foo"))); assertFalse("equals", node1.equals(new Object())); - assertNotNull(node1.toString()); // for code coverage + // for code coverage + assertNotNull(node1.toString()); assertNotNull(node1.toRelativeString(node2)); NodeWithValue node3 = new NodeWithValue<>(NODENAME1, new byte[]{1,2}); @@ -318,7 +321,8 @@ public class YangInstanceIdentifierTest { assertFalse("equals", node1.equals(new NodeIdentifier(NODENAME3))); assertFalse("equals", node1.equals(new Object())); - assertNotNull(node1.toString()); // for code coverage + // for code coverage + assertNotNull(node1.toString()); } @Test(expected = UnsupportedOperationException.class) @@ -352,7 +356,8 @@ public class YangInstanceIdentifierTest { assertEquals("compareTo", 1, node1.compareTo(node4)); assertEquals("compareTo", -1, node4.compareTo(node1)); - assertNotNull(node1.toString()); // for code coverage + // for code coverage + assertNotNull(node1.toString()); assertNotNull(node1.toRelativeString(node5)); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java index ba8dd12a39..e29fa3a28e 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefContextBuilder.java @@ -69,16 +69,16 @@ class LeafRefContextBuilder implements Builder { return isReferencedBy; } - public void setReferencedBy(final boolean isReferencedBy) { - this.isReferencedBy = isReferencedBy; + public void setReferencedBy(final boolean referencedBy) { + this.isReferencedBy = referencedBy; } public boolean isReferencing() { return isReferencing; } - public void setReferencing(final boolean isReferencing) { - this.isReferencing = isReferencing; + public void setReferencing(final boolean referencing) { + this.isReferencing = referencing; } public void addReferencingChild(final LeafRefContext child, final QName childQName) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java index 00d4b3cc81..5d70ef206e 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPath.java @@ -35,9 +35,9 @@ public abstract class LeafRefPath implements Immutable { } @Override - protected LeafRefPath createInstance(final LeafRefPath parent, - final QNameWithPredicate qname) { - return new AbsoluteLeafRefPath(parent, qname); + protected LeafRefPath createInstance(final LeafRefPath newParent, + final QNameWithPredicate newQname) { + return new AbsoluteLeafRefPath(newParent, newQname); } } @@ -56,9 +56,9 @@ public abstract class LeafRefPath implements Immutable { } @Override - protected LeafRefPath createInstance(final LeafRefPath parent, - final QNameWithPredicate qname) { - return new RelativeLeafRefPath(parent, qname); + protected LeafRefPath createInstance(final LeafRefPath newParent, + final QNameWithPredicate newQname) { + return new RelativeLeafRefPath(newParent, newQname); } } @@ -92,7 +92,7 @@ public abstract class LeafRefPath implements Immutable { private final int hash; /** - * Cached legacy path, filled-in when {@link #getPath()} or + * Cached legacy path, filled-in when {@link #getPathFromRoot()} or * {@link #getPathTowardsRoot()} is invoked. */ private volatile ImmutableList legacyPath; @@ -157,14 +157,14 @@ public abstract class LeafRefPath implements Immutable { /** * Create a new instance. * - * @param parent + * @param newParent * Parent LeafRefPath - * @param qname + * @param newQname * next path element * @return A new LeafRefPath instance */ - protected abstract LeafRefPath createInstance(LeafRefPath parent, - QNameWithPredicate qname); + protected abstract LeafRefPath createInstance(LeafRefPath newParent, + QNameWithPredicate newQname); /** * Create a child path based on concatenation of this path and a relative @@ -179,12 +179,12 @@ public abstract class LeafRefPath implements Immutable { return this; } - LeafRefPath parent = this; - for (QNameWithPredicate qname : relative) { - parent = parent.createInstance(parent, qname); + LeafRefPath newParent = this; + for (QNameWithPredicate relativeQname : relative) { + newParent = newParent.createInstance(newParent, relativeQname); } - return parent; + return newParent; } /** @@ -198,12 +198,12 @@ public abstract class LeafRefPath implements Immutable { public LeafRefPath createChild(final LeafRefPath relative) { checkArgument(!relative.isAbsolute(), "Child creation requires relative path"); - LeafRefPath parent = this; - for (QNameWithPredicate qname : relative.getPathFromRoot()) { - parent = parent.createInstance(parent, qname); + LeafRefPath newParent = this; + for (QNameWithPredicate relativeQname : relative.getPathFromRoot()) { + newParent = newParent.createInstance(newParent, relativeQname); } - return parent; + return newParent; } /** @@ -316,8 +316,8 @@ public abstract class LeafRefPath implements Immutable { sb.append(isAbsolute() ? "Absolute path:" : "Relative path:"); - for (QNameWithPredicate qname : getPathFromRoot()) { - sb.append('/').append(qname); + for (QNameWithPredicate qnameWithPredicate : getPathFromRoot()) { + sb.append('/').append(qnameWithPredicate); } return sb.toString(); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathErrorListener.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathErrorListener.java index 839ee43c2f..59476496cc 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathErrorListener.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefPathErrorListener.java @@ -46,11 +46,11 @@ class LeafRefPathErrorListener extends BaseErrorListener { } final StringBuilder sb = new StringBuilder(); - String module = null; + String exceptionModule = null; boolean first = true; for (final LeafRefPathSyntaxErrorException e : exceptions) { - if (module == null) { - module = e.getModule(); + if (exceptionModule == null) { + exceptionModule = e.getModule(); } if (first) { first = false; @@ -61,7 +61,7 @@ class LeafRefPathErrorListener extends BaseErrorListener { sb.append(e.getFormattedMessage()); } - throw new LeafRefPathSyntaxErrorException(module, 0, 0, sb.toString()); + throw new LeafRefPathSyntaxErrorException(exceptionModule, 0, 0, sb.toString()); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableDataContainerNodeAttrBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableDataContainerNodeAttrBuilder.java index ac72aee104..274cdd7e67 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableDataContainerNodeAttrBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableDataContainerNodeAttrBuilder.java @@ -40,15 +40,15 @@ abstract class AbstractImmutableDataContainerNodeAttrBuilder withAttributes(final Map attributes) { - this.attributes = attributes; + public DataContainerNodeAttrBuilder withAttributes(final Map withAttributes) { + this.attributes = withAttributes; return this; } @Override public DataContainerNodeAttrBuilder withValue( - final Collection> value) { - return (DataContainerNodeAttrBuilder) super.withValue(value); + final Collection> withValue) { + return (DataContainerNodeAttrBuilder) super.withValue(withValue); } @Override @@ -57,7 +57,7 @@ abstract class AbstractImmutableDataContainerNodeAttrBuilder withNodeIdentifier(final I nodeIdentifier) { - return (DataContainerNodeAttrBuilder) super.withNodeIdentifier(nodeIdentifier); + public DataContainerNodeAttrBuilder withNodeIdentifier(final I withNodeIdentifier) { + return (DataContainerNodeAttrBuilder) super.withNodeIdentifier(withNodeIdentifier); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableDataContainerNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableDataContainerNodeBuilder.java index 64dc2e4175..ebd5d2d073 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableDataContainerNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableDataContainerNodeBuilder.java @@ -98,9 +98,9 @@ abstract class AbstractImmutableDataContainerNodeBuilder withValue( - final Collection> value) { + final Collection> withValue) { // TODO Replace or putAll ? - for (final DataContainerChild dataContainerChild : value) { + for (final DataContainerChild dataContainerChild : withValue) { withChild(dataContainerChild); } return this; @@ -121,8 +121,8 @@ abstract class AbstractImmutableDataContainerNodeBuilder withNodeIdentifier(final I nodeIdentifier) { - this.nodeIdentifier = nodeIdentifier; + public DataContainerNodeBuilder withNodeIdentifier(final I withNodeIdentifier) { + this.nodeIdentifier = withNodeIdentifier; return this; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableNormalizedNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableNormalizedNodeBuilder.java index 0f817a52f2..b686b98203 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableNormalizedNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/AbstractImmutableNormalizedNodeBuilder.java @@ -39,20 +39,20 @@ abstract class AbstractImmutableNormalizedNodeBuilder withValue(final V value) { - this.value = requireNonNull(value); + public NormalizedNodeAttrBuilder withValue(final V withValue) { + this.value = requireNonNull(withValue); return this; } @Override - public NormalizedNodeAttrBuilder withNodeIdentifier(final I nodeIdentifier) { - this.nodeIdentifier = requireNonNull(nodeIdentifier); + public NormalizedNodeAttrBuilder withNodeIdentifier(final I withNodeIdentifier) { + this.nodeIdentifier = requireNonNull(withNodeIdentifier); return this; } @Override - public NormalizedNodeAttrBuilder withAttributes(final Map attributes) { - this.attributes = requireNonNull(attributes); + public NormalizedNodeAttrBuilder withAttributes(final Map withAttributes) { + this.attributes = requireNonNull(withAttributes); return this; } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAnyXmlNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAnyXmlNodeSchemaAwareBuilder.java index d18a00b945..19b3179e19 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAnyXmlNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAnyXmlNodeSchemaAwareBuilder.java @@ -25,13 +25,13 @@ public final class ImmutableAnyXmlNodeSchemaAwareBuilder extends ImmutableAnyXml } @Override - public NormalizedNodeAttrBuilder withValue(final DOMSource value) { - return super.withValue(value); + public NormalizedNodeAttrBuilder withValue(final DOMSource withValue) { + return super.withValue(withValue); } @Override public NormalizedNodeAttrBuilder withNodeIdentifier( - final NodeIdentifier nodeIdentifier) { + final NodeIdentifier withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAugmentationNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAugmentationNodeSchemaAwareBuilder.java index 0b76b8298c..b717078b26 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAugmentationNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableAugmentationNodeSchemaAwareBuilder.java @@ -26,7 +26,7 @@ public class ImmutableAugmentationNodeSchemaAwareBuilder extends ImmutableAugmen @Override public DataContainerNodeBuilder withNodeIdentifier( - final AugmentationIdentifier nodeIdentifier) { + final AugmentationIdentifier withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java index 6e2e586dfc..4ae76f7266 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableChoiceNodeSchemaAwareBuilder.java @@ -32,7 +32,7 @@ public class ImmutableChoiceNodeSchemaAwareBuilder extends ImmutableChoiceNodeBu @Override public DataContainerNodeBuilder withNodeIdentifier( - final NodeIdentifier nodeIdentifier) { + final NodeIdentifier withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableContainerNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableContainerNodeSchemaAwareBuilder.java index 9143a36c4f..3a1072cd99 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableContainerNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableContainerNodeSchemaAwareBuilder.java @@ -44,7 +44,7 @@ public final class ImmutableContainerNodeSchemaAwareBuilder extends ImmutableCon @Override public DataContainerNodeAttrBuilder withNodeIdentifier( - final NodeIdentifier nodeIdentifier) { + final NodeIdentifier withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafNodeBuilder.java index 258d408bfa..06cbc1e356 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafNodeBuilder.java @@ -47,8 +47,8 @@ public class ImmutableLeafNodeBuilder } @Override - protected byte[] wrapValue(final byte[] value) { - return value.clone(); + protected byte[] wrapValue(final byte[] valueToWrap) { + return valueToWrap.clone(); } } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafNodeSchemaAwareBuilder.java index fdc174099a..c31fe77ac8 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafNodeSchemaAwareBuilder.java @@ -23,14 +23,14 @@ public final class ImmutableLeafNodeSchemaAwareBuilder extends ImmutableLeafN } @Override - public NormalizedNodeAttrBuilder> withValue(final T value) { + public NormalizedNodeAttrBuilder> withValue(final T withValue) { // TODO: check value type - return super.withValue(value); + return super.withValue(withValue); } @Override public NormalizedNodeAttrBuilder> withNodeIdentifier( - final NodeIdentifier nodeIdentifier) { + final NodeIdentifier withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetEntryNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetEntryNodeSchemaAwareBuilder.java index 0dc17e921a..62baf847d4 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetEntryNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetEntryNodeSchemaAwareBuilder.java @@ -28,15 +28,15 @@ public final class ImmutableLeafSetEntryNodeSchemaAwareBuilder extends Immuta } @Override - public NormalizedNodeAttrBuilder> withValue(final T value) { - super.withNodeIdentifier(new NodeWithValue<>(schema.getQName(), value)); + public NormalizedNodeAttrBuilder> withValue(final T withValue) { + super.withNodeIdentifier(new NodeWithValue<>(schema.getQName(), withValue)); // TODO check value type using TypeProvider ? - return super.withValue(value); + return super.withValue(withValue); } @Override public NormalizedNodeAttrBuilder> withNodeIdentifier( - final NodeWithValue nodeIdentifier) { + final NodeWithValue withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java index 3f2609baaa..40b3d80c85 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeBuilder.java @@ -84,14 +84,14 @@ public class ImmutableLeafSetNodeBuilder implements ListNodeBuilder> withNodeIdentifier(final NodeIdentifier nodeIdentifier) { - this.nodeIdentifier = nodeIdentifier; + public ListNodeBuilder> withNodeIdentifier(final NodeIdentifier withNodeIdentifier) { + this.nodeIdentifier = withNodeIdentifier; return this; } @Override - public ListNodeBuilder> withValue(final Collection> value) { - for (final LeafSetEntryNode leafSetEntry : value) { + public ListNodeBuilder> withValue(final Collection> withValue) { + for (final LeafSetEntryNode leafSetEntry : withValue) { withChild(leafSetEntry); } return this; @@ -99,17 +99,18 @@ public class ImmutableLeafSetNodeBuilder implements ListNodeBuilder> withChildValue(final T value, final Map attributes) { + public ListNodeBuilder> withChildValue(final T childValue, + final Map attributes) { final ImmutableLeafSetEntryNodeBuilder b = ImmutableLeafSetEntryNodeBuilder.create(); - b.withNodeIdentifier(new NodeWithValue<>(nodeIdentifier.getNodeType(), value)); - b.withValue(value); + b.withNodeIdentifier(new NodeWithValue<>(nodeIdentifier.getNodeType(), childValue)); + b.withValue(childValue); b.withAttributes(attributes); return withChild(b.build()); } @Override - public ListNodeBuilder> withChildValue(final T value) { - return withChildValue(value, Collections.emptyMap()); + public ListNodeBuilder> withChildValue(final T childValue) { + return withChildValue(childValue, Collections.emptyMap()); } protected static final class ImmutableLeafSetNode extends diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeSchemaAwareBuilder.java index f557369a41..001884b489 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableLeafSetNodeSchemaAwareBuilder.java @@ -48,9 +48,9 @@ public final class ImmutableLeafSetNodeSchemaAwareBuilder extends ImmutableLe } @Override - public ListNodeBuilder> withChildValue(final T value) { + public ListNodeBuilder> withChildValue(final T childValue) { // TODO check value type - return super.withChildValue(value); + return super.withChildValue(childValue); } @Override @@ -64,7 +64,7 @@ public final class ImmutableLeafSetNodeSchemaAwareBuilder extends ImmutableLe } @Override - public ListNodeBuilder> withNodeIdentifier(final NodeIdentifier nodeIdentifier) { + public ListNodeBuilder> withNodeIdentifier(final NodeIdentifier withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java index 59af23fa5f..4d1126238a 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeBuilder.java @@ -79,9 +79,9 @@ public class ImmutableMapEntryNodeBuilder @Override public DataContainerNodeAttrBuilder withValue( - final Collection> value) { - fillQnames(value, childrenQNamesToPaths); - return super.withValue(value); + final Collection> withValue) { + fillQnames(withValue, childrenQNamesToPaths); + return super.withValue(withValue); } private static boolean isAugment(final PathArgument identifier) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeSchemaAwareBuilder.java index 36ee87875c..f5165cea60 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapEntryNodeSchemaAwareBuilder.java @@ -31,7 +31,7 @@ public final class ImmutableMapEntryNodeSchemaAwareBuilder extends ImmutableMapE } @Override - public ImmutableMapEntryNodeBuilder withNodeIdentifier(final NodeIdentifierWithPredicates nodeIdentifier) { + public ImmutableMapEntryNodeBuilder withNodeIdentifier(final NodeIdentifierWithPredicates withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java index d55c97ffae..2dfa40e6e7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java @@ -76,9 +76,9 @@ public class ImmutableMapNodeBuilder implements CollectionNodeBuilder withValue(final Collection value) { + public CollectionNodeBuilder withValue(final Collection withValue) { // TODO replace or putAll ? - for (final MapEntryNode mapEntryNode : value) { + for (final MapEntryNode mapEntryNode : withValue) { withChild(mapEntryNode); } @@ -86,8 +86,8 @@ public class ImmutableMapNodeBuilder implements CollectionNodeBuilder withNodeIdentifier(final NodeIdentifier nodeIdentifier) { - this.nodeIdentifier = nodeIdentifier; + public CollectionNodeBuilder withNodeIdentifier(final NodeIdentifier withNodeIdentifier) { + this.nodeIdentifier = withNodeIdentifier; return this; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeSchemaAwareBuilder.java index f4af8a7fdc..a5adfba9d9 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeSchemaAwareBuilder.java @@ -51,7 +51,7 @@ public class ImmutableMapNodeSchemaAwareBuilder extends ImmutableMapNodeBuilder } @Override - public CollectionNodeBuilder withNodeIdentifier(final NodeIdentifier nodeIdentifier) { + public CollectionNodeBuilder withNodeIdentifier(final NodeIdentifier withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java index 77b328af37..345e2e8247 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeBuilder.java @@ -83,32 +83,33 @@ public class ImmutableOrderedLeafSetNodeBuilder implements ListNodeBuilder> withNodeIdentifier(final NodeIdentifier nodeIdentifier) { - this.nodeIdentifier = nodeIdentifier; + public ListNodeBuilder> withNodeIdentifier(final NodeIdentifier withNodeIdentifier) { + this.nodeIdentifier = withNodeIdentifier; return this; } @Override - public ListNodeBuilder> withValue(final Collection> value) { + public ListNodeBuilder> withValue(final Collection> withValue) { checkDirty(); - for (final LeafSetEntryNode leafSetEntry : value) { + for (final LeafSetEntryNode leafSetEntry : withValue) { withChild(leafSetEntry); } return this; } @Override - public ListNodeBuilder> withChildValue(final T value, final Map attributes) { + public ListNodeBuilder> withChildValue(final T childValue, + final Map attributes) { final ImmutableLeafSetEntryNodeBuilder b = ImmutableLeafSetEntryNodeBuilder.create(); - b.withNodeIdentifier(new NodeWithValue<>(nodeIdentifier.getNodeType(), value)); - b.withValue(value); + b.withNodeIdentifier(new NodeWithValue<>(nodeIdentifier.getNodeType(), childValue)); + b.withValue(childValue); b.withAttributes(attributes); return withChild(b.build()); } @Override - public ListNodeBuilder> withChildValue(final T value) { - return withChildValue(value, Collections.emptyMap()); + public ListNodeBuilder> withChildValue(final T childValue) { + return withChildValue(childValue, Collections.emptyMap()); } protected static final class ImmutableOrderedLeafSetNode extends diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeSchemaAwareBuilder.java index 562beecc50..48b9d8fa19 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedLeafSetNodeSchemaAwareBuilder.java @@ -49,9 +49,9 @@ public final class ImmutableOrderedLeafSetNodeSchemaAwareBuilder extends Immu } @Override - public ListNodeBuilder> withChildValue(final T value) { + public ListNodeBuilder> withChildValue(final T childValue) { // TODO check value type - return super.withChildValue(value); + return super.withChildValue(childValue); } @Override @@ -65,7 +65,7 @@ public final class ImmutableOrderedLeafSetNodeSchemaAwareBuilder extends Immu } @Override - public ListNodeBuilder> withNodeIdentifier(final NodeIdentifier nodeIdentifier) { + public ListNodeBuilder> withNodeIdentifier(final NodeIdentifier withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedMapNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedMapNodeBuilder.java index 5f6232e3ac..22c8cc945c 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedMapNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedMapNodeBuilder.java @@ -89,9 +89,9 @@ public class ImmutableOrderedMapNodeBuilder implements CollectionNodeBuilder withValue(final Collection value) { + public CollectionNodeBuilder withValue(final Collection withValue) { // TODO replace or putAll ? - for (final MapEntryNode mapEntryNode : value) { + for (final MapEntryNode mapEntryNode : withValue) { withChild(mapEntryNode); } @@ -99,8 +99,9 @@ public class ImmutableOrderedMapNodeBuilder implements CollectionNodeBuilder withNodeIdentifier(final NodeIdentifier nodeIdentifier) { - this.nodeIdentifier = nodeIdentifier; + public CollectionNodeBuilder withNodeIdentifier( + final NodeIdentifier withNodeIdentifier) { + this.nodeIdentifier = withNodeIdentifier; return this; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedMapNodeSchemaAwareBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedMapNodeSchemaAwareBuilder.java index 54ae5e5e99..80ca2b7c57 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedMapNodeSchemaAwareBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableOrderedMapNodeSchemaAwareBuilder.java @@ -54,7 +54,8 @@ public class ImmutableOrderedMapNodeSchemaAwareBuilder extends ImmutableOrderedM } @Override - public CollectionNodeBuilder withNodeIdentifier(final NodeIdentifier nodeIdentifier) { + public CollectionNodeBuilder withNodeIdentifier( + final NodeIdentifier withNodeIdentifier) { throw new UnsupportedOperationException("Node identifier created from schema"); } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUnkeyedListNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUnkeyedListNodeBuilder.java index e0b4af5720..7d6437d376 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUnkeyedListNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUnkeyedListNodeBuilder.java @@ -80,9 +80,9 @@ public class ImmutableUnkeyedListNodeBuilder implements CollectionNodeBuilder withValue( - final Collection value) { + final Collection withValue) { // TODO replace or putAll ? - for (final UnkeyedListEntryNode node : value) { + for (final UnkeyedListEntryNode node : withValue) { withChild(node); } @@ -91,8 +91,8 @@ public class ImmutableUnkeyedListNodeBuilder implements CollectionNodeBuilder withNodeIdentifier( - final NodeIdentifier nodeIdentifier) { - this.nodeIdentifier = nodeIdentifier; + final NodeIdentifier withNodeIdentifier) { + this.nodeIdentifier = withNodeIdentifier; return this; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java index 31f8bab90d..2e6b6b1991 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java @@ -33,7 +33,7 @@ public abstract class AbstractImmutableNormalizedValueNode cursor = null; - protected > T openCursor(final T cursor) { - final boolean success = CURSOR_UPDATER.compareAndSet(this, null, cursor); + protected > T openCursor(final T cursorToOpen) { + final boolean success = CURSOR_UPDATER.compareAndSet(this, null, cursorToOpen); Preconditions.checkState(success, "Modification %s has cursor attached at path %s", this, this.cursor.getRootPath()); - return cursor; + return cursorToOpen; } - final void closeCursor(final AbstractCursor cursor) { - final boolean success = CURSOR_UPDATER.compareAndSet(this, cursor, null); + final void closeCursor(final AbstractCursor cursorToClose) { + final boolean success = CURSOR_UPDATER.compareAndSet(this, cursorToClose, null); if (!success) { - LOG.warn("Attempted to close cursor {} while {} is open", cursor, this.cursor); + LOG.warn("Attempted to close cursor {} while {} is open", cursorToClose, this.cursor); } } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java index 5456380cc5..9e163f538a 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java @@ -249,10 +249,10 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode value) { - updateValue(LogicalOperation.WRITE, value); + void write(final NormalizedNode newValue) { + updateValue(LogicalOperation.WRITE, newValue); children.clear(); } @@ -323,10 +323,10 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode value) { - this.value = requireNonNull(value); + void updateValue(final LogicalOperation type, final NormalizedNode newValue) { + this.value = requireNonNull(newValue); updateOperationType(type); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java index 35ce67f88f..32ff88de6f 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/leafref/context/LeafRefContextTreeBuilderTest.java @@ -219,8 +219,7 @@ public class LeafRefContextTreeBuilderTest { @Test(expected = IllegalArgumentException.class) @Ignore public void incorrectLeafRefPathTest() { - final SchemaContext context = YangParserTestUtils.parseYangResourceDirectory( - "/leafref-context-test/incorrect-modules"); - LeafRefContext.create(context); + LeafRefContext.create( + YangParserTestUtils.parseYangResourceDirectory("/leafref-context-test/incorrect-modules")); } } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java index bc3c4b0bee..b8a4ad363d 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Bug4454Test.java @@ -343,11 +343,11 @@ public class Bug4454Test { @Test public void minMaxListNoMinMaxDeleteTest() throws DataValidationFailedException { - final MapEntryNode fooEntryNode = ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME_NO_MINMAX, MIN_MAX_KEY_LEAF_QNAME, - "foo"); + final MapEntryNode fooEntryNoMinMaxNode = + ImmutableNodes.mapEntry(MIN_MAX_LIST_QNAME_NO_MINMAX, MIN_MAX_KEY_LEAF_QNAME, "foo"); final MapNode mapNode1 = ImmutableNodes.mapNodeBuilder() .withNodeIdentifier(new NodeIdentifier(MIN_MAX_LIST_QNAME_NO_MINMAX)) - .withChild(fooEntryNode).build(); + .withChild(fooEntryNoMinMaxNode).build(); final DataTreeModification modificationTree = inMemoryDataTree.takeSnapshot().newModification(); diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java index e8a4fa68a9..5a7a7d42ae 100644 --- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java +++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java @@ -144,21 +144,21 @@ final class LeafrefXPathStringParsingPathArgumentBuilder implements Builder currentNode = null; + NormalizedNodeContext nodeCtx = this.currentNodeCtx; + NormalizedNode node = null; for (String pathComponent : pathComponents) { final Matcher matcher = NODE_IDENTIFIER_PATTERN.matcher(pathComponent); if (UP_ONE_LEVEL.equals(pathComponent)) { checkValid(!inNodeIdentifierPart, "Up-one-level expression cannot follow concrete path component."); - currentNodeCtx = currentNodeCtx.getParent(); - currentNode = currentNodeCtx.getNode(); + nodeCtx = nodeCtx.getParent(); + node = nodeCtx.getNode(); offset += UP_ONE_LEVEL.length() + 1; } else if (matcher.matches()) { inNodeIdentifierPart = true; - if (currentNode != null && currentNode instanceof DataContainerNode) { - final DataContainerNode dcn = (DataContainerNode) currentNode; + if (node != null && node instanceof DataContainerNode) { + final DataContainerNode dcn = (DataContainerNode) node; final Optional> possibleChild = dcn.getChild(new NodeIdentifier(nextQName())); - currentNode = possibleChild.isPresent() ? possibleChild.get() : null; + node = possibleChild.isPresent() ? possibleChild.get() : null; } } else { throw new IllegalArgumentException(String.format( @@ -167,8 +167,8 @@ final class LeafrefXPathStringParsingPathArgumentBuilder implements Builder ret = legacyPath; if (ret == null) { final List tmp = new ArrayList<>(); - for (QName qname : getPathTowardsRoot()) { - tmp.add(qname); + for (QName item : getPathTowardsRoot()) { + tmp.add(item); } ret = ImmutableList.copyOf(Lists.reverse(tmp)); LEGACYPATH_UPDATER.lazySet(this, ret); @@ -187,8 +187,8 @@ public abstract class SchemaPath implements Immutable { } SchemaPath parentPath = this; - for (QName qname : relative) { - parentPath = parentPath.createChild(qname); + for (QName item : relative) { + parentPath = parentPath.createChild(item); } return parentPath; diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java index 764fbee19c..86be319fed 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/SchemaNodeIdentifier.java @@ -174,8 +174,8 @@ public abstract class SchemaNodeIdentifier implements Immutable { } SchemaNodeIdentifier parentNode = this; - for (QName qname : relative) { - parentNode = parentNode.createChild(qname); + for (QName item : relative) { + parentNode = parentNode.createChild(item); } return parentNode; diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformer.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformer.java index bb7da5593c..5053c1cf85 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformer.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformer.java @@ -35,7 +35,7 @@ public class SchemaSourceTransformer apply(@Nonnull S input) throws Exception; } - private final Map, RefcountedRegistration> sources = new HashMap<>(); + private final Map, RefcountedRegistration> availableSources = new HashMap<>(); private final SchemaSourceRegistry consumer; private final SchemaRepository provider; private final AsyncFunction function; @@ -81,7 +81,7 @@ public class SchemaSourceTransformer src) { - RefcountedRegistration reg = sources.get(src); + RefcountedRegistration reg = availableSources.get(src); if (reg != null) { reg.incRef(); return; @@ -91,13 +91,13 @@ public class SchemaSourceTransformer r = consumer.registerSchemaSource(this, newSrc); - sources.put(src, new RefcountedRegistration(r)); + availableSources.put(src, new RefcountedRegistration(r)); } private void unregisterSource(final PotentialSchemaSource src) { - final RefcountedRegistration reg = sources.get(src); + final RefcountedRegistration reg = availableSources.get(src); if (reg != null && reg.decRef()) { - sources.remove(src); + availableSources.remove(src); } } } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java index 29fe0a98ef..92de910457 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java @@ -75,7 +75,7 @@ public abstract class LengthRestrictedTypeBuilder ranges) { checkState(this.ranges == null, "Range constraint already defined as %s %s", this.ranges, this.constraint); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java index 439231b8eb..456d9fa362 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/RestrictedTypes.java @@ -78,8 +78,8 @@ public final class RestrictedTypes { @Nonnull final BinaryTypeDefinition baseType, @Nonnull final SchemaPath path) { return new LengthRestrictedTypeBuilder(baseType, path) { @Override - BinaryTypeDefinition buildType(final @Nullable LengthConstraint lengthConstraint) { - return new RestrictedBinaryType(getBaseType(), getPath(), getUnknownSchemaNodes(), lengthConstraint); + BinaryTypeDefinition buildType(final @Nullable LengthConstraint constraint) { + return new RestrictedBinaryType(getBaseType(), getPath(), getUnknownSchemaNodes(), constraint); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java index fc4b7b7d60..deafa424e7 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/StringTypeBuilder.java @@ -44,8 +44,8 @@ public final class StringTypeBuilder extends LengthRestrictedTypeBuilder(p, SchemaSourceTransformerTest.SRC_CLASS, this.consumer, SchemaSourceTransformerTest.DST_CLASS, this.function); - final SchemaSourceProvider provider = this.schema; - final Future source = provider.getSource(sourceIdentifier); + final SchemaSourceProvider prov = this.schema; + final Future source = prov.getSource(sourceIdentifier); Assert.assertNotNull(source); source.cancel(true); Assert.assertTrue(source.isDone()); } @Test - public void schemaSourceRegAndUnregSchemaSourceTest() throws Exception { + public void schemaSourceRegAndUnregSchemaSourceTest() { final SourceIdentifier sourceIdentifier = RevisionSourceIdentifier.create("source"); final Foo foo = new Foo<>(sourceIdentifier, SchemaSourceTransformerTest.SRC_CLASS, diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java index 65321570fd..4f322defee 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/DataNodeIteratorTest.java @@ -115,15 +115,15 @@ public class DataNodeIteratorTest { doReturn(groupings).when(mockedModule).getGroupings(); - final DataNodeIterator dataNodeIterator = new DataNodeIterator(mockedModule); - assertFalse(dataNodeIterator.allContainers().contains(mockedAugmentingContainer)); - assertTrue(dataNodeIterator.allContainers().contains(mockedContainer)); - assertTrue(dataNodeIterator.allLists().contains(mockedList)); - assertTrue(dataNodeIterator.allChoices().contains(mockedChoice)); - assertTrue(dataNodeIterator.allChoices().get(0).getCases().values().contains(mockedCase1)); - assertTrue(dataNodeIterator.allChoices().get(0).getCases().values().contains(mockedCase2)); - assertTrue(dataNodeIterator.allContainers().contains(mockedContainerInNotification)); - assertTrue(dataNodeIterator.allLists().contains(mockedListInRpcInputContainer)); - assertTrue(dataNodeIterator.allGroupings().contains(mockedGrouping)); + final DataNodeIterator it = new DataNodeIterator(mockedModule); + assertFalse(it.allContainers().contains(mockedAugmentingContainer)); + assertTrue(it.allContainers().contains(mockedContainer)); + assertTrue(it.allLists().contains(mockedList)); + assertTrue(it.allChoices().contains(mockedChoice)); + assertTrue(it.allChoices().get(0).getCases().values().contains(mockedCase1)); + assertTrue(it.allChoices().get(0).getCases().values().contains(mockedCase2)); + assertTrue(it.allContainers().contains(mockedContainerInNotification)); + assertTrue(it.allLists().contains(mockedListInRpcInputContainer)); + assertTrue(it.allGroupings().contains(mockedGrouping)); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java index 0ce69cfbd2..415d20aafb 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java @@ -50,8 +50,8 @@ import org.slf4j.LoggerFactory; final class SharedSchemaContextFactory implements SchemaContextFactory { private static final Logger LOG = LoggerFactory.getLogger(SharedSchemaContextFactory.class); - private final Cache, SchemaContext> cache = CacheBuilder.newBuilder().weakValues() - .build(); + private final Cache, SchemaContext> revisionCache = CacheBuilder.newBuilder() + .weakValues().build(); private final Cache, SchemaContext> semVerCache = CacheBuilder.newBuilder() .weakValues().build(); private final SharedSchemaRepository repository; @@ -69,7 +69,7 @@ final class SharedSchemaContextFactory implements SchemaContextFactory { public ListenableFuture createSchemaContext(final Collection requiredSources, final StatementParserMode statementParserMode, final Set supportedFeatures) { return createSchemaContext(requiredSources, - statementParserMode == StatementParserMode.SEMVER_MODE ? this.semVerCache : this.cache, + statementParserMode == StatementParserMode.SEMVER_MODE ? this.semVerCache : this.revisionCache, new AssembleSources(Optional.ofNullable(supportedFeatures), statementParserMode)); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java index 8a6968ad15..00075b9358 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java @@ -293,6 +293,7 @@ public final class YangTextSchemaContextResolver implements AutoCloseable, Schem } @Beta + @SuppressWarnings("checkstyle:avoidHidingCauseException") public SchemaContext trySchemaContext(final StatementParserMode statementParserMode) throws SchemaResolutionException { final ListenableFuture future = repository diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java index 980a17ead3..2fd1b9462e 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/BuildGlobalContext.java @@ -113,8 +113,8 @@ class BuildGlobalContext extends NamespaceStorageSupport implements Registry { return enabledSemanticVersions; } - StatementSupportBundle getSupportsForPhase(final ModelProcessingPhase currentPhase) { - return supports.get(currentPhase); + StatementSupportBundle getSupportsForPhase(final ModelProcessingPhase phase) { + return supports.get(phase); } void addSource(@Nonnull final StatementStreamSource source) { @@ -301,8 +301,8 @@ class BuildGlobalContext extends NamespaceStorageSupport implements Registry { } @SuppressWarnings("checkstyle:illegalCatch") - private void loadPhaseStatementsFor(final Set sources) throws ReactorException { - for (final SourceSpecificContext source : sources) { + private void loadPhaseStatementsFor(final Set srcs) throws ReactorException { + for (final SourceSpecificContext source : srcs) { try { source.loadStatements(); } catch (final RuntimeException ex) { diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java index bfa3aa1622..30130fb7c8 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ModifierImpl.java @@ -248,6 +248,7 @@ final class ModifierImpl implements ModelActionBuilder { } @Override + @SuppressWarnings("checkstyle:hiddenField") public void apply(final InferenceAction action) { Preconditions.checkState(this.action == null, "Action already defined to %s", this.action); this.action = Preconditions.checkNotNull(action); @@ -258,6 +259,7 @@ final class ModifierImpl implements ModelActionBuilder { private T value; @Override + @SuppressWarnings("checkstyle:hiddenField") public final T resolve(final InferenceContext ctx) { Preconditions.checkState(done); Preconditions.checkArgument(ctx == ModifierImpl.this.ctx); @@ -268,6 +270,7 @@ final class ModifierImpl implements ModelActionBuilder { return done; } + @SuppressWarnings("checkstyle:hiddenField") final boolean resolvePrereq(final T value) { this.value = value; this.done = true; @@ -275,7 +278,7 @@ final class ModifierImpl implements ModelActionBuilder { } final Prerequisite transform(final Function transformation) { - return ctx -> transformation.apply(resolve(ctx)); + return context -> transformation.apply(resolve(context)); } @Override @@ -305,7 +308,8 @@ final class ModifierImpl implements ModelActionBuilder { implements OnPhaseFinished { @SuppressWarnings("unchecked") @Override - public boolean phaseFinished(final StatementContextBase context, final ModelProcessingPhase phase) { + public boolean phaseFinished(final StatementContextBase context, + final ModelProcessingPhase finishedPhase) { return resolvePrereq((C) context); } } @@ -333,7 +337,8 @@ final class ModifierImpl implements ModelActionBuilder { @SuppressWarnings("unchecked") @Override - public boolean phaseFinished(final StatementContextBase context, final ModelProcessingPhase phase) { + public boolean phaseFinished(final StatementContextBase context, + final ModelProcessingPhase finishedPhase) { return resolvePrereq((C) context); } diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java index 7d60b26c1a..b4077ec9ce 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/RootStatementContext.java @@ -47,9 +47,9 @@ public class RootStatementContext, E extends E private final SourceSpecificContext sourceContext; private final A argument; - private YangVersion version; + private YangVersion rootVersion; private Collection requiredSources = ImmutableSet.of(); - private SourceIdentifier identifier; + private SourceIdentifier rootIdentifier; /** * References to RootStatementContext of submodules which are included in this source. @@ -202,16 +202,16 @@ public class RootStatementContext, E extends E @Override public YangVersion getRootVersion() { - return version == null ? DEFAULT_VERSION : version; + return rootVersion == null ? DEFAULT_VERSION : rootVersion; } @Override public void setRootVersion(final YangVersion version) { checkArgument(sourceContext.getSupportedVersions().contains(version), "Unsupported yang version %s in %s", version, getStatementSourceReference()); - checkState(this.version == null, "Version of root %s has been already set to %s", argument, - this.version); - this.version = requireNonNull(version); + checkState(this.rootVersion == null, "Version of root %s has been already set to %s", argument, + this.rootVersion); + this.rootVersion = requireNonNull(version); } @Override @@ -240,11 +240,11 @@ public class RootStatementContext, E extends E @Override public void setRootIdentifier(final SourceIdentifier identifier) { - this.identifier = requireNonNull(identifier); + this.rootIdentifier = requireNonNull(identifier); } SourceIdentifier getRootIdentifier() { - return identifier; + return rootIdentifier; } @Override diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java index d009eb78db..4e806ee4ae 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java @@ -76,7 +76,7 @@ public abstract class StatementContextBase, E /** * Invoked whenever a processing phase has finished. */ - boolean phaseFinished(StatementContextBase context, ModelProcessingPhase phase); + boolean phaseFinished(StatementContextBase context, ModelProcessingPhase finishedPhase); } /** @@ -293,9 +293,9 @@ public abstract class StatementContextBase, E } public void removeStatementsFromEffectiveSubstatements( - final Collection> substatements) { + final Collection> statements) { if (!effective.isEmpty()) { - effective.removeAll(substatements); + effective.removeAll(statements); shrinkEffective(); } } @@ -372,20 +372,20 @@ public abstract class StatementContextBase, E /** * Adds an effective statement to collection of substatements. * - * @param substatements substatements + * @param statements substatements * @throws IllegalStateException * if added in declared phase * @throws NullPointerException * if statement parameter is null */ - public void addEffectiveSubstatements(final Collection> substatements) { - if (substatements.isEmpty()) { + public void addEffectiveSubstatements(final Collection> statements) { + if (statements.isEmpty()) { return; } - substatements.forEach(Preconditions::checkNotNull); - beforeAddEffectiveStatement(substatements.size()); - effective.addAll(substatements); + statements.forEach(Preconditions::checkNotNull); + beforeAddEffectiveStatement(statements.size()); + effective.addAll(statements); } private void beforeAddEffectiveStatement(final int toAdd) { @@ -626,7 +626,7 @@ public abstract class StatementContextBase, E final ModelProcessingPhase phase, final NamespaceKeyCriterion criterion, final OnNamespaceItemAdded listener) { ((StatementContextBase) value).addPhaseCompletedListener(phase, - (context, completedPhase) -> { + (context, phaseCompleted) -> { selectMatch(type, criterion, listener); return true; }); diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementMap.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementMap.java index 1f9be29ca9..842e9d98fa 100644 --- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementMap.java +++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementMap.java @@ -35,8 +35,8 @@ abstract class StatementMap { } @Override - StatementMap put(final int index, final StatementContextBase object) { - return index == 0 ? new Singleton(object) : new Regular(index, object); + StatementMap put(final int index, final StatementContextBase obj) { + return index == 0 ? new Singleton(obj) : new Regular(index, obj); } @Override @@ -75,14 +75,14 @@ abstract class StatementMap { } @Override - StatementMap put(final int index, final StatementContextBase object) { + StatementMap put(final int index, final StatementContextBase obj) { if (index < elements.length) { checkArgument(elements[index] == null); } else { elements = Arrays.copyOf(elements, index + 1); } - elements[index] = requireNonNull(object); + elements[index] = requireNonNull(obj); return this; } @@ -169,9 +169,9 @@ abstract class StatementMap { } @Override - StatementMap put(final int index, final StatementContextBase object) { + StatementMap put(final int index, final StatementContextBase obj) { checkArgument(index != 0); - return new Regular(this.object, index, object); + return new Regular(this.object, index, obj); } @Override @@ -203,11 +203,11 @@ abstract class StatementMap { * Add a statement at specified index. * * @param index Element index, must be non-negative - * @param object Object to store + * @param obj Object to store * @return New statement map * @throws IllegalArgumentException if the index is already occupied */ - abstract @Nonnull StatementMap put(int index, @Nonnull StatementContextBase object); + abstract @Nonnull StatementMap put(int index, @Nonnull StatementContextBase obj); /** * Return a read-only view of the elements in this map. Unlike other maps, this view does not detect concurrent diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementSourceReferenceHandler.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementSourceReferenceHandler.java index 4131f55731..de13c70bdf 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementSourceReferenceHandler.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementSourceReferenceHandler.java @@ -7,7 +7,8 @@ */ package org.opendaylight.yangtools.yang.parser.rfc7950.repo; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.ArrayDeque; import java.util.Deque; import org.opendaylight.yangtools.yang.parser.spi.source.DeclarationInTextSource; @@ -32,10 +33,10 @@ final class StatementSourceReferenceHandler extends DefaultHandler { private final Document doc; private final String file; - private Locator locator; + private Locator documentLocator; StatementSourceReferenceHandler(final Document doc, final String file) { - this.doc = Preconditions.checkNotNull(doc); + this.doc = requireNonNull(doc); this.file = file; } @@ -53,7 +54,7 @@ final class StatementSourceReferenceHandler extends DefaultHandler { @Override public void setDocumentLocator(final Locator locator) { // Save the locator, so that it can be used later for line tracking when traversing nodes. - this.locator = locator; + this.documentLocator = locator; } @Override @@ -66,8 +67,8 @@ final class StatementSourceReferenceHandler extends DefaultHandler { el.setAttributeNS(attributes.getURI(i), attributes.getQName(i), attributes.getValue(i)); } - final StatementSourceReference ref = DeclarationInTextSource.atPosition(file, locator.getLineNumber(), - locator.getColumnNumber()); + final StatementSourceReference ref = DeclarationInTextSource.atPosition(file, documentLocator.getLineNumber(), + documentLocator.getColumnNumber()); el.setUserData(USER_DATA_KEY, ref, null); stack.push(el); } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangErrorListener.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangErrorListener.java index 511cb811fd..e6d57ff458 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangErrorListener.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangErrorListener.java @@ -12,7 +12,6 @@ import static java.util.Objects.requireNonNull; import java.util.ArrayList; import java.util.List; import org.antlr.v4.runtime.BaseErrorListener; -import org.antlr.v4.runtime.Parser; import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.Recognizer; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; @@ -38,26 +37,6 @@ public final class YangErrorListener extends BaseErrorListener { exceptions.add(new YangSyntaxErrorException(source, line, charPositionInLine, msg, e)); } - @SuppressWarnings("checkstyle:illegalCatch") - private static String getModuleName(final Recognizer recognizer) { - if (!(recognizer instanceof Parser)) { - return null; - } - - final Parser parser = (Parser) recognizer; - try { - String model = parser.getInputStream().getTokenSource().getInputStream().toString(); - model = model.substring(0, model.indexOf('\n')); - model = model.substring(model.indexOf("module") + 6); - model = model.substring(0, model.indexOf('{')); - model = model.trim(); - return model; - } catch (Exception e) { - LOG.debug("Failed to extract module name from parser {}", parser, e); - return null; - } - } - public void validate() throws YangSyntaxErrorException { if (exceptions.isEmpty()) { return; @@ -69,12 +48,8 @@ public final class YangErrorListener extends BaseErrorListener { } final StringBuilder sb = new StringBuilder(); - SourceIdentifier source = null; boolean first = true; for (YangSyntaxErrorException e : exceptions) { - if (source == null) { - source = e.getSource().orElse(null); - } if (first) { first = false; } else { diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java index fef331b86d..c66cf73d1e 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java @@ -337,7 +337,7 @@ public abstract class YangModelDependencyInfo { /** * Dependency information for YANG module. */ - public static class ModuleDependencyInfo extends YangModelDependencyInfo { + public static final class ModuleDependencyInfo extends YangModelDependencyInfo { private ModuleDependencyInfo(final String name, final String latestRevision, final ImmutableSet imports, final ImmutableSet includes) { super(name, latestRevision, imports, includes); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementParserListenerImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementParserListenerImpl.java index e4c9a8450f..5b61b28450 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementParserListenerImpl.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementParserListenerImpl.java @@ -50,12 +50,14 @@ final class YangStatementParserListenerImpl extends YangStatementParserBaseListe this.sourceName = sourceName; } + @SuppressWarnings("checkstyle:hiddenField") public void setAttributes(final StatementWriter writer, final QNameToStatementDefinition stmtDef) { this.writer = writer; this.stmtDef = stmtDef; initCounters(); } + @SuppressWarnings("checkstyle:hiddenField") public void setAttributes(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes) { this.writer = writer; @@ -64,6 +66,7 @@ final class YangStatementParserListenerImpl extends YangStatementParserBaseListe initCounters(); } + @SuppressWarnings("checkstyle:hiddenField") public void setAttributes(final StatementWriter writer, final QNameToStatementDefinition stmtDef, final PrefixToModule prefixes, final YangVersion yangVersion) { this.yangVersion = yangVersion; diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java index 6fcb060af8..6621bc20f8 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java @@ -387,6 +387,7 @@ public abstract class AbstractEffectiveModule findDataChildByName(final QName name) { // Child nodes are keyed by their container name, so we can do a direct lookup return Optional.ofNullable(childNodes.get(requireNonNull(name))); diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/UnknownEffectiveStatementBase.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/UnknownEffectiveStatementBase.java index 16d6e49a95..fde388da25 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/UnknownEffectiveStatementBase.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/UnknownEffectiveStatementBase.java @@ -55,7 +55,8 @@ public abstract class UnknownEffectiveStatementBase childNodes = x.getChildNodes(); final String[] expectedOrder = { "x15", "x10", "x5", "x1", "a5", "a1", "x2", "b5", "b1", "x3", "ax15", "ax5" }; diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java index b9a2e0d220..b4d32f4879 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java @@ -42,7 +42,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; -public class StmtTestUtils { +public final class StmtTestUtils { public static final FileFilter YANG_FILE_FILTER = file -> file.getName().endsWith(YangConstants.RFC6020_YANG_FILE_EXTENSION) && file.isFile(); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java index b6ed4af070..5319b9dae0 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java @@ -290,7 +290,8 @@ public class TypesResolutionTest { EnumTypeDefinition enumType = (EnumTypeDefinition) testedType.getBaseType(); List values = enumType.getValues(); - assertEquals(415, values.size()); // 0-414 + // 0-414 + assertEquals(415, values.size()); EnumPair enum168 = values.get(168); assertEquals("America/Danmarkshavn", enum168.getName()); -- 2.36.6