Make methods of TrafficSelector.Builder deprecated

Because direct use of primitive value like short is fragile against
future change and the methods can be easily replaced by
TrafficSelector.Builder.add(Criterion)

- matchLambda(short)
- matchOpticalSignalType(short)

Change-Id: I0f65605a9bccd77a5d752d3a262ca818234f6ea8
diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
index e887112..a0e8f45 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
@@ -297,11 +297,13 @@
             return add(Criteria.matchIPv6ExthdrFlags(exthdrFlags));
         }
 
+        @Deprecated
         @Override
         public Builder matchLambda(short lambda) {
             return add(Criteria.matchLambda(lambda));
         }
 
+        @Deprecated
         @Override
         public Builder matchOpticalSignalType(short signalType) {
             return add(Criteria.matchOpticalSignalType(signalType));
diff --git a/core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java b/core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java
index 1401e59..3b28093 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java
@@ -313,7 +313,11 @@
          *
          * @param lambda lambda
          * @return a selection builder
+         * @deprecated in Cardinal Release.
+         * Use {@link #add(Criterion)} with an instance created
+         * by {@link org.onosproject.net.flow.criteria.Criteria#matchLambda(org.onosproject.net.Lambda)}.
          */
+        @Deprecated
         Builder matchLambda(short lambda);
 
         /**
@@ -321,7 +325,11 @@
          *
          * @param signalType signalType
          * @return a selection builder
+         * @deprecated in Cardinal Release.
+         * Use {@link #add(Criterion)}} with an instance created
+         * by {@link org.onosproject.net.flow.criteria.Criteria#matchOchSignalType(org.onosproject.net.OchSignalType)}.
          */
+        @Deprecated
         Builder matchOpticalSignalType(short signalType);
 
         /**