Fix checkstyle issues to enforce it

[controller.git] / opendaylight / config / config-manager / src / test / java / org / opendaylight / controller / config / manager / impl / util / OsgiRegistrationUtilTest.java

diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java
index fb59e3d51554d1f69d3bdc215478daf14a2d88e2..6763facae57247ce7bb149d544c175035537804e 100644 (file)
--- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java
+++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/OsgiRegistrationUtilTest.java
@@ -1,3 +1,11 @@
+/*
+ * 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,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.config.manager.impl.util;
 
 import static org.mockito.Mockito.doNothing;
@@ -23,7 +31,8 @@ public class OsgiRegistrationUtilTest {
         ServiceRegistration<?> registration2 = mockServiceRegistration();
         doReturn(registration2).when(bundleContext).registerService(Object.class, "string", null);
 
-        AutoCloseable aggregatedRegister = OsgiRegistrationUtil.registerService(bundleContext, "string", String.class, Object.class);
+        AutoCloseable aggregatedRegister = OsgiRegistrationUtil.registerService(bundleContext, "string", String.class,
+                Object.class);
         aggregatedRegister.close();
 
         InOrder inOrder = Mockito.inOrder(registration, registration2);
@@ -37,7 +46,7 @@ public class OsgiRegistrationUtilTest {
         OsgiRegistrationUtil.wrap(serviceReg).close();
         verify(serviceReg).unregister();
 
-        final BundleTracker tracker = mock(BundleTracker.class);
+        final BundleTracker<?> tracker = mock(BundleTracker.class);
         doNothing().when(tracker).close();
         OsgiRegistrationUtil.wrap(tracker).close();
         verify(tracker).close();
@@ -48,14 +57,13 @@ public class OsgiRegistrationUtilTest {
         verify(sTracker).close();
     }
 
-    private ServiceRegistration<?> mockServiceRegistration() {
-        ServiceRegistration mock = mock(ServiceRegistration.class);
+    private static ServiceRegistration<?> mockServiceRegistration() {
+        ServiceRegistration<?> mock = mock(ServiceRegistration.class);
         doNothing().when(mock).unregister();
         return mock;
     }
 
     @Test
     public void testAggregate() throws Exception {
-
     }
-}
\ No newline at end of file
+}