Checkstyle fixes for ovsdb test dirs 26/42326/2
authorSam Hague <shague@redhat.com>
Fri, 22 Jul 2016 16:56:54 +0000 (12:56 -0400)
committerSam Hague <shague@redhat.com>
Fri, 22 Jul 2016 17:57:54 +0000 (13:57 -0400)
Change-Id: I96d5843f9b26463f89e54992aea34b2438b571d4
Signed-off-by: Sam Hague <shague@redhat.com>
15 files changed:
library/impl/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java
library/impl/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java
library/impl/src/test/java/org/opendaylight/ovsdb/lib/schema/OvsdbSchemaTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodecTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstanceTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManagerTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbSchemaContantsTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundMapperTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundUtilTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolRemovedCommandTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/ProtocolUpdateCommandTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTaskTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OpenVSwitchUpdateCommandTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommandTest.java
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java

index b481861eb1ca6dea4498427ebfcc84dcaf32c19e..753b1672733795166a95c07b9d3ad5d20dcdb697 100644 (file)
@@ -18,7 +18,9 @@ import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import org.apache.commons.lang3.NotImplementedException;
 
 public class NettyBootStrapper {
@@ -66,7 +68,7 @@ public class NettyBootStrapper {
             // Wait until all threads are terminated.
             bossGroup.terminationFuture().sync();
             workerGroup.terminationFuture().sync();
-        } catch (Exception e) {
+        } catch (ExecutionException | TimeoutException e) {
             //ignore
         }
     }
index 915caf19c138bcdae690e04c934ab01e95278594..643df7197668c27694329ac05e7f15f39cb3d2c1 100644 (file)
@@ -66,7 +66,6 @@ public class TestClient extends TestCase {
             String string = ",\"key1" + counter + "\":\"planet of apes" + counter + "\", \"key2" + counter
                     + "\":{\"k1\":\"ovs-db rocks the world\"}";
             outputStream.write(string.substring(i == 0 ? 1 : 0).getBytes("UTF-8"));
-            // System.out.println("data counter = " + counter);
         }
         outputStream.write("}".getBytes("UTF-8"));
     }
