Remove unused integrationtest

[ovsdb.git] / northbound / src / main / java / org / opendaylight / ovsdb / northbound / TableResource.java

diff --git a/northbound/src/main/java/org/opendaylight/ovsdb/northbound/TableResource.java b/northbound/src/main/java/org/opendaylight/ovsdb/northbound/TableResource.java
index c5501b3a7d52758b265e5d15cc1fabc2d7bd8e17..309448f702e0d767a56cf0fa7d7a4b5279ee6ebf 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/ovsdb/northbound/TableResource.java
+++ b/northbound/src/main/java/org/opendaylight/ovsdb/northbound/TableResource.java
@@ -1,5 +1,14 @@
+/*
+ * Copyright (c) 2014, 2015 Red Hat, 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.ovsdb.northbound;
 
+import com.fasterxml.jackson.databind.SerializationFeature;
 import java.util.Set;
 
 import javax.ws.rs.GET;
@@ -31,11 +40,11 @@ public class TableResource {
         this.databaseName = databaseName;
         objectMapper = new ObjectMapper();
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
     }
 
     private DatabaseSchema getDatabaseSchema (String databaseName) {
-        OvsdbClient client = NodeResource.getOvsdbConnection(nodeId, this);
+        OvsdbClient client = NodeResource.getOvsdbClient(nodeId, this);
         return client.getDatabaseSchema(databaseName);
     }
 
@@ -83,7 +92,9 @@ public class TableResource {
             return ciTableName;
         }
         for (String tableName : tables) {
-            if (tableName.equalsIgnoreCase(ciTableName)) return tableName;
+            if (tableName.equalsIgnoreCase(ciTableName)) {
+                return tableName;
+            }
         }
         return ciTableName;
     }