Updating the commons parent pom to 1.4.1-SNAPSHOT and checkstyle fixes

ovsdb project depends on the controller project's 1.4.0-SNAPSHOT version of commons pom.xml.
Since the latest changes (including the jackson upgrade) is done on 1.4.1-SNAPSHOT, we have
to update to the latest.
While doing so, it caught quite a few checkstyle errors, which am fixing it along.

Change-Id: Id650ffbae93f47121a7d259d0b39c6b537c2a992
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 062ffe8a9bf318ca7ea59c7f7ba3ae34431a37ad..bdee4b7b82d4de4580785d576e23e9943076e5cf 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>
   <artifactId>commons.ovsdb</artifactId>
@@ -21,7 +21,6 @@
   <properties>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jackson.new.version>2.3.0</jackson.new.version>
   </properties>
   <!-- modules should go once the jenkins job is updated to use the root pom -->
   <modules>

diff --git a/neutron/src/test/java/org/opendaylight/ovsdb/neutron/AdminConfigManagerTest.java b/neutron/src/test/java/org/opendaylight/ovsdb/neutron/AdminConfigManagerTest.java
index dca3eaaf54c6c93d126308bb5ba14639d0565be5..d121018cf5ae4176dda89c9efcafd4f3194a12b9 100644 (file)
--- a/neutron/src/test/java/org/opendaylight/ovsdb/neutron/AdminConfigManagerTest.java
+++ b/neutron/src/test/java/org/opendaylight/ovsdb/neutron/AdminConfigManagerTest.java
@@ -11,28 +11,30 @@
 
 package org.opendaylight.ovsdb.neutron;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.opendaylight.controller.sal.core.Node;
+import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
 import org.opendaylight.ovsdb.lib.table.Open_vSwitch;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-
-import org.opendaylight.controller.sal.core.Node;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
 import org.opendaylight.ovsdb.plugin.ConfigurationService;
 import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
-import org.opendaylight.controller.sal.utils.ServiceHelper;
-
-import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.opendaylight.ovsdb.lib.table.internal.Table;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(ServiceHelper.class)

diff --git a/neutron/src/test/java/org/opendaylight/ovsdb/neutron/BaseHandlerTest.java b/neutron/src/test/java/org/opendaylight/ovsdb/neutron/BaseHandlerTest.java
index f00eb91faa2a226c4c5255e0c1e1b39fcf35de7f..ba19bd7b9af113ce4a9dd3672c674562e6efbdcd 100644 (file)
--- a/neutron/src/test/java/org/opendaylight/ovsdb/neutron/BaseHandlerTest.java
+++ b/neutron/src/test/java/org/opendaylight/ovsdb/neutron/BaseHandlerTest.java
@@ -12,12 +12,13 @@
 
 package org.opendaylight.ovsdb.neutron;
 
-import java.net.HttpURLConnection;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-import static org.junit.Assert.*;
+import java.net.HttpURLConnection;
 
 import org.junit.Test;
-
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;
 

diff --git a/neutron/src/test/java/org/opendaylight/ovsdb/neutron/NetworkHandlerTest.java b/neutron/src/test/java/org/opendaylight/ovsdb/neutron/NetworkHandlerTest.java
index b35330078c08ba9ecf82d09896213d504bc4d8d9..c753172290f3569a48053d5d5803bd40157f838a 100644 (file)
--- a/neutron/src/test/java/org/opendaylight/ovsdb/neutron/NetworkHandlerTest.java
+++ b/neutron/src/test/java/org/opendaylight/ovsdb/neutron/NetworkHandlerTest.java
@@ -11,17 +11,19 @@
 
 package org.opendaylight.ovsdb.neutron;
 
-import java.net.HttpURLConnection;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import java.net.HttpURLConnection;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-
 import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
 @RunWith(PowerMockRunner.class)

diff --git a/northbound/ovsdb/pom.xml b/northbound/ovsdb/pom.xml
index 440afb0acc40ca15db873ae4b3755b7f173d4c2d..4e8a73ada7d106ab747697f2bfa2414e550b2281 100644 (file)
--- a/northbound/ovsdb/pom.xml
+++ b/northbound/ovsdb/pom.xml
@@ -89,19 +89,19 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.new.version}</version>
+      <version>${jackson.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson.new.version}</version>
+      <version>${jackson.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson.new.version}</version>
+      <version>${jackson.version}</version>
     </dependency>
 
   </dependencies>

