/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2022 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021,2023 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2023-2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.drools.server.restful;
-import com.worldturner.medeia.api.ValidationFailedException;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
return Response.status(Response.Status.NOT_ACCEPTABLE).build();
}
- try {
- LifecycleFeature.getFsm().getDomainMaker().conformance(toscaPolicy);
- } catch (ValidationFailedException v) {
- logger.trace("policy {} validation errors: {}", toscaPolicy, v.getMessage(), v);
- return Response.status(Response.Status.NOT_ACCEPTABLE).entity(v.getFailures()).build();
+ var isOk = LifecycleFeature.getFsm().getDomainMaker().conformance(toscaPolicy);
+ if (isOk) {
+ return Response.status(Response.Status.OK).entity(Collections.emptyList()).build();
+ } else {
+ return Response.status(Response.Status.NOT_ACCEPTABLE).entity(Collections.emptyList()).build();
}
- return Response.status(Response.Status.OK).entity(Collections.emptyList()).build();
}
private Response deployUndeployOperation(String policy, boolean deploy) {
private static final String EXAMPLE_NATIVE_ARTIFACT_POLICY_JSON =
"src/test/resources/tosca-policy-native-artifact-example.json";
- private static final String EXAMPLE_OTHER_UNVAL_POLICY_NAME = "other-unvalidated";
- private static final String EXAMPLE_OTHER_UNVAL_POLICY_JSON =
- "src/test/resources/tosca-policy-other-unvalidated.json";
-
private static final String EXAMPLE_OTHER_VAL_POLICY_NAME = "other-validated";
private static final String EXAMPLE_OTHER_VAL_POLICY_JSON =
"src/test/resources/tosca-policy-other-validated.json";
}
testNotNativePolicy(opPolicy);
- /* add tosca policy "other-unvalidated" of policy type "type1.type2" with no attached type schema */
-
- testNotNativePolicy(getPolicyFromFile(EXAMPLE_OTHER_UNVAL_POLICY_JSON, EXAMPLE_OTHER_UNVAL_POLICY_NAME));
-
/* add tosca policy "other-validated" of policy type "typeA" with an attached type schema */
testNotNativePolicy(getPolicyFromFile(EXAMPLE_OTHER_VAL_POLICY_JSON, EXAMPLE_OTHER_VAL_POLICY_NAME));
ToscaPolicy toscaPolicyValError =
getPolicyFromFile(EXAMPLE_OTHER_VAL_ERROR_POLICY_JSON, EXAMPLE_OTHER_VAL_ERROR_POLICY_NAME);
- assertThat(
- listPost(toString(toscaPolicyValError),
- Status.NOT_ACCEPTABLE.getStatusCode())).isNotEmpty();
+ assertThat(listPost(toString(toscaPolicyValError), Status.NOT_ACCEPTABLE.getStatusCode())).isEmpty();
booleanPost("policies", toString(toscaPolicyValError),
Status.NOT_ACCEPTABLE.getStatusCode(), Boolean.FALSE);
/* delete native artifact policy */
- booleanDelete("policies/example.artifact/1.0.0", Status.OK.getStatusCode(), Boolean.TRUE);
+ booleanDelete("policies/example.artifact/1.0.0", Status.OK.getStatusCode());
assertTrue(PolicyControllerConstants.getFactory().get("lifecycle").isAlive());
assertFalse(PolicyControllerConstants.getFactory().get("lifecycle").getDrools().isBrained());
/* delete native controller policy */
- booleanDelete("policies/example.controller/1.0.0", Status.OK.getStatusCode(), Boolean.TRUE);
+ booleanDelete("policies/example.controller/1.0.0", Status.OK.getStatusCode());
resourceLists("policyTypes", 2);
get("policyTypes/onap.policies.native.drools.Artifact/1.0.0", Status.OK.getStatusCode());
assertThatIllegalArgumentException().isThrownBy(() -> PolicyControllerConstants.getFactory().get("lifecycle"));
opPolicy.getMetadata().remove("policy-id");
- assertThat(
- listPost(toString(opPolicy),
- Status.NOT_ACCEPTABLE.getStatusCode())).isNotEmpty();
+ assertThat(listPost(toString(opPolicy), Status.NOT_ACCEPTABLE.getStatusCode())).isEmpty();
metrics();
}
get("policies/example.artifact/1.0.0", Status.OK.getStatusCode());
booleanDelete("policies/" + toscaPolicy.getName() + "/" + toscaPolicy.getVersion(),
- Status.OK.getStatusCode(), Boolean.TRUE);
+ Status.OK.getStatusCode());
assertEquals(0,
PolicyControllerConstants
.getFactory().get("lifecycle").getDrools().facts("junits", ToscaPolicy.class).size());
booleanResponse(response, statusCode, bool);
}
- private void booleanDelete(String contextPath, int statusCode, Boolean bool) {
+ private void booleanDelete(String contextPath, int statusCode) {
Response response = client.delete(contextPath, Collections.emptyMap());
- booleanResponse(response, statusCode, bool);
+ booleanResponse(response, statusCode, Boolean.TRUE);
}
private void resourceLists(String resource, int size) {
}
private LifecycleFsm newFsmInstance() throws NoSuchFieldException, IllegalAccessException {
- LifecycleFsm fsm = new LifecycleFsm();
- ControllerSupport.setStaticField(LifecycleFeature.class, "fsm", fsm);
- return fsm;
+ LifecycleFsm lifecycleFsm = new LifecycleFsm();
+ ControllerSupport.setStaticField(LifecycleFeature.class, "fsm", lifecycleFsm);
+ return lifecycleFsm;
}
protected ToscaPolicy getPolicyFromFile(String filePath, String policyName) throws CoderException, IOException {
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import com.worldturner.medeia.api.ValidationFailedException;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
// Native Drools Policy
private static final String EXAMPLE_NATIVE_DROOLS_POLICY_NAME = "example";
private static final String EXAMPLE_NATIVE_DROOLS_POLICY_JSON =
- "src/test/resources/tosca-policy-native-artifact-example.json";
+ "src/test/resources/tosca-policy-native-artifact-example.json";
// Controller Drools Policy
private static final String EXAMPLE_CONTROLLER_DROOLS_POLICY_NAME = "example";
private static final String EXAMPLE_CONTROLLER_DROOLS_POLICY_JSON =
- "src/test/resources/tosca-policy-native-controller-example.json";
+ "src/test/resources/tosca-policy-native-controller-example.json";
private DomainMaker domainMaker;
private StandardCoder nonValCoder;
@Test
void testToscaNativeDroolsPolicy() throws CoderException, IOException {
- String rawNativeDroolsPolicy =
- getPolicyFromFileString();
+ String rawNativeDroolsPolicy = getPolicyFromFileString();
ToscaPolicy toscaPolicy =
getExamplesPolicy(EXAMPLE_NATIVE_DROOLS_POLICY_JSON, EXAMPLE_NATIVE_DROOLS_POLICY_NAME);
String policyId = "" + toscaPolicy.getMetadata().remove("policy-id");
assertThatThrownBy(() -> domainMaker.convertTo(toscaPolicy, NativeArtifactPolicy.class))
- .isInstanceOf(CoderException.class).hasCauseInstanceOf(ValidationFailedException.class);
+ .isInstanceOf(CoderException.class);
toscaPolicy.getMetadata().put("policy-id", policyId);
domainDroolsPolicy.setName("");
assertFalse(domainMaker.isDomainConformant(policyTypeId, domainDroolsPolicy));
- assertThatThrownBy(() -> domainMaker.conformance(policyTypeId, domainDroolsPolicy))
- .isInstanceOf(ValidationFailedException.class)
- .hasMessageContaining("Pattern ^(.+)$ is not contained in text");
+ assertFalse(domainMaker.conformance(policyTypeId, domainDroolsPolicy));
// @formatter:off
NativeArtifactPolicy domainDroolsPolicy2 =
.typeVersion("1.0.0").build();
// @formatter:on
- assertTrue(domainMaker
- .isDomainConformant(
- new ToscaConceptIdentifier(domainDroolsPolicy2.getType(), domainDroolsPolicy2.getTypeVersion()),
- domainDroolsPolicy2));
+ var toscaId = new ToscaConceptIdentifier(domainDroolsPolicy2.getType(), domainDroolsPolicy2.getTypeVersion());
+ assertTrue(domainMaker.isDomainConformant(toscaId, domainDroolsPolicy2));
}
@Test
void testToscaControllerPolicy() throws CoderException {
ToscaPolicy toscaPolicy =
- getExamplesPolicy(EXAMPLE_CONTROLLER_DROOLS_POLICY_JSON, EXAMPLE_CONTROLLER_DROOLS_POLICY_NAME);
+ getExamplesPolicy(EXAMPLE_CONTROLLER_DROOLS_POLICY_JSON, EXAMPLE_CONTROLLER_DROOLS_POLICY_NAME);
assertTrue(domainMaker.isConformant(toscaPolicy));
ControllerPolicy controllerPolicy = domainMaker.convertTo(toscaPolicy, ControllerPolicy.class);
assertEquals("org.onap.policy.controlloop.CanonicalOnset",
controllerPolicy.getProperties().getSourceTopics().get(0).getEvents().get(0).getEventClass());
assertEquals("[?($.closedLoopEventStatus == 'ONSET')]",
- controllerPolicy.getProperties().getSourceTopics().get(0).getEvents().get(0).getEventFilter());
+ controllerPolicy.getProperties().getSourceTopics().get(0).getEvents().get(0).getEventFilter());
assertEquals("org.onap.policy.controlloop.util.Serialization",
- controllerPolicy.getProperties().getSourceTopics().get(0).getEvents().get(0)
- .getCustomSerialization().getCustomSerializerClass());
+ controllerPolicy.getProperties().getSourceTopics().get(0).getEvents().get(0)
+ .getCustomSerialization().getCustomSerializerClass());
assertEquals("gson",
- controllerPolicy.getProperties().getSourceTopics().get(0).getEvents().get(0)
- .getCustomSerialization().getJsonParser());
+ controllerPolicy.getProperties().getSourceTopics().get(0).getEvents().get(0)
+ .getCustomSerialization().getJsonParser());
assertEquals("appc-cl", controllerPolicy.getProperties().getSinkTopics().get(0).getTopicName());
assertEquals("org.onap.policy.appc.Response",
- controllerPolicy.getProperties().getSinkTopics().get(0).getEvents().get(0).getEventClass());
+ controllerPolicy.getProperties().getSinkTopics().get(0).getEvents().get(0).getEventClass());
assertEquals("[?($.CommonHeader && $.Status)]",
- controllerPolicy.getProperties().getSinkTopics().get(0).getEvents().get(0).getEventFilter());
+ controllerPolicy.getProperties().getSinkTopics().get(0).getEvents().get(0).getEventFilter());
assertEquals("org.onap.policy.appc.util.Serialization",
- controllerPolicy.getProperties().getSinkTopics().get(0).getEvents().get(0)
- .getCustomSerialization().getCustomSerializerClass());
+ controllerPolicy.getProperties().getSinkTopics().get(0).getEvents().get(0)
+ .getCustomSerialization().getCustomSerializerClass());
assertEquals("gsonPretty",
- controllerPolicy.getProperties().getSinkTopics().get(0).getEvents().get(0)
- .getCustomSerialization().getJsonParser());
+ controllerPolicy.getProperties().getSinkTopics().get(0).getEvents().get(0)
+ .getCustomSerialization().getJsonParser());
assertEquals("value1", controllerPolicy.getProperties().getCustomConfig().get("field1"));
}
ONAP Policy Engine - Drools PDP
================================================================================
Copyright (C) 2017, 2019-2021 AT&T Intellectual Property. All rights reserved.
- Modifications Copyright (C) 2023 Nordix Foundation.
+ Modifications Copyright (C) 2023-2024 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.worldturner.medeia</groupId>
- <artifactId>medeia-validator-core</artifactId>
+ <groupId>com.networknt</groupId>
+ <artifactId>json-schema-validator</artifactId>
</dependency>
</dependencies>
</project>
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 2024 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.policy.drools.policies;
-import com.worldturner.medeia.api.ValidationFailedException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import lombok.NoArgsConstructor;
try {
validators.get(policy.getTypeIdentifier()).conformance(rawPolicy);
} catch (CoderException e) {
- logger.info("policy {}:{}:{} is not conformant",
- policy.getTypeIdentifier(), policy.getName(), policy.getVersion(), e);
- if (e.getCause() instanceof ValidationFailedException) {
- throw (ValidationFailedException) e.getCause();
- }
+ logger.error("policy {}:{}:{} is not conformant",
+ policy.getTypeIdentifier(), policy.getName(), policy.getVersion(), e);
return false;
}
try {
validators.get(policyType).encode(domainPolicy);
} catch (CoderException e) {
- logger.info("policy {}:{} is not conformant", policyType, domainPolicy.getClass().getName(), e);
- if (e.getCause() instanceof ValidationFailedException) {
- throw (ValidationFailedException) e.getCause();
- }
+ logger.error("policy {}:{} is not conformant", policyType, domainPolicy.getClass().getName(), e);
return false;
}
// A known schema is one that embedded in a .jar in the classpath as a resource
// matching the following syntax: <policy-type-name>-<policy-type-version>.schema.json.
//
- var schema =
- ResourceUtils
- .getResourceAsString("schemas/"
- + policyType.getName() + "-" + policyType.getVersion() + ".schema.json");
+ var schemaPath = "schemas/" + policyType.getName() + "-" + policyType.getVersion() + ".schema.json";
+ var schema = ResourceUtils.getResourceAsString(schemaPath);
if (schema == null) {
+ logger.error("Couldn't find a matching schema for type {}", policyType);
return false;
}
*/
public boolean registerValidator(@NonNull ToscaConceptIdentifier policyType, @NonNull String schema) {
try {
- validators.put(policyType, new StandardValCoder(schema, policyType.toString()));
+ validators.put(policyType, new StandardValCoder(schema));
} catch (RuntimeException r) {
- logger.info("schema for {} is not valid", policyType, r);
+ logger.error("schema for {} is not valid", policyType, r);
return false;
}
return true;
* Converts a JSON policy into a Domain Policy.
*/
public <T> T convertTo(@NonNull ToscaConceptIdentifier policyType, @NonNull String json, @NonNull Class<T> clazz)
- throws CoderException {
+ throws CoderException {
if (isRegistered(policyType)) {
return validators.get(policyType).decode(json, clazz);
} else {
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import com.worldturner.medeia.api.ValidationFailedException;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
private DomainMaker domainMaker;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
domainMaker = new DomainMaker();
}
@Test
void testIsDomainConformant() {
ToscaConceptIdentifier policyTypeId =
- new ToscaConceptIdentifier("policy.type.A", "1.0.0");
+ new ToscaConceptIdentifier("policy.type.A", "1.0.0");
DomainAPolicy domainAPolicy = createDomainPolicy();
// integer exceeding max. value
domainAPolicy.getProperties().getNested().setNested3(999);
assertFalse(domainMaker.isDomainConformant(policyTypeId, domainAPolicy));
- domainAPolicy.getProperties().getNested().setNested3(33); // restore good valude
+ domainAPolicy.getProperties().getNested().setNested3(33); // restore good value
// not registered schema for policy type
policyTypeId.setVersion("2.0.0");
assertTrue(domainMaker.conformance(policy1));
policy1.getProperties().remove("nested");
- assertThatThrownBy(() -> domainMaker.conformance(policy1))
- .isInstanceOf(ValidationFailedException.class)
- .hasMessageContaining("Required property nested is missing from object");
+ assertFalse(domainMaker.conformance(policy1));
DomainAPolicy domainAPolicy = createDomainPolicy();
assertTrue(domainMaker.conformance(policy1.getTypeIdentifier(), domainAPolicy));
domainAPolicy.getProperties().getNested().setNested1("");
ToscaConceptIdentifier ident1 = policy1.getTypeIdentifier();
- assertThatThrownBy(() -> domainMaker.conformance(ident1, domainAPolicy))
- .isInstanceOf(ValidationFailedException.class)
- .hasMessageContaining("Pattern ^(.+)$ is not contained in text");
+ assertFalse(domainMaker.conformance(ident1, domainAPolicy));
}
@Test
void testRegisterValidator() throws IOException, CoderException {
ToscaConceptIdentifier policyTypeId =
- new ToscaConceptIdentifier("policy.type.external", "9.9.9");
+ new ToscaConceptIdentifier("policy.type.external", "9.9.9");
assertTrue(domainMaker.registerValidator(policyTypeId,
getJsonFromFile("src/test/resources/policy.type.external-9.9.9.schema.json")));
@Test
void testConvertToDomainPolicy() throws IOException, CoderException {
DomainAPolicy domainAPolicy =
- domainMaker.convertTo(getToscaPolicy("src/test/resources/policyA.json"), DomainAPolicy.class);
+ domainMaker.convertTo(getToscaPolicy("src/test/resources/policyA.json"), DomainAPolicy.class);
assertDomainPolicy(domainAPolicy);
assertNotNull(domainMaker.convertTo(getToscaPolicy("src/test/resources/policyA-no-policy-type.json"),
- DomainAPolicy.class));
+ DomainAPolicy.class));
}
@Test
@Test
void testIsRegistered() {
ToscaConceptIdentifier policyTypeId1 =
- new ToscaConceptIdentifier("policy.type.A", "1.0.0");
+ new ToscaConceptIdentifier("policy.type.A", "1.0.0");
assertTrue(domainMaker.isRegistered(policyTypeId1));
ToscaConceptIdentifier policyTypeId2 =
- new ToscaConceptIdentifier("policy.type.external", "7.7.9");
+ new ToscaConceptIdentifier("policy.type.external", "7.7.9");
assertFalse(domainMaker.isRegistered(policyTypeId2));
}
private DomainAPolicy createDomainPolicy() {
return DomainAPolicy.builder().metadata(Metadata.builder().policyId("A").build())
- .name("A")
- .version("1.0.0")
- .type("policy.type.A")
- .typeVersion("1.0.0")
- .properties(Properties.builder()
- .nested(Nested.builder().nested1("nested1").nested2(true).nested3(50).build())
- .build()).build();
+ .name("A")
+ .version("1.0.0")
+ .type("policy.type.A")
+ .typeVersion("1.0.0")
+ .properties(Properties.builder()
+ .nested(Nested.builder().nested1("nested1").nested2(true).nested3(50).build())
+ .build()).build();
}
private void assertDomainPolicy(DomainAPolicy domainAPolicy) {
<staging.path>content/repositories/staging/</staging.path>
<!-- Project common dependency versions -->
- <json.path.version>2.9.0</json.path.version>
<hibernate.commons.annotations.version>6.0.6.Final</hibernate.commons.annotations.version>
<xml.apis.version>1.4.01</xml.apis.version>
<policy.common.version>3.0.1-SNAPSHOT</policy.common.version>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
- <version>${json.path.version}</version>
+ <version>${version.json-path}</version>
</dependency>
<dependency>
<groupId>org.hibernate.common</groupId>
Code Review / policy / drools-pdp.git / commitdiff