From 2675d3413ab62267f0bf9d4d54a21822e9577db8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 10 Jun 2024 12:33:41 +0200 Subject: [PATCH] Yet another round of Sonar issue fixes Fix more unused throws declarations and unused variables. Change-Id: I17d6c584e761347bb2098c2bd2ddbbe9fd1c337d Signed-off-by: Robert Varga --- .../yangtools/concepts/CheckedValueTest.java | 25 +++++++++---------- ...itoUnstubbedMethodExceptionAnswerTest.java | 2 +- .../yang/data/tree/impl/YT776Test.java | 19 +++++++------- .../rfc7950/stmt/pattern/Bug5410Test.java | 3 +-- .../yang/stmt/DeclaredStatementsTest.java | 25 +++++++++---------- .../yang/stmt/IncludeRevisionsTest.java | 2 +- .../plugin/YangToSourcesProcessorTest.java | 2 +- 7 files changed, 37 insertions(+), 41 deletions(-) diff --git a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java index 98aae1e35f..78c2cce1f9 100644 --- a/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java +++ b/common/concepts/src/test/java/org/opendaylight/yangtools/concepts/CheckedValueTest.java @@ -31,28 +31,28 @@ public class CheckedValueTest { } public void testExceptionGet() { - final CheckedValue value = CheckedValue.ofException(new Exception()); + final var value = CheckedValue.ofException(new Exception()); assertThrows(IllegalStateException.class, () -> value.get()); } @Test public void testValueException() { - final CheckedValue value = CheckedValue.ofValue("foo"); + final var value = CheckedValue.ofValue("foo"); assertThrows(IllegalStateException.class, () -> value.getException()); } @Test public void testGet() { - final String value = "foo"; - final CheckedValue val = CheckedValue.ofValue(value); + final var value = "foo"; + final var val = CheckedValue.ofValue(value); assertTrue(val.isPresent()); assertSame(value, val.get()); } @Test public void testThrowableGetThrowable() { - final Exception cause = new Exception(); - final CheckedValue val = CheckedValue.ofException(cause); + final var cause = new Exception(); + final var val = CheckedValue.ofException(cause); assertFalse(val.isPresent()); assertSame(cause, val.getException()); } @@ -66,12 +66,11 @@ public class CheckedValueTest { @Test public void testEqualsHashCode() { - final CheckedValue fooVal = CheckedValue.ofValue("foo"); - final CheckedValue fooVal2 = CheckedValue.ofValue("foo"); - final CheckedValue oneVal = CheckedValue.ofValue(1); - final CheckedValue errBar = CheckedValue.ofException(new NullPointerException("bar")); - final CheckedValue errFoo = CheckedValue.ofException(new NullPointerException("foo")); - final CheckedValue errFoo2 = CheckedValue.ofException(new NullPointerException("foo")); + final var fooVal = CheckedValue.ofValue("foo"); + final var fooVal2 = CheckedValue.ofValue("foo"); + final var oneVal = CheckedValue.ofValue(1); + final var errBar = CheckedValue.ofException(new NullPointerException("bar")); + final var errFoo = CheckedValue.ofException(new NullPointerException("foo")); assertFalse(fooVal.equals(null)); assertFalse(fooVal.equals("foo")); @@ -128,7 +127,7 @@ public class CheckedValueTest { @Test public void testExceptionMap() { - final CheckedValue errVal = CheckedValue.ofException(new NullPointerException()); + final var errVal = CheckedValue.ofException(new NullPointerException()); @SuppressWarnings("unchecked") final Function mapper = mock(Function.class); doReturn(null).when(mapper).apply(any(Object.class)); diff --git a/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/MockitoUnstubbedMethodExceptionAnswerTest.java b/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/MockitoUnstubbedMethodExceptionAnswerTest.java index 73881a8998..085c6cc4e3 100644 --- a/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/MockitoUnstubbedMethodExceptionAnswerTest.java +++ b/common/testutils/src/test/java/org/opendaylight/yangtools/testutils/mockito/MockitoUnstubbedMethodExceptionAnswerTest.java @@ -16,7 +16,7 @@ import org.mockito.Mockito; class MockitoUnstubbedMethodExceptionAnswerTest { @Test - void testAnswering() throws Exception { + void testAnswering() { Closeable mock = Mockito.mock(Closeable.class, MoreAnswers.exception()); String message = assertThrows(UnstubbedMethodException.class, mock::close).getMessage(); assertEquals("close() is not stubbed in mock of java.io.Closeable", message); diff --git a/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/YT776Test.java b/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/YT776Test.java index b2277738d1..4c6e152c57 100644 --- a/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/YT776Test.java +++ b/data/yang-data-tree-ri/src/test/java/org/opendaylight/yangtools/yang/data/tree/impl/YT776Test.java @@ -25,7 +25,6 @@ import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.data.tree.api.DataTree; import org.opendaylight.yangtools.yang.data.tree.api.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification; -import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException; import org.opendaylight.yangtools.yang.data.tree.impl.di.InMemoryDataTreeFactory; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -137,7 +136,7 @@ class YT776Test { } @Test - void testEmptyAttributes() throws DataValidationFailedException { + void testEmptyAttributes() { final var mod = write(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(BOX) .withChild(ImmutableNodes.newSystemMapBuilder() @@ -156,7 +155,7 @@ class YT776Test { } @Test - void testOneAttribute() throws DataValidationFailedException { + void testOneAttribute() throws Exception { writeAndCommit(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(BOX) .withChild(ImmutableNodes.newSystemMapBuilder() @@ -174,7 +173,7 @@ class YT776Test { } @Test - void testTwoAttributes() throws DataValidationFailedException { + void testTwoAttributes() throws Exception { writeAndCommit(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(BOX) .withChild(ImmutableNodes.newSystemMapBuilder() @@ -193,7 +192,7 @@ class YT776Test { } @Test - void testThreeAttributes() throws DataValidationFailedException { + void testThreeAttributes() { final var mod = write(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(BOX) .withChild(ImmutableNodes.newSystemMapBuilder() @@ -217,7 +216,7 @@ class YT776Test { } @Test - void testEmptyAndMergeOne() throws DataValidationFailedException { + void testEmptyAndMergeOne() throws Exception { final var mod = dataTree.takeSnapshot().newModification(); mod.write(YangInstanceIdentifier.of(BOX), ImmutableNodes.newContainerBuilder() .withNodeIdentifier(BOX) @@ -248,7 +247,7 @@ class YT776Test { } @Test - void testEmptyAndMergeOneWithListTouched() throws DataValidationFailedException { + void testEmptyAndMergeOneWithListTouched() throws Exception { final var mod = dataTree.takeSnapshot().newModification(); mod.write(YangInstanceIdentifier.of(BOX), ImmutableNodes.newContainerBuilder() .withNodeIdentifier(BOX) @@ -281,7 +280,7 @@ class YT776Test { } @Test - void testDisappearInChoice() throws DataValidationFailedException { + void testDisappearInChoice() throws Exception { var mod = dataTree.takeSnapshot().newModification(); // Initialize choice with list mod.write(YangInstanceIdentifier.of(BOX), ImmutableNodes.newContainerBuilder() @@ -313,13 +312,13 @@ class YT776Test { return mod; } - private void writeAndCommit(final ContainerNode data) throws DataValidationFailedException { + private void writeAndCommit(final ContainerNode data) throws Exception { final var mod = dataTree.takeSnapshot().newModification(); mod.write(YangInstanceIdentifier.of(BOX), data); commit(mod); } - private void commit(final DataTreeModification mod) throws DataValidationFailedException { + private void commit(final DataTreeModification mod) throws Exception { mod.ready(); dataTree.validate(mod); dataTree.commit(dataTree.prepare(mod)); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug5410Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug5410Test.java index e95d007063..16c30355f3 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug5410Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/pattern/Bug5410Test.java @@ -13,7 +13,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.util.List; import org.junit.jupiter.api.Test; @@ -105,7 +104,7 @@ class Bug5410Test { } @Test - void testInvalidXSDRegexes() throws UnsupportedEncodingException { + void testInvalidXSDRegexes() { testInvalidPattern("$^a^[$^\\]", "Unclosed character class"); testInvalidPattern("$(\\)", "Unclosed group"); } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java index c917731dc1..05e62fbd64 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -23,8 +24,6 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.Submodule; -import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlEffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.AnyxmlStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ArgumentStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AugmentEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement; @@ -44,7 +43,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ImportStatement; import org.opendaylight.yangtools.yang.model.api.stmt.IncludeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.MustStatement; import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PresenceStatement; @@ -55,7 +53,6 @@ import org.opendaylight.yangtools.yang.model.api.stmt.StatusStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SubmoduleStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement; class DeclaredStatementsTest extends AbstractYangTest { @@ -63,20 +60,21 @@ class DeclaredStatementsTest extends AbstractYangTest { void testDeclaredAnyXml() { final var schemaContext = assertEffectiveModel("/declared-statements-test/anyxml-declared-test.yang"); - final Module testModule = schemaContext.findModules("anyxml-declared-test").iterator().next(); + final var testModule = schemaContext.findModules("anyxml-declared-test").iterator().next(); assertNotNull(testModule); - final AnyxmlSchemaNode anyxmlSchemaNode = (AnyxmlSchemaNode) testModule.getDataChildByName( - QName.create(testModule.getQNameModule(), "foobar")); - assertNotNull(anyxmlSchemaNode); - final AnyxmlStatement anyxmlStatement = ((AnyxmlEffectiveStatement) anyxmlSchemaNode).getDeclared(); + final var anyxmlSchemaNode = assertInstanceOf(AnyxmlSchemaNode.class, + testModule.getDataChildByName(QName.create(testModule.getQNameModule(), "foobar"))); + final var anyxmlStatement = anyxmlSchemaNode.asEffectiveStatement().getDeclared(); + assertNotNull(anyxmlStatement); final QName name = anyxmlStatement.argument(); assertNotNull(name); - final WhenStatement whenStatement = anyxmlStatement.getWhenStatement().orElseThrow(); + final var whenStatement = anyxmlStatement.getWhenStatement().orElseThrow(); assertNotNull(whenStatement.argument()); - final DescriptionStatement whenStatementDescription = whenStatement.getDescription().orElseThrow(); + final var whenStatementDescription = whenStatement.getDescription().orElseThrow(); + assertNotNull(whenStatementDescription.argument()); assertTrue(whenStatement.getReference().isPresent()); final var ifFeatureStatements = anyxmlStatement.getIfFeatures(); @@ -88,7 +86,7 @@ class DeclaredStatementsTest extends AbstractYangTest { final var mustStatements = anyxmlStatement.getMustStatements(); assertNotNull(mustStatements); assertEquals(1, mustStatements.size()); - final MustStatement mustStatement = mustStatements.iterator().next(); + final var mustStatement = mustStatements.iterator().next(); assertNotNull(mustStatement.argument()); assertTrue(mustStatement.getErrorAppTagStatement().isPresent()); assertTrue(mustStatement.getErrorMessageStatement().isPresent()); @@ -310,7 +308,8 @@ class DeclaredStatementsTest extends AbstractYangTest { final QName name = containerStatement.argument(); assertNotNull(name); - final WhenStatement containerStatementWhen = containerStatement.getWhenStatement().orElseThrow(); + final var containerStatementWhen = containerStatement.getWhenStatement().orElseThrow(); + assertNotNull(containerStatementWhen); final var containerStatementIfFeatures = containerStatement.getIfFeatures(); assertNotNull(containerStatementIfFeatures); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java index b1b58403ba..4dc4085b9c 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java @@ -39,7 +39,7 @@ class IncludeRevisionsTest { } @Test - void revsUnequalTest() throws Exception { + void revsUnequalTest() { var reactor = RFC7950Reactors.defaultReactor().newBuild().addSources(UNEQUAL_REV, UNEQUAL_ROOT); var ex = assertThrows(SomeModifiersUnresolvedException.class, reactor::build); assertEquals(ModelProcessingPhase.SOURCE_LINKAGE, ex.getPhase()); diff --git a/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java b/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java index 1710dbd8b0..cfab91d089 100644 --- a/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java +++ b/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java @@ -47,7 +47,7 @@ class YangToSourcesProcessorTest extends AbstractCodeGeneratorTest { } @Test - void excludeFilesTest() throws Exception { + void excludeFilesTest() { final var excludedYang = new File(getClass().getResource("/yang/excluded-file.yang").getFile()); assertMojoExecution( -- 2.36.6