diff options
author | jhh <jorge.hernandez-herrero@att.com> | 2020-02-04 19:24:26 -0600 |
---|---|---|
committer | jhh <jorge.hernandez-herrero@att.com> | 2020-02-04 19:24:26 -0600 |
commit | a24aa1615648b0698bb662f64915e8ba2d520e03 (patch) | |
tree | fd2c141aad4446404b89facc23d3445518c637f8 | |
parent | 06a1c3040a4a1a88654a91761fda8967806c9fd3 (diff) |
tackle few comments from DomainMaker review
Issue-ID: POLICY-2345
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I325d0c4892d46dad72303e3dcbc38238a029a725
3 files changed, 10 insertions, 10 deletions
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSourceTopic.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSourceTopic.java index 69d57bc6..ffad9cfa 100644 --- a/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSourceTopic.java +++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/domain/models/controller/ControllerSourceTopic.java @@ -20,7 +20,6 @@ package org.onap.policy.drools.domain.models.controller; -import com.google.gson.annotations.SerializedName; import java.io.Serializable; import java.util.List; import lombok.Data; @@ -36,9 +35,6 @@ import lombok.experimental.SuperBuilder; public class ControllerSourceTopic implements Serializable { private static final long serialVersionUID = -1732598566914643612L; - @SerializedName("topicName") protected String topicName; - - @SerializedName("serialization") protected List<ControllerSerialization> serialization; } diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/domain/models/DroolsPolicyModelsTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/domain/models/DroolsPolicyModelsTest.java index 813acdfa..d99dd089 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/domain/models/DroolsPolicyModelsTest.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/domain/models/DroolsPolicyModelsTest.java @@ -20,6 +20,8 @@ package org.onap.policy.drools.domain.models; +import static org.junit.Assert.assertNotNull; + import com.openpojo.reflection.PojoClass; import com.openpojo.reflection.filters.FilterChain; import com.openpojo.reflection.filters.FilterClassName; @@ -58,7 +60,8 @@ public class DroolsPolicyModelsTest { @Test public void testBuildDomainPolicyNativeDrools() { /* manually create a native drools policy */ - NativeDroolsPolicy.builder().metadata(Metadata.builder().policyId("policy-id").build()).name("example") + assertNotNull(NativeDroolsPolicy.builder().metadata(Metadata.builder().policyId("policy-id").build()) + .name("example") .type("onap.policies.native.Drools") .typeVersion("1.0.0") .version("1.0.0") @@ -68,19 +71,20 @@ public class DroolsPolicyModelsTest { .rulesArtifact( NativeDroolsRulesArtifact.builder().groupId("org.onap.policy.controlloop") .artifactId("example").version("example").build()).build()) - .build(); + .build()); } @Test public void testBuildDomainPolicyController() { /* manually create a controller policy */ - ControllerPolicy.builder().metadata(Metadata.builder().policyId("policy-id").build()).name("example") + assertNotNull(ControllerPolicy.builder().metadata(Metadata.builder().policyId("policy-id").build()) + .name("example") .version("1.0.0") .type("onap.policies.drools.Controller") .typeVersion("1.0.0") .properties(ControllerProperties.builder().controllerName("example").sourceTopics( new ArrayList<>()).sinkTopics(new ArrayList<>()).build()) - .build(); + .build()); } }
\ No newline at end of file diff --git a/policy-utils/src/main/java/org/onap/policy/drools/policies/DomainMaker.java b/policy-utils/src/main/java/org/onap/policy/drools/policies/DomainMaker.java index 6e1e0881..0097dff6 100644 --- a/policy-utils/src/main/java/org/onap/policy/drools/policies/DomainMaker.java +++ b/policy-utils/src/main/java/org/onap/policy/drools/policies/DomainMaker.java @@ -159,8 +159,8 @@ public class DomainMaker { */ public boolean registerValidator(@NonNull ToscaPolicyTypeIdentifier policyType) { // - // A known schema is an schema embedded in a .jar in the classpath under the schemas/ - // resource directory matching the following syntax: schemas/<policy-type>.schema.json. + // 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. // String schema = ResourceUtils |