From 5499b8dff5e7f183d62bc2692f03c1a5e8c28a26 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 16 Aug 2019 13:20:53 +0200 Subject: [PATCH] Remove trailing comments This fixes up minor code smells reported by sonar. Change-Id: Ic7abd5e431f2fc5e91ebc251d5a1e65d3c26c2bc Signed-off-by: Robert Varga --- .../binding/generator/impl/BindingSchemaContextUtils.java | 5 ++--- .../org/opendaylight/mdsal/binding/testutils/DiffUtil.java | 3 ++- .../util/RetryingManagedNewTransactionRunnerImpl.java | 3 ++- .../org/opendaylight/mdsal/trace/impl/TracingBroker.java | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java index 8a371e332b..70345d0e6b 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/BindingSchemaContextUtils.java @@ -42,7 +42,7 @@ public final class BindingSchemaContextUtils { throw new UnsupportedOperationException("Utility class should not be instantiated"); } - // FIXME: THis method does not search in case augmentations. + // FIXME: This method does not search in case augmentations. public static Optional findDataNodeContainer(final SchemaContext ctx, final InstanceIdentifier path) { Iterator pathArguments = path.getPathArguments().iterator(); @@ -99,8 +99,7 @@ public final class BindingSchemaContextUtils { } } else if (child instanceof DataNodeContainer && child.getQName().equals(targetQName)) { return Optional.of((DataNodeContainer) child); - } else if (child instanceof DataNodeContainer // - && child.isAddedByUses() // + } else if (child instanceof DataNodeContainer && child.isAddedByUses() && child.getQName().getLocalName().equals(targetQName.getLocalName())) { return Optional.of((DataNodeContainer) child); } diff --git a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/DiffUtil.java b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/DiffUtil.java index 232b02961a..167b885c20 100644 --- a/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/DiffUtil.java +++ b/binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/DiffUtil.java @@ -25,7 +25,8 @@ final class DiffUtil { // Configuration which we could tune as we use this more private static final int MAX_DIFFS = 1; - private static final int CONTEXT_LINES = 3; // number of lines of context output around each difference + // number of lines of context output around each difference + private static final int CONTEXT_LINES = 3; private static final Splitter SPLITTER = Splitter.on(System.getProperty("line.separator")); private static final Joiner JOINER = Joiner.on(System.getProperty("line.separator")); diff --git a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerImpl.java b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerImpl.java index 412bcbea68..9146a2ce9d 100644 --- a/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerImpl.java +++ b/binding/mdsal-binding-util/src/main/java/org/opendaylight/mdsal/binding/util/RetryingManagedNewTransactionRunnerImpl.java @@ -31,7 +31,8 @@ class RetryingManagedNewTransactionRunnerImpl implements ManagedNewTransactionRu // NB: The RetryingManagedNewTransactionRunnerTest is in mdsalutil-testutils's src/test, not this project's - private static final int DEFAULT_RETRIES = 3; // duplicated in SingleTransactionDataBroker + // duplicated in SingleTransactionDataBroker + private static final int DEFAULT_RETRIES = 3; private final int maxRetries; diff --git a/trace/mdsal-trace-impl/src/main/java/org/opendaylight/mdsal/trace/impl/TracingBroker.java b/trace/mdsal-trace-impl/src/main/java/org/opendaylight/mdsal/trace/impl/TracingBroker.java index 29e99af3a9..03d297f5e5 100644 --- a/trace/mdsal-trace-impl/src/main/java/org/opendaylight/mdsal/trace/impl/TracingBroker.java +++ b/trace/mdsal-trace-impl/src/main/java/org/opendaylight/mdsal/trace/impl/TracingBroker.java @@ -102,7 +102,8 @@ public class TracingBroker implements TracingDOMDataBroker { private static final int STACK_TRACE_FIRST_RELEVANT_FRAME = 2; - private final String type; // "default" VS "pingpong" + // "default" VS "pingpong" + private final String type; private final BindingNormalizedNodeSerializer codec; private final DOMDataBroker delegate; private final List registrationWatches = new ArrayList<>(); -- 2.36.6