summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-03-24 14:44:06 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-24 14:44:06 +0000
commit2a245ef80e39a101015efb164de53f1753fa5d47 (patch)
tree4c8a06236533aa2071af95eeac117c3a87ee5ed8
parentcc740771e3fdf02bc6e9e02f1d4f4d6cc39afcb0 (diff)
parent9854c6462dc16d53fbea809220637e320b1dc969 (diff)
Merge "Use enums from models-pdp in models-pap"
-rw-r--r--models-pap/pom.xml6
-rw-r--r--models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java2
-rw-r--r--models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java4
-rw-r--r--models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpGroup.java2
-rw-r--r--models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpInstanceDetails.java4
5 files changed, 9 insertions, 9 deletions
diff --git a/models-pap/pom.xml b/models-pap/pom.xml
index 9257b9bda..edb8ee703 100644
--- a/models-pap/pom.xml
+++ b/models-pap/pom.xml
@@ -33,9 +33,9 @@
<description>The models for Policy Administration (PAP) REST API's.</description>
<dependencies>
<dependency>
- <groupId>org.onap.policy.common</groupId>
- <artifactId>pdp-common</artifactId>
- <version>${policy.common.version}</version>
+ <groupId>org.onap.policy.models</groupId>
+ <artifactId>models-pdp</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.policy.models</groupId>
diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java
index a42ac21bd..d5e4191a2 100644
--- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java
+++ b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpGroup.java
@@ -29,7 +29,7 @@ import lombok.NonNull;
import lombok.Setter;
import lombok.ToString;
import org.onap.policy.models.base.PfUtils;
-import org.onap.policy.pdp.common.enums.PdpState;
+import org.onap.policy.models.pdp.enums.PdpState;
/**
* Class to represent a PDPGroup, which groups multiple PDPSubGroup entities together for a particular domain.
diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java
index 4f9041c7f..c214c7409 100644
--- a/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java
+++ b/models-pap/src/main/java/org/onap/policy/models/pap/concepts/PdpInstanceDetails.java
@@ -25,8 +25,8 @@ import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
import lombok.ToString;
-import org.onap.policy.pdp.common.enums.PdpHealthStatus;
-import org.onap.policy.pdp.common.enums.PdpState;
+import org.onap.policy.models.pdp.enums.PdpHealthStatus;
+import org.onap.policy.models.pdp.enums.PdpState;
/**
* Class to represent details of a running instance of PDP.
diff --git a/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpGroup.java b/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpGroup.java
index 3dc3c24b2..ee52d82fb 100644
--- a/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpGroup.java
+++ b/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpGroup.java
@@ -27,7 +27,7 @@ import java.util.Arrays;
import java.util.Map;
import java.util.TreeMap;
import org.junit.Test;
-import org.onap.policy.pdp.common.enums.PdpState;
+import org.onap.policy.models.pdp.enums.PdpState;
/**
* Test the copy constructor, as {@link TestModels} tests the other methods.
diff --git a/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpInstanceDetails.java b/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpInstanceDetails.java
index 9e48480f4..65fbef612 100644
--- a/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpInstanceDetails.java
+++ b/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestPdpInstanceDetails.java
@@ -24,8 +24,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.onap.policy.pdp.common.enums.PdpHealthStatus;
-import org.onap.policy.pdp.common.enums.PdpState;
+import org.onap.policy.models.pdp.enums.PdpHealthStatus;
+import org.onap.policy.models.pdp.enums.PdpState;
/**
* Test the copy constructor, as {@link TestModels} tests the other methods.