import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestTemplate;
@Component("PolicyAgentApi")
JsonArray schemas = JsonParser.parseString(rsp.getBody()).getAsJsonArray();
for (JsonElement schema : schemas) {
JsonObject schemaObj = schema.getAsJsonObject();
- String title = schemaObj.get("title").getAsString();
- String schemaAsStr = schemaObj.toString();
- PolicyType pt = new PolicyType(title, schemaAsStr);
- result.add(pt);
+ if (schemaObj.get("title") != null) {
+ String title = schemaObj.get("title").getAsString();
+ String schemaAsStr = schemaObj.toString();
+ PolicyType pt = new PolicyType(title, schemaAsStr);
+ result.add(pt);
+ } else {
+ logger.warn("Ignoring schema: {}", schemaObj);
+ }
}
return new ResponseEntity<>(gson.toJson(result), rsp.getStatusCode());
} catch (Exception e) {
- return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ return handleException(e);
}
}
}
return new ResponseEntity<>(gson.toJson(result), rsp.getStatusCode());
} catch (Exception e) {
- return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ return handleException(e);
}
}
@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");
this.restTemplate.put(url, createJsonHttpEntity(json), uriVariables);
return new ResponseEntity<>(HttpStatus.OK);
} catch (Exception e) {
- return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ return handleException(e);
}
}
@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);
} catch (Exception e) {
- return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND);
+ return handleException(e);
}
}
}
return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
} catch (Exception e) {
- return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ return handleException(e);
}
}
return new HttpEntity<>(content, headers);
}
+ private ResponseEntity<String> handleException(Exception throwable) {
+ if (throwable instanceof HttpClientErrorException) {
+ HttpClientErrorException e = (HttpClientErrorException) throwable;
+ return new ResponseEntity<>(e.getMessage(), e.getStatusCode());
+ } else if (throwable instanceof HttpServerErrorException) {
+ HttpServerErrorException e = (HttpServerErrorException) throwable;
+ return new ResponseEntity<>(e.getResponseBodyAsString(), e.getStatusCode());
+ }
+ return new ResponseEntity<>(throwable.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+
}