diff options
| author |   Chenfei Gao <cgao@research.att.com> | 2019-03-26 14:46:31 -0400 |
|---|---|---|
| committer | Chenfei Gao <cgao@research.att.com> | 2019-03-26 15:43:46 -0400 |
| commit | c7a12fc31e14225d8c6c3cbd6850c80beda56ff0 (patch) | |
| tree | 0b088f23a648affeadad9282e8f3403ffe54c3dc /models-tosca | |
| parent | 2c5a396554a34cddc2f43d98c72665d5b1496f85 (diff) | |
Fix file access issue in DummyProviderImpl
Changed to use ResourceUtils.getResourceAsString in policy/common project
to access dummy files.
Issue-ID: POLICY-1441
Change-Id: I42d7cb809a0eeedfc2a8a6b82edfe38ad7138548
Signed-off-by: Chenfei Gao <cgao@research.att.com>
Diffstat (limited to 'models-tosca')
2 files changed, 4 insertions, 8 deletions
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/concepts/LegacyGuardPolicy.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/concepts/LegacyGuardPolicy.java index 2454b51be..59715e4f9 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/concepts/LegacyGuardPolicy.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/concepts/LegacyGuardPolicy.java @@ -21,7 +21,6 @@ package org.onap.policy.models.tosca.legacy.concepts; -import java.util.List; import java.util.Map; import lombok.Data; @@ -30,6 +29,7 @@ import lombok.Data; * Definition of a legacy guard policy stored as a TOSCA policy. * * @author Liam Fallon (liam.fallon@est.tech) + * @author Chenfei Gao (cgao@research.att.com) */ @Data public class LegacyGuardPolicy { @@ -38,6 +38,6 @@ public class LegacyGuardPolicy { private String policyVersion; - private List<Map<String, String>> content; + private Map<String, String> content; } diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/concepts/LegacyGuardPolicyTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/concepts/LegacyGuardPolicyTest.java index d2b2216e7..764ce063f 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/concepts/LegacyGuardPolicyTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/concepts/LegacyGuardPolicyTest.java @@ -23,9 +23,7 @@ package org.onap.policy.models.tosca.legacy.concepts; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import org.junit.Test; @@ -41,10 +39,8 @@ public class LegacyGuardPolicyTest { assertEquals("guard.frequency", guard.getPolicyId()); guard.setPolicyVersion("1"); assertEquals("1", guard.getPolicyVersion()); - Map<String, String> body = new HashMap<>(); - body.put("actor", "SO"); - List<Map<String, String>> content = new ArrayList<>(); - content.add(body); + Map<String, String> content = new HashMap<>(); + content.put("actor", "SO"); guard.setContent(content); assertEquals(1, guard.getContent().size()); } |