Updated master to commit id 6ee8aa3e67ce89908a8c93aa9445c6f71a18f986

Change-Id: I94b055ee2f298daf71e2ec794fd0f2495bd8081f

1 files changed, 8 insertions, 14 deletions

diff --git a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
index f88c6bc3..4416456c 100644
--- a/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
+++ b/framework/src/onos/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
@@ -23,22 +23,26 @@ import org.onlab.packet.MacAddress;
 import org.onlab.packet.MplsLabel;
 import org.onlab.packet.TpPort;
 import org.onlab.packet.VlanId;
-import org.onosproject.net.IndexedLambda;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.flow.criteria.Criteria;
 import org.onosproject.net.flow.criteria.Criterion;
 
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.TreeSet;
 
 /**
  * Default traffic selector implementation.
  */
 public final class DefaultTrafficSelector implements TrafficSelector {
 
+    private static final Comparator<? super Criterion> TYPE_COMPARATOR =
+            (c1, c2) -> c1.type().compareTo(c2.type());
+
     private final Set<Criterion> criteria;
 
     private static final TrafficSelector EMPTY
@@ -50,7 +54,9 @@ public final class DefaultTrafficSelector implements TrafficSelector {
      * @param criteria criteria
      */
     private DefaultTrafficSelector(Set<Criterion> criteria) {
-        this.criteria = ImmutableSet.copyOf(criteria);
+        TreeSet<Criterion> elements = new TreeSet<>(TYPE_COMPARATOR);
+        elements.addAll(criteria);
+        this.criteria = ImmutableSet.copyOf(elements);
     }
 
     @Override
@@ -345,18 +351,6 @@ public final class DefaultTrafficSelector implements TrafficSelector {
             return add(Criteria.matchIPv6ExthdrFlags(exthdrFlags));
         }
 
-        @Deprecated
-        @Override
-        public Builder matchLambda(short lambda) {
-            return add(Criteria.matchLambda(new IndexedLambda(lambda)));
-        }
-
-        @Deprecated
-        @Override
-        public Builder matchOpticalSignalType(short signalType) {
-            return add(Criteria.matchOpticalSignalType(signalType));
-        }
-
         @Override
         public TrafficSelector build() {
             return new DefaultTrafficSelector(ImmutableSet.copyOf(selector.values()));