+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * AppcLcmActorServiceProvider
- * ================================================================================
- * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.policy.controlloop.params;
-
-import java.io.Serializable;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ControlLoopParams implements Serializable {
-
- private static final long serialVersionUID = 970755684770982776L;
-
- private String closedLoopControlName;
- private String controlLoopYaml;
- private String policyName;
- private String policyScope;
- private String policyVersion;
-
- /**
- * Construct an instance from an existing instance.
- *
- * @param params the existing instance
- */
- public ControlLoopParams(ControlLoopParams params) {
- this.closedLoopControlName = params.closedLoopControlName;
- this.controlLoopYaml = params.controlLoopYaml;
- this.policyName = params.policyName;
- this.policyScope = params.policyScope;
- this.policyVersion = params.policyVersion;
- }
-}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * controlloop
- * ================================================================================
- * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.policy.controlloop.params;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-
-public class ControlLoopParamsTest {
-
- @Test
- public void test() {
- ControlLoopParams params = new ControlLoopParams();
- assertNotNull(params);
-
- params.setClosedLoopControlName("name");
- params.setControlLoopYaml("yaml");
- params.setPolicyName("name");
- params.setPolicyScope("scope");
- params.setPolicyVersion("1");
-
- ControlLoopParams params2 = new ControlLoopParams(params);
-
- assertEquals("name", params2.getClosedLoopControlName());
- assertEquals("yaml", params2.getControlLoopYaml());
- assertEquals("name", params2.getPolicyName());
- assertEquals("scope", params2.getPolicyScope());
- assertEquals("1", params2.getPolicyVersion());
-
- }
-}
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
+import javax.persistence.Lob;
import javax.persistence.Table;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
+
import org.onap.policy.models.base.PfAuthorative;
import org.onap.policy.models.base.PfConcept;
import org.onap.policy.models.base.PfConceptKey;
private List<JpaToscaConstraint> constraints;
@ElementCollection
+ @Lob
private Map<String, JpaToscaProperty> properties;
/**
if (toscaDataType.getConstraints() != null) {
constraints = new ArrayList<>();
- for (ToscaConstraint toscaConstraint: toscaDataType.getConstraints()) {
+ for (ToscaConstraint toscaConstraint : toscaDataType.getConstraints()) {
constraints.add(JpaToscaConstraint.newInstance(toscaConstraint));
}
}
serviceTemplate.getPolicyTypes().getConceptMap().putAll(asConceptMap(jpaPolicyTypeList));
// Return all data types
- // TODO: In the next review, return just the data types used by the policy types on the policy type list
+ // TODO: In an upcoming review, return just the data types used by the policy types on the policy type list
List<JpaToscaDataType> jpaDataTypeList = dao.getFiltered(JpaToscaDataType.class, null, null);
if (!CollectionUtils.isEmpty(jpaDataTypeList)) {
serviceTemplate.setDataTypes(new JpaToscaDataTypes());
package org.onap.policy.models.tosca.utils;
+import java.util.function.Function;
+
import javax.ws.rs.core.Response;
import org.onap.policy.models.base.PfModelRuntimeException;
* @param serviceTemplate the service template containing policy types to be checked
*/
public static void assertExist(final JpaToscaServiceTemplate serviceTemplate,
- final ToscaChecker<JpaToscaServiceTemplate> checkerFunction) {
- String message = checkerFunction.check(serviceTemplate);
+ final Function<JpaToscaServiceTemplate, String> checkerFunction) {
+ String message = checkerFunction.apply(serviceTemplate);
if (message != null) {
LOGGER.warn(message);
throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, message);
* @param serviceTemplate the service template containing policy types to be checked
*/
public static boolean doExist(final JpaToscaServiceTemplate serviceTemplate,
- final ToscaChecker<JpaToscaServiceTemplate> checkerFunction) {
- return checkerFunction.check(serviceTemplate) == null;
+ final Function<JpaToscaServiceTemplate, String> checkerFunction) {
+ return checkerFunction.apply(serviceTemplate) == null;
}
/**
* Check if data types have been specified correctly.
*/
- public static ToscaChecker<JpaToscaServiceTemplate> checkDataTypesExist() {
+ public static Function<JpaToscaServiceTemplate, String> checkDataTypesExist() {
return serviceTemplate -> {
if (serviceTemplate.getDataTypes() == null) {
return "no data types specified on service template";
/**
* Check if policy types have been specified correctly.
*/
- public static ToscaChecker<JpaToscaServiceTemplate> checkPolicyTypesExist() {
+ public static Function<JpaToscaServiceTemplate, String> checkPolicyTypesExist() {
return serviceTemplate -> {
if (serviceTemplate.getPolicyTypes() == null) {
return "no policy types specified on service template";
/**
* Check if policies have been specified correctly.
*/
- public static ToscaChecker<JpaToscaServiceTemplate> checkPoliciesExist() {
+ public static Function<JpaToscaServiceTemplate, String> checkPoliciesExist() {
return serviceTemplate -> {
if (serviceTemplate.getTopologyTemplate() == null) {
return "topology template not specified on service template";
return null;
};
}
-
- @FunctionalInterface
- interface ToscaChecker<T> {
- String check(final T serviceTemplate);
- }
}
assertFalse(ToscaUtils.doDataTypesExist(jpaToscaServiceTemplate));
assertEquals("no data types specified on service template",
- ToscaUtils.checkDataTypesExist().check(jpaToscaServiceTemplate));
+ ToscaUtils.checkDataTypesExist().apply(jpaToscaServiceTemplate));
assertThatThrownBy(() -> {
ToscaUtils.assertDataTypesExist(jpaToscaServiceTemplate);
}).hasMessage("no data types specified on service template");
assertFalse(ToscaUtils.doDataTypesExist(jpaToscaServiceTemplate));
assertEquals("list of data types specified on service template is empty",
- ToscaUtils.checkDataTypesExist().check(jpaToscaServiceTemplate));
+ ToscaUtils.checkDataTypesExist().apply(jpaToscaServiceTemplate));
assertThatThrownBy(() -> {
ToscaUtils.assertDataTypesExist(jpaToscaServiceTemplate);
}).hasMessage("list of data types specified on service template is empty");
jpaToscaServiceTemplate.getDataTypes().getConceptMap().put(new PfConceptKey(), null);
assertTrue(ToscaUtils.doDataTypesExist(jpaToscaServiceTemplate));
- assertEquals(null, ToscaUtils.checkDataTypesExist().check(jpaToscaServiceTemplate));
+ assertEquals(null, ToscaUtils.checkDataTypesExist().apply(jpaToscaServiceTemplate));
assertThatCode(() -> {
ToscaUtils.assertDataTypesExist(jpaToscaServiceTemplate);
}).doesNotThrowAnyException();
assertFalse(ToscaUtils.doPolicyTypesExist(jpaToscaServiceTemplate));
assertEquals("no policy types specified on service template",
- ToscaUtils.checkPolicyTypesExist().check(jpaToscaServiceTemplate));
+ ToscaUtils.checkPolicyTypesExist().apply(jpaToscaServiceTemplate));
assertThatThrownBy(() -> {
ToscaUtils.assertPolicyTypesExist(jpaToscaServiceTemplate);
}).hasMessage("no policy types specified on service template");
assertFalse(ToscaUtils.doPolicyTypesExist(jpaToscaServiceTemplate));
assertEquals("list of policy types specified on service template is empty",
- ToscaUtils.checkPolicyTypesExist().check(jpaToscaServiceTemplate));
+ ToscaUtils.checkPolicyTypesExist().apply(jpaToscaServiceTemplate));
assertThatThrownBy(() -> {
ToscaUtils.assertPolicyTypesExist(jpaToscaServiceTemplate);
}).hasMessage("list of policy types specified on service template is empty");
jpaToscaServiceTemplate.getPolicyTypes().getConceptMap().put(new PfConceptKey(), null);
assertTrue(ToscaUtils.doPolicyTypesExist(jpaToscaServiceTemplate));
- assertEquals(null, ToscaUtils.checkPolicyTypesExist().check(jpaToscaServiceTemplate));
+ assertEquals(null, ToscaUtils.checkPolicyTypesExist().apply(jpaToscaServiceTemplate));
assertThatCode(() -> {
ToscaUtils.assertPolicyTypesExist(jpaToscaServiceTemplate);
}).doesNotThrowAnyException();
assertFalse(ToscaUtils.doPoliciesExist(jpaToscaServiceTemplate));
assertEquals("topology template not specified on service template",
- ToscaUtils.checkPoliciesExist().check(jpaToscaServiceTemplate));
+ ToscaUtils.checkPoliciesExist().apply(jpaToscaServiceTemplate));
assertThatThrownBy(() -> {
ToscaUtils.assertPoliciesExist(jpaToscaServiceTemplate);
}).hasMessage("topology template not specified on service template");
assertFalse(ToscaUtils.doPoliciesExist(jpaToscaServiceTemplate));
assertEquals("no policies specified on topology template of service template",
- ToscaUtils.checkPoliciesExist().check(jpaToscaServiceTemplate));
+ ToscaUtils.checkPoliciesExist().apply(jpaToscaServiceTemplate));
assertThatThrownBy(() -> {
ToscaUtils.assertPoliciesExist(jpaToscaServiceTemplate);
}).hasMessage("no policies specified on topology template of service template");
assertFalse(ToscaUtils.doPoliciesExist(jpaToscaServiceTemplate));
assertEquals("list of policies specified on topology template of service template is empty",
- ToscaUtils.checkPoliciesExist().check(jpaToscaServiceTemplate));
+ ToscaUtils.checkPoliciesExist().apply(jpaToscaServiceTemplate));
assertThatThrownBy(() -> {
ToscaUtils.assertPoliciesExist(jpaToscaServiceTemplate);
}).hasMessage("list of policies specified on topology template of service template is empty");
jpaToscaServiceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(new PfConceptKey(), null);
assertTrue(ToscaUtils.doPoliciesExist(jpaToscaServiceTemplate));
- assertEquals(null, ToscaUtils.checkPoliciesExist().check(jpaToscaServiceTemplate));
+ assertEquals(null, ToscaUtils.checkPoliciesExist().apply(jpaToscaServiceTemplate));
assertThatCode(() -> {
ToscaUtils.assertPoliciesExist(jpaToscaServiceTemplate);
}).doesNotThrowAnyException();
Code Review / policy / models.git / commitdiff