@Override
public ResponseEntity<Object> getPolicyInstance(String id) {
- String url = baseUrl() + "/policy?instance={id}";
+ String url = baseUrl() + "/policy?id={id}";
Map<String, ?> uriVariables = Map.of("id", id);
return this.restTemplate.getForEntity(url, Object.class, uriVariables);
@Override
public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, Object json,
String ric) {
- String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
+ String url = baseUrl() + "/policy?type={type}&id={id}&ric={ric}&service={service}";
Map<String, ?> uriVariables = Map.of( //
"type", policyTypeIdString, //
- "instance", policyInstanceId, //
+ "id", policyInstanceId, //
"ric", ric, //
"service", "controlpanel");
@Override
public ResponseEntity<String> deletePolicy(String policyInstanceId) {
- String url = baseUrl() + "/policy?instance={instance}";
- Map<String, ?> uriVariables = Map.of("instance", policyInstanceId);
+ String url = baseUrl() + "/policy?id={id}";
+ Map<String, ?> uriVariables = Map.of("id", policyInstanceId);
try {
this.restTemplate.delete(url, uriVariables);
return new ResponseEntity<>(HttpStatus.OK);
private static final String URL_PREFIX = "UrlPrefix";
private static final String URL_POLICY_SCHEMAS = "/policy_schemas";
private static final String URL_POLICY_INSTANCES = "/policies?type={type}";
- private static final String URL_POLICY_INSTANCE = "/policy?instance={id}";
- private static final String URL_PUT_POLICY = "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
- private static final String URL_DELETE_POLICY = "/policy?instance={instance}";
+ private static final String URL_POLICY_INSTANCE = "/policy?id={id}";
+ private static final String URL_PUT_POLICY = "/policy?type={type}&id={id}&ric={ric}&service={service}";
+ private static final String URL_DELETE_POLICY = "/policy?id={id}";
private static final String URL_RIC_INFO = "/rics?policyType={typeName}";
private static final String POLICY_TYPE_1_ID = "type1";
private static final String POLICY_TYPE_1_VALID = "{\"title\":\"type1\"}";
HttpEntity<Object> jsonHttpEntity = createJsonHttpEntity(POLICY_1_VALID);
Map<String, ?> uriVariables = Map.of( //
"type", POLICY_TYPE_1_ID, //
- "instance", POLICY_1_ID, //
+ "id", POLICY_1_ID, //
"ric", RIC_1_ID, //
"service", "controlpanel");
doThrow(new RestClientException(CLIENT_ERROR_MESSAGE)).when(restTemplateMock)
HttpEntity<Object> jsonHttpEntity = createJsonHttpEntity(POLICY_1_VALID);
Map<String, ?> uriVariables = Map.of( //
"type", POLICY_TYPE_1_ID, //
- "instance", POLICY_1_ID, //
+ "id", POLICY_1_ID, //
"ric", RIC_1_ID, //
"service", "controlpanel");
@Test
public void testDeletePolicyFailure() {
- Map<String, ?> uriVariables = Map.of("instance", POLICY_1_ID);
+ Map<String, ?> uriVariables = Map.of("id", POLICY_1_ID);
doThrow(new RestClientException(CLIENT_ERROR_MESSAGE)).when(restTemplateMock)
.delete(eq(URL_PREFIX + URL_DELETE_POLICY), eq(uriVariables));
@Test
public void testDeletePolicySuccess() {
- Map<String, ?> uriVariables = Map.of("instance", POLICY_1_ID);
+ Map<String, ?> uriVariables = Map.of("id", POLICY_1_ID);
ResponseEntity<String> returnedResp = apiUnderTest.deletePolicy(POLICY_1_ID);