From 7ee0100fadc14a764b1d971013d28f057457f20e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 5 Sep 2016 12:11:34 +0200 Subject: [PATCH] Fix a bunch of warnings - javadoc order - unneeded casts - static methods Change-Id: I98344b7052eee1a58c709665e92d0cb1a0d72b46 Signed-off-by: Robert Varga --- .../parser/spi/meta/ModelActionBuilder.java | 3 +- .../stmt/reactor/StatementContextBase.java | 6 ++-- .../stmt/reactor/SubstatementContext.java | 1 - .../SchemaNodeIdentifierBuildNamespace.java | 2 +- .../yangtools/yang/stmt/Bug5884Test.java | 5 ++- .../yangtools/yang/stmt/Bug6316.java | 4 +-- .../yang/stmt/TypesResolutionTest.java | 34 +++++++++---------- 7 files changed, 25 insertions(+), 30 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java index 54605dbc67..d14f3c8443 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/ModelActionBuilder.java @@ -126,11 +126,10 @@ public interface ModelActionBuilder { * List of failed prerequisites should be used to select right message / error * type to debug problem in YANG sources. * + * @param failed collection of prerequisites which were not met * @throws InferenceException If inference action can not be processed. * Note that this exception be used for user to debug YANG sources, * so should provide helpful context to fix issue in sources. - * - * @param failed collection of prerequisites which were not met */ void prerequisiteFailed(Collection> failed) throws InferenceException; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java index 1512ff21b2..cf79951a3c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java @@ -278,12 +278,11 @@ public abstract class StatementContextBase, E /** * adds effective statement to collection of substatements * + * @param substatement substatement * @throws IllegalStateException * if added in declared phase * @throws NullPointerException * if statement parameter is null - * - * @param substatement substatement */ public void addEffectiveSubstatement(final StatementContextBase substatement) { @@ -299,12 +298,11 @@ public abstract class StatementContextBase, E /** * adds declared statement to collection of substatements * + * @param substatement substatement * @throws IllegalStateException * if added in effective phase * @throws NullPointerException * if statement parameter is null - * - * @param substatement substatement */ public void addDeclaredSubstatement(final StatementContextBase substatement) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java index c8129a5e5e..5536dfe7c5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/SubstatementContext.java @@ -11,7 +11,6 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Verify; import java.util.Collection; -import java.util.Objects; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.SchemaPath; diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java index 40d84cee4c..ddcdd40afe 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/SchemaNodeIdentifierBuildNamespace.java @@ -74,7 +74,7 @@ class SchemaNodeIdentifierBuildNamespace extends } @SuppressWarnings({"unchecked", "rawtypes"}) - private Mutable> tryToFindUnknownStatement(final String localName, + private static Mutable> tryToFindUnknownStatement(final String localName, final Mutable> current) { Collection> unknownSubstatements = (Collection)StmtContextUtils.findAllSubstatements(current, UnknownStatement.class); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java index 309b0e7569..4669a4e3cd 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java @@ -55,10 +55,9 @@ public class Bug5884Test { testIterator(availableIterator); } - private void testIterator(final Iterator iterator) { - AugmentationSchema allAugments; + private static void testIterator(final Iterator iterator) { while (iterator.hasNext()) { - allAugments = iterator.next(); + AugmentationSchema allAugments = iterator.next(); final DataSchemaNode currentChoice = allAugments.getChildNodes().iterator().next(); assertTrue(currentChoice instanceof ChoiceCaseNode); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316.java index eb60e0a974..c83ad38412 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316.java @@ -37,7 +37,7 @@ public class Bug6316 { verifyBitsTypedefinition(context); } - private void verifyEnumTypedefinition(final SchemaContext context) { + private static void verifyEnumTypedefinition(final SchemaContext context) { final DataSchemaNode dataChildByName = context.getDataChildByName(QName .create("foo", "1970-01-01", "enum-leaf")); assertTrue(dataChildByName instanceof LeafSchemaNode); @@ -70,7 +70,7 @@ public class Bug6316 { } } - private void verifyBitsTypedefinition(final SchemaContext context) { + private static void verifyBitsTypedefinition(final SchemaContext context) { final DataSchemaNode dataChildByName = context.getDataChildByName(QName .create("foo", "1970-01-01", "bits-leaf")); assertTrue(dataChildByName instanceof LeafSchemaNode); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java index 797b65c253..16b8cefe3b 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java @@ -76,17 +76,17 @@ public class TypesResolutionTest { EnumPair value0 = values.get(0); assertEquals("unknown", value0.getName()); - assertEquals(0, (int) value0.getValue()); + assertEquals(0, value0.getValue()); assertEquals("An unknown or unspecified version of the Internet protocol.", value0.getDescription()); EnumPair value1 = values.get(1); assertEquals("ipv4", value1.getName()); - assertEquals(1, (int) value1.getValue()); + assertEquals(1, value1.getValue()); assertEquals("The IPv4 protocol as defined in RFC 791.", value1.getDescription()); EnumPair value2 = values.get(2); assertEquals("ipv6", value2.getName()); - assertEquals(2, (int) value2.getValue()); + assertEquals(2, value2.getValue()); assertEquals("The IPv6 protocol as defined in RFC 2460.", value2.getDescription()); } @@ -102,22 +102,22 @@ public class TypesResolutionTest { EnumPair value0 = values.get(0); assertEquals("unknown", value0.getName()); - assertEquals(0, (int) value0.getValue()); + assertEquals(0, value0.getValue()); assertEquals("An unknown or unspecified version of the Internet protocol.", value0.getDescription()); EnumPair value1 = values.get(1); assertEquals("ipv4", value1.getName()); - assertEquals(19, (int) value1.getValue()); + assertEquals(19, value1.getValue()); assertEquals("The IPv4 protocol as defined in RFC 791.", value1.getDescription()); EnumPair value2 = values.get(2); assertEquals("ipv6", value2.getName()); - assertEquals(7, (int) value2.getValue()); + assertEquals(7, value2.getValue()); assertEquals("The IPv6 protocol as defined in RFC 2460.", value2.getDescription()); EnumPair value3 = values.get(3); assertEquals("default", value3.getName()); - assertEquals(20, (int) value3.getValue()); + assertEquals(20, value3.getValue()); assertEquals("default ip", value3.getDescription()); } @@ -228,15 +228,15 @@ public class TypesResolutionTest { Bit bit1 = bits.get(0); assertEquals("disable-nagle", bit1.getName()); - assertEquals(0L, (long) bit1.getPosition()); + assertEquals(0L, bit1.getPosition()); Bit bit2 = bits.get(1); assertEquals("auto-sense-speed", bit2.getName()); - assertEquals(1L, (long) bit2.getPosition()); + assertEquals(1L, bit2.getPosition()); Bit bit3 = bits.get(2); assertEquals("10-Mb-only", bit3.getName()); - assertEquals(2L, (long) bit3.getPosition()); + assertEquals(2L, bit3.getPosition()); } @Test @@ -250,19 +250,19 @@ public class TypesResolutionTest { assertEquals(5, bits.size()); Bit bit0 = bits.get(0); - assertEquals(0L, (long) bit0.getPosition()); + assertEquals(0L, bit0.getPosition()); Bit bit1 = bits.get(1); - assertEquals(500L, (long) bit1.getPosition()); + assertEquals(500L, bit1.getPosition()); Bit bit2 = bits.get(2); - assertEquals(501L, (long) bit2.getPosition()); + assertEquals(501L, bit2.getPosition()); Bit bit3 = bits.get(3); - assertEquals(502L, (long) bit3.getPosition()); + assertEquals(502L, bit3.getPosition()); Bit bit4 = bits.get(4); - assertEquals(365L, (long) bit4.getPosition()); + assertEquals(365L, bit4.getPosition()); } @Test @@ -287,12 +287,12 @@ public class TypesResolutionTest { EnumPair enum168 = values.get(168); assertEquals("America/Danmarkshavn", enum168.getName()); - assertEquals(168, (int) enum168.getValue()); + assertEquals(168, enum168.getValue()); assertEquals("east coast, north of Scoresbysund", enum168.getDescription()); EnumPair enum374 = values.get(374); assertEquals("America/Indiana/Winamac", enum374.getName()); - assertEquals(374, (int) enum374.getValue()); + assertEquals(374, enum374.getValue()); assertEquals("Eastern Time - Indiana - Pulaski County", enum374.getDescription()); } -- 2.36.6