From 6408c52c34202ae0b9511a64a99be09b0a25a5b1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 18 Oct 2017 16:57:18 +0200 Subject: [PATCH] Fix odlparent-3-detected checkstyle issues This is a preparatory patch to keep the transition changes down. Change-Id: Iabbebc4c0dcae2bf248c523d5fd4041f6b99e140 Signed-off-by: Robert Varga --- .../org/opendaylight/yangtools/checkstyle/FileNameUtil.java | 2 +- .../testutils/mockito/CallsRealOrExceptionAnswer.java | 2 +- .../testutils/mockito/ThrowsMethodExceptionAnswer.java | 2 +- .../org/opendaylight/yangtools/util/xml/UntrustedXML.java | 3 +++ .../yangtools/util/concurrent/CommonTestUtils.java | 6 +++++- .../yangtools/yang/data/codec/gson/TestUtils.java | 3 ++- .../codec/gson/TestingNormalizedNodeStructuresCreator.java | 5 ++++- .../xml/SchemalessXMLStreamNormalizedNodeStreamWriter.java | 2 +- .../codec/xml/YangModeledAnyXMLDeserializationTest.java | 4 ++-- .../yang/data/impl/leafref/LeafRefValidatation.java | 2 +- .../builder/impl/ImmutableYangModeledAnyXmlNodeBuilder.java | 2 +- .../impl/codecs/TypeDefinitionAwareCodecTestHelper.java | 5 ++++- .../yangtools/yang/data/impl/schema/tree/TestModel.java | 6 +++++- .../yangtools/yang/data/util/codec/QNameCodecUtil.java | 4 ++++ .../yangtools/yang/model/util/SchemaNodeUtils.java | 2 +- .../org/opendaylight/yangtools/yang/validator/Main.java | 6 +++++- .../yangtools/yang/validator/SystemTestUtils.java | 6 +++++- .../yang/parser/spi/meta/SubstatementValidator.java | 4 ++-- 18 files changed, 48 insertions(+), 18 deletions(-) diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/FileNameUtil.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/FileNameUtil.java index d29122834b..4c221d1d75 100644 --- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/FileNameUtil.java +++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/FileNameUtil.java @@ -19,7 +19,7 @@ import java.util.Optional; * * @see checkstyle-devel list thread */ -public class FileNameUtil { +public final class FileNameUtil { private FileNameUtil() { } diff --git a/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/CallsRealOrExceptionAnswer.java b/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/CallsRealOrExceptionAnswer.java index fdf6c5a2a2..4f706df111 100644 --- a/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/CallsRealOrExceptionAnswer.java +++ b/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/CallsRealOrExceptionAnswer.java @@ -113,7 +113,7 @@ import org.mockito.stubbing.Answer; * @author Michael Vorburger */ @Beta -public class CallsRealOrExceptionAnswer implements Answer, Serializable { +public final class CallsRealOrExceptionAnswer implements Answer, Serializable { private static final long serialVersionUID = -3730024662402964588L; static final CallsRealOrExceptionAnswer INSTANCE = new CallsRealOrExceptionAnswer(); diff --git a/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/ThrowsMethodExceptionAnswer.java b/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/ThrowsMethodExceptionAnswer.java index 6750c304bb..f8fbdcdafd 100644 --- a/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/ThrowsMethodExceptionAnswer.java +++ b/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/ThrowsMethodExceptionAnswer.java @@ -36,7 +36,7 @@ import org.mockito.stubbing.Answer; * @author Michael Vorburger */ @Beta -public class ThrowsMethodExceptionAnswer implements Answer, Serializable { +public final class ThrowsMethodExceptionAnswer implements Answer, Serializable { private static final long serialVersionUID = -7316574192253912318L; static final ThrowsMethodExceptionAnswer INSTANCE = new ThrowsMethodExceptionAnswer(); diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/xml/UntrustedXML.java b/common/util/src/main/java/org/opendaylight/yangtools/util/xml/UntrustedXML.java index 8619875c2a..669715bd73 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/xml/UntrustedXML.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/xml/UntrustedXML.java @@ -86,6 +86,9 @@ public final class UntrustedXML { XIF = f; } + private UntrustedXML() { + throw new UnsupportedOperationException(); + } /** * Create a new {@link DocumentBuilder} for dealing with untrusted XML data. This method is equivalent to 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 9ee60f7ad0..b0c5c10b71 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 @@ -18,7 +18,11 @@ import java.util.concurrent.CountDownLatch; * * @author Thomas Pantelis */ -public class CommonTestUtils { +public final class CommonTestUtils { + private CommonTestUtils() { + throw new UnsupportedOperationException(); + } + @FunctionalInterface public interface Invoker { ListenableFuture invokeExecutor(ListeningExecutorService executor, CountDownLatch blockingLatch); diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java index b98566e140..acedf94cf1 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestUtils.java @@ -20,9 +20,10 @@ import java.io.FileReader; import java.io.IOException; import java.net.URISyntaxException; -public class TestUtils { +public final class TestUtils { private TestUtils() { + throw new UnsupportedOperationException(); } static String loadTextFile(final File file) throws IOException { diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java index 17aabfc7e2..fd4f568484 100644 --- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java +++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/TestingNormalizedNodeStructuresCreator.java @@ -35,7 +35,10 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContaine import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; -public class TestingNormalizedNodeStructuresCreator { +public final class TestingNormalizedNodeStructuresCreator { + private TestingNormalizedNodeStructuresCreator() { + throw new UnsupportedOperationException(); + } @SafeVarargs static NormalizedNode cont1Node( diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriter.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriter.java index 9964a19837..12cd33d32d 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemalessXMLStreamNormalizedNodeStreamWriter.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -class SchemalessXMLStreamNormalizedNodeStreamWriter extends XMLStreamNormalizedNodeStreamWriter { +final class SchemalessXMLStreamNormalizedNodeStreamWriter extends XMLStreamNormalizedNodeStreamWriter { private enum ContainerType { CONTAINER, LEAF_SET, diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java index fa39ffbe94..6106f61b18 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/YangModeledAnyXMLDeserializationTest.java @@ -168,11 +168,11 @@ public class YangModeledAnyXMLDeserializationTest { assertEquals("any-xml-leaf-3-value", leafNode3Value); } - private static class YangModeledAnyXMLSchemaNodeImplTest implements YangModeledAnyXmlSchemaNode { + private static final class YangModeledAnyXMLSchemaNodeImplTest implements YangModeledAnyXmlSchemaNode { private final QName qname; private final ContainerSchemaNode contentSchema; - private YangModeledAnyXMLSchemaNodeImplTest(final QName qname, final ContainerSchemaNode contentSchema) { + YangModeledAnyXMLSchemaNodeImplTest(final QName qname, final ContainerSchemaNode contentSchema) { this.qname = qname; this.contentSchema = contentSchema; } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java index 8a20f715d4..7db06727c1 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/leafref/LeafRefValidatation.java @@ -40,7 +40,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class LeafRefValidatation { +public final class LeafRefValidatation { private static final Logger LOG = LoggerFactory.getLogger(LeafRefValidatation.class); private static final String FAILED = " -> FAILED"; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableYangModeledAnyXmlNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableYangModeledAnyXmlNodeBuilder.java index ddb14a2c25..658a5f4c5f 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableYangModeledAnyXmlNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableYangModeledAnyXmlNodeBuilder.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.nodes.AbstractImmutableD import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.YangModeledAnyXmlSchemaNode; -public class ImmutableYangModeledAnyXmlNodeBuilder extends +public final class ImmutableYangModeledAnyXmlNodeBuilder extends AbstractImmutableDataContainerNodeAttrBuilder { private final ContainerSchemaNode contentSchema; diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/TypeDefinitionAwareCodecTestHelper.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/TypeDefinitionAwareCodecTestHelper.java index 222f9ef029..f2c2c671c3 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/TypeDefinitionAwareCodecTestHelper.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/TypeDefinitionAwareCodecTestHelper.java @@ -22,7 +22,10 @@ import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; import org.opendaylight.yangtools.yang.model.util.type.EnumerationTypeBuilder; -public class TypeDefinitionAwareCodecTestHelper { +public final class TypeDefinitionAwareCodecTestHelper { + private TypeDefinitionAwareCodecTestHelper() { + throw new UnsupportedOperationException(); + } @SuppressWarnings("unchecked") public static T getCodec(final TypeDefinition def, final Class clazz) { 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 cf2252b758..664d7d6561 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 @@ -12,7 +12,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; -public class TestModel { +public final class TestModel { public static final QName TEST_QNAME = QName.create( "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test", "2014-03-13", "test"); @@ -34,6 +34,10 @@ public class TestModel { public static final QName TWO_QNAME = QName.create(TEST_QNAME, "two"); public static final QName THREE_QNAME = QName.create(TEST_QNAME, "three"); + private TestModel() { + throw new UnsupportedOperationException(); + } + public static SchemaContext createTestContext() { return createTestContext(DATASTORE_TEST_YANG); } diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/codec/QNameCodecUtil.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/codec/QNameCodecUtil.java index 25800d09bc..3b48442655 100644 --- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/codec/QNameCodecUtil.java +++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/codec/QNameCodecUtil.java @@ -25,6 +25,10 @@ import org.opendaylight.yangtools.yang.common.QNameModule; public final class QNameCodecUtil { private static final Splitter COLON_SPLITTER = Splitter.on(':').trimResults(); + private QNameCodecUtil() { + throw new UnsupportedOperationException(); + } + public static QName decodeQName(final String str, final Function prefixToModule) { final Iterator it = COLON_SPLITTER.split(str).iterator(); 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 0754104f70..64ae8da3d7 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 @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.DerivableSchemaNode; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaNode; -public class SchemaNodeUtils { +public final class SchemaNodeUtils { private SchemaNodeUtils() { throw new UnsupportedOperationException("Utility class"); diff --git a/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/Main.java b/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/Main.java index 9c06ba3032..84aa2bf07c 100644 --- a/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/Main.java +++ b/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/Main.java @@ -48,12 +48,16 @@ import org.slf4j.LoggerFactory; * -o, --output path to output file for logs. Output file will be overwritten. * -m, --module-name validate yang by module name. */ -public class Main { +public final class Main { private static final Logger LOG = LoggerFactory.getLogger(Main.class); private static final ch.qos.logback.classic.Logger LOG_ROOT = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(ch.qos.logback.classic.Logger.ROOT_LOGGER_NAME); private static final int MB = 1024 * 1024; + private Main() { + // Hidden on purpose + } + private static Options createOptions() { final Options options = new Options(); diff --git a/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/SystemTestUtils.java b/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/SystemTestUtils.java index 543e6351b2..d1da05ae43 100644 --- a/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/SystemTestUtils.java +++ b/yang/yang-model-validator/src/main/java/org/opendaylight/yangtools/yang/validator/SystemTestUtils.java @@ -34,11 +34,15 @@ import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -class SystemTestUtils { +final class SystemTestUtils { private static final Pattern MODULE_PATTERN = Pattern.compile("module(.*?)\\{"); private static final Pattern WHITESPACES = Pattern.compile("\\s+"); + private SystemTestUtils() { + throw new UnsupportedOperationException(); + } + static final FileFilter YANG_FILE_FILTER = file -> { final String name = file.getName().toLowerCase(); return name.endsWith(YangConstants.RFC6020_YANG_FILE_EXTENSION) && file.isFile(); diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java index c1d1a2a586..c039849402 100644 --- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java +++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java @@ -44,7 +44,7 @@ public final class SubstatementValidator { return new Builder(currentStatement); } - public static class Builder { + public static final class Builder { private static final Cardinality ONE_MAX = new Cardinality(1, Integer.MAX_VALUE); private static final Cardinality ONE_ONE = new Cardinality(1, 1); private static final Cardinality ZERO_MAX = new Cardinality(0, Integer.MAX_VALUE); @@ -53,7 +53,7 @@ public final class SubstatementValidator { private final ImmutableMap.Builder cardinalityMap = ImmutableMap.builder(); private final StatementDefinition currentStatement; - private Builder(final StatementDefinition currentStatement) { + Builder(final StatementDefinition currentStatement) { this.currentStatement = currentStatement; } -- 2.36.6