mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 20:26:16 +02:00
Code Issues Projects Releases Wiki Activity

Adding post method with String return type

Browse Source 
Change-Id: I4483ad2494ccaca08f7460de212e432d46cba710
This commit is contained in:
Andrea Campanella 2016-06-08 12:27:11 +02:00 committed by Gerrit Code Review
parent bd85f785a2
commit c385126fcd
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
protocols/rest/api/src/main/java/org/onosproject/protocol/rest/RestSBController.java
View File

@ -77,6 +77,20 @@ public interface RestSBController {
*/
boolean post(DeviceId device, String request, InputStream payload, String mediaType);
/**
* Does a REST 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
* @param responseClass the type of response object we are interested in,
* such as String, InputStream.
* @return Object of type requested via responseClass.
*/
<T> T post(DeviceId device, String request, InputStream payload,
String mediaType, Class<T> responseClass);
/**
* Does a REST PUT request with specified parameters to the device.
*

21
protocols/rest/ctl/src/main/java/org/onosproject/protocol/rest/ctl/RestSBControllerImpl.java
View File

@ -134,6 +134,22 @@ public class RestSBControllerImpl implements RestSBController {
@Override
public boolean post(DeviceId device, String request, InputStream payload, String mediaType) {
Response response = getResponse(device, request, payload, mediaType);
return checkReply(response);
}
@Override
public <T> T post(DeviceId device, String request, InputStream payload,
String mediaType, Class<T> responseClass) {
Response response = getResponse(device, request, payload, mediaType);
if (response.hasEntity()) {
return response.readEntity(responseClass);
}
log.error("Response from device {} for request {} contains no entity", device, request);
return null;
}
private Response getResponse(DeviceId device, String request, InputStream payload, String mediaType) {
WebTarget wt = getWebTarget(device, request);
Response response = null;
@ -148,7 +164,7 @@ public class RestSBControllerImpl implements RestSBController {
} else {
response = wt.request(mediaType).post(Entity.entity(null, mediaType));
}
return checkReply(response);
return response;
}
@Override
@ -189,7 +205,7 @@ public class RestSBControllerImpl implements RestSBController {
Response s = wt.request(type).get();
if (checkReply(s)) {
return new ByteArrayInputStream(wt.request(type)
.get(String.class).getBytes(StandardCharsets.UTF_8));
.get(String.class).getBytes(StandardCharsets.UTF_8));
}
return null;
}
@ -305,7 +321,6 @@ public class RestSBControllerImpl implements RestSBController {
public X509Certificate[] getAcceptedIssuers() {
return new X509Certificate[0];
}
} }, new java.security.SecureRandom());
} catch (NoSuchAlgorithmException | KeyManagementException e) {
e.printStackTrace();