Bug 3302: fix for GroupTable

[groupbasedpolicy.git] / renderers / ofoverlay / src / main / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / equivalence / EquivalenceFabric.java

diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/equivalence/EquivalenceFabric.java b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/equivalence/EquivalenceFabric.java
index c7e33efa223038a5c65540e61236d68c97922100..ffd84892bcd923c085cc758189415e7545605d04 100755 (executable)
--- a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/equivalence/EquivalenceFabric.java
+++ b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/equivalence/EquivalenceFabric.java
@@ -8,26 +8,30 @@
 
 package org.opendaylight.groupbasedpolicy.renderer.ofoverlay.equivalence;
 
+import javax.annotation.Nullable;
+
 import com.google.common.base.Equivalence;
 import com.google.common.base.Function;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
-
-import javax.annotation.Nullable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group;
 
 /**
- * A simple fabric for equivalence rules
- * and for functions used in converting Lists to Sets with our own equivalence rules
- *
+ * A simple fabric for equivalence rules and for functions used<br>
+ *     in converting Lists to Sets with our own equivalence rules
  */
 public class EquivalenceFabric {
 
-    private EquivalenceFabric(){
+    private EquivalenceFabric() {
         throw new UnsupportedOperationException("Can not create an instance");
     }
 
+    // Flow
     public static final FlowEquivalence FLOW_EQUIVALENCE = new FlowEquivalence();
+    public static final MatchEquivalence MATCH_EQUIVALENCE = new MatchEquivalence();
+
     public static final Function<Flow, Equivalence.Wrapper<Flow>> FLOW_WRAPPER_FUNCTION =
             new Function<Flow, Equivalence.Wrapper<Flow>>() {
+
                 @Nullable
                 @Override
                 public Equivalence.Wrapper<Flow> apply(@Nullable Flow input) {
@@ -35,6 +39,18 @@ public class EquivalenceFabric {
                 }
             };
 
-    public static final MatchEquivalence MATCH_EQUIVALENCE = new MatchEquivalence();
+    // Group
+    public static final BucketsEquivalence BUCKETS_EQUIVALENCE = new BucketsEquivalence();
+    public static final GroupEquivalence GROUP_EQUIVALENCE = new GroupEquivalence();
+
+    public static final Function<Group, Equivalence.Wrapper<Group>> GROUP_WRAPPER_FUNCTION =
+            new Function<Group, Equivalence.Wrapper<Group>>() {
+
+                @Nullable
+                @Override
+                public Equivalence.Wrapper<Group> apply(@Nullable Group input) {
+                    return GROUP_EQUIVALENCE.wrap(input);
+                }
+            };
 
 }