commit 7cd8a42f057a3bb378cbd31407bf98065e079745
author Sho SHIMIZU <shimizu.sho@jp.fujitsu.com> Wed Aug 27 16:05:21 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:25 2014 -0700
tree 340070f48f690e076473ad149e7f1fa0eb963a7a
parent 9925bf3948be6d07b14cbaad2a9ce64d204a3de5

Extract common ID generation logic using IdBlockAllocator

- Define IdGenerator<T> interface
- Implement AbstractIdBlockAllocatorBasedIdGenerator<T>, which
  has the common logic for the existing IntentId, FlowId, MatchActionId,
  and MatchActionOperationsId generator implementations.

Change-Id: I7aeea249df1710719760ed477bffe62853577e0f

src/main/java/net/onrc/onos/core/newintent/PathIntentCompiler.java

diff --git a/src/main/java/net/onrc/onos/core/newintent/PathIntentCompiler.java b/src/main/java/net/onrc/onos/core/newintent/PathIntentCompiler.java
index e7e2f87..0277050 100644
--- a/src/main/java/net/onrc/onos/core/newintent/PathIntentCompiler.java
+++ b/src/main/java/net/onrc/onos/core/newintent/PathIntentCompiler.java
@@ -3,15 +3,16 @@
 import com.google.common.base.Predicates;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
-import net.onrc.onos.api.flowmanager.FlowIdGenerator;
+import net.onrc.onos.api.flowmanager.FlowId;
 import net.onrc.onos.api.flowmanager.FlowLink;
 import net.onrc.onos.api.flowmanager.PacketPathFlow;
 import net.onrc.onos.api.flowmanager.Path;
 import net.onrc.onos.api.newintent.Intent;
-import net.onrc.onos.api.newintent.IntentIdGenerator;
+import net.onrc.onos.api.newintent.IntentId;
 import net.onrc.onos.api.newintent.PathIntent;
 import net.onrc.onos.core.matchaction.match.Match;
 import net.onrc.onos.core.matchaction.match.PacketMatch;
+import net.onrc.onos.core.util.IdGenerator;
 import net.onrc.onos.core.util.LinkTuple;
 
 import java.util.Arrays;
@@ -30,8 +31,8 @@
      * @param intentIdGenerator intent ID generator
      * @param flowIdGenerator flow ID generator
      */
-    public PathIntentCompiler(IntentIdGenerator intentIdGenerator,
-                              FlowIdGenerator flowIdGenerator) {
+    public PathIntentCompiler(IdGenerator<IntentId> intentIdGenerator,
+                              IdGenerator<FlowId> flowIdGenerator) {
         super(intentIdGenerator, flowIdGenerator);
     }