X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fdynamicmbean%2FAnnotationsTest.java;h=018fea86ed1b0c779fd48e8a27ca773c982f12c9;hp=029b347ccaa20f578a90ff21c2e42a782b9e599f;hb=405c97ddf445b6057a2654545dd8072d28eedcce;hpb=ffd3c3d542dcdab0c2523759a9e5ea02d709e75c diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsTest.java index 029b347cca..018fea86ed 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsTest.java @@ -33,10 +33,8 @@ public class AnnotationsTest { private final String setSomethingString = "setSomething"; - private void assertRequireInterfaceAnnotationHasCorrectValue( - Class clazz, String methodName, - Set> inspectedInterfaces, - Class expectedValue) { + private static void assertRequireInterfaceAnnotationHasCorrectValue(final Class clazz, final String methodName, + final Set> inspectedInterfaces, final Class expectedValue) { Method setter = findMethod(clazz, methodName); RequireInterface found = AttributeHolder .findRequireInterfaceAnnotation(setter, inspectedInterfaces); @@ -48,19 +46,18 @@ public class AnnotationsTest { } } - private Method findMethod(Class clazz, String methodName) { + private static Method findMethod(final Class clazz, final String methodName) { Method setter; try { - setter = clazz.getMethod(methodName, - new Class[] { ObjectName.class }); + setter = clazz.getMethod(methodName, new Class[] { ObjectName.class }); } catch (Exception e) { throw Throwables.propagate(e); } return setter; } - private void assertDescription(Class clazz, String methodName, - Set> exportedInterfaces, String expectedValue) { + private static void assertDescription(final Class clazz, final String methodName, + final Set> exportedInterfaces, final String expectedValue) { Method setter = findMethod(clazz, methodName); String found = AttributeHolder.findDescription(setter, exportedInterfaces); @@ -72,10 +69,9 @@ public class AnnotationsTest { } } - private void assertDescriptionOnClass(Class clazz, - Set> jmxInterfaces, String expectedValue) { - String found = AbstractDynamicWrapper.findDescription(clazz, - jmxInterfaces); + private static void assertDescriptionOnClass(final Class clazz, final Set> jmxInterfaces, + final String expectedValue) { + String found = AbstractDynamicWrapper.findDescription(clazz, jmxInterfaces); if (expectedValue == null) { assertNull(found); } else { @@ -84,10 +80,8 @@ public class AnnotationsTest { } } - private void assertNoDescriptionOnClass(Class clazz, - Set> jmxInterfaces) { - String found = AbstractDynamicWrapper.findDescription(clazz, - jmxInterfaces); + private static void assertNoDescriptionOnClass(final Class clazz, final Set> jmxInterfaces) { + String found = AbstractDynamicWrapper.findDescription(clazz, jmxInterfaces); assertTrue(found.isEmpty()); } @@ -104,7 +98,7 @@ public class AnnotationsTest { public static class SuperClass { @RequireInterface(SimpleSI.class) @Description("descr") - public void setSomething(ObjectName objectName) { + public void setSomething(final ObjectName objectName) { } } @@ -139,7 +133,7 @@ public class AnnotationsTest { public static class SubClassWithEmptyMethod extends SuperClass { @Override - public void setSomething(ObjectName objectName) { + public void setSomething(final ObjectName objectName) { } } @@ -169,25 +163,21 @@ public class AnnotationsTest { @Override @RequireInterface(SubSI2.class) @Description("descr2") - public void setSomething(ObjectName objectName) { + public void setSomething(final ObjectName objectName) { } } @Test public void testFindAnnotation_SubClassWithAnnotation() throws Exception { - assertDescription(SubClassWithAnnotation.class, setSomethingString, - emptySetOfInterfaces(), "descr2\ndescr"); + assertDescription(SubClassWithAnnotation.class, setSomethingString, emptySetOfInterfaces(), "descr2\ndescr"); try { - assertRequireInterfaceAnnotationHasCorrectValue( - SubClassWithAnnotation.class, setSomethingString, - emptySetOfInterfaces(), SubSI2.class); + assertRequireInterfaceAnnotationHasCorrectValue(SubClassWithAnnotation.class, setSomethingString, + emptySetOfInterfaces(), SubSI2.class); fail(); } catch (IllegalStateException e) { - assertTrue( - e.getMessage(), - e.getMessage() - .startsWith("Error finding @RequireInterface. More than one value specified")); + assertTrue(e.getMessage(), + e.getMessage().startsWith("Error finding @RequireInterface. More than one value specified")); } } @@ -195,8 +185,7 @@ public class AnnotationsTest { void setSomething(ObjectName objectName); } - public static class SubClassWithoutMethodWithInterface extends SuperClass - implements HasSomeMethod { + public static class SubClassWithoutMethodWithInterface extends SuperClass implements HasSomeMethod { } @@ -214,14 +203,13 @@ public class AnnotationsTest { @Override @RequireInterface(SubSI2.class) @Description("descr") - public void setSomething(ObjectName objectName) { + public void setSomething(final ObjectName objectName) { } } @Description("class") - public static class SubClassOfSuperClassWithInterface extends - SuperClassWithInterface { + public static class SubClassOfSuperClassWithInterface extends SuperClassWithInterface { } @@ -239,41 +227,32 @@ public class AnnotationsTest { @Test public void testFindAnnotation2() throws Exception { - assertNoDescriptionOnClass(SuperClassWithInterface.class, - emptySetOfInterfaces()); + assertNoDescriptionOnClass(SuperClassWithInterface.class, emptySetOfInterfaces()); } @Description("class") interface HasSomeMethodWithAnnotations { - @RequireInterface(SubSI2.class) @Description("descr") void setSomething(ObjectName objectName); } - static class HasSomeMethodWithAnnotationsImpl implements - HasSomeMethodWithAnnotations { + static class HasSomeMethodWithAnnotationsImpl implements HasSomeMethodWithAnnotations { @Override - public void setSomething(ObjectName objectName) { + public void setSomething(final ObjectName objectName) { } - } @Test public void testHasSomeMethodWithAnnotationsImpl() { HashSet> exportedInterfaces = Sets .> newHashSet(HasSomeMethodWithAnnotations.class); - assertRequireInterfaceAnnotationHasCorrectValue( - HasSomeMethodWithAnnotationsImpl.class, setSomethingString, + assertRequireInterfaceAnnotationHasCorrectValue(HasSomeMethodWithAnnotationsImpl.class, setSomethingString, exportedInterfaces, SubSI2.class); - assertDescription(HasSomeMethodWithAnnotationsImpl.class, - setSomethingString, exportedInterfaces, "descr"); + assertDescription(HasSomeMethodWithAnnotationsImpl.class, setSomethingString, exportedInterfaces, "descr"); - assertDescriptionOnClass( - HasSomeMethodWithAnnotationsImpl.class, - new HashSet<>(Arrays - .asList(HasSomeMethodWithAnnotations.class)), "class"); + assertDescriptionOnClass(HasSomeMethodWithAnnotationsImpl.class, + new HashSet<>(Arrays.asList(HasSomeMethodWithAnnotations.class)), "class"); } - }