Regard the release when the APIs became deprecated as Cardinal

Change-Id: I072fa33a2a70baa7466d7a0dc5067191476be0f3

@@ -57,6 +57,7 @@ import static org.onosproject.net.DeviceId.deviceId;
  * optical links and any other state that needs to be configured for correct network
  * optical links and any other state that needs to be configured for correct network
  * operations.
  * operations.
  *
  *
+ * @deprecated in Cardinal Release
  */
  */
 @Deprecated
 @Deprecated
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonIgnoreProperties(ignoreUnknown = true)

@@ -21,6 +21,8 @@ import org.onlab.util.HexString;
 
 
 /**
 /**
  * Public class corresponding to JSON described data model.
  * Public class corresponding to JSON described data model.
+ *
+ * @deprecated in Cardinal Release
  */
  */
 @Deprecated
 @Deprecated
 public class OpticalLinkDescription {
 public class OpticalLinkDescription {

@@ -23,6 +23,8 @@ import org.slf4j.LoggerFactory;
 
 
 /**
 /**
  * Public class corresponding to JSON described data model.
  * Public class corresponding to JSON described data model.
+ *
+ * @deprecated in Cardinal Release
  */
  */
 @Deprecated
 @Deprecated
 public class OpticalNetworkConfig {
 public class OpticalNetworkConfig {

@@ -22,6 +22,8 @@ import org.onlab.util.HexString;
 
 
 /**
 /**
  * Public class corresponding to JSON described data model.
  * Public class corresponding to JSON described data model.
+ *
+ * @deprecated in Cardinal Release
  */
  */
 @Deprecated
 @Deprecated
 public class OpticalSwitchDescription {
 public class OpticalSwitchDescription {

@@ -17,6 +17,8 @@ package org.onosproject.optical.cfg;
 
 
 /**
 /**
  * Packet-optical link Java data object.
  * Packet-optical link Java data object.
+ *
+ * @deprecated in Cardinal Release
  */
  */
 @Deprecated
 @Deprecated
 class PktOptLink {
 class PktOptLink {

@@ -17,6 +17,8 @@ package org.onosproject.optical.cfg;
 
 
 /**
 /**
  * ROADM java data object converted from a JSON file.
  * ROADM java data object converted from a JSON file.
+ *
+ * @deprecated in Cardinal Release
  */
  */
 @Deprecated
 @Deprecated
 class Roadm {
 class Roadm {

@@ -17,6 +17,8 @@ package org.onosproject.optical.cfg;
 
 
 /**
 /**
  * WDM Link Java data object converted from a JSON file.
  * WDM Link Java data object converted from a JSON file.
+ *
+ * @deprecated in Cardinal Release
  */
  */
 @Deprecated
 @Deprecated
 class WdmLink {
 class WdmLink {

@@ -199,6 +199,7 @@ public class OnosXOSIntegrationManager implements VoltTenantService {
      * with no additional URI.
      * with no additional URI.
      *
      *
      * @return web resource builder
      * @return web resource builder
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     private WebResource.Builder getClientBuilder() {
     private WebResource.Builder getClientBuilder() {
@@ -210,6 +211,7 @@ public class OnosXOSIntegrationManager implements VoltTenantService {
      * with an optional additional URI.
      * with an optional additional URI.
      *
      *
      * @return web resource builder
      * @return web resource builder
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     private WebResource.Builder getClientBuilder(String uri) {
     private WebResource.Builder getClientBuilder(String uri) {
@@ -227,6 +229,7 @@ public class OnosXOSIntegrationManager implements VoltTenantService {
      * Performs a REST GET operation on the base XOS REST URI.
      * Performs a REST GET operation on the base XOS REST URI.
      *
      *
      * @return JSON string fetched by the GET operation
      * @return JSON string fetched by the GET operation
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     private String getRest() {
     private String getRest() {
@@ -238,6 +241,7 @@ public class OnosXOSIntegrationManager implements VoltTenantService {
      * an optional additional URI.
      * an optional additional URI.
      *
      *
      * @return JSON string fetched by the GET operation
      * @return JSON string fetched by the GET operation
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     private String getRest(String uri) {
     private String getRest(String uri) {
@@ -259,6 +263,7 @@ public class OnosXOSIntegrationManager implements VoltTenantService {
      * XOS REST URI with an optional additional URI.
      * XOS REST URI with an optional additional URI.
      *
      *
      * @param json JSON string to post
      * @param json JSON string to post
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     private String postRest(String json) {
     private String postRest(String json) {
@@ -284,6 +289,7 @@ public class OnosXOSIntegrationManager implements VoltTenantService {
      * XOS REST URI with an optional additional URI.
      * XOS REST URI with an optional additional URI.
      *
      *
      * @param uri optional additional URI
      * @param uri optional additional URI
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     private void deleteRest(String uri) {
     private void deleteRest(String uri) {

@@ -32,6 +32,8 @@ public interface FlowRule {
      * The FlowRule type is used to determine in which table the flow rule needs
      * The FlowRule type is used to determine in which table the flow rule needs
      * to be put for multi-table support switch. For single table switch,
      * to be put for multi-table support switch. For single table switch,
      * Default is used.
      * Default is used.
+     *
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     static enum Type {
     static enum Type {

@@ -51,6 +51,7 @@ public interface FlowRuleStore extends Store<FlowRuleBatchEvent, FlowRuleStoreDe
      * Stores a new flow rule without generating events.
      * Stores a new flow rule without generating events.
      *
      *
      * @param rule the flow rule to add
      * @param rule the flow rule to add
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     void storeFlowRule(FlowRule rule);
     void storeFlowRule(FlowRule rule);

@@ -284,6 +284,7 @@ public final class Instructions {
      *
      *
      * @param etherType Ethernet type to set
      * @param etherType Ethernet type to set
      * @return a L2 modification.
      * @return a L2 modification.
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     public static Instruction popMpls(int etherType) {
     public static Instruction popMpls(int etherType) {

@@ -57,7 +57,7 @@ implements GraphDescription {
      * @param links collection of infrastructure links
      * @param links collection of infrastructure links
      *
      *
      * @param annotations optional key/value annotations map
      * @param annotations optional key/value annotations map
-     *
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     public DefaultGraphDescription(long nanos, Iterable<Device> devices,
     public DefaultGraphDescription(long nanos, Iterable<Device> devices,

@@ -35,6 +35,7 @@ public interface ClusterCommunicationService {
      * @param subject    message subject
      * @param subject    message subject
      * @param subscriber message subscriber
      * @param subscriber message subscriber
      * @param executor executor to use for running handler.
      * @param executor executor to use for running handler.
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     void addSubscriber(MessageSubject subject, ClusterMessageHandler subscriber, ExecutorService executor);
     void addSubscriber(MessageSubject subject, ClusterMessageHandler subscriber, ExecutorService executor);

@@ -38,6 +38,7 @@ public final class JsonUtils {
      * @param sid     sequence ID
      * @param sid     sequence ID
      * @param payload event payload
      * @param payload event payload
      * @return the object node representation
      * @return the object node representation
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     public static ObjectNode envelope(String type, long sid, ObjectNode payload) {
     public static ObjectNode envelope(String type, long sid, ObjectNode payload) {

@@ -105,6 +105,10 @@ public final class MastershipBasedTimestamp implements Timestamp {
     }
     }
 
 
     // Default constructor for serialization
     // Default constructor for serialization
+
+    /**
+     * @deprecated in Cardinal Release
+     */
     @Deprecated
     @Deprecated
     protected MastershipBasedTimestamp() {
     protected MastershipBasedTimestamp() {
         this.termNumber = -1;
         this.termNumber = -1;

@@ -108,6 +108,9 @@ public final class Timestamped<T> {
     }
     }
 
 
     // Default constructor for serialization
     // Default constructor for serialization
+    /**
+     * @deprecated in Cardinal Release
+     */
     @Deprecated
     @Deprecated
     private Timestamped() {
     private Timestamped() {
         this.value = null;
         this.value = null;

@@ -75,6 +75,7 @@ public interface IPacket {
      * @param length
      * @param length
      *            length of the data to deserialize
      *            length of the data to deserialize
      * @return the deserialized data
      * @return the deserialized data
+     * @deprecated in Cardinal Release
      */
      */
     @Deprecated
     @Deprecated
     IPacket deserialize(byte[] data, int offset, int length);
     IPacket deserialize(byte[] data, int offset, int length);

@@ -197,6 +197,9 @@ public class TopologyViewMessageHandler extends TopologyViewMessageHandlerBase {
 
 
     // ==================================================================
     // ==================================================================
 
 
+    /**
+     * @deprecated in Cardinal Release
+     */
     @Deprecated
     @Deprecated
     private final class TopoStart extends RequestHandler {
     private final class TopoStart extends RequestHandler {
         private TopoStart() {
         private TopoStart() {
@@ -213,6 +216,9 @@ public class TopologyViewMessageHandler extends TopologyViewMessageHandlerBase {
         }
         }
     }
     }
 
 
+    /**
+     * @deprecated in Cardinal Release
+     */
     @Deprecated
     @Deprecated
     private final class TopoHeartbeat extends RequestHandler {
     private final class TopoHeartbeat extends RequestHandler {
         private TopoHeartbeat() {
         private TopoHeartbeat() {
@@ -225,6 +231,9 @@ public class TopologyViewMessageHandler extends TopologyViewMessageHandlerBase {
         }
         }
     }
     }
 
 
+    /**
+     * @deprecated in Cardinal Release
+     */
     @Deprecated
     @Deprecated
     private final class TopoStop extends RequestHandler {
     private final class TopoStop extends RequestHandler {
         private TopoStop() {
         private TopoStop() {
@@ -238,6 +247,9 @@ public class TopologyViewMessageHandler extends TopologyViewMessageHandlerBase {
         }
         }
     }
     }
 
 
+    /**
+     * @deprecated in Cardinal Release
+     */
     @Deprecated
     @Deprecated
     private final class ReqSummary extends RequestHandler {
     private final class ReqSummary extends RequestHandler {
         private ReqSummary() {
         private ReqSummary() {

@@ -109,6 +109,8 @@ import static org.onosproject.ui.impl.TopologyViewMessageHandlerBase.StatsType.P
 
 
 /**
 /**
  * Facility for creating messages bound for the topology viewer.
  * Facility for creating messages bound for the topology viewer.
+ *
+ * @deprecated in Cardinal Release
  */
  */
 @Deprecated
 @Deprecated
 public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler {
 public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler {