X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-jmx-generator%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyangjmxgenerator%2FRuntimeBeanEntryTest.java;h=bdacef8efe4aed659ddfa7c4deeb05802f703104;hp=e80ebc67a566197294ac64e2c431dd07c5131b3c;hb=f43b01b81319959b1907e3e04537f5169e7f33d8;hpb=ae9f221d8bb8db034f4297f632270ba202827c56

diff --git a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntryTest.java b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntryTest.java
index e80ebc67a5..bdacef8efe 100644
--- a/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntryTest.java
+++ b/opendaylight/config/yang-jmx-generator/src/test/java/org/opendaylight/controller/config/yangjmxgenerator/RuntimeBeanEntryTest.java
@@ -7,28 +7,25 @@
  */
 package org.opendaylight.controller.config.yangjmxgenerator;
 
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-
 import javax.management.openmbean.SimpleType;
-
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.opendaylight.controller.config.yangjmxgenerator.attribute.JavaAttribute;
-import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl;
+import org.opendaylight.mdsal.binding.yang.types.TypeProviderImpl;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
+import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
@@ -48,15 +45,15 @@ public class RuntimeBeanEntryTest extends AbstractYangTest {
 
     @Test
     public void createRuntimeBean() {
-        ChoiceCaseNode caseNode = Mockito.mock(ChoiceCaseNode.class);
+        final CaseSchemaNode caseNode = Mockito.mock(CaseSchemaNode.class);
         doReturn(new HashSet<LeafSchemaNode>()).when(caseNode).getChildNodes();
         doReturn(new ArrayList<UnknownSchemaNode>()).when(caseNode)
                 .getUnknownSchemaNodes();
-        Map<String, RuntimeBeanEntry> runtimeBeans = RuntimeBeanEntry
+        final Map<String, RuntimeBeanEntry> runtimeBeans = RuntimeBeanEntry
                 .extractClassNameToRuntimeBeanMap(PACKAGE_NAME, caseNode, "test-name", new TypeProviderWrapper(new
-                        TypeProviderImpl(context)), "test", jmxImplModule);
+                        TypeProviderImpl(this.context)), "test", this.jmxImplModule, this.context);
         assertEquals(1, runtimeBeans.size());
-        RuntimeBeanEntry runtimeMXBean = runtimeBeans.get("testRuntimeMXBean");
+        final RuntimeBeanEntry runtimeMXBean = runtimeBeans.get("testRuntimeMXBean");
         assertTrue(runtimeMXBean.isRoot());
         assertEquals("test-name", runtimeMXBean.getYangName());
     }
