commit b413be88c1e56973aacb8c4df3629f715146e902
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Feb 23 16:25:48 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Feb 24 19:27:57 2015 +0000
tree 3d12df471c6fbe8e5e253109d03b7aa314b8ca42
parent 5000a754d873c42935ce098f2c7b3b35e3408bf2

Remove createIntentUpdate() a method under IntentWorker

Because the method is only accessed from IntentWorker

Change-Id: Id80a93a7dfdaabc0c78a519a47fd979572d990ef

core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index 3699df6..8f808e4 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -284,23 +284,6 @@
         }
     }
 
-    private IntentProcessPhase createIntentUpdate(IntentData intentData) {
-        IntentData current = store.getIntentData(intentData.key());
-        switch (intentData.state()) {
-            case INSTALL_REQ:
-                return new InstallRequest(processor, intentData, Optional.ofNullable(current));
-            case WITHDRAW_REQ:
-                if (current == null || isNullOrEmpty(current.installables())) {
-                    return new Withdrawn(intentData, WITHDRAWN);
-                } else {
-                    return new WithdrawRequest(processor, intentData, current);
-                }
-            default:
-                // illegal state
-                return new CompilingFailed(intentData);
-        }
-    }
-
     private Future<FinalIntentProcessPhase> submitIntentData(IntentData data) {
         return workerExecutor.submit(new IntentWorker(data));
     }
@@ -400,6 +383,23 @@
             }
             return (FinalIntentProcessPhase) previousPhase;
         }
+
+        private IntentProcessPhase createIntentUpdate(IntentData intentData) {
+            IntentData current = store.getIntentData(intentData.key());
+            switch (intentData.state()) {
+                case INSTALL_REQ:
+                    return new InstallRequest(processor, intentData, Optional.ofNullable(current));
+                case WITHDRAW_REQ:
+                    if (current == null || isNullOrEmpty(current.installables())) {
+                        return new Withdrawn(intentData, WITHDRAWN);
+                    } else {
+                        return new WithdrawRequest(processor, intentData, current);
+                    }
+                default:
+                    // illegal state
+                    return new CompilingFailed(intentData);
+            }
+        }
     }
 
     private class InternalBatchDelegate implements IntentBatchDelegate {