import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+
import java.util.Collection;
import java.util.Vector;
-import org.oransc.policyagent.Beans;
+
import org.oransc.policyagent.configuration.ApplicationConfig;
import org.oransc.policyagent.exceptions.ServiceException;
import org.oransc.policyagent.repository.ImmutablePolicy;
import org.oransc.policyagent.repository.Policies;
import org.oransc.policyagent.repository.Policy;
+import org.oransc.policyagent.repository.PolicyType;
import org.oransc.policyagent.repository.PolicyTypes;
import org.oransc.policyagent.repository.Ric;
import org.oransc.policyagent.repository.Rics;
+import org.oransc.policyagent.repository.Services;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
private final ApplicationConfig appConfig;
private final Rics rics;
- private final PolicyTypes types;
+ private final PolicyTypes policyTypes;
private final Policies policies;
+ private final Services services;
private static Gson gson = new GsonBuilder() //
.serializeNulls() //
.create(); //
@Autowired
- PolicyController(Beans beans) {
- this.appConfig = beans.getApplicationConfig();
- this.rics = beans.getRics();
- this.types = beans.getPolicyTypes();
- this.policies = beans.getPolicies();
+ PolicyController(ApplicationConfig config, PolicyTypes types, Policies policies, Rics rics, Services services) {
+ this.appConfig = config;
+ this.policyTypes = types;
+ this.policies = policies;
+ this.rics = rics;
+ this.services = services;
+ }
+
+ @GetMapping("/policy_types")
+ public ResponseEntity<String> getPolicyTypes() {
+
+ Collection<PolicyType> types = this.policyTypes.getAll();
+ return new ResponseEntity<String>(policyTypesToJson(types), HttpStatus.OK);
}
@GetMapping("/policy")
public ResponseEntity<String> getPolicy( //
- @RequestParam(name = "instance", required = false, defaultValue = "new") String instance) {
+ @RequestParam(name = "instance", required = true) String instance) {
try {
Policy p = policies.get(instance);
return new ResponseEntity<String>(p.json(), HttpStatus.OK);
-
} catch (ServiceException e) {
return new ResponseEntity<String>(e.getMessage(), HttpStatus.NO_CONTENT);
}
}
+ @DeleteMapping("/policy")
+ public ResponseEntity<String> deletePolicy( //
+ @RequestParam(name = "instance", required = true) String instance) {
+
+ Policy p = policies.removeId(instance);
+ return new ResponseEntity<String>("OK", HttpStatus.OK);
+ }
+
@GetMapping("/policies")
public ResponseEntity<String> getPolicies( //
@RequestParam(name = "type", required = false) String type, //
result = policies.getAll();
}
- return new ResponseEntity<String>(toJson(result), HttpStatus.OK);
+ return new ResponseEntity<String>(policiesToJson(result), HttpStatus.OK);
}
private boolean include(String filter, String value) {
return filtered;
}
- private String toJson(Collection<Policy> policies) {
+ private String policiesToJson(Collection<Policy> policies) {
Vector<PolicyInfo> v = new Vector<>(policies.size());
for (Policy p : policies) {
PolicyInfo policyInfo = ImmutablePolicyInfo.builder() //
.json(p.json()) //
- .name(p.id()) //
+ .id(p.id()) //
.ric(p.ric().name()) //
- .type(p.type().name()).build();
+ .type(p.type().name()) //
+ .service(p.ownerServiceName()) //
+ .lastModified(p.lastModified()) //
+ .build();
v.add(policyInfo);
}
return gson.toJson(v);
}
+ private String policyTypesToJson(Collection<PolicyType> types) {
+ Vector<PolicyTypeInfo> v = new Vector<>(types.size());
+ for (PolicyType t : types) {
+ PolicyTypeInfo policyInfo = ImmutablePolicyTypeInfo.builder() //
+ .schema(t.jsonSchema()) //
+ .name(t.name()) //
+ .build();
+ v.add(policyInfo);
+ }
+ return gson.toJson(v);
+ }
+
+ private String getTimeStampUTC() {
+ return java.time.Instant.now().toString();
+ }
+
@PutMapping(path = "/policy")
public ResponseEntity<String> putPolicy( //
@RequestParam(name = "type", required = true) String type, //
@RequestBody String jsonBody) {
try {
+ // services.getService(service).ping();
Ric ricObj = rics.getRic(ric);
Policy policy = ImmutablePolicy.builder() //
.id(instanceId) //
.json(jsonBody) //
- .type(types.getType(type)) //
+ .type(policyTypes.getType(type)) //
.ric(ricObj) //
.ownerServiceName(service) //
+ .lastModified(getTimeStampUTC()) //
.build();
policies.put(policy);
return new ResponseEntity<String>(HttpStatus.OK);