From: Stephen Kitt Date: Mon, 7 Mar 2016 16:19:17 +0000 (+0100) Subject: Remove redundant modifiers X-Git-Tag: release/boron~194 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ded9e3c33f7138c7391caf5afb377dce76986f8f;p=yangtools.git Remove redundant modifiers * Use instead of . * Delete unnecessary semi-colons. * Drop public static from interface members (they're the default). * Drop final from static methods (it's the default). * Drop private from enum constructors (it's the default). * Collapse common exception handlers. * Clean up obsolete imports. Change-Id: I8f7f74a126f558cba0a99fd0b7376cfdbccc4390 Signed-off-by: Stephen Kitt --- 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 1a8161455c..f258cf839d 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 @@ -79,7 +79,7 @@ public final class ClassLoaderUtils { } } - public static Object construct(final Constructor constructor, final List objects) + public static Object construct(final Constructor constructor, final List objects) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { final Object[] initargs = objects.toArray(); return constructor.newInstance(initargs); diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java index 60c56a452c..584c8674c3 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/CommonTestUtils.java @@ -24,7 +24,7 @@ public class CommonTestUtils { public interface Invoker { ListenableFuture invokeExecutor( ListeningExecutorService executor, CountDownLatch blockingLatch ); - }; + } public static final Invoker SUBMIT_CALLABLE = new Invoker() { @Override diff --git a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java index 1a6689e7d6..8e50b5873f 100644 --- a/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java +++ b/common/util/src/test/java/org/opendaylight/yangtools/util/concurrent/DeadlockDetectingListeningExecutorServiceTest.java @@ -42,7 +42,7 @@ public class DeadlockDetectingListeningExecutorServiceTest { interface InitialInvoker { void invokeExecutor( ListeningExecutorService executor, Runnable task ); - }; + } static final InitialInvoker SUBMIT = new InitialInvoker() { @Override diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java index 3645637b89..63f59d5bea 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/RpcError.java @@ -13,12 +13,12 @@ package org.opendaylight.yangtools.yang.common; */ public interface RpcError { - public enum ErrorSeverity { + enum ErrorSeverity { ERROR, WARNING } - public enum ErrorType { + enum ErrorType { /** * Indicates an error occurred during transport of data, eg over the network. */ 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 6b23f8ee20..61bae7c4e8 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 @@ -129,7 +129,7 @@ public class NormalizedNodeWriter implements Closeable, Flushable { * @param children Child nodes * @return Best estimate of the collection size required to hold all the children. */ - protected static final int childSizeHint(final Iterable children) { + protected static int childSizeHint(final Iterable children) { return (children instanceof Collection) ? ((Collection) children).size() : UNKNOWN_SIZE; } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractContainerNode.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractContainerNode.java index e085948f9b..57e86c19c9 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractContainerNode.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractContainerNode.java @@ -31,7 +31,7 @@ abstract class AbstractContainerNode extends AbstractTreeNode { return Optional.fromNullable(getChildFromData(castData(), childId, getVersion())); } - static final TreeNode getChildFromData(final NormalizedNodeContainer> data, + static TreeNode getChildFromData(final NormalizedNodeContainer> data, final PathArgument childId, final Version version) { final Optional> child = data.getChild(childId); return child.isPresent() ? TreeNodeFactory.createTreeNode(child.get(), version) : null; diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java index 9a93146e21..f184ce7b5e 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java @@ -94,12 +94,10 @@ public final class JsonParserStream implements Closeable, Flushable { } // The stream ended prematurely so it is likely a syntax error. throw new JsonSyntaxException(e); - } catch (final MalformedJsonException e) { + } catch (final MalformedJsonException | NumberFormatException e) { throw new JsonSyntaxException(e); } catch (final IOException e) { throw new JsonIOException(e); - } catch (final NumberFormatException e) { - throw new JsonSyntaxException(e); } catch (StackOverflowError | OutOfMemoryError e) { throw new JsonParseException("Failed parsing JSON source: " + reader + " to Json", e); } finally { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java index 313adbcd53..dcbcbd45fa 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java @@ -8,9 +8,7 @@ package org.opendaylight.yangtools.yang.data.impl.codec; import com.google.common.annotations.Beta; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import java.io.IOException; import java.util.ArrayDeque; @@ -35,7 +33,6 @@ import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; -import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodec.java index 9f25a55bba..8bcdd4ccc1 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodec.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodec.java @@ -42,12 +42,12 @@ public abstract class TypeDefinitionAwareCodec> i } @SuppressWarnings({ "rawtypes", "unchecked" }) - public static final TypeDefinitionAwareCodec> from(final TypeDefinition typeDefinition) { + public static TypeDefinitionAwareCodec> from(final TypeDefinition typeDefinition) { return (TypeDefinitionAwareCodec)fromType(typeDefinition); } @SuppressWarnings("unchecked") - public static final > TypeDefinitionAwareCodec fromType(final T typeDefinition) { + public static > TypeDefinitionAwareCodec fromType(final T typeDefinition) { // FIXME: this is not necessary with yang.model.util.type final T normalizedType = (T) DerivedType.from(typeDefinition); @SuppressWarnings("rawtypes") diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java index 73202be3ee..8f4c5eee91 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/ImmutableNormalizedNodeStreamWriter.java @@ -90,7 +90,7 @@ public class ImmutableNormalizedNodeStreamWriter implements SchemaAwareNormalize * @param builder Builder to which data will be written. * @return {@link NormalizedNodeStreamWriter} which writes data */ - public static final NormalizedNodeStreamWriter from(final NormalizedNodeContainerBuilder builder) { + public static NormalizedNodeStreamWriter from(final NormalizedNodeContainerBuilder builder) { return new ImmutableNormalizedNodeStreamWriter(builder); } @@ -112,7 +112,7 @@ public class ImmutableNormalizedNodeStreamWriter implements SchemaAwareNormalize * @param result {@link NormalizedNodeResult} object which will hold result value. * @return {@link NormalizedNodeStreamWriter} which will write item to supplied result holder. */ - public static final NormalizedNodeStreamWriter from(final NormalizedNodeResult result) { + public static NormalizedNodeStreamWriter from(final NormalizedNodeResult result) { return new ImmutableNormalizedNodeStreamWriter(result); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java index 9125f66180..8fd5e28a85 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/NormalizedDataBuilderTest.java @@ -181,7 +181,6 @@ public class NormalizedDataBuilderTest { // .build()) .build(); - ; builder.withChild(choice); // This should fail, child from case diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/NormalizedDataBuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/NormalizedDataBuilderTest.java index a7d35be318..20c413d8af 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/NormalizedDataBuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/retest/NormalizedDataBuilderTest.java @@ -163,7 +163,6 @@ public class NormalizedDataBuilderTest { // .build()) .build(); - ; builder.withChild(choice); // This should fail, child from case diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/BuilderTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/BuilderTest.java index f297acd564..b81b15428f 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/BuilderTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/test/BuilderTest.java @@ -23,7 +23,6 @@ import org.junit.Test; import org.opendaylight.yangtools.util.UnmodifiableCollection; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode; import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; @@ -39,7 +38,6 @@ import org.opendaylight.yangtools.yang.data.impl.RetestUtils; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableAugmentationNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableChoiceNodeBuilder; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/RetestModel.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/RetestModel.java index f0d559dd79..8035f5cb43 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/RetestModel.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/RetestModel.java @@ -35,7 +35,7 @@ public class RetestModel { public static final QName TWO_QNAME = QName.create(TEST_QNAME, "two"); public static final QName THREE_QNAME = QName.create(TEST_QNAME, "three"); - public static final InputStream getDatastoreTestInputStream() { + public static InputStream getDatastoreTestInputStream() { return RetestModel.class.getResourceAsStream(DATASTORE_TEST_YANG); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_Bug2690Fix.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_Bug2690Fix.java index f116c670b1..933017534c 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_Bug2690Fix.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_Bug2690Fix.java @@ -44,7 +44,7 @@ public class Retest_Bug2690Fix { inMemoryDataTree.setSchemaContext(schemaContext); } - public static final InputStream getDatastoreTestInputStream() { + public static InputStream getDatastoreTestInputStream() { return getInputStream(ODL_DATASTORE_TEST_YANG); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_ListConstraintsValidation.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_ListConstraintsValidation.java index ff7d466a13..fc21395e3b 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_ListConstraintsValidation.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/Retest_ListConstraintsValidation.java @@ -90,7 +90,7 @@ public class Retest_ListConstraintsValidation { inMemoryDataTree.commit(inMemoryDataTree.prepare(modificationTree)); } - public static final InputStream getDatastoreTestInputStream() { + public static InputStream getDatastoreTestInputStream() { return getInputStream(CONSTRAINTS_VALIDATION_TEST_YANG); } diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/TestModel.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/TestModel.java index 9dd298b14c..25e6519148 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/TestModel.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/TestModel.java @@ -38,7 +38,7 @@ public final class TestModel { throw new UnsupportedOperationException(); } - public static final InputStream getDatastoreTestInputStream() { + public static InputStream getDatastoreTestInputStream() { return TestModel.class.getResourceAsStream(DATASTORE_TEST_YANG); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java index 8db4e0c21d..5412700e84 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/DataSchemaContextNode.java @@ -86,7 +86,7 @@ public abstract class DataSchemaContextNode implements I return dataSchemaNode; } - static final DataSchemaNode findChildSchemaNode(final DataNodeContainer parent, final QName child) { + static DataSchemaNode findChildSchemaNode(final DataNodeContainer parent, final QName child) { DataSchemaNode potential = parent.getDataChildByName(child); if (potential == null) { Iterable choices = FluentIterable.from( diff --git a/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java b/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java index 0ed29b7718..1365e560c7 100644 --- a/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java +++ b/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java @@ -17,7 +17,6 @@ import java.io.InputStream; import java.net.URISyntaxException; import java.net.URL; import java.util.Arrays; -import java.util.List; import java.util.Properties; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java index 69a920a6c5..2a29cb8380 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Deviation.java @@ -30,7 +30,7 @@ public interface Deviation { private final String keyword; - private Deviate(final String keyword) { + Deviate(final String keyword) { this.keyword = Preconditions.checkNotNull(keyword); } 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 57e69ee675..8b9732dd8e 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 @@ -50,7 +50,7 @@ public final class PotentialSchemaSource { private final int value; - private Costs(final int value) { + Costs(final int value) { this.value = value; } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java index 2099eb2e13..1600003d71 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/ExtendedType.java @@ -60,7 +60,7 @@ public class ExtendedType implements TypeDefinition> { * @param reference Reference of Type * @param path Schema path to type definition. */ - public static final Builder builder(final QName typeName, final TypeDefinition baseType, + public static Builder builder(final QName typeName, final TypeDefinition baseType, final Optional description, final Optional reference, final SchemaPath path) { return new Builder(typeName, baseType, description.or(""), reference.or(""), path); } diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java index 6d2e0493ec..2b7d5dc83b 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.java @@ -799,7 +799,7 @@ public final class SchemaContextUtil { * a node representing LeafSchemaNode * @return concrete type definition of node value */ - private static TypeDefinition typeDefinition(final LeafSchemaNode node) { + private static TypeDefinition typeDefinition(final LeafSchemaNode node) { TypeDefinition baseType = node.getType(); while (baseType.getBaseType() != null) { baseType = baseType.getBaseType(); @@ -814,7 +814,7 @@ public final class SchemaContextUtil { * a node representing LeafListSchemaNode * @return concrete type definition of node value */ - private static TypeDefinition typeDefinition(final LeafListSchemaNode node) { + private static TypeDefinition typeDefinition(final LeafListSchemaNode node) { TypeDefinition baseType = node.getType(); while (baseType.getBaseType() != null) { baseType = baseType.getBaseType(); @@ -829,7 +829,7 @@ public final class SchemaContextUtil { * a node representing DataSchemaNode * @return concrete type definition of node value */ - private static TypeDefinition typeDefinition(final DataSchemaNode node) { + private static TypeDefinition typeDefinition(final DataSchemaNode node) { if (node instanceof LeafListSchemaNode) { return typeDefinition((LeafListSchemaNode) node); } else if (node instanceof LeafSchemaNode) { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java index eaa6b9d920..f572247740 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtils.java @@ -23,7 +23,7 @@ public class SchemaNodeUtils { throw new UnsupportedOperationException("Utility class"); } - public static final Optional getOriginalIfPossible(final SchemaNode node) { + public static Optional getOriginalIfPossible(final SchemaNode node) { if(node instanceof DerivableSchemaNode) { @SuppressWarnings("unchecked") final Optional ret = (Optional) (((DerivableSchemaNode) node).getOriginal()); @@ -32,7 +32,7 @@ public class SchemaNodeUtils { return Optional.absent(); } - public static final SchemaNode getRootOriginalIfPossible(final SchemaNode data) { + public static SchemaNode getRootOriginalIfPossible(final SchemaNode data) { Optional previous = Optional.absent(); Optional next = getOriginalIfPossible(data); while(next.isPresent()) { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnresolvedNumber.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnresolvedNumber.java index 041d15cee4..5cfd9960ed 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnresolvedNumber.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/UnresolvedNumber.java @@ -90,7 +90,7 @@ public abstract class UnresolvedNumber extends Number implements Immutable { throw new UnsupportedOperationException(); } - private final static Number resolve(final Number number) { + private static Number resolve(final Number number) { Preconditions.checkArgument(!(number instanceof UnresolvedNumber)); return number; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java index 7896a17533..3dbf52de9b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelProcessingPhase.java @@ -31,7 +31,7 @@ public enum ModelProcessingPhase { private final ModelProcessingPhase previousPhase; - private ModelProcessingPhase(@Nullable ModelProcessingPhase previous) { + ModelProcessingPhase(@Nullable ModelProcessingPhase previous) { this.previousPhase = previous; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSource.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSource.java index fb05b40202..280e18cc0e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSource.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/DeclarationInTextSource.java @@ -51,15 +51,15 @@ public abstract class DeclarationInTextSource implements StatementSourceReferenc @Override public abstract String toString(); - public static final DeclarationInTextSource inSource(String sourceName) { + public static DeclarationInTextSource inSource(String sourceName) { return new InSource(sourceName); } - public static final DeclarationInTextSource atLine(String sourceName, int line) { + public static DeclarationInTextSource atLine(String sourceName, int line) { return new AtLine(sourceName, line); } - public static final DeclarationInTextSource atPosition(String sourceName, int line, int position) { + public static DeclarationInTextSource atPosition(String sourceName, int line, int position) { return new AtPosition(sourceName, line,position); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java index 42505dea8f..b58d750f4a 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/validation/ValidationBundlesNamespace.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace; public interface ValidationBundlesNamespace extends IdentifierNamespace> { - public static enum ValidationBundleType { + enum ValidationBundleType { /** * whether a node is suitable refine substatement */ diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java index 3856d72658..f224e768c9 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java @@ -47,7 +47,7 @@ public class CrossSourceStatementReactor { this.supportedValidation = ImmutableMap.copyOf(supportedValidation); } - public static final Builder builder() { + public static Builder builder() { return new Builder(); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SupportedExtensionsMapping.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SupportedExtensionsMapping.java index d68382d852..a62e0b7c5e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SupportedExtensionsMapping.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SupportedExtensionsMapping.java @@ -28,7 +28,7 @@ public enum SupportedExtensionsMapping implements StatementDefinition { private final QName name; private final QName argument; - private SupportedExtensionsMapping(final String namespace, final String revision, + SupportedExtensionsMapping(final String namespace, final String revision, final Class> declared, final Class> effective, final String nameStr, final String argumentStr) { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java index 2cc4484373..3103774910 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserWithContextTest.java @@ -57,7 +57,7 @@ public class YangParserWithContextTest { private final DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); private final YangParserImpl parser = new YangParserImpl(); - private final SchemaContext createContext(final String... resources) throws IOException, YangSyntaxErrorException { + private SchemaContext createContext(final String... resources) throws IOException, YangSyntaxErrorException { final List srcs = new ArrayList<>(resources.length); for (String resource : resources) { srcs.add(Resources.asByteSource(getClass().getResource(resource)));