aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorKrysiak Adam <adam.krysiak@nokia.com>2019-03-01 15:32:19 +0100
committerKrysiak Adam <adam.krysiak@nokia.com>2019-03-07 13:08:41 +0100
commit5f14c7ada8aca6bdfecdb4ac3bd2d1387315250c (patch)
tree3ac6c5b9a7abbc8a7dd6643cd02a0dc71d6d52ec /src/main/java/org
parente577b6a44e1dda60fb68543bcdfc627f111b4a97 (diff)
created Api for closed loop managing
Change-Id: Ib6bd92d1ae3119a857c5a63df10e8f9bb130f75f Issue-ID: CLAMP-301 Signed-off-by: Krysiak Adam <adam.krysiak@nokia.com>
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/onap/clamp/clds/Application.java2
-rw-r--r--src/main/java/org/onap/clamp/clds/config/AAFConfiguration.java1
-rw-r--r--src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java2
-rw-r--r--src/main/java/org/onap/clamp/configuration/CamelGsonConfiguration.java63
-rw-r--r--src/main/java/org/onap/clamp/loop/Loop.java (renamed from src/main/java/org/onap/clamp/dao/model/Loop.java)56
-rw-r--r--src/main/java/org/onap/clamp/loop/LoopController.java70
-rw-r--r--src/main/java/org/onap/clamp/loop/LoopService.java91
-rw-r--r--src/main/java/org/onap/clamp/loop/LoopState.java (renamed from src/main/java/org/onap/clamp/dao/model/LoopState.java)2
-rw-r--r--src/main/java/org/onap/clamp/loop/LoopsRepository.java (renamed from src/main/java/org/onap/clamp/dao/LoopsRepository.java)7
-rw-r--r--src/main/java/org/onap/clamp/loop/log/LogType.java (renamed from src/main/java/org/onap/clamp/dao/model/LogType.java)2
-rw-r--r--src/main/java/org/onap/clamp/loop/log/LoopLog.java (renamed from src/main/java/org/onap/clamp/dao/model/LoopLog.java)3
-rw-r--r--src/main/java/org/onap/clamp/loop/log/LoopLogRepository.java (renamed from src/main/java/org/onap/clamp/dao/LoopLogRepository.java)3
-rw-r--r--src/main/java/org/onap/clamp/policy/Policy.java35
-rw-r--r--src/main/java/org/onap/clamp/policy/PolicyService.java36
-rw-r--r--src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java (renamed from src/main/java/org/onap/clamp/dao/model/MicroServicePolicy.java)21
-rw-r--r--src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyRepository.java (renamed from src/main/java/org/onap/clamp/dao/MicroServicePolicyRepository.java)5
-rw-r--r--src/main/java/org/onap/clamp/policy/microservice/MicroservicePolicyService.java79
-rw-r--r--src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java (renamed from src/main/java/org/onap/clamp/dao/model/OperationalPolicy.java)32
-rw-r--r--src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepository.java (renamed from src/main/java/org/onap/clamp/dao/OperationalPolicyRepository.java)7
-rw-r--r--src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java66
20 files changed, 530 insertions, 53 deletions
diff --git a/src/main/java/org/onap/clamp/clds/Application.java b/src/main/java/org/onap/clamp/clds/Application.java
index 920b0f28c..7e78504ff 100644
--- a/src/main/java/org/onap/clamp/clds/Application.java
+++ b/src/main/java/org/onap/clamp/clds/Application.java
@@ -108,7 +108,7 @@ public class Application extends SpringBootServletInitializer {
eelfLogger.info(ResourceFileUtil.getResourceAsString("boot-message.txt") + "(v"
+ ClampVersioning.getCldsVersionFromProps() + ")" + System.getProperty("line.separator"));
ServletRegistrationBean registration = new ServletRegistrationBean(new ClampServlet(),
- "/restservices/clds/v1/*");
+ "/restservices/clds/*");
registration.setName("CamelServlet");
return registration;
}
diff --git a/src/main/java/org/onap/clamp/clds/config/AAFConfiguration.java b/src/main/java/org/onap/clamp/clds/config/AAFConfiguration.java
index 8bc6f69dc..c91494df5 100644
--- a/src/main/java/org/onap/clamp/clds/config/AAFConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/AAFConfiguration.java
@@ -58,6 +58,7 @@ public class AAFConfiguration {
registration.addUrlPatterns("/restservices/clds/v1/tosca/*");
registration.addUrlPatterns("/restservices/clds/v1/dictionary/*");
registration.addUrlPatterns("/restservices/clds/v1/user/*");
+ registration.addUrlPatterns("/restservices/clds/v2/loop/*");
//registration.addUrlPatterns("*");
registration.setName("cadiFilter");
registration.setOrder(0);
diff --git a/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java b/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java
index 45c945c4f..f10565049 100644
--- a/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/CamelConfiguration.java
@@ -36,7 +36,7 @@ public class CamelConfiguration extends RouteBuilder {
// turn on swagger api-doc
.apiContextPath("api-doc").apiVendorExtension(true).apiProperty("api.title", "Clamp Rest API")
.apiProperty("api.version", ClampVersioning.getCldsVersionFromProps())
- .apiProperty("base.path", "/restservices/clds/v1/");
+ .apiProperty("base.path", "/restservices/clds/");
// .apiProperty("cors", "true");
}
}
diff --git a/src/main/java/org/onap/clamp/configuration/CamelGsonConfiguration.java b/src/main/java/org/onap/clamp/configuration/CamelGsonConfiguration.java
new file mode 100644
index 000000000..f71d2f091
--- /dev/null
+++ b/src/main/java/org/onap/clamp/configuration/CamelGsonConfiguration.java
@@ -0,0 +1,63 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.configuration;
+
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+import com.google.gson.annotations.Expose;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import org.apache.camel.component.gson.GsonDataFormat;
+import org.apache.camel.spi.DataFormatCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class CamelGsonConfiguration {
+
+ @Bean
+ public List<DataFormatCustomizer<GsonDataFormat>> provideGsonCustomizers() {
+ DataFormatCustomizer<GsonDataFormat> dataFormatCustomizer = dataformat ->
+ dataformat.setExclusionStrategies(
+ Collections.singletonList(new ExcludeFieldsWithoutExposedAnnotation())
+ );
+ return Collections.singletonList(dataFormatCustomizer);
+ }
+
+ private static class ExcludeFieldsWithoutExposedAnnotation implements ExclusionStrategy {
+
+ @Override
+ public boolean shouldSkipField(FieldAttributes f) {
+ return Optional.ofNullable(f.getAnnotation(Expose.class))
+ .map(expose -> !expose.serialize())
+ .orElse(true);
+ }
+
+ @Override
+ public boolean shouldSkipClass(Class<?> clazz) {
+ return false;
+ }
+ }
+}
diff --git a/src/main/java/org/onap/clamp/dao/model/Loop.java b/src/main/java/org/onap/clamp/loop/Loop.java
index 78175cc52..910c5aad3 100644
--- a/src/main/java/org/onap/clamp/dao/model/Loop.java
+++ b/src/main/java/org/onap/clamp/loop/Loop.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.dao.model;
+package org.onap.clamp.loop;
import com.google.gson.JsonObject;
import com.google.gson.annotations.Expose;
@@ -46,6 +46,9 @@ import javax.persistence.Table;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
+import org.onap.clamp.loop.log.LoopLog;
+import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.clamp.policy.operational.OperationalPolicy;
import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
@Entity
@@ -75,7 +78,6 @@ public class Loop implements Serializable {
@Column(name = "dcae_blueprint_id")
private String dcaeBlueprintId;
- @Expose
@Column(name = "svg_representation")
private String svgRepresentation;
@@ -84,7 +86,6 @@ public class Loop implements Serializable {
@Column(columnDefinition = "json", name = "global_properties_json")
private JsonObject globalPropertiesJson;
- @Expose
@Column(nullable = false, name = "blueprint_yaml")
private String blueprint;
@@ -106,11 +107,22 @@ public class Loop implements Serializable {
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "loop")
private Set<LoopLog> loopLogs = new HashSet<>();
+ public Loop() {
+ }
+
+ public Loop(String name, String blueprint, String svgRepresentation) {
+ this.name = name;
+ this.svgRepresentation = svgRepresentation;
+ this.blueprint = blueprint;
+ this.lastComputedState = LoopState.DESIGN;
+ this.globalPropertiesJson = new JsonObject();
+ }
+
public String getName() {
return name;
}
- public void setName(String name) {
+ void setName(String name) {
this.name = name;
}
@@ -118,7 +130,7 @@ public class Loop implements Serializable {
return dcaeDeploymentId;
}
- public void setDcaeDeploymentId(String dcaeDeploymentId) {
+ void setDcaeDeploymentId(String dcaeDeploymentId) {
this.dcaeDeploymentId = dcaeDeploymentId;
}
@@ -126,7 +138,7 @@ public class Loop implements Serializable {
return dcaeDeploymentStatusUrl;
}
- public void setDcaeDeploymentStatusUrl(String dcaeDeploymentStatusUrl) {
+ void setDcaeDeploymentStatusUrl(String dcaeDeploymentStatusUrl) {
this.dcaeDeploymentStatusUrl = dcaeDeploymentStatusUrl;
}
@@ -134,7 +146,7 @@ public class Loop implements Serializable {
return svgRepresentation;
}
- public void setSvgRepresentation(String svgRepresentation) {
+ void setSvgRepresentation(String svgRepresentation) {
this.svgRepresentation = svgRepresentation;
}
@@ -142,61 +154,61 @@ public class Loop implements Serializable {
return blueprint;
}
- public void setBlueprint(String blueprint) {
+ void setBlueprint(String blueprint) {
this.blueprint = blueprint;
}
- public LoopState getLastComputedState() {
+ LoopState getLastComputedState() {
return lastComputedState;
}
- public void setLastComputedState(LoopState lastComputedState) {
+ void setLastComputedState(LoopState lastComputedState) {
this.lastComputedState = lastComputedState;
}
- public Set<OperationalPolicy> getOperationalPolicies() {
+ Set<OperationalPolicy> getOperationalPolicies() {
return operationalPolicies;
}
- public void setOperationalPolicies(Set<OperationalPolicy> operationalPolicies) {
+ void setOperationalPolicies(Set<OperationalPolicy> operationalPolicies) {
this.operationalPolicies = operationalPolicies;
}
- public Set<MicroServicePolicy> getMicroServicePolicies() {
+ Set<MicroServicePolicy> getMicroServicePolicies() {
return microServicePolicies;
}
- public void setMicroServicePolicies(Set<MicroServicePolicy> microServicePolicies) {
+ void setMicroServicePolicies(Set<MicroServicePolicy> microServicePolicies) {
this.microServicePolicies = microServicePolicies;
}
- public JsonObject getGlobalPropertiesJson() {
+ JsonObject getGlobalPropertiesJson() {
return globalPropertiesJson;
}
- public void setGlobalPropertiesJson(JsonObject globalPropertiesJson) {
+ void setGlobalPropertiesJson(JsonObject globalPropertiesJson) {
this.globalPropertiesJson = globalPropertiesJson;
}
- public Set<LoopLog> getLoopLogs() {
+ Set<LoopLog> getLoopLogs() {
return loopLogs;
}
- public void setLoopLogs(Set<LoopLog> loopLogs) {
+ void setLoopLogs(Set<LoopLog> loopLogs) {
this.loopLogs = loopLogs;
}
- public void addOperationalPolicy(OperationalPolicy opPolicy) {
- opPolicy.setLoop(this);
+ void addOperationalPolicy(OperationalPolicy opPolicy) {
operationalPolicies.add(opPolicy);
+ opPolicy.setLoop(this);
}
- public void addMicroServicePolicy(MicroServicePolicy microServicePolicy) {
+ void addMicroServicePolicy(MicroServicePolicy microServicePolicy) {
microServicePolicies.add(microServicePolicy);
microServicePolicy.getUsedByLoops().add(this);
}
- public void addLog(LoopLog log) {
+ void addLog(LoopLog log) {
loopLogs.add(log);
log.setLoop(this);
}
diff --git a/src/main/java/org/onap/clamp/loop/LoopController.java b/src/main/java/org/onap/clamp/loop/LoopController.java
new file mode 100644
index 000000000..eeb6105b1
--- /dev/null
+++ b/src/main/java/org/onap/clamp/loop/LoopController.java
@@ -0,0 +1,70 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop;
+
+import com.google.gson.JsonArray;
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.List;
+import org.onap.clamp.clds.util.JsonUtils;
+import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+
+
+@Controller
+public class LoopController {
+
+ private final LoopService loopService;
+ private static final Type OPERATIONAL_POLICY_TYPE = new TypeToken<List<OperationalPolicy>>() {
+ }.getType();
+ private static final Type MICROSERVICE_POLICY_TYPE = new TypeToken<List<MicroServicePolicy>>() {
+ }.getType();
+
+ @Autowired
+ public LoopController(LoopService loopService) {
+ this.loopService = loopService;
+ }
+
+ public List<String> getLoopNames() {
+ return loopService.getClosedLoopNames();
+ }
+
+ public Loop getLoop(String loopName) {
+ return loopService.getLoop(loopName);
+ }
+
+ public Loop updateOperationalPolicies(String loopName, JsonArray operationalPoliciesJson) {
+ List<OperationalPolicy> operationalPolicies = JsonUtils.GSON
+ .fromJson(operationalPoliciesJson, OPERATIONAL_POLICY_TYPE);
+ return loopService.updateOperationalPolicies(loopName, operationalPolicies);
+ }
+
+ public Loop updateMicroservicePolicies(String loopName, JsonArray microServicePoliciesJson) {
+ List<MicroServicePolicy> microservicePolicies = JsonUtils.GSON
+ .fromJson(microServicePoliciesJson, MICROSERVICE_POLICY_TYPE);
+ return loopService.updateMicroservicePolicies(loopName, microservicePolicies);
+ }
+}
diff --git a/src/main/java/org/onap/clamp/loop/LoopService.java b/src/main/java/org/onap/clamp/loop/LoopService.java
new file mode 100644
index 000000000..7b79c112e
--- /dev/null
+++ b/src/main/java/org/onap/clamp/loop/LoopService.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.loop;
+
+import java.util.List;
+import java.util.Set;
+import javax.persistence.EntityNotFoundException;
+import org.onap.clamp.policy.microservice.MicroservicePolicyService;
+import org.onap.clamp.policy.operational.OperationalPolicyService;
+import org.onap.clamp.policy.microservice.MicroServicePolicy;
+import org.onap.clamp.policy.operational.OperationalPolicy;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LoopService {
+
+ private final LoopsRepository loopsRepository;
+ private final MicroservicePolicyService microservicePolicyService;
+ private final OperationalPolicyService operationalPolicyService;
+
+ public LoopService(LoopsRepository loopsRepository,
+ MicroservicePolicyService microservicePolicyService,
+ OperationalPolicyService operationalPolicyService) {
+ this.loopsRepository = loopsRepository;
+ this.microservicePolicyService = microservicePolicyService;
+ this.operationalPolicyService = operationalPolicyService;
+ }
+
+ Loop addNewLoop(Loop loop) {
+ return loopsRepository.save(loop);
+ }
+
+ List<String> getClosedLoopNames() {
+ return loopsRepository.getAllLoopNames();
+ }
+
+ Loop getLoop(String loopName){
+ return loopsRepository
+ .findById(loopName)
+ .orElse(null);
+ }
+
+ String getClosedLoopModelSVG(String loopName) {
+ Loop closedLoopByName = findClosedLoopByName(loopName);
+ return closedLoopByName.getSvgRepresentation();
+ }
+
+ Loop updateOperationalPolicies(String loopName, List<OperationalPolicy> newOperationalPolicies) {
+ Loop loop = findClosedLoopByName(loopName);
+ Set<OperationalPolicy> newPolicies = operationalPolicyService
+ .updatePolicies(loop, newOperationalPolicies);
+
+ loop.setOperationalPolicies(newPolicies);
+ return loopsRepository.save(loop);
+ }
+
+ Loop updateMicroservicePolicies(String loopName, List<MicroServicePolicy> newMicroservicePolicies) {
+ Loop loop = findClosedLoopByName(loopName);
+ Set<MicroServicePolicy> newPolicies = microservicePolicyService
+ .updatePolicies(loop, newMicroservicePolicies);
+
+ loop.setMicroServicePolicies(newPolicies);
+ return loopsRepository.save(loop);
+ }
+
+ private Loop findClosedLoopByName(String loopName) {
+ return loopsRepository.findById(loopName)
+ .orElseThrow(() -> new EntityNotFoundException("Couldn't find closed loop named: " + loopName));
+ }
+}
diff --git a/src/main/java/org/onap/clamp/dao/model/LoopState.java b/src/main/java/org/onap/clamp/loop/LoopState.java
index 1cde0aa9e..4707730ce 100644
--- a/src/main/java/org/onap/clamp/dao/model/LoopState.java
+++ b/src/main/java/org/onap/clamp/loop/LoopState.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.dao.model;
+package org.onap.clamp.loop;
public enum LoopState {
DESIGN, SUBMITTED, DEPLOYED, RUNNING, STOPPED, IN_ERROR, WAITING;
diff --git a/src/main/java/org/onap/clamp/dao/LoopsRepository.java b/src/main/java/org/onap/clamp/loop/LoopsRepository.java
index 51019baac..37c47622f 100644
--- a/src/main/java/org/onap/clamp/dao/LoopsRepository.java
+++ b/src/main/java/org/onap/clamp/loop/LoopsRepository.java
@@ -21,13 +21,16 @@
*
*/
-package org.onap.clamp.dao;
+package org.onap.clamp.loop;
-import org.onap.clamp.dao.model.Loop;
+import java.util.List;
+import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface LoopsRepository extends CrudRepository<Loop, String> {
+ @Query("SELECT loop.name FROM Loop as loop")
+ List<String> getAllLoopNames();
}
diff --git a/src/main/java/org/onap/clamp/dao/model/LogType.java b/src/main/java/org/onap/clamp/loop/log/LogType.java
index 1a8ed36cd..13d9dccf8 100644
--- a/src/main/java/org/onap/clamp/dao/model/LogType.java
+++ b/src/main/java/org/onap/clamp/loop/log/LogType.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.dao.model;
+package org.onap.clamp.loop.log;
public enum LogType {
INFO, WARNING, ERROR;
diff --git a/src/main/java/org/onap/clamp/dao/model/LoopLog.java b/src/main/java/org/onap/clamp/loop/log/LoopLog.java
index ba88bbee4..7b7fe1b1c 100644
--- a/src/main/java/org/onap/clamp/dao/model/LoopLog.java
+++ b/src/main/java/org/onap/clamp/loop/log/LoopLog.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.dao.model;
+package org.onap.clamp.loop.log;
import com.google.gson.annotations.Expose;
@@ -40,6 +40,7 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.onap.clamp.loop.Loop;
/**
*
diff --git a/src/main/java/org/onap/clamp/dao/LoopLogRepository.java b/src/main/java/org/onap/clamp/loop/log/LoopLogRepository.java
index 199a25e87..103341fa5 100644
--- a/src/main/java/org/onap/clamp/dao/LoopLogRepository.java
+++ b/src/main/java/org/onap/clamp/loop/log/LoopLogRepository.java
@@ -21,9 +21,8 @@
*
*/
-package org.onap.clamp.dao;
+package org.onap.clamp.loop.log;
-import org.onap.clamp.dao.model.LoopLog;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/org/onap/clamp/policy/Policy.java b/src/main/java/org/onap/clamp/policy/Policy.java
new file mode 100644
index 000000000..13ba1a9f1
--- /dev/null
+++ b/src/main/java/org/onap/clamp/policy/Policy.java
@@ -0,0 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+
+package org.onap.clamp.policy;
+
+import com.google.gson.JsonObject;
+
+public interface Policy {
+
+ String getName();
+
+ JsonObject getJsonRepresentation();
+
+}
diff --git a/src/main/java/org/onap/clamp/policy/PolicyService.java b/src/main/java/org/onap/clamp/policy/PolicyService.java
new file mode 100644
index 000000000..05785c045
--- /dev/null
+++ b/src/main/java/org/onap/clamp/policy/PolicyService.java
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.policy;
+
+import java.util.List;
+import java.util.Set;
+import org.onap.clamp.loop.Loop;
+
+public interface PolicyService<T extends Policy> {
+
+ Set<T> updatePolicies(Loop loop,
+ List<T> newMicroservicePolicies);
+
+ boolean isExisting(String policyName);
+}
diff --git a/src/main/java/org/onap/clamp/dao/model/MicroServicePolicy.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
index 8ea6d2650..e5b333dbb 100644
--- a/src/main/java/org/onap/clamp/dao/model/MicroServicePolicy.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
@@ -21,7 +21,7 @@
*
*/
-package org.onap.clamp.dao.model;
+package org.onap.clamp.policy.microservice;
import com.google.gson.JsonObject;
import com.google.gson.annotations.Expose;
@@ -39,12 +39,14 @@ import javax.persistence.Table;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
+import org.onap.clamp.loop.Loop;
+import org.onap.clamp.policy.Policy;
import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
@Entity
@Table(name = "micro_service_policies")
@TypeDefs({ @TypeDef(name = "json", typeClass = StringJsonUserType.class) })
-public class MicroServicePolicy implements Serializable {
+public class MicroServicePolicy implements Serializable, Policy {
/**
*
*/
@@ -76,12 +78,21 @@ public class MicroServicePolicy implements Serializable {
@ManyToMany(mappedBy = "microServicePolicies")
private Set<Loop> usedByLoops = new HashSet<>();
- public String getName() {
- return name;
+ public MicroServicePolicy() {
+ //serialization
}
- public void setName(String name) {
+ public MicroServicePolicy(String name, String policyTosca, Boolean shared, JsonObject jsonRepresentation,
+ Set<Loop> usedByLoops) {
this.name = name;
+ this.policyTosca = policyTosca;
+ this.shared = shared;
+ this.jsonRepresentation = jsonRepresentation;
+ this.usedByLoops = usedByLoops;
+ }
+
+ public String getName() {
+ return name;
}
public JsonObject getProperties() {
diff --git a/src/main/java/org/onap/clamp/dao/MicroServicePolicyRepository.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyRepository.java
index 1bdaf3e5e..f658aacc3 100644
--- a/src/main/java/org/onap/clamp/dao/MicroServicePolicyRepository.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicyRepository.java
@@ -21,13 +21,12 @@
*
*/
-package org.onap.clamp.dao;
+package org.onap.clamp.policy.microservice;
-import org.onap.clamp.dao.model.MicroServicePolicy;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
-public interface MicroServicePolicyRepository extends CrudRepository<MicroServicePolicy, String> {
+interface MicroServicePolicyRepository extends CrudRepository<MicroServicePolicy, String> {
}
diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroservicePolicyService.java b/src/main/java/org/onap/clamp/policy/microservice/MicroservicePolicyService.java
new file mode 100644
index 000000000..91794b754
--- /dev/null
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroservicePolicyService.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.policy.microservice;
+
+import com.google.common.collect.Sets;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.onap.clamp.policy.PolicyService;
+import org.onap.clamp.loop.Loop;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class MicroservicePolicyService implements PolicyService<MicroServicePolicy> {
+
+ private final MicroServicePolicyRepository repository;
+
+ @Autowired
+ public MicroservicePolicyService(MicroServicePolicyRepository repository) {
+ this.repository = repository;
+ }
+
+ @Override
+ @Transactional
+ public Set<MicroServicePolicy> updatePolicies(Loop loop,
+ List<MicroServicePolicy> newMicroservicePolicies) {
+ return newMicroservicePolicies
+ .stream()
+ .map(policy ->
+ getAndUpdateMicroServicePolicy(loop, policy))
+ .collect(Collectors.toSet());
+ }
+
+ @Override
+ public boolean isExisting(String policyName) {
+ return repository.existsById(policyName);
+ }
+
+ private MicroServicePolicy getAndUpdateMicroServicePolicy(Loop loop, MicroServicePolicy policy) {
+ return repository
+ .findById(policy.getName())
+ .map(p -> updateMicroservicePolicyProperties(p, policy, loop))
+ .orElse(new MicroServicePolicy(policy.getName(), policy.getPolicyTosca(),
+ policy.getShared(), policy.getJsonRepresentation(),
+ Sets.newHashSet(loop)));
+ }
+
+ private MicroServicePolicy updateMicroservicePolicyProperties(MicroServicePolicy oldPolicy,
+ MicroServicePolicy newPolicy, Loop loop) {
+ oldPolicy.setJsonRepresentation(newPolicy.getJsonRepresentation());
+ if (oldPolicy.getUsedByLoops().contains(loop)) {
+ oldPolicy.getUsedByLoops().add(loop);
+ }
+ return oldPolicy;
+ }
+}
diff --git a/src/main/java/org/onap/clamp/dao/model/OperationalPolicy.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
index ba2c442c7..033b53972 100644
--- a/src/main/java/org/onap/clamp/dao/model/OperationalPolicy.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicy.java
@@ -21,37 +21,38 @@
*
*/
-package org.onap.clamp.dao.model;
+package org.onap.clamp.policy.operational;
import com.google.gson.JsonObject;
import com.google.gson.annotations.Expose;
-
import java.io.Serializable;
import javax.persistence.Column;
+import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.hibernate.annotations.TypeDefs;
+import org.onap.clamp.loop.Loop;
+import org.onap.clamp.policy.Policy;
import org.onap.clamp.dao.model.jsontype.StringJsonUserType;
@Entity
@Table(name = "operational_policies")
@TypeDefs({ @TypeDef(name = "json", typeClass = StringJsonUserType.class) })
-public class OperationalPolicy implements Serializable {
+public class OperationalPolicy implements Serializable, Policy {
/**
*
*/
private static final long serialVersionUID = 6117076450841538255L;
- @Expose
@Id
+ @Expose
@Column(nullable = false, name = "name", unique = true)
private String name;
@@ -64,20 +65,31 @@ public class OperationalPolicy implements Serializable {
@JoinColumn(name = "loop_id", nullable = false)
private Loop loop;
- public Loop getLoop() {
- return loop;
+ public OperationalPolicy() {
+ //Serialization
}
- public void setLoop(Loop loop) {
+ public OperationalPolicy(String name, Loop loop, JsonObject configurationsJson) {
+ this.name = name;
this.loop = loop;
+ this.configurationsJson = configurationsJson;
}
public String getName() {
return name;
}
- public void setName(String name) {
- this.name = name;
+ public void setLoop(Loop loopName) {
+ this.loop = loopName;
+ }
+
+ public Loop getLoop(){
+ return loop;
+ }
+
+ @Override
+ public JsonObject getJsonRepresentation() {
+ return configurationsJson;
}
public JsonObject getConfigurationsJson() {
diff --git a/src/main/java/org/onap/clamp/dao/OperationalPolicyRepository.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepository.java
index cf03a812e..97b183f72 100644
--- a/src/main/java/org/onap/clamp/dao/OperationalPolicyRepository.java
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyRepository.java
@@ -21,13 +21,12 @@
*
*/
-package org.onap.clamp.dao;
+package org.onap.clamp.policy.operational;
-import org.onap.clamp.dao.model.OperationalPolicy;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
-public interface OperationalPolicyRepository extends CrudRepository<OperationalPolicy, String> {
-
+interface OperationalPolicyRepository extends CrudRepository<OperationalPolicy, String> {
+ void deleteByName(String policyName);
}
diff --git a/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
new file mode 100644
index 000000000..b24a2db11
--- /dev/null
+++ b/src/main/java/org/onap/clamp/policy/operational/OperationalPolicyService.java
@@ -0,0 +1,66 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 Nokia Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.policy.operational;
+
+import com.google.gson.JsonObject;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.onap.clamp.policy.PolicyService;
+import org.onap.clamp.loop.Loop;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OperationalPolicyService implements PolicyService<OperationalPolicy> {
+
+ private final OperationalPolicyRepository repository;
+
+ @Autowired
+ public OperationalPolicyService(OperationalPolicyRepository repository) {
+ this.repository = repository;
+ }
+
+ @Override
+ public Set<OperationalPolicy> updatePolicies(Loop loop, List<OperationalPolicy> operationalPolicies) {
+ return operationalPolicies
+ .stream()
+ .map(policy ->
+ repository
+ .findById(policy.getName())
+ .map(p -> setConfigurationJson(p, policy.getConfigurationsJson()))
+ .orElse(new OperationalPolicy(policy.getName(), loop, policy.getConfigurationsJson())))
+ .collect(Collectors.toSet());
+ }
+
+ @Override
+ public boolean isExisting(String policyName) {
+ return repository.existsById(policyName);
+ }
+
+ private OperationalPolicy setConfigurationJson(OperationalPolicy policy, JsonObject configurationsJson) {
+ policy.setConfigurationsJson(configurationsJson);
+ return policy;
+ }
+}