From 1eb87c819cc6881ca7be74917a5d0bb7a9cad41f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 19 Nov 2016 15:51:40 +0100 Subject: [PATCH] Address trivial eclipse warnings - missing javadoc - superfluous else branches - checkstyle violations Change-Id: Ibf74b95d6ae7d1c9889852f541cce3e9d6b28bb4 Signed-off-by: Robert Varga --- .../yangtools/util/ClassLoaderUtils.java | 5 +- .../util/DurationStatisticsTracker.java | 5 +- .../yangtools/util/MapAdaptor.java | 4 +- .../AsyncNotifyingListenableFutureTask.java | 10 +- .../util/concurrent/ExceptionMapper.java | 9 +- ...DetectingListeningExecutorServiceTest.java | 99 +++++++------- .../yangtools/yang/common/QName.java | 5 +- .../data/api/FixedYangInstanceIdentifier.java | 3 +- .../yang/data/api/StackedPathArguments.java | 3 +- .../api/StackedYangInstanceIdentifier.java | 3 +- .../yang/data/api/schema/NormalizedNodes.java | 7 +- .../schema/stream/NormalizedNodeWriter.java | 7 +- .../NormalizedNodeDataTreeCandidateNode.java | 8 +- .../yang/data/impl/codec/EnumStringCodec.java | 16 +-- .../yang/data/impl/codec/SchemaTracker.java | 10 +- .../data/impl/codec/UnionStringCodec.java | 3 +- .../impl/leafref/LeafRefContextUtils.java | 124 +++++++----------- .../yang/data/impl/leafref/LeafRefPath.java | 19 ++- .../data/impl/schema/InstanceIdToNodes.java | 3 +- .../impl/ImmutableUnkeyedListNodeBuilder.java | 7 +- .../tree/AbstractDataTreeCandidateNode.java | 20 +-- ...bstractModifiedNodeBasedCandidateNode.java | 48 +++---- .../tree/AbstractRecursiveCandidateNode.java | 3 +- .../impl/codec/xml/XmlStreamUtilsTest.java | 4 +- .../impl/schema/NormalizedNodeUtilsTest.java | 3 +- ...SchemaOrderedNormalizedNodeWriterTest.java | 6 +- .../tree/ModificationMetadataTreeTest.java | 4 +- .../parser/spi/meta/QNameCacheNamespace.java | 8 +- .../stmt/rfc6020/AugmentStatementImpl.java | 18 +-- .../stmt/rfc6020/ModuleStatementSupport.java | 2 +- .../rfc6020/effective/CaseShorthandImpl.java | 11 +- .../util/NamedByteArrayInputStream.java | 7 +- 32 files changed, 198 insertions(+), 286 deletions(-) diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java index 45f4e0ce49..6e65b03658 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.util; import static com.google.common.base.Preconditions.checkNotNull; + import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; @@ -109,9 +110,9 @@ public final class ClassLoaderUtils { final String outerName = Joiner.on(".").join(components.subList(0, length)); final String innerName = outerName + "$" + components.get(length); return cls.loadClass(innerName); - } else { - throw e; } + + throw e; } } 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 a551642e39..c376afc2ad 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 @@ -182,11 +182,10 @@ public abstract class DurationStatisticsTracker { } private static String formatDuration(final DurationWithTime current) { - if (current != null) { - return formatDuration(current.getDuration(), current.getTimeMillis()); - } else { + if (current == null) { return formatDuration(0, null); } + return formatDuration(current.getDuration(), current.getTimeMillis()); } private static TimeUnit chooseUnit(final long nanos) { diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/MapAdaptor.java b/common/util/src/main/java/org/opendaylight/yangtools/util/MapAdaptor.java index df404a079e..e6c23ddc05 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/MapAdaptor.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/MapAdaptor.java @@ -167,8 +167,8 @@ public final class MapAdaptor { * Input will be thrown away, result will be retained for read-only access or * {@link #takeSnapshot(Map)} purposes. * - * @param input - * @return + * @param input non-optimized (read-write) map + * @return optimized read-only map */ public Map optimize(final Map input) { if (input instanceof ReadOnlyTrieMap) { diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListenableFutureTask.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListenableFutureTask.java index 0e36b74da3..53629b0330 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListenableFutureTask.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AsyncNotifyingListenableFutureTask.java @@ -136,11 +136,10 @@ public class AsyncNotifyingListenableFutureTask extends FutureTask impleme */ public static AsyncNotifyingListenableFutureTask create(final Callable callable, @Nullable final Executor listenerExecutor) { - if (listenerExecutor != null) { - return new DelegatingAsyncNotifyingListenableFutureTask<>(callable, listenerExecutor); - } else { + if (listenerExecutor == null) { return new AsyncNotifyingListenableFutureTask<>(callable); } + return new DelegatingAsyncNotifyingListenableFutureTask<>(callable, listenerExecutor); } /** @@ -155,11 +154,10 @@ public class AsyncNotifyingListenableFutureTask extends FutureTask impleme */ public static AsyncNotifyingListenableFutureTask create(final Runnable runnable, @Nullable final V result, @Nullable final Executor listenerExecutor) { - if (listenerExecutor != null) { - return new DelegatingAsyncNotifyingListenableFutureTask<>(runnable, result, listenerExecutor); - } else { + if (listenerExecutor == null) { return new AsyncNotifyingListenableFutureTask<>(runnable, result); } + return new DelegatingAsyncNotifyingListenableFutureTask<>(runnable, result, listenerExecutor); } @Override diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/ExceptionMapper.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/ExceptionMapper.java index 1616cd24aa..b109b190a9 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/ExceptionMapper.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/ExceptionMapper.java @@ -81,22 +81,21 @@ public abstract class ExceptionMapper implements Function DEADLOCK_EXECUTOR_SUPPLIER = TestDeadlockException::new; @@ -63,14 +64,14 @@ public class DeadlockDetectingListeningExecutorServiceTest { @After public void tearDown() { - if (executor != null ) { + if (executor != null) { executor.shutdownNow(); } } DeadlockDetectingListeningExecutorService newExecutor() { - return new DeadlockDetectingListeningExecutorService( Executors.newSingleThreadExecutor(), - DEADLOCK_EXECUTOR_SUPPLIER ); + return new DeadlockDetectingListeningExecutorService(Executors.newSingleThreadExecutor(), + DEADLOCK_EXECUTOR_SUPPLIER); } @Test @@ -82,7 +83,7 @@ public class DeadlockDetectingListeningExecutorServiceTest { ListenableFuture future = executor.submit(() -> "foo"); - assertEquals( "Future result", "foo", future.get( 5, TimeUnit.SECONDS ) ); + assertEquals( "Future result", "foo", future.get( 5, TimeUnit.SECONDS)); // Test submit with Runnable. @@ -91,10 +92,9 @@ public class DeadlockDetectingListeningExecutorServiceTest { // Test submit with Runnable and value. - future = executor.submit(() -> { - }, "foo" ); + future = executor.submit(() -> { }, "foo"); - assertEquals( "Future result", "foo", future.get( 5, TimeUnit.SECONDS ) ); + assertEquals("Future result", "foo", future.get(5, TimeUnit.SECONDS)); } @Test @@ -102,38 +102,38 @@ public class DeadlockDetectingListeningExecutorServiceTest { executor = newExecutor(); - testNonBlockingSubmitOnExecutorThread( SUBMIT, SUBMIT_CALLABLE ); - testNonBlockingSubmitOnExecutorThread( SUBMIT, SUBMIT_RUNNABLE ); - testNonBlockingSubmitOnExecutorThread( SUBMIT, SUBMIT_RUNNABLE_WITH_RESULT ); + testNonBlockingSubmitOnExecutorThread(SUBMIT, SUBMIT_CALLABLE); + testNonBlockingSubmitOnExecutorThread(SUBMIT, SUBMIT_RUNNABLE); + testNonBlockingSubmitOnExecutorThread(SUBMIT, SUBMIT_RUNNABLE_WITH_RESULT); - testNonBlockingSubmitOnExecutorThread( EXECUTE, SUBMIT_CALLABLE ); + testNonBlockingSubmitOnExecutorThread(EXECUTE, SUBMIT_CALLABLE); } - void testNonBlockingSubmitOnExecutorThread( final InitialInvoker initialInvoker, - final Invoker invoker ) throws Throwable { + void testNonBlockingSubmitOnExecutorThread(final InitialInvoker initialInvoker, final Invoker invoker) + throws Throwable { final AtomicReference caughtEx = new AtomicReference<>(); - final CountDownLatch futureCompletedLatch = new CountDownLatch( 1 ); + final CountDownLatch futureCompletedLatch = new CountDownLatch(1); - Runnable task = () -> Futures.addCallback( invoker.invokeExecutor( executor, null ), new FutureCallback() { + Runnable task = () -> Futures.addCallback(invoker.invokeExecutor(executor, null), new FutureCallback() { @Override - public void onSuccess( final Object result ) { + public void onSuccess(final Object result) { futureCompletedLatch.countDown(); } @Override - public void onFailure( final Throwable t ) { - caughtEx.set( t ); + public void onFailure(final Throwable t) { + caughtEx.set(t); futureCompletedLatch.countDown(); } - } ); + }); - initialInvoker.invokeExecutor( executor, task ); + initialInvoker.invokeExecutor(executor, task); - assertTrue( "Task did not complete - executor likely deadlocked", - futureCompletedLatch.await( 5, TimeUnit.SECONDS ) ); + assertTrue("Task did not complete - executor likely deadlocked", + futureCompletedLatch.await(5, TimeUnit.SECONDS)); - if (caughtEx.get() != null ) { + if (caughtEx.get() != null) { throw caughtEx.get(); } } @@ -143,57 +143,54 @@ public class DeadlockDetectingListeningExecutorServiceTest { executor = newExecutor(); - testBlockingSubmitOnExecutorThread( SUBMIT, SUBMIT_CALLABLE ); - testBlockingSubmitOnExecutorThread( SUBMIT, SUBMIT_RUNNABLE ); - testBlockingSubmitOnExecutorThread( SUBMIT, SUBMIT_RUNNABLE_WITH_RESULT ); + testBlockingSubmitOnExecutorThread(SUBMIT, SUBMIT_CALLABLE); + testBlockingSubmitOnExecutorThread(SUBMIT, SUBMIT_RUNNABLE); + testBlockingSubmitOnExecutorThread(SUBMIT, SUBMIT_RUNNABLE_WITH_RESULT); - testBlockingSubmitOnExecutorThread( EXECUTE, SUBMIT_CALLABLE ); + testBlockingSubmitOnExecutorThread(EXECUTE, SUBMIT_CALLABLE); } - void testBlockingSubmitOnExecutorThread( final InitialInvoker initialInvoker, - final Invoker invoker ) throws Exception { + void testBlockingSubmitOnExecutorThread(final InitialInvoker initialInvoker, final Invoker invoker) + throws Exception { final AtomicReference caughtEx = new AtomicReference<>(); - final CountDownLatch latch = new CountDownLatch( 1 ); + final CountDownLatch latch = new CountDownLatch(1); Runnable task = () -> { try { - invoker.invokeExecutor( executor, null ).get(); - } catch( ExecutionException e ) { - caughtEx.set( e.getCause() ); - } catch( Throwable e ) { - caughtEx.set( e ); + invoker.invokeExecutor(executor, null).get(); + } catch(ExecutionException e) { + caughtEx.set(e.getCause()); + } catch(Throwable e) { + caughtEx.set(e); } finally { latch.countDown(); } }; - initialInvoker.invokeExecutor( executor, task ); - - assertTrue( "Task did not complete - executor likely deadlocked", - latch.await( 5, TimeUnit.SECONDS ) ); + initialInvoker.invokeExecutor(executor, task); - assertNotNull( "Expected exception thrown", caughtEx.get() ); - assertEquals( "Caught exception type", TestDeadlockException.class, caughtEx.get().getClass() ); + assertTrue("Task did not complete - executor likely deadlocked", latch.await( 5, TimeUnit.SECONDS)); + assertNotNull("Expected exception thrown", caughtEx.get()); + assertEquals("Caught exception type", TestDeadlockException.class, caughtEx.get().getClass()); } @Test public void testListenableFutureCallbackWithExecutor() throws InterruptedException { String listenerThreadPrefix = "ListenerThread"; - ExecutorService listenerExecutor = Executors.newFixedThreadPool( 1, - new ThreadFactoryBuilder().setNameFormat( listenerThreadPrefix + "-%d" ).build() ); + ExecutorService listenerExecutor = Executors.newFixedThreadPool(1, + new ThreadFactoryBuilder().setNameFormat(listenerThreadPrefix + "-%d").build()); executor = new DeadlockDetectingListeningExecutorService( - Executors.newSingleThreadExecutor( - new ThreadFactoryBuilder().setNameFormat( "SingleThread" ).build() ), - DEADLOCK_EXECUTOR_SUPPLIER, listenerExecutor ); + Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("SingleThread").build()), + DEADLOCK_EXECUTOR_SUPPLIER, listenerExecutor); try { - testListenerCallback( executor, SUBMIT_CALLABLE, listenerThreadPrefix ); - testListenerCallback( executor, SUBMIT_RUNNABLE, listenerThreadPrefix ); - testListenerCallback( executor, SUBMIT_RUNNABLE_WITH_RESULT, listenerThreadPrefix ); + testListenerCallback(executor, SUBMIT_CALLABLE, listenerThreadPrefix); + testListenerCallback(executor, SUBMIT_RUNNABLE, listenerThreadPrefix); + testListenerCallback(executor, SUBMIT_RUNNABLE_WITH_RESULT, listenerThreadPrefix); } finally { listenerExecutor.shutdownNow(); } diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java index 12a01fa1b8..d49078681b 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java @@ -266,7 +266,6 @@ public final class QName implements Immutable, Serializable, Comparable { } /** - * * Creates new QName. * * @param namespace @@ -276,7 +275,7 @@ public final class QName implements Immutable, Serializable, Comparable { * in format YYYY-mm-dd. * @param localName * Local name part of QName. MUST NOT BE null. - * @return + * @return A new QName * @throws NullPointerException * If any of parameters is null. * @throws IllegalArgumentException @@ -305,7 +304,7 @@ public final class QName implements Immutable, Serializable, Comparable { * Namespace of QName, MUST NOT BE Null. * @param localName * Local name part of QName. MUST NOT BE null. - * @return + * @return A new QName * @throws NullPointerException * If any of parameters is null. * @throws IllegalArgumentException diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/FixedYangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/FixedYangInstanceIdentifier.java index 39afcacba2..d5a07238e3 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/FixedYangInstanceIdentifier.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/FixedYangInstanceIdentifier.java @@ -120,9 +120,8 @@ final class FixedYangInstanceIdentifier extends YangInstanceIdentifier implement boolean pathArgumentsEqual(final YangInstanceIdentifier other) { if (other instanceof FixedYangInstanceIdentifier) { return path.equals(((FixedYangInstanceIdentifier) other).path); - } else { - return super.pathArgumentsEqual(other); } + return super.pathArgumentsEqual(other); } @Override diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java index 94596ceedc..7279b58f4b 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedPathArguments.java @@ -40,9 +40,8 @@ final class StackedPathArguments extends PathArgumentList { public PathArgument get(final int index) { if (index < base.size()) { return base.get(index); - } else { - return stack.get(index - base.size()); } + return stack.get(index - base.size()); } @Override diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedYangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedYangInstanceIdentifier.java index 5ccc73759a..35de59be97 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedYangInstanceIdentifier.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedYangInstanceIdentifier.java @@ -153,9 +153,8 @@ final class StackedYangInstanceIdentifier extends YangInstanceIdentifier impleme if (other instanceof StackedYangInstanceIdentifier) { final StackedYangInstanceIdentifier stacked = (StackedYangInstanceIdentifier) other; return pathArgument.equals(stacked.pathArgument) && parent.equals(stacked.parent); - } else { - return super.pathArgumentsEqual(other); } + return super.pathArgumentsEqual(other); } private void readObject(final ObjectInputStream inputStream) throws IOException, ClassNotFoundException { diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java index fc0302ba4f..34d23c5a3e 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/NormalizedNodes.java @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.data.api.schema; import static com.google.common.base.Preconditions.checkNotNull; + import com.google.common.annotations.Beta; import com.google.common.base.Optional; import com.google.common.base.Strings; @@ -35,11 +36,7 @@ public final class NormalizedNodes { public static Optional> findNode(final YangInstanceIdentifier rootPath, final NormalizedNode rootNode, final YangInstanceIdentifier childPath) { final Optional relativePath = childPath.relativeTo(rootPath); - if (relativePath.isPresent()) { - return findNode(rootNode, relativePath.get()); - } else { - return Optional.absent(); - } + return relativePath.isPresent() ? findNode(rootNode, relativePath.get()) : Optional.absent(); } public static Optional> findNode(final Optional> parent, final Iterable relativePath) { diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java index 2d91bf34e6..29702b22f1 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.data.api.schema.stream; import static org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter.UNKNOWN_SIZE; + import com.google.common.annotations.Beta; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -81,11 +82,7 @@ public class NormalizedNodeWriter implements Closeable, Flushable { * @return A new instance. */ public static NormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, final boolean orderKeyLeaves) { - if (orderKeyLeaves) { - return new OrderedNormalizedNodeWriter(writer); - } else { - return new NormalizedNodeWriter(writer); - } + return orderKeyLeaves ? new OrderedNormalizedNodeWriter(writer) : new NormalizedNodeWriter(writer); } /** 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 0b0bd7cbf5..d41a334d68 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 @@ -11,8 +11,8 @@ import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; +import com.google.common.collect.ImmutableList; import java.util.Collection; -import java.util.Collections; import javax.annotation.Nonnull; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -49,9 +49,8 @@ final class NormalizedNodeDataTreeCandidateNode implements DataTreeCandidateNode public Collection getChildNodes() { if (data instanceof NormalizedNodeContainer) { return Collections2.transform(((NormalizedNodeContainer) data).getValue(), FACTORY_FUNCTION); - } else { - return Collections.emptyList(); } + return ImmutableList.of(); } @Override @@ -60,9 +59,8 @@ final class NormalizedNodeDataTreeCandidateNode implements DataTreeCandidateNode @SuppressWarnings({ "rawtypes", "unchecked" }) final Optional> child = ((NormalizedNodeContainer)data).getChild(identifier); return FACTORY_FUNCTION.apply(child.orNull()); - } else { - return null; } + return null; } @Override diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EnumStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EnumStringCodec.java index 54fe384de8..bfc67e49bb 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EnumStringCodec.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EnumStringCodec.java @@ -41,16 +41,16 @@ final class EnumStringCodec extends TypeDefinitionAwareCodec pathFromRoot, LeafRefContext root) { - + public static LeafRefContext getLeafRefReferencingContext(final Iterable pathFromRoot, LeafRefContext root) { LeafRefContext leafRefCtx = null; final Iterator iterator = pathFromRoot.iterator(); while (iterator.hasNext() && root != null) { @@ -52,8 +49,7 @@ public final class LeafRefContextUtils { return leafRefCtx; } - public static LeafRefContext getLeafRefReferencedByContext(final SchemaNode node, - final LeafRefContext root) { + public static LeafRefContext getLeafRefReferencedByContext(final SchemaNode node, final LeafRefContext root) { final SchemaPath schemaPath = node.getPath(); return getLeafRefReferencedByContext(schemaPath, root); } @@ -64,8 +60,8 @@ public final class LeafRefContextUtils { return getLeafRefReferencedByContext(pathFromRoot, root); } - public static LeafRefContext getLeafRefReferencedByContext( - final Iterable pathFromRoot, LeafRefContext root) { + public static LeafRefContext getLeafRefReferencedByContext(final Iterable pathFromRoot, + LeafRefContext root) { LeafRefContext leafRefCtx = null; final Iterator iterator = pathFromRoot.iterator(); @@ -81,13 +77,11 @@ public final class LeafRefContextUtils { } public static boolean isLeafRef(final SchemaNode node, final LeafRefContext root) { - if (node == null || root == null) { return false; } - final LeafRefContext leafRefReferencingContext = getLeafRefReferencingContext( - node, root); + final LeafRefContext leafRefReferencingContext = getLeafRefReferencingContext(node, root); if (leafRefReferencingContext == null) { return false; } @@ -96,13 +90,11 @@ public final class LeafRefContextUtils { } public static boolean hasLeafRefChild(final SchemaNode node, final LeafRefContext root) { - if (node == null || root == null) { return false; } - final LeafRefContext leafRefReferencingContext = getLeafRefReferencingContext( - node, root); + final LeafRefContext leafRefReferencingContext = getLeafRefReferencingContext(node, root); if (leafRefReferencingContext == null) { return false; } @@ -110,15 +102,12 @@ public final class LeafRefContextUtils { return leafRefReferencingContext.hasReferencingChild(); } - public static boolean isReferencedByLeafRef(final SchemaNode node, - final LeafRefContext root) { - + public static boolean isReferencedByLeafRef(final SchemaNode node, final LeafRefContext root) { if (node == null || root == null) { return false; } - final LeafRefContext leafRefReferencedByContext = getLeafRefReferencedByContext( - node, root); + final LeafRefContext leafRefReferencedByContext = getLeafRefReferencedByContext(node, root); if (leafRefReferencedByContext == null) { return false; } @@ -126,15 +115,12 @@ public final class LeafRefContextUtils { return leafRefReferencedByContext.isReferenced(); } - public static boolean hasChildReferencedByLeafRef(final SchemaNode node, - final LeafRefContext root) { - - if ((node == null) || (root == null)) { + public static boolean hasChildReferencedByLeafRef(final SchemaNode node, final LeafRefContext root) { + if (node == null || root == null) { return false; } - final LeafRefContext leafRefReferencedByContext = getLeafRefReferencedByContext( - node, root); + final LeafRefContext leafRefReferencedByContext = getLeafRefReferencedByContext(node, root); if (leafRefReferencedByContext == null) { return false; } @@ -142,33 +128,24 @@ public final class LeafRefContextUtils { return leafRefReferencedByContext.hasReferencedChild(); } - public static List findAllLeafRefChilds(final SchemaNode node, - final LeafRefContext root) { - + public static List findAllLeafRefChilds(final SchemaNode node, final LeafRefContext root) { return findAllLeafRefChilds(node.getPath(), root); } - public static List findAllLeafRefChilds( - final SchemaPath schemaPath, final LeafRefContext root) { - + public static List findAllLeafRefChilds(final SchemaPath schemaPath, final LeafRefContext root) { return findAllLeafRefChilds(schemaPath.getPathFromRoot(), root); } - public static List findAllLeafRefChilds( - final Iterable pathFromRoot, final LeafRefContext root) { - - final LeafRefContext leafRefReferencingContext = getLeafRefReferencingContext( - pathFromRoot, root); + public static List findAllLeafRefChilds(final Iterable pathFromRoot, + final LeafRefContext root) { + final LeafRefContext leafRefReferencingContext = getLeafRefReferencingContext(pathFromRoot, root); final List allLeafRefsChilds = findAllLeafRefChilds(leafRefReferencingContext); return allLeafRefsChilds; } - public static List findAllLeafRefChilds( - final LeafRefContext parent) { - + public static List findAllLeafRefChilds(final LeafRefContext parent) { final LinkedList leafRefChilds = new LinkedList<>(); - if (parent == null) { return leafRefChilds; } @@ -176,44 +153,37 @@ public final class LeafRefContextUtils { if (parent.isReferencing()) { leafRefChilds.add(parent); return leafRefChilds; - } else { - final Set> childs = parent - .getReferencingChilds().entrySet(); - for (final Entry child : childs) { - leafRefChilds.addAll(findAllLeafRefChilds(child.getValue())); - } + } + + final Set> childs = parent.getReferencingChilds().entrySet(); + for (final Entry child : childs) { + leafRefChilds.addAll(findAllLeafRefChilds(child.getValue())); } return leafRefChilds; } - public static List findAllChildsReferencedByLeafRef( - final SchemaNode node, final LeafRefContext root) { - + public static List findAllChildsReferencedByLeafRef(final SchemaNode node, + final LeafRefContext root) { return findAllChildsReferencedByLeafRef(node.getPath(), root); } - public static List findAllChildsReferencedByLeafRef( - final SchemaPath schemaPath, final LeafRefContext root) { - - return findAllChildsReferencedByLeafRef(schemaPath.getPathFromRoot(), - root); + public static List findAllChildsReferencedByLeafRef(final SchemaPath schemaPath, + final LeafRefContext root) { + return findAllChildsReferencedByLeafRef(schemaPath.getPathFromRoot(), root); } - public static List findAllChildsReferencedByLeafRef( - final Iterable pathFromRoot, final LeafRefContext root) { + public static List findAllChildsReferencedByLeafRef(final Iterable pathFromRoot, + final LeafRefContext root) { - final LeafRefContext leafRefReferencedByContext = getLeafRefReferencedByContext( - pathFromRoot, root); - final List allChildsReferencedByLeafRef = findAllChildsReferencedByLeafRef(leafRefReferencedByContext); + final LeafRefContext leafRefReferencedByContext = getLeafRefReferencedByContext(pathFromRoot, root); + final List allChildsReferencedByLeafRef = + findAllChildsReferencedByLeafRef(leafRefReferencedByContext); return allChildsReferencedByLeafRef; } - public static List findAllChildsReferencedByLeafRef( - final LeafRefContext parent) { - + public static List findAllChildsReferencedByLeafRef(final LeafRefContext parent) { final LinkedList childsReferencedByLeafRef = new LinkedList<>(); - if (parent == null) { return childsReferencedByLeafRef; } @@ -221,14 +191,11 @@ public final class LeafRefContextUtils { if (parent.isReferenced()) { childsReferencedByLeafRef.add(parent); return childsReferencedByLeafRef; - } else { - final Set> childs = parent - .getReferencedByChilds().entrySet(); - for (final Entry child : childs) { - childsReferencedByLeafRef - .addAll(findAllChildsReferencedByLeafRef(child - .getValue())); - } + } + + final Set> childs = parent.getReferencedByChilds().entrySet(); + for (final Entry child : childs) { + childsReferencedByLeafRef.addAll(findAllChildsReferencedByLeafRef(child.getValue())); } return childsReferencedByLeafRef; } @@ -238,22 +205,19 @@ public final class LeafRefContextUtils { return getAllLeafRefsReferencingThisNode(node.getPath(), root); } - public static Map getAllLeafRefsReferencingThisNode( - final SchemaPath path, final LeafRefContext root) { + public static Map getAllLeafRefsReferencingThisNode(final SchemaPath path, + final LeafRefContext root) { return getAllLeafRefsReferencingThisNode(path.getPathFromRoot(), root); } - public static Map getAllLeafRefsReferencingThisNode( - final Iterable pathFromRoot, final LeafRefContext root) { - - final LeafRefContext leafRefReferencedByContext = getLeafRefReferencedByContext( - pathFromRoot, root); + public static Map getAllLeafRefsReferencingThisNode(final Iterable pathFromRoot, + final LeafRefContext root) { + final LeafRefContext leafRefReferencedByContext = getLeafRefReferencedByContext(pathFromRoot, root); if (leafRefReferencedByContext == null) { return new HashMap<>(); } return leafRefReferencedByContext.getAllReferencedByLeafRefCtxs(); } - } 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 84f17d195d..988de8e887 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 @@ -195,8 +195,7 @@ public abstract class LeafRefPath implements Immutable { * @return A new child path */ public LeafRefPath createChild(final LeafRefPath relative) { - Preconditions.checkArgument(!relative.isAbsolute(), - "Child creation requires relative path"); + Preconditions.checkArgument(!relative.isAbsolute(), "Child creation requires relative path"); LeafRefPath parent = this; for (QNameWithPredicate qname : relative.getPathFromRoot()) { @@ -248,20 +247,18 @@ public abstract class LeafRefPath implements Immutable { @Override public QNameWithPredicate next() { - if (current.parent != null) { - final QNameWithPredicate ret = current.qname; - current = current.parent; - return ret; - } else { - throw new NoSuchElementException( - "No more elements available"); + if (current.parent == null) { + throw new NoSuchElementException("No more elements available"); } + + final QNameWithPredicate ret = current.qname; + current = current.parent; + return ret; } @Override public void remove() { - throw new UnsupportedOperationException( - "Component removal not supported"); + throw new UnsupportedOperationException("Component removal not supported"); } }; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java index f27815bac6..f68044ce0b 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/InstanceIdToNodes.java @@ -205,9 +205,8 @@ abstract class InstanceIdToNodes implements Identifiable } if (augmentation != null) { return new InstanceIdToCompositeNodes.AugmentationNormalization(augmentation, parent); - } else { - return fromDataSchemaNode(child); } + return fromDataSchemaNode(child); } static InstanceIdToNodes fromDataSchemaNode(final DataSchemaNode potential) { 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 7b658054fb..fb47782805 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 @@ -99,9 +99,8 @@ public class ImmutableUnkeyedListNodeBuilder implements CollectionNodeBuilder> implements Immutable, UnkeyedListNode { + protected static final class EmptyImmutableUnkeyedListNode extends + AbstractImmutableNormalizedNode> implements Immutable, + UnkeyedListNode { protected EmptyImmutableUnkeyedListNode(final NodeIdentifier nodeIdentifier) { super(nodeIdentifier); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java index f7bea78824..082dfd4c87 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeCandidateNode.java @@ -23,11 +23,7 @@ abstract class AbstractDataTreeCandidateNode implements DataTreeCandidateNode { private static Optional> getChild( final NormalizedNodeContainer> container, final PathArgument identifier) { - if (container != null) { - return container.getChild(identifier); - } else { - return Optional.absent(); - } + return container == null ? Optional.absent() : container.getChild(identifier); } static DataTreeCandidateNode deltaChild( @@ -40,19 +36,15 @@ abstract class AbstractDataTreeCandidateNode implements DataTreeCandidateNode { final NormalizedNode oldChild = maybeOldChild.get(); if (maybeNewChild.isPresent()) { return AbstractRecursiveCandidateNode.replaceNode(oldChild, maybeNewChild.get()); - } else { - return AbstractRecursiveCandidateNode.deleteNode(oldChild); - } - } else { - if (maybeNewChild.isPresent()) { - return AbstractRecursiveCandidateNode.writeNode(maybeNewChild.get()); - } else { - return null; } + return AbstractRecursiveCandidateNode.deleteNode(oldChild); } + + return maybeNewChild.isPresent() ? AbstractRecursiveCandidateNode.writeNode(maybeNewChild.get()) : null; } - static Collection deltaChildren(@Nullable final NormalizedNodeContainer> oldData, + static Collection deltaChildren( + @Nullable final NormalizedNodeContainer> oldData, @Nullable final NormalizedNodeContainer> newData) { Preconditions.checkArgument(newData != null || oldData != null, "No old or new data, modification type should be NONE and deltaChildren() mustn't be called."); 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 aa1ae48cee..02d961eed3 100644 --- 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 @@ -10,8 +10,8 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.collect.Collections2; +import com.google.common.collect.ImmutableList; import java.util.Collection; -import java.util.Collections; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -46,11 +46,7 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida } private static TreeNode childMeta(final TreeNode parent, final PathArgument id) { - if (parent != null) { - return parent.getChild(id).orNull(); - } else { - return null; - } + return parent == null ? null : parent.getChild(id).orNull(); } private static boolean canHaveChildren(@Nullable final TreeNode oldMeta, @Nullable final TreeNode newMeta) { @@ -84,21 +80,20 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida case UNMODIFIED: // Unmodified node, but we still need to resolve potential children. canHaveChildren returns // false if both arguments are null. - if (canHaveChildren(oldMeta, newMeta)) { - return Collections2.transform(getContainer(newMeta != null ? newMeta : oldMeta).getValue(), - AbstractRecursiveCandidateNode::unmodifiedNode); - } else { - return Collections.emptyList(); + if (!canHaveChildren(oldMeta, newMeta)) { + return ImmutableList.of(); } + + return Collections2.transform(getContainer(newMeta != null ? newMeta : oldMeta).getValue(), + AbstractRecursiveCandidateNode::unmodifiedNode); case DELETE: case WRITE: // This is unusual, the user is requesting we follow into an otherwise-terminal node. // We need to fudge things based on before/after data to correctly fake the expectations. - if (canHaveChildren(oldMeta, newMeta)) { - return AbstractDataTreeCandidateNode.deltaChildren(getContainer(oldMeta), getContainer(newMeta)); - } else { - return Collections.emptyList(); + if (!canHaveChildren(oldMeta, newMeta)) { + return ImmutableList.of(); } + return AbstractDataTreeCandidateNode.deltaChildren(getContainer(oldMeta), getContainer(newMeta)); default: throw new IllegalArgumentException("Unhandled modification type " + mod.getModificationType()); } @@ -111,11 +106,7 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida } private static Optional> optionalData(final TreeNode meta) { - if (meta != null) { - return Optional.of(meta.getData()); - } else { - return Optional.absent(); - } + return meta == null ? Optional.absent() : Optional.of(meta.getData()); } @Override @@ -142,23 +133,18 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida } return null; case UNMODIFIED: - if (canHaveChildren(oldMeta, newMeta)) { - final Optional> maybeChild = getContainer(newMeta != null ? newMeta : oldMeta).getChild(identifier); - if (maybeChild.isPresent()) { - return AbstractRecursiveCandidateNode.unmodifiedNode(maybeChild.get()); - } else { - return null; - } - } else { + if (!canHaveChildren(oldMeta, newMeta)) { return null; } + final Optional> maybeChild = getContainer(newMeta != null ? newMeta : oldMeta) + .getChild(identifier); + return maybeChild.isPresent() ? AbstractRecursiveCandidateNode.unmodifiedNode(maybeChild.get()) : null; case DELETE: case WRITE: - if (canHaveChildren(oldMeta, newMeta)) { - return AbstractDataTreeCandidateNode.deltaChild(getContainer(oldMeta), getContainer(newMeta), identifier); - } else { + if (!canHaveChildren(oldMeta, newMeta)) { return null; } + return AbstractDataTreeCandidateNode.deltaChild(getContainer(oldMeta), getContainer(newMeta), identifier); default: throw new IllegalArgumentException("Unhandled modification type " + mod.getModificationType()); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractRecursiveCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractRecursiveCandidateNode.java index f8dd37d24d..8f1baffcf6 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractRecursiveCandidateNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractRecursiveCandidateNode.java @@ -76,9 +76,8 @@ abstract class AbstractRecursiveCandidateNode extends AbstractDataTreeCandidateN private DataTreeCandidateNode createChild(final NormalizedNode childData) { if (isContainer(childData)) { return createContainer((NormalizedNodeContainer>) childData); - } else { - return createLeaf(childData); } + return createLeaf(childData); } protected abstract DataTreeCandidateNode createContainer(NormalizedNodeContainer> childData); 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 8ba53004fc..06e5764f13 100644 --- 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 @@ -13,6 +13,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; + import com.google.common.base.Optional; import com.google.common.collect.Maps; import java.io.ByteArrayOutputStream; @@ -190,9 +191,8 @@ public class XmlStreamUtilsTest { final QName moduleQName = QName.create(namespace, revision, "module"); final QNameModule module = QNameModule.create(moduleQName.getNamespace(), moduleQName.getRevision()); return QName.create(module, localName); - } else { - return QName.create(namespace, revision, localName); } + return QName.create(namespace, revision, localName); } private LeafSchemaNode findSchemaNodeWithLeafrefType(final DataNodeContainer module, final String nodeName) { diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedNodeUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedNodeUtilsTest.java index 7df8959ffd..67d9409d10 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedNodeUtilsTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedNodeUtilsTest.java @@ -13,6 +13,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.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -89,7 +90,7 @@ public class NormalizedNodeUtilsTest { * * * - * @return + * @return A test document */ public NormalizedNode createDocumentOne() { return ImmutableContainerNodeBuilder diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriterTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriterTest.java index 4b4ef99b4f..1922cfa02b 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriterTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaOrderedNormalizedNodeWriterTest.java @@ -156,7 +156,7 @@ public class SchemaOrderedNormalizedNodeWriterTest { XMLAssert.assertXMLIdentical(new Diff(EXPECTED_2, stringWriter.toString()), true); } - private SchemaContext getSchemaContext(String filePath) throws URISyntaxException, ReactorException, FileNotFoundException { + private SchemaContext getSchemaContext(final String filePath) throws URISyntaxException, ReactorException, FileNotFoundException { final InputStream resourceStream = getClass().getResourceAsStream(filePath); final YangStatementSourceImpl source = new YangStatementSourceImpl(resourceStream); CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR @@ -165,11 +165,11 @@ public class SchemaOrderedNormalizedNodeWriterTest { return reactor.buildEffective(); } - private YangInstanceIdentifier.NodeIdentifier getNodeIdentifier(String ns, String name) { + private static YangInstanceIdentifier.NodeIdentifier getNodeIdentifier(final String ns, final String name) { return YangInstanceIdentifier.NodeIdentifier.create(createQName(ns, name)); } - private QName createQName(String ns, String name) { + private static QName createQName(final String ns, final String name) { return QName.create(ns, "2016-02-17", name); } 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 a74bad4c3a..0f1ead3308 100644 --- 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 @@ -26,8 +26,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; @@ -120,7 +120,7 @@ public class ModificationMetadataTreeTest { * * * - * @return + * @return a test document */ public NormalizedNode createDocumentOne() { return ImmutableContainerNodeBuilder diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/QNameCacheNamespace.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/QNameCacheNamespace.java index d6f0192747..79b25dd257 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/QNameCacheNamespace.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/QNameCacheNamespace.java @@ -47,12 +47,12 @@ public final class QNameCacheNamespace extends NamespaceBehaviour> stmt) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java index 5f4b9a4630..9f4dcca254 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/CaseShorthandImpl.java @@ -112,11 +112,7 @@ final class CaseShorthandImpl implements ChoiceCaseNode, DerivableSchemaNode { @Override public DataSchemaNode getDataChildByName(final QName name) { - if (getQName().equals(name)) { - return caseShorthandNode; - } else { - return null; - } + return getQName().equals(name) ? caseShorthandNode : null; } @Override @@ -160,10 +156,7 @@ final class CaseShorthandImpl implements ChoiceCaseNode, DerivableSchemaNode { @Override public String toString() { - return CaseShorthandImpl.class.getSimpleName() + "[" + - "qname=" + - getQName() + - "]"; + return CaseShorthandImpl.class.getSimpleName() + "[" + "qname=" + getQName() + "]"; } private static ChoiceCaseNode getOriginalIfPresent(final SchemaNode caseShorthandNode) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/NamedByteArrayInputStream.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/NamedByteArrayInputStream.java index 158dce8cf3..9deb0f05b4 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/NamedByteArrayInputStream.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/NamedByteArrayInputStream.java @@ -15,19 +15,18 @@ import java.io.InputStream; public class NamedByteArrayInputStream extends ByteArrayInputStream implements NamedInputStream { private final String toString; - public NamedByteArrayInputStream(byte[] buf, String toString) { + public NamedByteArrayInputStream(final byte[] buf, final String toString) { super(buf); this.toString = toString; } - public static ByteArrayInputStream create(InputStream originalIS) throws IOException { + public static ByteArrayInputStream create(final InputStream originalIS) throws IOException { final byte[] data = ByteStreams.toByteArray(originalIS); if (originalIS instanceof NamedInputStream) { return new NamedByteArrayInputStream(data, originalIS.toString()); - } else { - return new ByteArrayInputStream(data); } + return new ByteArrayInputStream(data); } @Override -- 2.36.6