diff --git a/ovsdb/pom.xml b/ovsdb/pom.xml
index bfc671085772fa8c6acc22475445fb730d3fec35..7c2775fd7e279b6992c03d9fd1ea1d875b9f40fb 100755 (executable)
--- a/ovsdb/pom.xml
+++ b/ovsdb/pom.xml
@@ -137,17 +137,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.new.version}</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson.new.version}</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.new.version}</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.portlet</groupId>
@@ -181,6 +181,25 @@
           <artifactId>commons-collections</artifactId>
           <version>1.0</version>
         </dependency>
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <version>${guava.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>equinoxSDK381</groupId>
+          <artifactId>org.eclipse.osgi</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.google.code.gson</groupId>
+          <artifactId>gson</artifactId>
+          <version>2.1</version>
+          <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSBridge.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSBridge.java
index 5ab9b47b70c417e5d0a9e42e127230a1f613c83e..2c404c280cffeb3e5cd1dd3646f0c7b5926071f2 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSBridge.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSBridge.java
@@ -10,10 +10,14 @@
 package org.opendaylight.ovsdb.lib.database;\r
 \r
 \r
-import org.opendaylight.ovsdb.plugin.Connection;\r
-import org.opendaylight.ovsdb.plugin.OvsdbMessage;\r
-\r
-import java.util.*;\r
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.opendaylight.ovsdb.plugin.Connection;
+import org.opendaylight.ovsdb.plugin.OvsdbMessage;
 \r
 public class OVSBridge {\r
 \r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Request.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Request.java
index d1fa2ce26a9e4d092dca0f6fa2e4374d39a05693..7ecaf4badb0780a12a749cef0d3f354f07f32a2d 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Request.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Request.java
@@ -12,7 +12,6 @@ package org.opendaylight.ovsdb.lib.jsonrpc;
 import com.google.common.collect.Lists;
 
 import java.util.List;
-import java.util.UUID;
 
 public class JsonRpc10Request {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Response.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Response.java
index 013185659fdccce336abcc03b206e22690268189..5498557573c7cdb6420b4bbeb70be5a0e501d2d2 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Response.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Response.java
@@ -11,7 +11,6 @@ package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import java.util.List;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.Lists;
 
 public class JsonRpc10Response {

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/InsertSerializer.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/InsertSerializer.java
index 68e09acfb7acc9209c5e07a9d56e92bf6db0d586..421aa39f30ee47932d2de036ad6aee1014ab9e78 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/InsertSerializer.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/InsertSerializer.java
@@ -12,7 +12,6 @@ package org.opendaylight.ovsdb.lib.message;
 import java.io.IOException;
 
 import org.opendaylight.ovsdb.lib.message.operations.InsertOperation;
-import org.opendaylight.ovsdb.lib.notation.Condition;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java
index ac4bf4f85ecaf0cf03e9d446bbb3459ee19f7884..406eb1aa7bf66885b9aa06d83f5b8b8e5e53d866 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java
@@ -13,7 +13,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import org.opendaylight.ovsdb.lib.jsonrpc.Params;
-import org.opendaylight.ovsdb.lib.table.Bridge;
 import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 import java.util.List;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java
index b0697bb4b7998696820d14f5a9fa66dfb34379fb..2bebe92b465c25e9d3b6332b4587c8af251b28ee 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java
@@ -17,7 +17,6 @@ import com.google.common.collect.Maps;
 
 import java.util.Collection;
 import java.util.Map;
-import java.util.Set;
 
 import org.opendaylight.ovsdb.lib.table.internal.Table;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TransactBuilder.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TransactBuilder.java
index 2c937ed7a3eb5416a27e039702f06f06d78222f0..26ffe3bad38e78dc55348dc27a4a2d8a63a3e397 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TransactBuilder.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TransactBuilder.java
@@ -10,15 +10,10 @@
 package org.opendaylight.ovsdb.lib.message;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 import org.opendaylight.ovsdb.lib.jsonrpc.Params;
 import org.opendaylight.ovsdb.lib.message.operations.Operation;
-import org.opendaylight.ovsdb.lib.table.Bridge;
-import org.opendaylight.ovsdb.lib.table.internal.Table;
-
 import java.util.List;
-import java.util.Map;
 
 public class TransactBuilder implements Params {
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/operations/InsertOperation.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/operations/InsertOperation.java
index b651a645fccbcdb5ec838839d30eb22830323cbc..57e507739aed0d4c27f5fc1e4e747d91c1b4af82 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/operations/InsertOperation.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/operations/InsertOperation.java
@@ -9,8 +9,6 @@
  */
 package org.opendaylight.ovsdb.lib.message.operations;
 
-import java.util.Map;
-
 import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsDBMap.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsDBMap.java
index 39e241a7f37eb3f83b797c4bdd5801c55f2712c4..c3e1e84c00ecffe11a33fcaa707a8e6ba57f78ca 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsDBMap.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsDBMap.java
@@ -14,7 +14,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.collect.ForwardingMap;
 import com.google.common.collect.Maps;
 
-import org.opendaylight.ovsdb.lib.notation.json.ConditionSerializer;
 import org.opendaylight.ovsdb.lib.notation.json.Converter;
 import org.opendaylight.ovsdb.lib.notation.json.OvsDBMapSerializer;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsDBSetSerializer.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsDBSetSerializer.java
index 42293584faee390f83ebb3566de4ee895861d895..1d73d214646eb5b52ccb33b0074b581b07a6fee3 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsDBSetSerializer.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsDBSetSerializer.java
@@ -12,7 +12,6 @@ package org.opendaylight.ovsdb.lib.notation.json;
 import java.io.IOException;
 import java.util.Set;
 
-import org.opendaylight.ovsdb.lib.notation.Condition;
 import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
 
 import com.fasterxml.jackson.core.JsonGenerator;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Qos.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Qos.java
index 31362a5284e2144f4a26eccf490cbcb9568b8c6d..0eb8a615060607945e1d859423aa092f3a6a6d3b 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Qos.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Qos.java
@@ -9,10 +9,8 @@
  */
 package org.opendaylight.ovsdb.lib.table;
 
-import java.math.BigInteger;
 
 import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
-import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.lib.table.internal.Table;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Queue.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Queue.java
index 88528d41abf0c7f7b70e6b745227b292b05a5a56..122f3bcf810deec57237c55cb5bd3ce2b2d9ec53 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Queue.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Queue.java
@@ -9,11 +9,9 @@
  */
 package org.opendaylight.ovsdb.lib.table;
 
-import java.math.BigInteger;
 
 import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
 import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
-import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.lib.table.internal.Table;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SSL.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SSL.java
index e252ac6162bda5435c2e6f50e516c3a5ebc068f6..1236d75b9526c97ab2ff28fac0bdd0ff8293ae73 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SSL.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SSL.java
@@ -10,9 +10,7 @@
 package org.opendaylight.ovsdb.lib.table;
 
 import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
-import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
 import org.opendaylight.ovsdb.lib.table.internal.Table;
-import org.opendaylight.ovsdb.lib.table.internal.Table.Name;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
index ccb386e92aad008f9b6d3718e91938d718ed04d8..19270ede771d96d8828797fa26ae959f431b5c17 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
@@ -45,7 +45,6 @@ import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
 import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.lib.table.Bridge;
-import org.opendaylight.ovsdb.lib.table.Capability;
 import org.opendaylight.ovsdb.lib.table.Controller;
 import org.opendaylight.ovsdb.lib.table.Interface;
 import org.opendaylight.ovsdb.lib.table.Manager;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Connection.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Connection.java
index e869363146e81d8ed6e842a632e5aea8bd9ba760..6c551d76a62e05942a9441c0e2c636bc8eebd23f 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Connection.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Connection.java
@@ -19,8 +19,6 @@ import org.opendaylight.ovsdb.lib.message.OvsdbRPC;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-
 public class Connection {
     private Node node;
     private String identifier;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java
index 7cfac4b5072ed8f0cd11f40f977177dd4923bc57..a6b47d61efb856d247db4297b39d5c406680f78b 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java
@@ -29,13 +29,9 @@ import io.netty.util.CharsetUtil;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -49,7 +45,6 @@ import org.opendaylight.controller.sal.connection.ConnectionConstants;
 import org.opendaylight.controller.sal.connection.IPluginInConnectionService;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.Property;
-import org.opendaylight.controller.sal.utils.NetUtils;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InsertRequest.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InsertRequest.java
index 49e7460bacc92d26289b256346f425f0bd42a8a9..e604f11a7897afa3a75a98c81e9b43266fd0294e 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InsertRequest.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InsertRequest.java
@@ -9,13 +9,9 @@
  */
 package org.opendaylight.ovsdb.plugin;\r
 \r
-import java.util.ArrayList;\r
 import java.util.Map;\r
-\r
 import com.fasterxml.jackson.annotation.JsonProperty;\r
 \r
-import org.opendaylight.ovsdb.lib.database.OvsdbType;\r
-\r
 public class InsertRequest {\r
     public String op;\r
     public String table;\r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MutateRequest.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MutateRequest.java
index 82988666f08954f6568eb20ee75382e9e446540b..e0f0331c91d372a93fa3614a842969f939ecc09a 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MutateRequest.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MutateRequest.java
@@ -9,7 +9,6 @@
  */
 package org.opendaylight.ovsdb.plugin;\r
 \r
-import java.util.ArrayList;\r
 import java.util.List;\r
 \r
 public class MutateRequest {\r

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java
index 9a3a8defd6aeb8334bfe5c644873c69cd99fba2a..7c4d7e8bac2a823c76bccd0099997fb22e0310d4 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java
@@ -10,7 +10,11 @@
 package org.opendaylight.ovsdb.lib.jsonrpc;
 
 import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.*;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java
index 0ef84540b53a47e7846049ec708ca47a8f15b43e..5647a26cb3d2413d8d2c39b9a2d987662483c21e 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java
@@ -12,13 +12,10 @@ package org.opendaylight.ovsdb.lib.jsonrpc;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 import junit.framework.TestCase;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcDecoder;
 
-import java.io.*;
+import java.io.OutputStream;
+import java.io.IOException;
 import java.net.Socket;
 
 public class TestClient extends TestCase {

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestTokens.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestTokens.java
index 36e028d53799f1fbedf74acb074be0067e20764f..a12b1076d671945e7e904eaf10d8ddd82e18b1d7 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestTokens.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestTokens.java
@@ -12,10 +12,7 @@ package org.opendaylight.ovsdb.lib.jsonrpc;
 import com.google.common.reflect.Invokable;
 import com.google.common.reflect.TypeToken;
 import com.google.common.util.concurrent.ListenableFuture;
-
 import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 
 
 public class TestTokens {

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/MonitorResponseTest.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/MonitorResponseTest.java
index a2384f615917fd9fe44109e8ccaed85aa36f162b..97bdcdd103e72cd7443625c21786541d1bf6203c 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/MonitorResponseTest.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/MonitorResponseTest.java
@@ -19,8 +19,6 @@ import com.google.common.io.Resources;
 
 import junit.framework.TestCase;
 
-import org.opendaylight.ovsdb.lib.message.TableUpdate;
-import org.opendaylight.ovsdb.lib.message.TableUpdates;
 import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
 import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
 import org.opendaylight.ovsdb.lib.notation.UUID;
@@ -28,7 +26,6 @@ import org.opendaylight.ovsdb.lib.table.Bridge;
 import org.opendaylight.ovsdb.lib.table.Interface;
 import org.opendaylight.ovsdb.lib.table.Port;
 import org.opendaylight.ovsdb.lib.table.internal.Table;
-import org.sonatype.inject.Nullable;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -99,7 +96,7 @@ public class MonitorResponseTest extends TestCase {
         assertEquals(2, rows.size());
         List<TableUpdate.Row<Port>> sorted = Ordering.natural().onResultOf(new Function<TableUpdate.Row<Port>, String>() {
             @Override
-            public String apply(@Nullable org.opendaylight.ovsdb.lib.message.TableUpdate.Row<Port> input) {
+            public String apply(org.opendaylight.ovsdb.lib.message.TableUpdate.Row<Port> input) {
                 return input.getId();
             }
         }).sortedCopy(rows);

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java
index e3b3a646378d8c27483c30c91c0f27a2084542a9..dd5925862f276fc6f63f885a8f9af693c209512c 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java
@@ -12,8 +12,6 @@ package org.opendaylight.ovsdb.plugin;
 import org.junit.Test;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.ovsdb.plugin.ConfigurationService;
-import org.opendaylight.ovsdb.plugin.ConnectionService;
 import org.opendaylight.controller.sal.connection.ConnectionConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;