* O-RAN-SC
* %%
* Copyright (C) 2019 Nordix Foundation
+ * Modifications Copyright (C) 2020 Nordix Foundation
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static com.google.gson.Gson gson = new GsonBuilder() //
- .serializeNulls() //
- .create(); //
+ .serializeNulls() //
+ .create(); //
@Bean
public PolicyAgentApi policyAgentApi() {
private final Database database = new Database();
@Override
- public ResponseEntity<String> getPolicyInstance(String id) {
+ public ResponseEntity<Object> getPolicyInstance(String id) {
return new ResponseEntity<>(database.getInstance(id), HttpStatus.OK);
}
@Override
- public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, String json,
- String ric) {
+ public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, Object json,
+ String ric) {
database.putInstance(policyTypeIdString, policyInstanceId, json, ric);
return new ResponseEntity<>("Policy was put successfully", HttpStatus.OK);
}
private String getStringFromFile(String path) {
try {
- InputStream inputStream = MethodHandles.lookup().lookupClass().getClassLoader()
- .getResourceAsStream(path);
+ InputStream inputStream =
+ MethodHandles.lookup().lookupClass().getClassLoader().getResourceAsStream(path);
return new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining("\n"));
} catch (Exception e) {
logger.error("Cannot read file :" + path, e);
return java.time.Instant.now().toString();
}
- void putInstance(String typeId, String instanceId, String instanceData, String ric) {
+ void putInstance(String typeId, String instanceId, Object instanceData, String ric) {
PolicyInfo i = ImmutablePolicyInfo.builder().json(instanceData).lastModified(getTimeStampUTC())
- .id(instanceId).ric(ric).service("service").type(typeId).build();
+ .id(instanceId).ric(ric).service("service").type(typeId).build();
instances.put(instanceId, i);
}
instances.remove(instanceId);
}
- String getInstance(String id) throws RestClientException {
+ Object getInstance(String id) throws RestClientException {
PolicyInfo i = instances.get(id);
if (i == null) {
throw new RestClientException("Type not found: " + id);