From ce1cf85647ab1ae3c292fd1b1286ea0dbb56223f Mon Sep 17 00:00:00 2001 From: "Tej, Tarun" Date: Fri, 11 Aug 2017 12:20:16 -0400 Subject: Fixes for Backward compatibility issues Changes to the API interface and Java SDK to support backward compatibility. Issue-Id: POLICY-165 Change-Id: I2efe8196614cfbd8b733abceb505bd6b91aa97f7 Signed-off-by: Tarun Tej Velaga --- .../pdp/rest/api/models/ConfigPolicyAPIRequest.java | 18 ++++++++++++++++-- .../policy/pdp/rest/api/services/GetConfigService.java | 2 +- .../pdp/rest/api/services/GetDecisionService.java | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) (limited to 'ONAP-PDP-REST/src/main') diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/ConfigPolicyAPIRequest.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/ConfigPolicyAPIRequest.java index dd40bfe5f..e7cb40762 100644 --- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/ConfigPolicyAPIRequest.java +++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/models/ConfigPolicyAPIRequest.java @@ -19,11 +19,11 @@ */ package org.onap.policy.pdp.rest.api.models; -import io.swagger.annotations.ApiModel; - import java.io.Serializable; import java.util.Map; +import io.swagger.annotations.ApiModel; + @ApiModel public class ConfigPolicyAPIRequest implements Serializable{ private static final long serialVersionUID = -4103391389984557025L; @@ -65,6 +65,13 @@ public class ConfigPolicyAPIRequest implements Serializable{ public String getOnapName() { return onapName; } + /** + * @return the onapName + */ + @Deprecated + public String getEcompName() { + return onapName; + } /** * @return the configName */ @@ -113,6 +120,13 @@ public class ConfigPolicyAPIRequest implements Serializable{ public void setOnapName(String onapName) { this.onapName = onapName; } + /** + * @param ecompName the onapName to set + */ + @Deprecated + public void setEcompName(String ecompName) { + this.onapName = ecompName; + } /** * @param configName the configName to set */ diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetConfigService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetConfigService.java index 1817d8861..58d5c8f31 100644 --- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetConfigService.java +++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetConfigService.java @@ -302,7 +302,7 @@ public class GetConfigService { return false; } if(configRequestParameters.getOnapName()==null && configRequestParameters.getPolicyName()==null){ - message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Cannot proceed without onapComponentName or PolicyName"; + message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Cannot proceed without onapName or PolicyName"; return false; } return true; diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDecisionService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDecisionService.java index 66beb0663..a74203cca 100644 --- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDecisionService.java +++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDecisionService.java @@ -164,7 +164,7 @@ public class GetDecisionService { message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Decision Request Paramaters"; return false; } - onapComponentName = decisionRequestParameters.getONAPComponentName(); + onapComponentName = decisionRequestParameters.getOnapName(); decisionAttributes = decisionRequestParameters.getDecisionAttributes(); if (onapComponentName == null || onapComponentName.isEmpty()) { message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No onapComponentName given : " + onapComponentName; -- cgit 1.2.3-korg