From e3c2c14eefad463d26f4a4e5ad243764128b33df Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 21 Apr 2020 07:50:55 +0200 Subject: [PATCH] Remove explicit UOE throws Private constructors do not really have to be that defensive. Remove exception throws and related tests. Change-Id: I245264a78607d136d92a4c18d68f5d5df17a4832 Signed-off-by: Robert Varga --- .../binding/spec/naming/BindingMapping.java | 2 +- .../spec/reflect/BindingReflections.java | 2 +- .../spec/util/DataObjectReadingUtil.java | 2 +- .../spec/naming/BindingMappingTest.java | 19 -------------- .../spec/reflect/BindingReflectionsTest.java | 25 +++---------------- .../spec/util/DataObjectReadingUtilTest.java | 16 ------------ .../test/model/util/ListsBindingUtils.java | 8 +++--- 7 files changed, 10 insertions(+), 64 deletions(-) diff --git a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/naming/BindingMapping.java b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/naming/BindingMapping.java index 48c08379f0..7729ad1942 100644 --- a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/naming/BindingMapping.java +++ b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/naming/BindingMapping.java @@ -106,7 +106,7 @@ public final class BindingMapping { private static final Interner PACKAGE_INTERNER = Interners.newWeakInterner(); private BindingMapping() { - throw new UnsupportedOperationException("Utility class should not be instantiated"); + // Hidden on purpose } public static @NonNull String getRootPackageName(final QName module) { diff --git a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java index 9e3b18e912..2097215d77 100644 --- a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java +++ b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java @@ -82,7 +82,7 @@ public final class BindingReflections { }); private BindingReflections() { - throw new UnsupportedOperationException("Utility class."); + // Hidden on purpose } /** diff --git a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java index 9142484094..67178c8e72 100644 --- a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java +++ b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtil.java @@ -41,7 +41,7 @@ public final class DataObjectReadingUtil { new AugmentationReadingStrategy(); private DataObjectReadingUtil() { - throw new UnsupportedOperationException("Utility class. Instantion is not allowed."); + // Hidden on purpose } /** diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/naming/BindingMappingTest.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/naming/BindingMappingTest.java index 39742ec7ed..d2dd726966 100644 --- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/naming/BindingMappingTest.java +++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/naming/BindingMappingTest.java @@ -9,12 +9,8 @@ package org.opendaylight.mdsal.binding.spec.naming; import static com.google.common.collect.ImmutableList.of; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.net.URI; import java.util.HashMap; import java.util.List; @@ -45,21 +41,6 @@ public class BindingMappingTest { assertEquals("", BindingMapping.getClassName("")); } - @Test(expected = UnsupportedOperationException.class) - @SuppressWarnings({ "checkstyle:illegalThrows", "checkstyle:avoidHidingCauseException" }) - public void privateConstructTest() throws Throwable { - final Constructor bindingMappingConstructor = BindingMapping.class.getDeclaredConstructor(); - assertFalse(bindingMappingConstructor.isAccessible()); - - bindingMappingConstructor.setAccessible(true); - try { - bindingMappingConstructor.newInstance(); - fail("Expected exception for calling private constructor"); - } catch (InvocationTargetException e) { - throw e.getCause(); - } - } - @Test public void mapEnumAssignedNamesTest() { // Okay identifier diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflectionsTest.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflectionsTest.java index e629129389..1065418157 100644 --- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflectionsTest.java +++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflectionsTest.java @@ -16,8 +16,6 @@ import static org.mockito.Mockito.mock; import static org.opendaylight.mdsal.binding.spec.reflect.BindingReflections.findHierarchicalParent; import com.google.common.util.concurrent.ListenableFuture; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.Collections; import java.util.List; import org.junit.Test; @@ -61,35 +59,20 @@ public class BindingReflectionsTest { assertEquals(QName.create("test", "test"), BindingReflections.getQName(TestIdentity.class)); } - @Test(expected = UnsupportedOperationException.class) - @SuppressWarnings({ "checkstyle:illegalThrows", "checkstyle:avoidHidingCauseException" }) - public void testPrivateConstructor() throws Throwable { - assertFalse(BindingReflections.class.getDeclaredConstructor().isAccessible()); - final Constructor constructor = BindingReflections.class.getDeclaredConstructor(); - constructor.setAccessible(true); - try { - constructor.newInstance(); - } catch (InvocationTargetException e) { - throw e.getCause(); - } - } - - private interface TestIdentity extends BaseIdentity { - @SuppressWarnings("unused") + interface TestIdentity extends BaseIdentity { QName QNAME = QName.create("test", "test"); } - private static final class TestImplementation implements Augmentation, RpcService { - @SuppressWarnings("unused") + static final class TestImplementation implements Augmentation, RpcService { public static final QName QNAME = QName.create("test", "test"); - @SuppressWarnings({ "unused", "static-method" }) + @SuppressWarnings("static-method") ListenableFuture> rpcMethodTest() { return null; } - @SuppressWarnings({ "unused", "static-method" }) + @SuppressWarnings("static-method") ListenableFuture rpcMethodTest2() { return null; } diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java index 5289a077f9..9832232364 100644 --- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java +++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.mdsal.binding.spec.util; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -17,8 +16,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.UnmodifiableIterator; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.Map; import java.util.Map.Entry; import org.junit.Before; @@ -98,17 +95,4 @@ public class DataObjectReadingUtilTest { public void testReadDataWithTwoParams() { readData(mockedDataObject, DataObject.class); } - - @Test(expected = UnsupportedOperationException.class) - @SuppressWarnings({ "checkstyle:illegalThrows", "checkstyle:avoidHidingCauseException" }) - public void testPrivateConstructor() throws Throwable { - assertFalse(DataObjectReadingUtil.class.getDeclaredConstructor().isAccessible()); - final Constructor constructor = DataObjectReadingUtil.class.getDeclaredConstructor(); - constructor.setAccessible(true); - try { - constructor.newInstance(); - } catch (InvocationTargetException e) { - throw e.getCause(); - } - } } \ No newline at end of file diff --git a/binding/mdsal-binding-test-model/src/main/java/org/opendaylight/mdsal/binding/test/model/util/ListsBindingUtils.java b/binding/mdsal-binding-test-model/src/main/java/org/opendaylight/mdsal/binding/test/model/util/ListsBindingUtils.java index 230b5b20c8..135d047684 100644 --- a/binding/mdsal-binding-test-model/src/main/java/org/opendaylight/mdsal/binding/test/model/util/ListsBindingUtils.java +++ b/binding/mdsal-binding-test-model/src/main/java/org/opendaylight/mdsal/binding/test/model/util/ListsBindingUtils.java @@ -29,18 +29,16 @@ import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public final class ListsBindingUtils { - private static final InstanceIdentifier TOP_PATH = InstanceIdentifier.create(Top.class); - private ListsBindingUtils() { - throw new UnsupportedOperationException(); - } - public static final TopLevelListKey TOP_FOO_KEY = new TopLevelListKey("foo"); public static final TopLevelListKey TOP_BAR_KEY = new TopLevelListKey("bar"); public static final ListViaUsesKey USES_ONE_KEY = new ListViaUsesKey("one"); public static final ListViaUsesKey USES_TWO_KEY = new ListViaUsesKey("two"); + private ListsBindingUtils() { + // Hidden on purpose + } public static InstanceIdentifier path(final TopLevelListKey key) { return TOP_PATH.child(TopLevelList.class, key); -- 2.36.6