commit c66073c5ec53d91cf0f0a930be25217e2f0a033a
author Yuta HIGUCHI <y-higuchi@onlab.us> Fri Apr 25 09:58:57 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Fri Apr 25 09:58:57 2014 -0700
tree 57cb2691ec1bac1221984acf67d6ad152b29bf92
parent e636d4774d843b4e6b02beb03ff22a65b7f0f6a5

Remove deprecated method getOp()

Change-Id: I89250ce53a98a3b60beac3a19eda98bc1991e1af

src/main/java/net/onrc/onos/core/datastore/utils/KVObject.java

diff --git a/src/main/java/net/onrc/onos/core/datastore/utils/KVObject.java b/src/main/java/net/onrc/onos/core/datastore/utils/KVObject.java
index 2efa0b0..aad0310 100644
--- a/src/main/java/net/onrc/onos/core/datastore/utils/KVObject.java
+++ b/src/main/java/net/onrc/onos/core/datastore/utils/KVObject.java
@@ -360,11 +360,6 @@
             return obj;
         }
 
-        @Deprecated
-        public OPERATION getOp() {
-            return this.getOperation();
-        }
-
         @Override
         public boolean hasSucceeded() {
             return base.hasSucceeded();

src/main/java/net/onrc/onos/core/topology/NetworkGraphDatastore.java

diff --git a/src/main/java/net/onrc/onos/core/topology/NetworkGraphDatastore.java b/src/main/java/net/onrc/onos/core/topology/NetworkGraphDatastore.java
index f5aec14..08eb061 100644
--- a/src/main/java/net/onrc/onos/core/topology/NetworkGraphDatastore.java
+++ b/src/main/java/net/onrc/onos/core/topology/NetworkGraphDatastore.java
@@ -70,7 +70,7 @@
         if (failed) {
             log.error("Adding Switch {} and its ports failed.", sw.getDpid());
             for (WriteOp op : groupOp) {
-                log.debug("Operation:{} for {} - Result:{}", op.getOp(), op.getObject(), op.getStatus());
+                log.debug("Operation:{} for {} - Result:{}", op.getOperation(), op.getObject(), op.getStatus());
 
                 // If we changed the operation from ForceCreate to
                 // Conditional operation (Create/Update) then we should retry here.