Remove deprecated HTTP SB controller APIs
Change-Id: Id712a389991c3ba405c1feded64054ccc95e945f
diff --git a/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaWaveserverDeviceDescription.java b/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaWaveserverDeviceDescription.java
index 8a6113b..bd411c1 100644
--- a/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaWaveserverDeviceDescription.java
+++ b/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaWaveserverDeviceDescription.java
@@ -40,6 +40,7 @@
import org.onosproject.protocol.rest.RestSBController;
import org.slf4j.Logger;
+import javax.ws.rs.core.MediaType;
import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -119,7 +120,7 @@
DeviceId deviceId = handler().data().deviceId();
HierarchicalConfiguration config = XmlConfigParser.
- loadXml(controller.get(deviceId, PORT_REQUEST, XML));
+ loadXml(controller.get(deviceId, PORT_REQUEST, MediaType.APPLICATION_XML_TYPE));
List<HierarchicalConfiguration> portsConfig =
parseWaveServerCienaPorts(config);
portsConfig.forEach(sub -> {
diff --git a/protocols/rest/api/src/main/java/org/onosproject/protocol/http/HttpSBController.java b/protocols/rest/api/src/main/java/org/onosproject/protocol/http/HttpSBController.java
index f8d23c8..ada5496 100644
--- a/protocols/rest/api/src/main/java/org/onosproject/protocol/http/HttpSBController.java
+++ b/protocols/rest/api/src/main/java/org/onosproject/protocol/http/HttpSBController.java
@@ -76,89 +76,6 @@
* @param request url of the request
* @param payload payload of the request as an InputStream
* @param mediaType type of content in the payload i.e. application/json
- * @return true if operation returned 200, 201, 202, false otherwise
- *
- * @deprecated in Kingfisher (1.10.0)
- */
- @Deprecated
- boolean post(DeviceId device, String request, InputStream payload, String mediaType);
-
- /**
- * Does a HTTP POST request with specified parameters to the device.
- *
- * @param <T> post return type
- * @param device device to make the request to
- * @param request url of the request
- * @param payload payload of the request as an InputStream
- * @param mediaType type of content in the payload i.e. application/json
- * @param responseClass the type of response object we are interested in,
- * such as String, InputStream.
- * @return Object of type requested via responseClass.
- */
- @Deprecated
- <T> T post(DeviceId device, String request, InputStream payload, String mediaType, Class<T> responseClass);
-
- /**
- * Does a HTTP PUT request with specified parameters to the device.
- *
- * @param device device to make the request to
- * @param request resource path of the request
- * @param payload payload of the request as an InputStream
- * @param mediaType type of content in the payload i.e. application/json
- * @return true if operation returned 200, 201, 202, false otherwise
- *
- * @deprecated in Kingfisher (1.10.0)
- */
- @Deprecated
- boolean put(DeviceId device, String request, InputStream payload, String mediaType);
-
- /**
- *
- * Does a HTTP GET request with specified parameters to the device.
- *
- * @param device device to make the request to
- * @param request url of the request
- * @param mediaType format to retrieve the content in
- * @return an inputstream of data from the reply.
- */
- @Deprecated
- InputStream get(DeviceId device, String request, String mediaType);
-
- /**
- * Does a HTTP PATCH request with specified parameters to the device.
- *
- * @param device device to make the request to
- * @param request url of the request
- * @param payload payload of the request as an InputStream
- * @param mediaType format to retrieve the content in
- * @return true if operation returned 200, 201, 202, false otherwise
- *
- * @deprecated in Kingfisher (1.10.0)
- */
- @Deprecated
- boolean patch(DeviceId device, String request, InputStream payload, String mediaType);
-
- /**
- * Does a HTTP DELETE request with specified parameters to the device.
- *
- * @param device device to make the request to
- * @param request url of the request
- * @param payload payload of the request as an InputStream
- * @param mediaType type of content in the payload i.e. application/json
- * @return true if operation returned 200 false otherwise
- *
- * @deprecated in Kingfisher (1.10.0)
- */
- @Deprecated
- boolean delete(DeviceId device, String request, InputStream payload, String mediaType);
-
- /**
- * Does a HTTP POST request with specified parameters to the device.
- *
- * @param device device to make the request to
- * @param request url of the request
- * @param payload payload of the request as an InputStream
- * @param mediaType type of content in the payload i.e. application/json
* @return status Commonly used status codes defined by HTTP
*/
int post(DeviceId device, String request, InputStream payload, MediaType mediaType);
diff --git a/protocols/rest/api/src/main/java/org/onosproject/protocol/http/ctl/HttpSBControllerImpl.java b/protocols/rest/api/src/main/java/org/onosproject/protocol/http/ctl/HttpSBControllerImpl.java
index 5e5ba37..aef15f6 100644
--- a/protocols/rest/api/src/main/java/org/onosproject/protocol/http/ctl/HttpSBControllerImpl.java
+++ b/protocols/rest/api/src/main/java/org/onosproject/protocol/http/ctl/HttpSBControllerImpl.java
@@ -123,11 +123,6 @@
}
@Override
- public boolean post(DeviceId device, String request, InputStream payload, String mediaType) {
- return checkStatusCode(post(device, request, payload, typeOfMediaType(mediaType)));
- }
-
- @Override
public int post(DeviceId device, String request, InputStream payload, MediaType mediaType) {
Response response = getResponse(device, request, payload, mediaType);
if (response == null) {
@@ -137,11 +132,6 @@
}
@Override
- public <T> T post(DeviceId device, String request, InputStream payload, String mediaType, Class<T> responseClass) {
- return post(device, request, payload, typeOfMediaType(mediaType), responseClass);
- }
-
- @Override
public <T> T post(DeviceId device, String request, InputStream payload, MediaType mediaType,
Class<T> responseClass) {
Response response = getResponse(device, request, payload, mediaType);
@@ -173,11 +163,6 @@
}
@Override
- public boolean put(DeviceId device, String request, InputStream payload, String mediaType) {
- return checkStatusCode(put(device, request, payload, typeOfMediaType(mediaType)));
- }
-
- @Override
public int put(DeviceId device, String request, InputStream payload, MediaType mediaType) {
WebTarget wt = getWebTarget(device, request);
@@ -201,11 +186,6 @@
}
@Override
- public InputStream get(DeviceId device, String request, String mediaType) {
- return get(device, request, typeOfMediaType(mediaType));
- }
-
- @Override
public InputStream get(DeviceId device, String request, MediaType mediaType) {
WebTarget wt = getWebTarget(device, request);
@@ -218,11 +198,6 @@
}
@Override
- public boolean patch(DeviceId device, String request, InputStream payload, String mediaType) {
- return checkStatusCode(patch(device, request, payload, typeOfMediaType(mediaType)));
- }
-
- @Override
public int patch(DeviceId device, String request, InputStream payload, MediaType mediaType) {
try {
@@ -257,11 +232,6 @@
}
@Override
- public boolean delete(DeviceId device, String request, InputStream payload, String mediaType) {
- return checkStatusCode(delete(device, request, payload, typeOfMediaType(mediaType)));
- }
-
- @Override
public int delete(DeviceId device, String request, InputStream payload, MediaType mediaType) {
WebTarget wt = getWebTarget(device, request);
diff --git a/protocols/restconf/client/ctl/src/main/java/org/onosproject/protocol/restconf/ctl/RestConfSBControllerImpl.java b/protocols/restconf/client/ctl/src/main/java/org/onosproject/protocol/restconf/ctl/RestConfSBControllerImpl.java
index 4dc7ac4..38f296d 100644
--- a/protocols/restconf/client/ctl/src/main/java/org/onosproject/protocol/restconf/ctl/RestConfSBControllerImpl.java
+++ b/protocols/restconf/client/ctl/src/main/java/org/onosproject/protocol/restconf/ctl/RestConfSBControllerImpl.java
@@ -32,7 +32,6 @@
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
-import java.io.InputStream;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -109,53 +108,6 @@
}
@Override
- public boolean post(DeviceId device, String request, InputStream payload,
- String mediaType) {
- request = discoverRootResource(device) + RESOURCE_PATH_PREFIX
- + request;
- return super.post(device, request, payload, mediaType);
- }
-
- @Override
- public <T> T post(DeviceId device, String request, InputStream payload,
- String mediaType, Class<T> responseClass) {
- request = discoverRootResource(device) + RESOURCE_PATH_PREFIX
- + request;
- return super.post(device, request, payload, mediaType, responseClass);
- }
-
- @Override
- public boolean put(DeviceId device, String request, InputStream payload,
- String mediaType) {
- request = discoverRootResource(device) + RESOURCE_PATH_PREFIX
- + request;
- return super.put(device, request, payload, mediaType);
- }
-
- @Override
- public InputStream get(DeviceId device, String request, String mediaType) {
- request = discoverRootResource(device) + RESOURCE_PATH_PREFIX
- + request;
- return super.get(device, request, mediaType);
- }
-
- @Override
- public boolean patch(DeviceId device, String request, InputStream payload,
- String mediaType) {
- request = discoverRootResource(device) + RESOURCE_PATH_PREFIX
- + request;
- return super.patch(device, request, payload, mediaType);
- }
-
- @Override
- public boolean delete(DeviceId device, String request, InputStream payload,
- String mediaType) {
- request = discoverRootResource(device) + RESOURCE_PATH_PREFIX
- + request;
- return super.delete(device, request, payload, mediaType);
- }
-
- @Override
public void enableNotifications(DeviceId device, String request,
String mediaType,
RestconfNotificationEventListener listener) {