Remove deprecated APIs
- Storage Admin Service getPartitionInfo()
- org.onosproject.codec.ExtensionSelectorCodec
- org.onosproject.codec.ExtensionTreatmentCodec
- DefaultPortDescription builder withPortNumer()
- DefaultTableStatisticsEntry public constructors
- IntentData public constructors and copy constructors
- DistributedPrimitiveOptions withMeteringDisbled()
- PartitionService getActiveMembersMembers(), getDistributedPrimitiveCreator()
- DistributedPrimitive DEFAULT_OPERTATION_TIMEOU_MILLIS
- MapEvent.value()
- PartitionClientInfo.sessionId(), session()
- org.onosproject.store.flow.impl.DistributedFlowRuleStore
Change-Id: Id89870e6facf1e7fca24dd180bbd095139d001f3
diff --git a/core/api/src/main/java/org/onosproject/codec/ExtensionSelectorCodec.java b/core/api/src/main/java/org/onosproject/codec/ExtensionSelectorCodec.java
deleted file mode 100644
index 48feb4c..0000000
--- a/core/api/src/main/java/org/onosproject/codec/ExtensionSelectorCodec.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.codec;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onosproject.net.driver.HandlerBehaviour;
-import org.onosproject.net.flow.criteria.ExtensionSelector;
-
-/**
- * Interface for encode and decode extension selector.
- * @deprecated 1.11.0 Loon use interface under core/api/net/flow.
- */
-@Deprecated
-public interface ExtensionSelectorCodec extends HandlerBehaviour {
-
- /**
- * Encodes an extension selector to an JSON object.
- *
- * @param extensionSelector extension selector
- * @param context encoding context
- * @return JSON object
- */
- default ObjectNode encode(ExtensionSelector extensionSelector, CodecContext context) {
- return null;
- }
-
- /**
- * Decodes an JSON object to an extension selector.
- *
- * @param objectNode JSON object
- * @param context decoding context
- * @return extension selector
- */
- default ExtensionSelector decode(ObjectNode objectNode, CodecContext context) {
- return null;
- }
-}
diff --git a/core/api/src/main/java/org/onosproject/codec/ExtensionTreatmentCodec.java b/core/api/src/main/java/org/onosproject/codec/ExtensionTreatmentCodec.java
deleted file mode 100644
index 416f02c..0000000
--- a/core/api/src/main/java/org/onosproject/codec/ExtensionTreatmentCodec.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.codec;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onosproject.net.driver.HandlerBehaviour;
-import org.onosproject.net.flow.instructions.ExtensionTreatment;
-
-/**
- * Interface for encode and decode extension treatment.
- * @deprecated 1.11.0 Loon use interface under core/api/net/flow.
- */
-@Deprecated
-public interface ExtensionTreatmentCodec extends HandlerBehaviour {
-
- /**
- * Encodes an extension treatment to an JSON object.
- *
- * @param extensionTreatment extension treatment
- * @param context encoding context
- * @return JSON object
- */
- default ObjectNode encode(ExtensionTreatment extensionTreatment, CodecContext context) {
- return null;
- }
-
- /**
- * Decodes an JSON object to an extension treatment.
- *
- * @param objectNode JSON object
- * @param context decoding context
- * @return extension treatment
- */
- default ExtensionTreatment decode(ObjectNode objectNode, CodecContext context) {
- return null;
- }
-}
diff --git a/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java b/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
index 12396c2..d687a8b 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
@@ -170,20 +170,6 @@
*
* @param number to set
* @return self
- *
- * @deprecated in 1.13.0 use withPortNumber() instead.
- */
-
- @Deprecated
- public Builder withPortNumer(PortNumber number) {
- return withPortNumber(number);
- }
-
- /**
- * Sets mandatory field PortNumber.
- *
- * @param number to set
- * @return self
*/
public Builder withPortNumber(PortNumber number) {
this.number = checkNotNull(number);
diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTableStatisticsEntry.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTableStatisticsEntry.java
index bf34437..e84b343 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTableStatisticsEntry.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTableStatisticsEntry.java
@@ -35,30 +35,6 @@
* Default table statistics constructor.
*
* @param deviceId device identifier
- * @param tableId index table identifier
- * @param activeFlowEntries number of active flow entries in the table
- * @param packetsLookedupCount number of packets looked up in table
- * @param packetsMatchedCount number of packets that hit table
- * @deprecated since 1.15, suggest using the Builder class.
- */
- @Deprecated
- public DefaultTableStatisticsEntry(DeviceId deviceId,
- int tableId,
- long activeFlowEntries,
- long packetsLookedupCount,
- long packetsMatchedCount) {
- this.deviceId = checkNotNull(deviceId);
- this.tableId = IndexTableId.of(tableId);
- this.activeFlowEntries = activeFlowEntries;
- this.packetsLookedupCount = packetsLookedupCount;
- this.packetsMatchedCount = packetsMatchedCount;
- this.maxSize = NOT_PRESENT;
- }
-
- /**
- * Default table statistics constructor.
- *
- * @param deviceId device identifier
* @param tableId table identifier
* @param activeFlowEntries number of active flow entries in the table
* @param packetsLookedupCount number of packets looked up in table
diff --git a/core/api/src/main/java/org/onosproject/net/intent/IntentData.java b/core/api/src/main/java/org/onosproject/net/intent/IntentData.java
index 2c996c2..3375570 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/IntentData.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/IntentData.java
@@ -223,69 +223,13 @@
}
/**
- * Creates a new intent data object.
- *
- * @param intent intent this metadata references
- * @param state intent state
- * @param version version of the intent for this key
- * @param origin ID of the node where the data was originally created
- *
- * @deprecated in 1.11.0
- */
- // No longer used in the code base anywhere
- @Deprecated
- public IntentData(Intent intent, IntentState state, Timestamp version, NodeId origin) {
- checkNotNull(intent);
- checkNotNull(state);
- checkNotNull(version);
- checkNotNull(origin);
-
- this.intent = intent;
- this.state = state;
- this.request = state;
- this.version = version;
- this.origin = origin;
- }
-
- /**
- * Creates a new intent data object.
- *
- * @param intent intent this metadata references
- * @param state intent state
- * @param request intent request
- * @param version version of the intent for this key
- * @param origin ID of the node where the data was originally created
- *
- * @deprecated in 1.11.0
- */
- // No longer used in the code base anywhere
- // was used when IntentData is picked up by some of the node and was assigned with a version
- @Deprecated
- public IntentData(Intent intent, IntentState state, IntentState request, Timestamp version, NodeId origin) {
- checkNotNull(intent);
- checkNotNull(state);
- checkNotNull(request);
- checkNotNull(version);
- checkNotNull(origin);
-
- this.intent = intent;
- this.state = state;
- this.request = request;
- this.version = version;
- this.origin = origin;
- }
-
- /**
* Copy constructor.
*
* @param intentData intent data to copy
*
- * @deprecated in 1.11.0 use {@link #copy(IntentData)} instead
*/
// used to create a defensive copy
- // to be made private
- @Deprecated
- public IntentData(IntentData intentData) {
+ private IntentData(IntentData intentData) {
checkNotNull(intentData);
intent = intentData.intent;
diff --git a/core/api/src/main/java/org/onosproject/store/primitives/DistributedPrimitiveOptions.java b/core/api/src/main/java/org/onosproject/store/primitives/DistributedPrimitiveOptions.java
index 1691086..224358e 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/DistributedPrimitiveOptions.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/DistributedPrimitiveOptions.java
@@ -101,17 +101,6 @@
}
/**
- * Disables recording usage stats for this primitive.
- * @deprecated usage of this method is discouraged for most common scenarios.
- * @return this builder
- */
- @Deprecated
- public O withMeteringDisabled() {
- this.meteringDisabled = true;
- return (O) this;
- }
-
- /**
* Disables state changing operations on the returned distributed primitive.
* @return this builder
*/
diff --git a/core/api/src/main/java/org/onosproject/store/primitives/PartitionService.java b/core/api/src/main/java/org/onosproject/store/primitives/PartitionService.java
index a392e20..1478159 100644
--- a/core/api/src/main/java/org/onosproject/store/primitives/PartitionService.java
+++ b/core/api/src/main/java/org/onosproject/store/primitives/PartitionService.java
@@ -42,29 +42,9 @@
Set<NodeId> getConfiguredMembers(PartitionId partitionId);
/**
- * Returns the set of controller nodes that are the current active members of a partition.
- *
- * @param partitionId partition identifier
- * @return set of node identifiers
- * @deprecated since 1.14
- */
- @Deprecated
- Set<NodeId> getActiveMembersMembers(PartitionId partitionId);
-
- /**
* Returns the identifiers of all partitions.
*
* @return set of partition identifiers
*/
Set<PartitionId> getAllPartitionIds();
-
- /**
- * Returns a DistributedPrimitiveCreator that can create primitives hosted on a partition.
- *
- * @param partitionId partition identifier
- * @return distributed primitive creator
- * @deprecated since 1.14
- */
- @Deprecated
- DistributedPrimitiveCreator getDistributedPrimitiveCreator(PartitionId partitionId);
}
diff --git a/core/api/src/main/java/org/onosproject/store/service/DistributedPrimitive.java b/core/api/src/main/java/org/onosproject/store/service/DistributedPrimitive.java
index 620e16d..f7c056c 100644
--- a/core/api/src/main/java/org/onosproject/store/service/DistributedPrimitive.java
+++ b/core/api/src/main/java/org/onosproject/store/service/DistributedPrimitive.java
@@ -136,12 +136,6 @@
long DEFAULT_OPERATION_TIMEOUT_MILLIS = 15000L;
/**
- * Use {@link #DEFAULT_OPERATION_TIMEOUT_MILLIS} instead.
- */
- @Deprecated
- long DEFAULT_OPERTATION_TIMEOUT_MILLIS = DEFAULT_OPERATION_TIMEOUT_MILLIS;
-
- /**
* Returns the name of this primitive.
* @return name
*/
diff --git a/core/api/src/main/java/org/onosproject/store/service/MapEvent.java b/core/api/src/main/java/org/onosproject/store/service/MapEvent.java
index ecea954..e2258af 100644
--- a/core/api/src/main/java/org/onosproject/store/service/MapEvent.java
+++ b/core/api/src/main/java/org/onosproject/store/service/MapEvent.java
@@ -111,19 +111,6 @@
}
/**
- * Returns the value associated with this event. If type is REMOVE,
- * this is the value that was removed. If type is INSERT/UPDATE, this is
- * the new value.
- *
- * @return the value
- * @deprecated 1.5.0 Falcon release. Use {@link #newValue()} or {@link #oldValue()} instead.
- */
- @Deprecated
- public Versioned<V> value() {
- return type == Type.REMOVE ? oldValue() : newValue();
- }
-
- /**
* Returns the new value in the map associated with the key. If {@link #type()} returns {@code REMOVE},
* this method will return {@code null}.
*
diff --git a/core/api/src/main/java/org/onosproject/store/service/PartitionClientInfo.java b/core/api/src/main/java/org/onosproject/store/service/PartitionClientInfo.java
index ac5c48c..e33c0b4 100644
--- a/core/api/src/main/java/org/onosproject/store/service/PartitionClientInfo.java
+++ b/core/api/src/main/java/org/onosproject/store/service/PartitionClientInfo.java
@@ -19,7 +19,6 @@
import org.onosproject.cluster.NodeId;
import org.onosproject.cluster.PartitionId;
-import org.onosproject.store.service.DistributedPrimitive.Status;
import com.google.common.collect.ImmutableList;
@@ -54,24 +53,4 @@
public Collection<NodeId> servers() {
return servers;
}
-
- /**
- * Return the sessionId for the partition client.
- * @return session id
- * @deprecated in Loon release (1.11.0)
- */
- @Deprecated
- public long sessionId() {
- return 0;
- }
-
- /**
- * Returns the current status for the client session.
- * @return status
- * @deprecated in Loon release (1.11.0)
- */
- @Deprecated
- public Status status() {
- return null;
- }
}
diff --git a/core/api/src/main/java/org/onosproject/store/service/StorageAdminService.java b/core/api/src/main/java/org/onosproject/store/service/StorageAdminService.java
index f44d398..405bc7c 100644
--- a/core/api/src/main/java/org/onosproject/store/service/StorageAdminService.java
+++ b/core/api/src/main/java/org/onosproject/store/service/StorageAdminService.java
@@ -27,15 +27,6 @@
public interface StorageAdminService {
/**
- * Returns information about all partitions in the system.
- *
- * @return list of partition information
- * @deprecated 1.5.0 Falcon Release
- */
- @Deprecated
- List<PartitionInfo> getPartitionInfo();
-
- /**
* Returns information about all the consistent maps in the system.
*
* @return list of map information