Fix checkstyle issues to enforce it

[controller.git] / opendaylight / config / config-manager / src / test / java / org / opendaylight / controller / config / manager / impl / factoriesresolver / HardcodedModuleFactoriesResolver.java

diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/factoriesresolver/HardcodedModuleFactoriesResolver.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/factoriesresolver/HardcodedModuleFactoriesResolver.java
index 969192c6217948bfe306839e46530e29198bd92b..b6cc61e1e3175c289ea607ee4f405876819ef045 100644 (file)
--- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/factoriesresolver/HardcodedModuleFactoriesResolver.java
+++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/factoriesresolver/HardcodedModuleFactoriesResolver.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,
@@ -7,34 +7,21 @@
  */
 package org.opendaylight.controller.config.manager.impl.factoriesresolver;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-
-import java.io.Closeable;
 import java.util.AbstractMap;
-import java.util.Arrays;
-import java.util.Dictionary;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
 import org.opendaylight.controller.config.spi.ModuleFactory;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 
 public class HardcodedModuleFactoriesResolver implements ModuleFactoriesResolver {
-    private Map<String, Map.Entry<ModuleFactory, BundleContext>> factories;
+    private final Map<String, Map.Entry<ModuleFactory, BundleContext>> factories;
 
     public HardcodedModuleFactoriesResolver(final BundleContext bundleContext, final ModuleFactory... list) {
         this.factories = new HashMap<>(list.length);
         for (ModuleFactory moduleFactory : list) {
             String moduleName = moduleFactory.getImplementationName();
             if (moduleName == null || moduleName.isEmpty()) {
-                throw new IllegalStateException(
-                        "Invalid implementation name for " + moduleFactory);
+                throw new IllegalStateException("Invalid implementation name for " + moduleFactory);
             }
             Map.Entry<ModuleFactory, BundleContext> conflicting = factories.get(moduleName);
             if (conflicting == null) {
@@ -47,19 +34,8 @@ public class HardcodedModuleFactoriesResolver implements ModuleFactoriesResolver
         }
     }
 
-    private static BundleContext mockBundleContext() {
-        BundleContext bundleContext = Mockito.mock(BundleContext.class);
-        ServiceRegistration<ModuleFactory> serviceRegistration = mock(ServiceRegistration.class);
-        doNothing().when(serviceRegistration).unregister();
-        doReturn(serviceRegistration).when(bundleContext).registerService(
-                Matchers.any(String[].class), any(Closeable.class),
-                any(Dictionary.class));
-        return bundleContext;
-    }
-
     @Override
     public Map<String, Map.Entry<ModuleFactory, BundleContext>> getAllFactories() {
         return factories;
     }
-
 }