@@ -64,35 +61,35 @@ public class RuntimeBeanEntryTest extends AbstractYangTest {
     @Test
     public void runtimeBeanRPCTest() {
         // create service interfaces
-        Map<QName, ServiceInterfaceEntry> modulesToSIEs = ServiceInterfaceEntry
-                .create(threadsModule, "packages.sis",identitiesToSIs);
+        final Map<QName, ServiceInterfaceEntry> modulesToSIEs = ServiceInterfaceEntry
+                .create(this.threadsModule, "packages.sis",identitiesToSIs);
         assertNotNull(modulesToSIEs);
 
         // create MXBeans map
-        Map<String, ModuleMXBeanEntry> namesToMBEs = ModuleMXBeanEntry.create(
-                threadsJavaModule, modulesToSIEs, context,
-                new TypeProviderWrapper(new TypeProviderImpl(context)),
+        final Map<String, ModuleMXBeanEntry> namesToMBEs = ModuleMXBeanEntry.create(
+                this.threadsJavaModule, modulesToSIEs, this.context,
+                new TypeProviderWrapper(new TypeProviderImpl(this.context)),
                 PACKAGE_NAME);
         assertFalse(namesToMBEs.isEmpty());
 
         // get threadfactory-naming bean
-        ModuleMXBeanEntry threadfactoryNamingMXBean = namesToMBEs
+        final ModuleMXBeanEntry threadfactoryNamingMXBean = namesToMBEs
                 .get(THREADFACTORY_NAMING_MXB_NAME);
         assertNotNull(threadfactoryNamingMXBean);
 
         // get runtime beans
-        Collection<RuntimeBeanEntry> runtimeBeanEntries = threadfactoryNamingMXBean
+        final Collection<RuntimeBeanEntry> runtimeBeanEntries = threadfactoryNamingMXBean
                 .getRuntimeBeans();
         assertFalse(runtimeBeanEntries.isEmpty());
 
         // get root runtime bean
-        RuntimeBeanEntry threadfactoryRuntimeBeanEntry = getRuntimeBeanEntryByJavaName(
+        final RuntimeBeanEntry threadfactoryRuntimeBeanEntry = getRuntimeBeanEntryByJavaName(
                 runtimeBeanEntries, "NamingThreadFactoryRuntimeMXBean");
         assertNotNull(threadfactoryRuntimeBeanEntry);
         assertTrue(threadfactoryRuntimeBeanEntry.isRoot());
 
         // get thread runtime bean
-        RuntimeBeanEntry runtimeBeanEntry = getRuntimeBeanEntryByJavaName(
+        final RuntimeBeanEntry runtimeBeanEntry = getRuntimeBeanEntryByJavaName(
                 runtimeBeanEntries, THREAD_RUNTIME_BEAN_JAVA_NAME);
         assertNotNull(runtimeBeanEntry);
 
@@ -105,21 +102,21 @@ public class RuntimeBeanEntryTest extends AbstractYangTest {
         assertEquals(THREAD_RUNTIME_BEAN_YANG_NAME, runtimeBeanEntry.getYangName());
 
         // get thread runtime bean rpcs
-        List<RuntimeBeanEntry.Rpc> rpcs = new ArrayList<RuntimeBeanEntry.Rpc>(
+        final List<RuntimeBeanEntry.Rpc> rpcs = new ArrayList<>(
                 runtimeBeanEntry.getRpcs());
         assertEquals(2, rpcs.size());
 
         // get sleep rpc and test it
-        RuntimeBeanEntry.Rpc rpc = getRpcByName(rpcs, SLEEP_RPC_NAME);
+        final RuntimeBeanEntry.Rpc rpc = getRpcByName(rpcs, SLEEP_RPC_NAME);
         assertNotNull(rpc);
         assertEquals(SLEEP_RPC_NAME, rpc.getYangName());
 
         assertTrue(((JavaAttribute)rpc.getReturnType()).getType().getFullyQualifiedName().endsWith(SLEEP_RPC_OUTPUT));
 
         // get sleep rpc input attribute and test it
-        List<JavaAttribute> attributes = rpc.getParameters();
+        final List<JavaAttribute> attributes = rpc.getParameters();
         assertEquals(1, attributes.size());
-        JavaAttribute attribute = attributes.get(0);
+        final JavaAttribute attribute = attributes.get(0);
         assertEquals(SLEEP_RPC_INPUT_NAME, attribute.getAttributeYangName());
         assertEquals(SLEEP_RPC_INPUT_TYPE, attribute.getType().getName());
         assertEquals(SLEEP_RPC_INPUT_NAME, attribute.getLowerCaseCammelCase());
@@ -132,8 +129,8 @@ public class RuntimeBeanEntryTest extends AbstractYangTest {
     private RuntimeBeanEntry getRuntimeBeanEntryByJavaName(
             final Collection<RuntimeBeanEntry> runtimeBeanEntries,
             final String javaName) {
-        if (runtimeBeanEntries != null && !runtimeBeanEntries.isEmpty()) {
-            for (RuntimeBeanEntry runtimeBeanEntry : runtimeBeanEntries) {
+        if ((runtimeBeanEntries != null) && !runtimeBeanEntries.isEmpty()) {
+            for (final RuntimeBeanEntry runtimeBeanEntry : runtimeBeanEntries) {
                 if (runtimeBeanEntry.getJavaNameOfRuntimeMXBean().equals(
                         javaName)) {
                     return runtimeBeanEntry;
@@ -145,8 +142,8 @@ public class RuntimeBeanEntryTest extends AbstractYangTest {
 
     private RuntimeBeanEntry.Rpc getRpcByName(
             final List<RuntimeBeanEntry.Rpc> rpcs, final String name) {
-        if (rpcs != null && !rpcs.isEmpty()) {
-            for (RuntimeBeanEntry.Rpc rpc : rpcs) {
+        if ((rpcs != null) && !rpcs.isEmpty()) {
+            for (final RuntimeBeanEntry.Rpc rpc : rpcs) {
                 if (rpc.getName().equals(name)) {
                     return rpc;
                 }