X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-api%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fapi%2Fjmx%2FObjectNameUtilTest.java;h=7498561eb2d6c8bc6a5ec2ca7be7deff84a090cf;hb=c65916d075142dd937cb67e5128a87c05616b834;hp=a9be8e984a5aed0f999c74e6fd41c1acf83eb715;hpb=dd4468c48a1a0e807f4dffba879c939006c99086;p=controller.git

diff --git a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java
index a9be8e984a..7498561eb2 100644
--- a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java
+++ b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2013, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -45,7 +45,8 @@ public class ObjectNameUtilTest {
         assertEquals(serviceQName, ObjectNameUtil.getServiceQName(serviceReferenceON));
         assertEquals(refName, ObjectNameUtil.getReferenceName(serviceReferenceON));
         assertEquals(transaction, ObjectNameUtil.getTransactionName(serviceReferenceON));
-        assertEquals(ObjectNameUtil.createReadOnlyServiceON(serviceQName, refName), ObjectNameUtil.withoutTransactionName(serviceReferenceON));
+        assertEquals(ObjectNameUtil.createReadOnlyServiceON(serviceQName, refName),
+                ObjectNameUtil.withoutTransactionName(serviceReferenceON));
 
         serviceReferenceON = ObjectNameUtil.createReadOnlyServiceON(serviceQName, refName);
         assertFalse(serviceReferenceON.isPattern());
@@ -124,34 +125,23 @@ public class ObjectNameUtilTest {
 
     @Test
     public void testChecks() throws Exception {
-        final ObjectName on = ObjectNameUtil.createON("customDomain", ObjectNameUtil.TYPE_KEY, ObjectNameUtil.TYPE_MODULE);
-
-        assertFailure(new Runnable() {
-            @Override
-            public void run() {
-                ObjectNameUtil.checkTypeOneOf(on, ObjectNameUtil.TYPE_RUNTIME_BEAN, ObjectNameUtil.TYPE_CONFIG_TRANSACTION);
-            }
-        }, IllegalArgumentException.class);
-
-        assertFailure(new Runnable() {
-            @Override
-            public void run() {
-                ObjectNameUtil.checkType(on, ObjectNameUtil.TYPE_RUNTIME_BEAN);
-            }
-        }, IllegalArgumentException.class);
-
-        assertFailure(new Runnable() {
-            @Override
-            public void run() {
-                ObjectNameUtil.checkDomain(on);
-            }
-        }, IllegalArgumentException.class);
+        final ObjectName on = ObjectNameUtil.createON("customDomain", ObjectNameUtil.TYPE_KEY,
+                ObjectNameUtil.TYPE_MODULE);
+
+        assertFailure(() -> ObjectNameUtil.checkTypeOneOf(on, ObjectNameUtil.TYPE_RUNTIME_BEAN,
+                ObjectNameUtil.TYPE_CONFIG_TRANSACTION), IllegalArgumentException.class);
+
+        assertFailure(() -> ObjectNameUtil.checkType(on, ObjectNameUtil.TYPE_RUNTIME_BEAN),
+                IllegalArgumentException.class);
+
+        assertFailure(() -> ObjectNameUtil.checkDomain(on), IllegalArgumentException.class);
     }
 
+    @SuppressWarnings("IllegalCatch")
     private void assertFailure(final Runnable test, final Class<? extends Exception> ex) {
         try {
             test.run();
-        } catch(final Exception e) {
+        } catch (final Exception e) {
             assertTrue("Failed with wrong exception: " + Throwables.getStackTraceAsString(e),
                     e.getClass().isAssignableFrom(ex));
             return;