X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fdynamicmbean%2FAnnotationsHelper.java;h=6859e4caf3f37dd086a512651146290e8306b53a;hp=fba9844dbfaf9d7fc8cef7ed54e223c73c7431b2;hb=6227570f6482136b72a26675d43c8bb88279503e;hpb=83dfe301bf2a2b1eff6883a2af3282c95d5a752e diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsHelper.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsHelper.java index fba9844dbf..6859e4caf3 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsHelper.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/AnnotationsHelper.java @@ -45,14 +45,15 @@ public class AnnotationsHelper { } // we need to go deeper inspectedClass = inspectedClass.getSuperclass(); + // no need to go further } catch (NoSuchMethodException e) { - inspectedClass = Object.class; // no need to go further + inspectedClass = Object.class; } } while (!inspectedClass.equals(Object.class)); // inspect interfaces for (Class ifc : inspectedInterfaces) { - if (ifc.isInterface() == false) { + if (!ifc.isInterface()) { throw new IllegalArgumentException(ifc + " is not an interface"); } try { @@ -78,7 +79,7 @@ public class AnnotationsHelper { */ static List findClassAnnotationInSuperClassesAndIfcs( final Class clazz, final Class annotationType, final Set> interfaces) { - List result = new ArrayList(); + List result = new ArrayList<>(); Class declaringClass = clazz; do { T annotation = declaringClass.getAnnotation(annotationType); @@ -86,10 +87,10 @@ public class AnnotationsHelper { result.add(annotation); } declaringClass = declaringClass.getSuperclass(); - } while (declaringClass.equals(Object.class) == false); + } while (!declaringClass.equals(Object.class)); // inspect interfaces for (Class ifc : interfaces) { - if (ifc.isInterface() == false) { + if (!ifc.isInterface()) { throw new IllegalArgumentException(ifc + " is not an interface"); } T annotation = ifc.getAnnotation(annotationType);