@@ -79,7 +78,6 @@ public class TestClient extends TestCase {
         counter++;
         String string = "                       {\"part" + counter + "\":";
         outputStream.write(string.getBytes("UTF-8"));
-        // System.out.println("partial first half counter = " + counter);
     }
 
     /**
@@ -88,7 +86,6 @@ public class TestClient extends TestCase {
     private void writePartialLast(OutputStream outputStream) throws IOException {
         String string = "\"val" + counter + "\"}";
         outputStream.write(string.getBytes("UTF-8"));
-        // System.out.println("partial second half counter = " + counter);
     }
 
 }
index cd86836b56c0b1a0153e0dbe314fbd3e66a86fdd..dd2ee867e445a433b283a9d1aaa9e240df1a889e 100644 (file)
@@ -31,7 +31,6 @@ public class OvsdbSchemaTest {
         InputStream resourceAsStream = OvsdbSchemaTest.class.getResourceAsStream("test_schema.json");
         ObjectMapper mapper = new ObjectMapper();
         JsonNode jsonNode = mapper.readTree(resourceAsStream);
-        //System.out.println("jsonNode = " + jsonNode.get("id"));
 
         DatabaseSchema schema = DatabaseSchema.fromJson("some", jsonNode.get("result"));
         assertNotNull(schema);
index b7016e8cce47f4729e0ec3934ea5311a534525de..72353cd48b2c3c13724ae8b74003e74bb5b1f6a2 100644 (file)
@@ -120,7 +120,7 @@ public class InstanceIdentifierCodecTest {
         mock(InstanceIdentifier.class);
         when(bindingNormalizedNodeSerializer.fromYangInstanceIdentifier(yiid))
                 .thenAnswer(new Answer<InstanceIdentifier<?>>() {
-                    public InstanceIdentifier<?> answer(InvocationOnMock invocation) throws Throwable {
+                    public InstanceIdentifier<?> answer(InvocationOnMock invocation) throws Exception {
                         return (InstanceIdentifier<?>) invocation.getArguments()[0];
                     }
                 });
index 62e87e54fd3eb5cbd258911029d544877c956c02..566501356f99ecd79d8ddc5c8a02f514661ac082 100644 (file)
@@ -35,7 +35,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
-import org.opendaylight.ovsdb.lib.EchoServiceCallbackFilters;
 import org.opendaylight.ovsdb.lib.LockAquisitionCallback;
 import org.opendaylight.ovsdb.lib.LockStolenCallback;
 import org.opendaylight.ovsdb.lib.MonitorCallBack;
index c466c22743e119ef3d18c3b1a0042cddd91047ff..b2e327ccf387fe7d49c5d6bfe9c2cc5c321d0b23 100644 (file)
@@ -297,20 +297,23 @@ public class OvsdbConnectionManagerTest {
         ConnectionInfo key = mock(ConnectionInfo.class);
         suppress(MemberMatcher.method(OvsdbConnectionManager.class, "getConnectionInstance", ConnectionInfo.class));
         when(ovsdbConnManager.getConnectionInstance(key)).thenReturn((OvsdbConnectionInstance)ovsdbClient);
-        assertEquals("Error getting correct OvsdbClient object", ovsdbClient.getOvsdbClient(), ovsdbConnManager.getClient(key));
+        assertEquals("Error getting correct OvsdbClient object", ovsdbClient.getOvsdbClient(),
+                ovsdbConnManager.getClient(key));
 
         //Test getClient(OvsdbBridgeAttributes mn)
         OvsdbBridgeAttributes mn = mock(OvsdbBridgeAttributes.class);
         suppress(MemberMatcher.method(OvsdbConnectionManager.class, "getConnectionInstance",
                 OvsdbBridgeAttributes.class));
         when(ovsdbConnManager.getConnectionInstance(mn)).thenReturn((OvsdbConnectionInstance)ovsdbClient);
-        assertEquals("Error getting correct OvsdbClient object", ovsdbClient.getOvsdbClient(), ovsdbConnManager.getClient(mn));
+        assertEquals("Error getting correct OvsdbClient object", ovsdbClient.getOvsdbClient(),
+                ovsdbConnManager.getClient(mn));
 
         //Test getClient(Node node)
         Node node = mock(Node.class);
         suppress(MemberMatcher.method(OvsdbConnectionManager.class, "getConnectionInstance", Node.class));
         when(ovsdbConnManager.getConnectionInstance(node)).thenReturn((OvsdbConnectionInstance)ovsdbClient);
-        assertEquals("Error getting correct OvsdbClient object", ovsdbClient.getOvsdbClient(), ovsdbConnManager.getClient(node));
+        assertEquals("Error getting correct OvsdbClient object", ovsdbClient.getOvsdbClient(),
+                ovsdbConnManager.getClient(node));
     }
 
     @SuppressWarnings("unchecked")
index d0e9c5821957c12255e80af1c11fa6d199bcd7e3..506c7cd6c4f9a5107bcd6b956a91483de6df647c 100644 (file)
@@ -16,7 +16,8 @@ public class OvsdbSchemaContantsTest {
 
     @Test
     public void testDatabaseName() {
-        assertEquals("Error databaseName did not return correct value", "Open_vSwitch", OvsdbSchemaContants.DATABASE_NAME);
+        assertEquals("Error databaseName did not return correct value", "Open_vSwitch",
+                OvsdbSchemaContants.DATABASE_NAME);
     }
 
     @Test
index dbeae0e45fdbd0d2f28a754856de90105a6c0300..daeb5c0ca40d10baf2782fdc3b7681ab6a95c39a 100644 (file)
@@ -177,7 +177,7 @@ public class SouthboundMapperTest {
         OvsdbBridgeAugmentation mdsalbridge = mock(OvsdbBridgeAugmentation.class);
         when(mdsalbridge.getDatapathType()).thenAnswer(new Answer<Class<? extends DatapathTypeBase>>() {
             public Class<? extends DatapathTypeBase> answer(
-                    InvocationOnMock invocation) throws Throwable {
+                    InvocationOnMock invocation) throws Exception {
                 return DatapathTypeNetdev.class;
             }
         });
@@ -185,7 +185,7 @@ public class SouthboundMapperTest {
 
         when(mdsalbridge.getDatapathType()).thenAnswer(new Answer<Class<? extends DatapathTypeBase>>() {
             public Class<? extends DatapathTypeBase> answer(
-                    InvocationOnMock invocation) throws Throwable {
+                    InvocationOnMock invocation) throws Exception {
                 return DatapathTypeSystem.class;
             }
         });
@@ -208,7 +208,7 @@ public class SouthboundMapperTest {
         when(ovsdbBridgeNode.getProtocolEntry()).thenReturn(protocolList);
         when(protocolEntry.getProtocol()).thenAnswer(new Answer<Class<? extends OvsdbBridgeProtocolBase>>() {
             public Class<? extends OvsdbBridgeProtocolBase> answer(
-                    InvocationOnMock invocation) throws Throwable {
+                    InvocationOnMock invocation) throws Exception {
                 return OvsdbBridgeProtocolOpenflow10.class;
             }
         });
@@ -288,7 +288,8 @@ public class SouthboundMapperTest {
             ObjectMapper mapper = new ObjectMapper();
             JsonNode jsonNode = mapper.readTree(resourceAsStream);
 
-            DatabaseSchema dbSchema = DatabaseSchema.fromJson(OvsdbSchemaContants.DATABASE_NAME, jsonNode.get("result"));
+            DatabaseSchema dbSchema = DatabaseSchema.fromJson(OvsdbSchemaContants.DATABASE_NAME,
+                    jsonNode.get("result"));
 
             String uuidString = "7da709ff-397f-4778-a0e8-994811272fdb";
             OvsdbBridgeAugmentation omn = new OvsdbBridgeAugmentationBuilder()
index f7e864f4608ac0e079d300d273b507c7f331d640..48677cb74c49d7e378f6bf1208446d744ba0ecb5 100644 (file)
@@ -97,7 +97,7 @@ public class SouthboundUtilTest {
         when(db.newReadOnlyTransaction()).thenReturn(transaction);
         when(mn.getManagedBy()).thenReturn(ref);
         when(ref.getValue()).thenAnswer(new Answer<InstanceIdentifier<Node>>() {
-            public InstanceIdentifier<Node> answer(InvocationOnMock invocation) throws Throwable {
+            public InstanceIdentifier<Node> answer(InvocationOnMock invocation) throws Exception {
                 return (InstanceIdentifier<Node>) mock(InstanceIdentifier.class);
             }
         });
index 84a735f5b4cdf334ac25b2b1ad3a310f01d0884c..b650fdc14b39d5b6cf1fada1bb30de8a4bed7b4b 100644 (file)
@@ -63,7 +63,7 @@ public class ProtocolRemovedCommandTest {
         ProtocolEntry protocol = mock(ProtocolEntry.class);
         when(protocol.getProtocol()).thenAnswer(new Answer<Class<? extends OvsdbBridgeProtocolBase>>() {
             public Class<? extends OvsdbBridgeProtocolBase> answer(
-                    InvocationOnMock invocation) throws Throwable {
+                    InvocationOnMock invocation) throws Exception {
                 return OvsdbBridgeProtocolOpenflow10.class;
             }
         });
index f52a6f826a85e4723362117e7c10cb38f3c5d8df..940f6de6a2efcc2c1ddc98eb73ee9f5aefe2a73e 100644 (file)
@@ -92,7 +92,7 @@ public class ProtocolUpdateCommandTest {
         when(ovsdbBridge.getBridgeName()).thenReturn(ovsdbBridgeName);
         when(protocolEntry.getProtocol()).thenAnswer(new Answer<Class<? extends OvsdbBridgeProtocolBase>>() {
             public Class<? extends OvsdbBridgeProtocolBase> answer(
-                    InvocationOnMock invocation) throws Throwable {
+                    InvocationOnMock invocation) throws Exception {
                 return OvsdbBridgeProtocolOpenflow10.class;
             }
         });
index 60397aa9c2f9792e81b41aed95ec61412639326b..7756f40f99e704e22c5f290cda9bbee8f066a072 100644 (file)
@@ -128,7 +128,7 @@ public class BridgeConfigReconciliationTaskTest {
         ProtocolEntryKey protocolEntryKey = mock(ProtocolEntryKey.class);
         Mockito.when(protocolEntry.getProtocol()).thenAnswer(new Answer<Class<? extends OvsdbBridgeProtocolBase>>() {
             public Class<? extends OvsdbBridgeProtocolBase> answer(
-                    InvocationOnMock invocation) throws Throwable {
+                    InvocationOnMock invocation) throws Exception {
                 return OvsdbBridgeProtocolOpenflow10.class;
             }
         });
index 9593884bc6cb1f6261eff0d614e4b26bb0eccdb3..043ed9ac5f60d554bdfe709d9586ac21858e1e3d 100644 (file)
@@ -314,7 +314,7 @@ public class OpenVSwitchUpdateCommandTest {
         PowerMockito.mockStatic(SouthboundMapper.class);
         when(SouthboundMapper.createInterfaceType(anyString()))
                 .thenAnswer(new Answer<Class<? extends InterfaceTypeBase>>() {
-                    public Class<? extends InterfaceTypeBase> answer(InvocationOnMock invocation) throws Throwable {
+                    public Class<? extends InterfaceTypeBase> answer(InvocationOnMock invocation) throws Exception {
                         return InterfaceTypeInternal.class;
                     }
                 });
@@ -345,7 +345,7 @@ public class OpenVSwitchUpdateCommandTest {
         PowerMockito.mockStatic(SouthboundMapper.class);
         when(SouthboundMapper.createDatapathType(anyString()))
                 .thenAnswer(new Answer<Class<? extends DatapathTypeBase>>() {
-                    public Class<? extends DatapathTypeBase> answer(InvocationOnMock invocation) throws Throwable {
+                    public Class<? extends DatapathTypeBase> answer(InvocationOnMock invocation) throws Exception {
                         return DatapathTypeSystem.class;
                     }
                 });
index 000f8985980eeaabd7443d4224bc3d39c459d29b..e09f7adcf6508cf60ce0b96c8a90b39c76fd7bf4 100644 (file)
@@ -331,7 +331,7 @@ public class OvsdbBridgeUpdateCommandTest {
         PowerMockito.mockStatic(SouthboundMapper.class);
         when(SouthboundMapper.createDatapathType(anyString()))
                 .thenAnswer(new Answer<Class<? extends DatapathTypeBase>>() {
-                    public Class<? extends DatapathTypeBase> answer(InvocationOnMock invocation) throws Throwable {
+                    public Class<? extends DatapathTypeBase> answer(InvocationOnMock invocation) throws Exception {
                         return DatapathTypeSystem.class;
                     }
                 });
index 87ffe60f291600bd0b8e31adb4a8a7cda2a9b5aa..564a63c06b6b829f77c2f9512f2d12b865c78757 100644 (file)
@@ -426,7 +426,7 @@ public class OvsdbPortUpdateCommandTest {
         PowerMockito.mockStatic(SouthboundMapper.class);
         PowerMockito.when(SouthboundMapper.createInterfaceType(anyString()))
                 .thenAnswer(new Answer<Class<? extends InterfaceTypeBase>>() {
-                    public Class<? extends InterfaceTypeBase> answer(InvocationOnMock invocation) throws Throwable {
+                    public Class<? extends InterfaceTypeBase> answer(InvocationOnMock invocation) throws Exception {
                         return InterfaceTypeInternal.class;
                     }
                 });