import java.lang.invoke.MethodHandles;
import java.lang.reflect.Type;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.Vector;
import org.immutables.gson.Gson;
import org.immutables.value.Value;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@Override
public ResponseEntity<String> getAllPolicyTypes() {
- String url = baseUrl() + "/policy_schemas";
- ResponseEntity<String> rsp = this.restTemplate.getForEntity(url, String.class);
- if (!rsp.getStatusCode().is2xxSuccessful()) {
- return rsp;
- }
-
- PolicyTypes result = new PolicyTypes();
- JsonParser jsonParser = new JsonParser();
try {
+ String url = baseUrl() + "/policy_schemas";
+ ResponseEntity<String> rsp = this.restTemplate.getForEntity(url, String.class);
+ if (!rsp.getStatusCode().is2xxSuccessful()) {
+ return rsp;
+ }
+
+ PolicyTypes result = new PolicyTypes();
+ JsonParser jsonParser = new JsonParser();
+
JsonArray schemas = jsonParser.parse(rsp.getBody()).getAsJsonArray();
for (JsonElement schema : schemas) {
JsonObject schemaObj = schema.getAsJsonObject();
}
@Override
- public ResponseEntity<String> getPolicyInstance(String id) {
+ public ResponseEntity<Object> getPolicyInstance(String id) {
String url = baseUrl() + "/policy?instance={id}";
Map<String, ?> uriVariables = Map.of("id", id);
- return this.restTemplate.getForEntity(url, String.class, uriVariables);
+ return this.restTemplate.getForEntity(url, Object.class, uriVariables);
}
@Override
- public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, String json,
+ public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, Object json,
String ric) {
String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
Map<String, ?> uriVariables = Map.of( //
"service", "dashboard");
try {
- this.restTemplate.put(url, json, uriVariables);
- return new ResponseEntity<>("Policy was put successfully", HttpStatus.OK);
+ this.restTemplate.put(url, createJsonHttpEntity(json), uriVariables);
+ return new ResponseEntity<>(HttpStatus.OK);
} catch (Exception e) {
return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
}
Map<String, ?> uriVariables = Map.of("instance", policyInstanceId);
try {
this.restTemplate.delete(url, uriVariables);
- return new ResponseEntity<>("Policy was deleted successfully", HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(HttpStatus.OK);
} catch (Exception e) {
return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND);
}
@Value.Immutable
@Gson.TypeAdapters
interface RicInfo {
- public String name();
+ public String ricName();
public Collection<String> nodeNames();
try {
Type listType = new TypeToken<List<ImmutableRicInfo>>() {}.getType();
List<RicInfo> rspParsed = gson.fromJson(rsp, listType);
- Collection<String> result = new Vector<>(rspParsed.size());
+ Collection<String> result = new ArrayList<>(rspParsed.size());
for (RicInfo ric : rspParsed) {
- result.add(ric.name());
+ result.add(ric.ricName());
}
return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
} catch (Exception e) {
}
}
+ private HttpEntity<Object> createJsonHttpEntity(Object content) {
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ return new HttpEntity<>(content, headers);
+ }
+
}