From 844803aaf77ad49444188191bcf1e57769c82e33 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 16 Jun 2015 20:59:27 +0200 Subject: [PATCH] Sonar: remove unused modifiers public/static/final modifies are implied by the context, e.g. by being declared in an interface. Change-Id: Ic2f97172595d7cdb2119510c077eabac55fa0798 Signed-off-by: Robert Varga --- .../yangtools/yang/binding/BindingStreamEventWriter.java | 2 +- .../api/schema/stream/NormalizedNodeStreamWriter.java | 2 +- .../yangtools/yang/model/repo/api/SchemaSourceFilter.java | 2 +- .../yangtools/yang/model/repo/api/SourceIdentifier.java | 2 +- .../yang/model/repo/spi/PotentialSchemaSource.java | 2 +- .../yang/model/repo/util/AbstractSchemaRepository.java | 2 +- .../yang/model/repo/util/SchemaSourceTransformer.java | 2 +- .../yang/model/util/repo/TransformingSourceProvider.java | 4 ++-- .../yangtools/yang/parser/spi/meta/StmtContext.java | 2 +- .../yangtools/yang/parser/spi/source/PrefixToModule.java | 8 +------- 10 files changed, 11 insertions(+), 17 deletions(-) diff --git a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingStreamEventWriter.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingStreamEventWriter.java index c986f8143e..4aeb309dd5 100644 --- a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingStreamEventWriter.java +++ b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/BindingStreamEventWriter.java @@ -104,7 +104,7 @@ public interface BindingStreamEventWriter extends Closeable, Flushable { * all other values will result, based on implementation preference, in the * hint being completely ignored or IllegalArgumentException being thrown. */ - final int UNKNOWN_SIZE = -1; + int UNKNOWN_SIZE = -1; /** * diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java index 94b5ba69e5..1165612038 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeStreamWriter.java @@ -92,7 +92,7 @@ public interface NormalizedNodeStreamWriter extends Closeable, Flushable { * all other values will result, based on implementation preference, in the * hint being completely ignored or IllegalArgumentException being thrown. */ - public final int UNKNOWN_SIZE = -1; + int UNKNOWN_SIZE = -1; /** * diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceFilter.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceFilter.java index 85b26a52d4..dfcbe3c9e6 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceFilter.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaSourceFilter.java @@ -23,7 +23,7 @@ public interface SchemaSourceFilter { /** * A {@link SchemaSourceFilter} which accepts any schema source it is presented with. */ - public static final SchemaSourceFilter ALWAYS_ACCEPT = new SchemaSourceFilter() { + SchemaSourceFilter ALWAYS_ACCEPT = new SchemaSourceFilter() { private final Iterable> Representations = Collections.>singletonList(SchemaSourceRepresentation.class); diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SourceIdentifier.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SourceIdentifier.java index 0b74d4b63f..2c62dcbd59 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SourceIdentifier.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SourceIdentifier.java @@ -199,7 +199,7 @@ public final class SourceIdentifier implements Identifier, Immutable { * * @return Filename for this source identifier. */ - public static final String toYangFileName(final String moduleName, final Optional revision) { + public static String toYangFileName(final String moduleName, final Optional revision) { StringBuilder filename = new StringBuilder(moduleName); if (revision.isPresent()) { filename.append('@'); diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/spi/PotentialSchemaSource.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/spi/PotentialSchemaSource.java index fa2758f4e3..73af008cdd 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/spi/PotentialSchemaSource.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/spi/PotentialSchemaSource.java @@ -76,7 +76,7 @@ public final class PotentialSchemaSource { this.cost = cost; } - public static final PotentialSchemaSource create(final SourceIdentifier sourceIdentifier, final Class representation, final int cost) { + public static PotentialSchemaSource create(final SourceIdentifier sourceIdentifier, final Class representation, final int cost) { return new PotentialSchemaSource<>(sourceIdentifier, representation, cost); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java index d6058292af..a001f0e589 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java @@ -65,7 +65,7 @@ public abstract class AbstractSchemaRepository implements SchemaRepository, Sche @GuardedBy("this") private final Collection listeners = new ArrayList<>(); - private static final CheckedFuture fetchSource(final SourceIdentifier id, final Iterator> it) { + private static CheckedFuture fetchSource(final SourceIdentifier id, final Iterator> it) { final AbstractSchemaSourceRegistration reg = it.next(); @SuppressWarnings("unchecked") 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 7b58006cf0..13ddf4dee3 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 @@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistry; public class SchemaSourceTransformer implements SchemaSourceListener, SchemaSourceProvider { private static final ExceptionMapper MAPPER = ReflectiveExceptionMapper.create("Source transformation", SchemaSourceException.class); - public static interface Transformation extends AsyncFunction { + public interface Transformation extends AsyncFunction { @Override CheckedFuture apply(final S input) throws Exception; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/TransformingSourceProvider.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/TransformingSourceProvider.java index 69e07e809a..cdbe27cf5a 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/TransformingSourceProvider.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/TransformingSourceProvider.java @@ -38,7 +38,7 @@ public final class TransformingSourceProvider implements // * @throws NullPointerException * if any of arguments is null. */ - public static final TransformingSourceProvider create(final AdvancedSchemaSourceProvider delegate, + public static TransformingSourceProvider create(final AdvancedSchemaSourceProvider delegate, final SchemaSourceTransformation transformation) { return new TransformingSourceProvider<>(delegate, transformation); } @@ -68,4 +68,4 @@ public final class TransformingSourceProvider implements // public Optional getSchemaSource(final String moduleName, final Optional revision) { return getSchemaSource(SourceIdentifier.create(moduleName, revision)); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java index 1c19a2bf39..1e24600932 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContext.java @@ -79,7 +79,7 @@ public interface StmtContext, E extends Effect void setTypeOfCopy(TypeOfCopy typeOfCopy); - public StatementContextBase getOriginalCtx(); + StatementContextBase getOriginalCtx(); void setOriginalCtx(StatementContextBase originalCtx); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModule.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModule.java index 6b409e00ce..516eaea4c0 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModule.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/PrefixToModule.java @@ -12,17 +12,13 @@ import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace; /** - * * Source-specific mapping of prefixes to namespaces - * */ public interface PrefixToModule extends IdentifierNamespace { - public static final String DEFAULT_PREFIX = ""; - + String DEFAULT_PREFIX = ""; /** - * * Returns QNameModule (namespace + revision) associated with supplied * prefix. * @@ -36,7 +32,6 @@ public interface PrefixToModule extends IdentifierNamespace @Nullable QNameModule get(String prefix); /** - * * Returns QNameModule (namespace + revision) associated with XML namespace * (URI). * @@ -47,5 +42,4 @@ public interface PrefixToModule extends IdentifierNamespace * */ @Nullable QNameModule getByNamespace(String namespace); - } -- 2.36.6