From fa37fa33cc1d7b721b2e94e6456d466b770ddd46 Mon Sep 17 00:00:00 2001 From: pasindu Date: Fri, 6 Oct 2023 13:50:55 +0530 Subject: [PATCH] Map JsonObject to dto classes in publisher API revesion --- .../rest/api/PublisherRESTAPIServices.java | 23 +++--- .../api/PublisherRESTAPIServicesImpl.java | 70 +++++++++---------- .../rest/api/dto/APIInfo/APIRevision.java | 37 +++++++--- .../dto/APIInfo/APIRevisionDeployment.java | 26 +++---- .../publisher/APIPublisherServiceImpl.java | 45 ++++++------ 5 files changed, 103 insertions(+), 98 deletions(-) diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/PublisherRESTAPIServices.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/PublisherRESTAPIServices.java index a191b0ac16..6793e06b92 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/PublisherRESTAPIServices.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/PublisherRESTAPIServices.java @@ -19,16 +19,11 @@ package io.entgra.device.mgt.core.apimgt.extension.rest.api; import io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIApplicationKey; +import io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIInfo.*; import io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.AccessTokenInfo; import io.entgra.device.mgt.core.apimgt.extension.rest.api.exceptions.APIServicesException; import io.entgra.device.mgt.core.apimgt.extension.rest.api.exceptions.BadRequestException; import io.entgra.device.mgt.core.apimgt.extension.rest.api.exceptions.UnexpectedResponseException; -import io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIInfo.APIInfo; -import io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIInfo.Scope; -import io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIInfo.Mediation; -import io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIInfo.Documentation; -import io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIInfo.APIRevision; -import io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIInfo.APIRevisionDeployment; import org.json.JSONObject; import java.util.List; @@ -63,8 +58,8 @@ public interface PublisherRESTAPIServices { String asyncApiDefinition) throws APIServicesException, BadRequestException, UnexpectedResponseException; - JSONObject getAllApiSpecificMediationPolicies(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, - String apiUuid) + MediationPolicy[] getAllApiSpecificMediationPolicies(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, + String apiUuid) throws APIServicesException, BadRequestException, UnexpectedResponseException; boolean addApiSpecificMediationPolicy(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, @@ -72,18 +67,18 @@ public interface PublisherRESTAPIServices { throws APIServicesException, BadRequestException, UnexpectedResponseException; boolean deleteApiSpecificMediationPolicy(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, - String uuid, Mediation mediation) + String uuid, Mediation mediation) throws APIServicesException, BadRequestException, UnexpectedResponseException; boolean changeLifeCycleStatus(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, String uuid, String action) throws APIServicesException, BadRequestException, UnexpectedResponseException; - JSONObject getAPIRevisions(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, String uuid, - Boolean deploymentStatus) + APIRevision[] getAPIRevisions(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, String uuid, + Boolean deploymentStatus) throws APIServicesException, BadRequestException, UnexpectedResponseException; - JSONObject addAPIRevision(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, + APIRevision addAPIRevision(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, APIRevision apiRevision) throws APIServicesException, BadRequestException, UnexpectedResponseException; @@ -92,11 +87,11 @@ public interface PublisherRESTAPIServices { throws APIServicesException, BadRequestException, UnexpectedResponseException; boolean undeployAPIRevisionDeployment(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, - JSONObject apiRevisionDeployment, String uuid) + APIRevision apiRevisionDeployment, String uuid) throws APIServicesException, BadRequestException, UnexpectedResponseException; boolean deleteAPIRevision(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, - JSONObject apiRevision, String uuid) + APIRevision apiRevision, String uuid) throws APIServicesException, BadRequestException, UnexpectedResponseException; JSONObject getDocumentations(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/PublisherRESTAPIServicesImpl.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/PublisherRESTAPIServicesImpl.java index 05f0a3fe98..ac0d2434dc 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/PublisherRESTAPIServicesImpl.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/PublisherRESTAPIServicesImpl.java @@ -643,7 +643,7 @@ public class PublisherRESTAPIServicesImpl implements PublisherRESTAPIServices { } @Override - public JSONObject getAllApiSpecificMediationPolicies(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, + public MediationPolicy[] getAllApiSpecificMediationPolicies(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, String apiUuid) throws APIServicesException, BadRequestException, UnexpectedResponseException { @@ -658,8 +658,8 @@ public class PublisherRESTAPIServicesImpl implements PublisherRESTAPIServices { try { Response response = client.newCall(request).execute(); if (HttpStatus.SC_OK == response.code()) { - JSONObject jsonObject = new JSONObject(response.body().string()); - return jsonObject; + JSONArray mediationPolicyList = (JSONArray) new JSONObject(response.body().string()).get("list"); + return gson.fromJson(mediationPolicyList.toString(), MediationPolicy[].class); } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) { APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl(); AccessTokenInfo refreshedAccessToken = apiApplicationServices. @@ -814,7 +814,7 @@ public class PublisherRESTAPIServicesImpl implements PublisherRESTAPIServices { } @Override - public JSONObject getAPIRevisions(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, String uuid, + public APIRevision[] getAPIRevisions(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, String uuid, Boolean deploymentStatus) throws APIServicesException, BadRequestException, UnexpectedResponseException { @@ -831,8 +831,8 @@ public class PublisherRESTAPIServicesImpl implements PublisherRESTAPIServices { try { Response response = client.newCall(request).execute(); if (HttpStatus.SC_OK == response.code()) { - JSONObject jsonObject = new JSONObject(response.body().string()); - return jsonObject; + JSONArray revisionList = (JSONArray) new JSONObject(response.body().string()).get("list"); + return gson.fromJson(revisionList.toString(), APIRevision[].class); } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) { APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl(); AccessTokenInfo refreshedAccessToken = apiApplicationServices. @@ -856,16 +856,15 @@ public class PublisherRESTAPIServicesImpl implements PublisherRESTAPIServices { } @Override - public JSONObject addAPIRevision(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, APIRevision apiRevision) + public APIRevision addAPIRevision(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, APIRevision apiRevision) throws APIServicesException, BadRequestException, UnexpectedResponseException { String addNewScope = endPointPrefix + Constants.API_ENDPOINT + apiRevision.getApiUUID() + "/revisions"; - String apiRevisionDescription = "{\n" + - " \"description\":\"" + apiRevision.getDescription() + "\"\n" + - "}"; + JSONObject payload = new JSONObject(); + payload.put("description", (apiRevision.getDescription() != null ? apiRevision.getDescription() : null)); - RequestBody requestBody = RequestBody.create(JSON, apiRevisionDescription); + RequestBody requestBody = RequestBody.create(JSON, payload.toString()); Request request = new Request.Builder() .url(addNewScope) .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER @@ -876,8 +875,7 @@ public class PublisherRESTAPIServicesImpl implements PublisherRESTAPIServices { try { Response response = client.newCall(request).execute(); if (HttpStatus.SC_CREATED == response.code()) { - JSONObject jsonObject = new JSONObject(response.body().string()); - return jsonObject; + return gson.fromJson(response.body().string(), APIRevision.class); } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) { APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl(); AccessTokenInfo refreshedAccessToken = apiApplicationServices. @@ -908,15 +906,14 @@ public class PublisherRESTAPIServicesImpl implements PublisherRESTAPIServices { String deployAPIRevisionEndPoint = endPointPrefix + Constants.API_ENDPOINT + uuid + "/deploy-revision?revisionId=" + apiRevisionId; APIRevisionDeployment apiRevisionDeployment = apiRevisionDeploymentList.get(0); - String revision = "[\n" + - " {\n" + - " \"name\": \"" + apiRevisionDeployment.getDeployment() + "\",\n" + - " \"vhost\": \"" + apiRevisionDeployment.getVhost() + "\",\n" + - " \"displayOnDevportal\": " + apiRevisionDeployment.isDisplayOnDevportal() + "\n" + - " }\n" + - "]"; + JSONArray payload = new JSONArray(); + JSONObject revision = new JSONObject(); + revision.put("name", (apiRevisionDeployment.getName() != null ? apiRevisionDeployment.getName() : "")); + revision.put("vhost", (apiRevisionDeployment.getVhost() != null ? apiRevisionDeployment.getVhost() : "")); + revision.put("displayOnDevportal", apiRevisionDeployment.isDisplayOnDevportal()); + payload.put(revision); - RequestBody requestBody = RequestBody.create(JSON, revision); + RequestBody requestBody = RequestBody.create(JSON, payload.toString()); Request request = new Request.Builder() .url(deployAPIRevisionEndPoint) .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER @@ -953,23 +950,22 @@ public class PublisherRESTAPIServicesImpl implements PublisherRESTAPIServices { @Override public boolean undeployAPIRevisionDeployment(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, - JSONObject apiRevisionDeployment, String uuid) + APIRevision apiRevisionDeployment, String uuid) throws APIServicesException, BadRequestException, UnexpectedResponseException { String undeployAPIRevisionEndPoint = endPointPrefix + Constants.API_ENDPOINT + uuid + "/undeploy-revision?revisionId=" - + apiRevisionDeployment.getString("id"); - JSONArray array = apiRevisionDeployment.getJSONArray("deploymentInfo"); - JSONObject obj = array.getJSONObject(0); - - String revision = "[\n" + - " {\n" + - " \"name\": \"" + obj.getString("name") + "\",\n" + - " \"vhost\": \"" + obj.getString("vhost") + "\",\n" + - " \"displayOnDevportal\": " + obj.get("displayOnDevportal") + "\n" + - " }\n" + - "]"; - - RequestBody requestBody = RequestBody.create(JSON, revision); + + apiRevisionDeployment.getId(); + List apiRevisionDeployments = apiRevisionDeployment.getDeploymentInfo(); + APIRevisionDeployment earliestDeployment = apiRevisionDeployments.get(0); + + JSONArray payload = new JSONArray(); + JSONObject revision = new JSONObject(); + revision.put("name", (earliestDeployment.getName() != null ? earliestDeployment.getName() : "")); + revision.put("vhost", (earliestDeployment.getVhost() != null ? earliestDeployment.getVhost() : "")); + revision.put("displayOnDevportal", earliestDeployment.isDisplayOnDevportal()); + payload.put(revision); + + RequestBody requestBody = RequestBody.create(JSON, payload.toString()); Request request = new Request.Builder() .url(undeployAPIRevisionEndPoint) .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER @@ -1005,11 +1001,11 @@ public class PublisherRESTAPIServicesImpl implements PublisherRESTAPIServices { @Override public boolean deleteAPIRevision(APIApplicationKey apiApplicationKey, AccessTokenInfo accessTokenInfo, - JSONObject apiRevision, String uuid) + APIRevision apiRevision, String uuid) throws APIServicesException, BadRequestException, UnexpectedResponseException { String apiRevisionEndPoint = endPointPrefix + Constants.API_ENDPOINT + uuid + "/revisions/" + - apiRevision.getString("id"); + apiRevision.getId(); Request request = new Request.Builder() .url(apiRevisionEndPoint) diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/dto/APIInfo/APIRevision.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/dto/APIInfo/APIRevision.java index 581fbb1792..c3f3b5831b 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/dto/APIInfo/APIRevision.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/dto/APIInfo/APIRevision.java @@ -17,26 +17,26 @@ */ package io.entgra.device.mgt.core.apimgt.extension.rest.api.dto.APIInfo; -import org.wso2.carbon.apimgt.api.model.APIRevisionDeployment; - import java.io.Serializable; import java.util.List; public class APIRevision implements Serializable { private static final long serialVersionUID = 1L; - private int id; + private String id; private String apiUUID; private String revisionUUID; private String description; + private String displayName; private String createdBy; private String createdTime; - private List apiRevisionDeploymentList; + private APIInfo apiInfo; + private List deploymentInfo; - public int getId() { + public String getId() { return id; } - public void setId(int id) { + public void setId(String id) { this.id = id; } @@ -80,11 +80,28 @@ public class APIRevision implements Serializable { this.createdTime = createdTime; } - public List getApiRevisionDeploymentList() { - return apiRevisionDeploymentList; + public List getDeploymentInfo() { + return deploymentInfo; + } + + public void setDeploymentInfo(List deploymentInfo) { + this.deploymentInfo = deploymentInfo; + } + + public String getDisplayName() { + return displayName; } - public void setApiRevisionDeploymentList(List apiRevisionDeploymentList) { - this.apiRevisionDeploymentList = apiRevisionDeploymentList; + public void setDisplayName(String displayName) { + this.displayName = displayName; } + + public APIInfo getApiInfo() { + return apiInfo; + } + + public void setApiInfo(APIInfo apiInfo) { + this.apiInfo = apiInfo; + } + } diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/dto/APIInfo/APIRevisionDeployment.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/dto/APIInfo/APIRevisionDeployment.java index 20c84232cc..4be3a64836 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/dto/APIInfo/APIRevisionDeployment.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/dto/APIInfo/APIRevisionDeployment.java @@ -23,10 +23,10 @@ import java.io.Serializable; public class APIRevisionDeployment implements Serializable { private static final long serialVersionUID = 1L; private int id; - private String revisionUUID; - private String deployment; + private String revisionUuid; + private String name; private String vhost; - private boolean isDisplayOnDevportal; + private boolean displayOnDevportal; private String deployedTime; public int getId() { @@ -37,20 +37,20 @@ public class APIRevisionDeployment implements Serializable { this.id = id; } - public String getRevisionUUID() { - return revisionUUID; + public String getRevisionUuid() { + return revisionUuid; } - public void setRevisionUUID(String revisionUUID) { - this.revisionUUID = revisionUUID; + public void setRevisionUuid(String revisionUuid) { + this.revisionUuid = revisionUuid; } - public String getDeployment() { - return deployment; + public String getName() { + return name; } - public void setDeployment(String deployment) { - this.deployment = deployment; + public void setName(String name) { + this.name = name; } public String getVhost() { @@ -62,11 +62,11 @@ public class APIRevisionDeployment implements Serializable { } public boolean isDisplayOnDevportal() { - return isDisplayOnDevportal; + return displayOnDevportal; } public void setDisplayOnDevportal(boolean displayOnDevportal) { - isDisplayOnDevportal = displayOnDevportal; + this.displayOnDevportal = displayOnDevportal; } public String getDeployedTime() { diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java index d3a43eec02..d32a7d6d30 100644 --- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java +++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java @@ -215,10 +215,10 @@ public class APIPublisherServiceImpl implements APIPublisherService { apiRevision.setApiUUID(apiUuid); apiRevision.setDescription("Initial Revision"); String apiRevisionId = publisherRESTAPIServices.addAPIRevision(apiApplicationKey, - accessTokenInfo, apiRevision).getString("id"); + accessTokenInfo, apiRevision).getId(); APIRevisionDeployment apiRevisionDeployment = new APIRevisionDeployment(); - apiRevisionDeployment.setDeployment(API_PUBLISH_ENVIRONMENT); + apiRevisionDeployment.setName(API_PUBLISH_ENVIRONMENT); apiRevisionDeployment.setVhost(System.getProperty("iot.gateway.host")); apiRevisionDeployment.setDisplayOnDevportal(true); @@ -308,15 +308,14 @@ public class APIPublisherServiceImpl implements APIPublisherService { mediation.setType("in"); mediation.setGlobal(false); - JSONArray mediationList = (JSONArray) publisherRESTAPIServices - .getAllApiSpecificMediationPolicies(apiApplicationKey, accessTokenInfo, - apiUuid).get("list"); + MediationPolicy[] mediationList = publisherRESTAPIServices + .getAllApiSpecificMediationPolicies(apiApplicationKey, accessTokenInfo, apiUuid); boolean isMediationPolicyFound = false; - for (int i = 0; i < mediationList.length(); i++) { - JSONObject mediationObj = mediationList.getJSONObject(i); - if (apiConfig.getInSequenceName().equals(mediationObj.getString("name"))) { - mediation.setUuid(mediationObj.getString("id")); + for (int i = 0; i < mediationList.length; i++) { + MediationPolicy mediationPolicy = mediationList[i]; + if (apiConfig.getInSequenceName().equals(mediationPolicy.getName())) { + mediation.setUuid(mediationPolicy.getId()); publisherRESTAPIServices.deleteApiSpecificMediationPolicy(apiApplicationKey, accessTokenInfo, apiUuid, mediation); publisherRESTAPIServices.addApiSpecificMediationPolicy(apiApplicationKey, @@ -331,24 +330,22 @@ public class APIPublisherServiceImpl implements APIPublisherService { } } - int apiRevisionCount = (int) publisherRESTAPIServices.getAPIRevisions(apiApplicationKey, - accessTokenInfo, apiUuid, null).get("count"); + int apiRevisionCount = publisherRESTAPIServices.getAPIRevisions(apiApplicationKey, + accessTokenInfo, apiUuid, null).length; if (apiRevisionCount >= 5) { // This will retrieve the deployed revision - JSONArray revisionDeploymentList = (JSONArray) publisherRESTAPIServices.getAPIRevisions( - apiApplicationKey, accessTokenInfo, apiUuid, - true).get("list"); - if (revisionDeploymentList.length() > 0) { - JSONObject latestRevisionDeployment = revisionDeploymentList.getJSONObject(0); + APIRevision[] revisionDeploymentList = publisherRESTAPIServices.getAPIRevisions( + apiApplicationKey, accessTokenInfo, apiUuid, true); + if (revisionDeploymentList.length > 0) { + APIRevision latestRevisionDeployment = revisionDeploymentList[0]; publisherRESTAPIServices.undeployAPIRevisionDeployment(apiApplicationKey, accessTokenInfo, latestRevisionDeployment, apiUuid); } - // This will retrieve the un deployed revision list - JSONArray undeployedRevisionList = (JSONArray) publisherRESTAPIServices.getAPIRevisions( - apiApplicationKey, accessTokenInfo, apiUuid, - false).get("list"); - if (undeployedRevisionList.length() > 0) { - JSONObject earliestUndeployRevision = undeployedRevisionList.getJSONObject(0); + // This will retrieve the undeployed revision list + APIRevision[] undeployedRevisionList = publisherRESTAPIServices.getAPIRevisions(apiApplicationKey, + accessTokenInfo, apiUuid, false); + if (undeployedRevisionList.length > 0) { + APIRevision earliestUndeployRevision = undeployedRevisionList[0]; publisherRESTAPIServices.deleteAPIRevision(apiApplicationKey, accessTokenInfo, earliestUndeployRevision, apiUuid); } @@ -359,10 +356,10 @@ public class APIPublisherServiceImpl implements APIPublisherService { apiRevision.setApiUUID(apiUuid); apiRevision.setDescription("Updated Revision"); String apiRevisionId = publisherRESTAPIServices.addAPIRevision(apiApplicationKey, - accessTokenInfo, apiRevision).getString("id"); + accessTokenInfo, apiRevision).getId(); APIRevisionDeployment apiRevisionDeployment = new APIRevisionDeployment(); - apiRevisionDeployment.setDeployment(API_PUBLISH_ENVIRONMENT); + apiRevisionDeployment.setName(API_PUBLISH_ENVIRONMENT); apiRevisionDeployment.setVhost(System.getProperty("iot.gateway.host")); apiRevisionDeployment.setDisplayOnDevportal(true);