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/AbstractFlowGeneratingIntentCompiler.java

diff --git a/src/main/java/net/onrc/onos/core/newintent/AbstractFlowGeneratingIntentCompiler.java b/src/main/java/net/onrc/onos/core/newintent/AbstractFlowGeneratingIntentCompiler.java
index 07041e9..159caf5 100644
--- a/src/main/java/net/onrc/onos/core/newintent/AbstractFlowGeneratingIntentCompiler.java
+++ b/src/main/java/net/onrc/onos/core/newintent/AbstractFlowGeneratingIntentCompiler.java
@@ -1,9 +1,9 @@
 package net.onrc.onos.core.newintent;
 
 import net.onrc.onos.api.flowmanager.FlowId;
-import net.onrc.onos.api.flowmanager.FlowIdGenerator;
 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.core.util.IdGenerator;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -15,17 +15,17 @@
 public abstract class AbstractFlowGeneratingIntentCompiler<T extends Intent>
         extends AbstractIntentCompiler<T> {
 
-    private final FlowIdGenerator flowIdGenerator;
+    private final IdGenerator<FlowId> flowIdGenerator;
 
     /**
-     * Constructs an object with the specified {@link IntentIdGenerator}
-     * and {@link FlowIdGenerator}.
+     * Constructs an object with the specified {@link IdGenerator IdGenerators} of intent ID
+     * and flow ID.
      *
      * @param intentIdGenerator
      * @param flowIdGenerator
      */
-    protected AbstractFlowGeneratingIntentCompiler(IntentIdGenerator intentIdGenerator,
-                                                   FlowIdGenerator flowIdGenerator) {
+    protected AbstractFlowGeneratingIntentCompiler(IdGenerator<IntentId> intentIdGenerator,
+                                                   IdGenerator<FlowId> flowIdGenerator) {
         super(intentIdGenerator);
         this.flowIdGenerator = checkNotNull(flowIdGenerator);
     }