From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 26 Feb 2015 14:21:40 +0000 (-0700)
Subject: Slight simplification in OvsdbConnectionInstance
X-Git-Tag: release/lithium~355^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4e90877819f3ed89195f1a9cec78f81ad51c15a3;p=ovsdb.git

Slight simplification in OvsdbConnectionInstance

Change-Id: If5b2350ec2d2cb228d17add95133cd4cc69602eb
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
index dd79aecfd..9ea46ce03 100644
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
@@ -61,22 +61,7 @@ public class OvsdbConnectionInstance implements OvsdbClient {
                 for (String database : databases) {
                     DatabaseSchema dbSchema = getSchema(database).get();
                     if(dbSchema != null) {
-                        Set<String> tables = dbSchema.getTables();
-                        if(tables != null) {
-                            List<MonitorRequest<GenericTableSchema>> monitorRequests = Lists.newArrayList();
-                            for (String tableName : tables) {
-                                GenericTableSchema tableSchema = dbSchema.table(tableName, GenericTableSchema.class);
-                                Set<String> columns = tableSchema.getColumns();
-                                MonitorRequestBuilder<GenericTableSchema> monitorBuilder = MonitorRequestBuilder.builder(tableSchema);
-                                for (String column : columns) {
-                                    monitorBuilder.addColumn(column);
-                                }
-                                monitorRequests.add(monitorBuilder.with(new MonitorSelect(true, true, true, true)).build());
-                            }
-                            this.callback.update(monitor(dbSchema, monitorRequests, callback),dbSchema);
-                        } else {
-                            LOG.warn("No tables for schema {} for database {} for key {}",dbSchema,database,key);
-                        }
+                        monitorAllTables(database, dbSchema);
                     } else {
                         LOG.warn("No schema reported for database {} for key {}",database,key);
                     }
@@ -89,6 +74,25 @@ public class OvsdbConnectionInstance implements OvsdbClient {
         }
     }
 
+    private void monitorAllTables(String database, DatabaseSchema dbSchema) {
+        Set<String> tables = dbSchema.getTables();
+        if(tables != null) {
+            List<MonitorRequest<GenericTableSchema>> monitorRequests = Lists.newArrayList();
+            for (String tableName : tables) {
+                GenericTableSchema tableSchema = dbSchema.table(tableName, GenericTableSchema.class);
+                Set<String> columns = tableSchema.getColumns();
+                MonitorRequestBuilder<GenericTableSchema> monitorBuilder = MonitorRequestBuilder.builder(tableSchema);
+                for (String column : columns) {
+                    monitorBuilder.addColumn(column);
+                }
+                monitorRequests.add(monitorBuilder.with(new MonitorSelect(true, true, true, true)).build());
+            }
+            this.callback.update(monitor(dbSchema, monitorRequests, callback),dbSchema);
+        } else {
+            LOG.warn("No tables for schema {} for database {} for key {}",dbSchema,database,key);
+        }
+    }
+
     public ListenableFuture<List<String>> getDatabases() {
         return client.getDatabases();
     }