Plugin migration to use the new Schema independent Library.

[ovsdb.git] / library / src / main / java / org / opendaylight / ovsdb / lib / impl / OvsdbClientImpl.java

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java b/library/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
index 59c12192205005536ee661f34134f956551a2bf7..a396a0e1d8be6e1e8262e767df5eee74798ca914 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
@@ -85,8 +85,8 @@ public class OvsdbClientImpl implements OvsdbClient {
         if (rpcCallback == null) {
             OvsdbRPC.Callback temp = new OvsdbRPC.Callback() {
                 @Override
-                public void update(Object node, UpdateNotification upadateNotification) {
-                    Object key = upadateNotification.getContext();
+                public void update(Object node, UpdateNotification updateNotification) {
+                    Object key = updateNotification.getContext();
                     CallbackContext callbackContext = monitorCallbacks.get(key);
                     MonitorCallBack monitorCallBack = callbackContext.monitorCallBack;
                     if (monitorCallBack == null) {
@@ -94,7 +94,7 @@ public class OvsdbClientImpl implements OvsdbClient {
                         logger.info("callback received with context {}, but no known handler. Ignoring!", key);
                         return;
                     }
-                    _transformingCallback(upadateNotification.getUpdates(), monitorCallBack, callbackContext.schema);
+                    _transformingCallback(updateNotification.getUpdates(), monitorCallBack, callbackContext.schema);
                 }
 
                 @Override
@@ -127,7 +127,7 @@ public class OvsdbClientImpl implements OvsdbClient {
 
             }
             TableUpdates updates = new TableUpdates(tableUpdateMap);
-            monitorCallBack.update(updates);
+            monitorCallBack.update(updates, dbSchema);
         }
     }
 
@@ -238,11 +238,11 @@ public class OvsdbClientImpl implements OvsdbClient {
     }
 
     @Override
-    public ListenableFuture<DatabaseSchema> getSchema(final String database, final boolean cacheResult) {
+    public ListenableFuture<DatabaseSchema> getSchema(final String database) {
 
         DatabaseSchema databaseSchema = schema.get(database);
 
-        if (databaseSchema == null || cacheResult) {
+        if (databaseSchema == null) {
             return Futures.transform(
                     getSchemaFromDevice(Lists.newArrayList(database)),
                     new Function<Map<String, DatabaseSchema>, DatabaseSchema>() {
@@ -251,17 +251,13 @@ public class OvsdbClientImpl implements OvsdbClient {
                             if (result.containsKey(database)) {
                                 DatabaseSchema s = result.get(database);
                                 s.populateInternallyGeneratedColumns();
-                                if (cacheResult) {
-                                    OvsdbClientImpl.this.schema.put(database, s);
-                                }
+                                OvsdbClientImpl.this.schema.put(database, s);
                                 return s;
                             } else {
                                 return null;
                             }
                         }
                     }, executorService);
-
-
         } else {
             return Futures.immediateFuture(databaseSchema);
         }