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;
}
@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( //
@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<String> createJsonHttpEntity(String content) {
+ private HttpEntity<Object> createJsonHttpEntity(Object content) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
- return new HttpEntity<String>(content, headers);
+ return new HttpEntity<>(content, headers);
}
}