Update for pomba-audit-common model

Issue-ID: SDNC-317
Change-Id: I88956a61dfd3ada19e1d8e9674715d4a7da1d6c9
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>

5 files changed, 10 insertions, 78 deletions

diff --git a/pomba/network-discovery-api/pom.xml b/pomba/network-discovery-api/pom.xml
index a24dcd6..706e240 100644
--- a/pomba/network-discovery-api/pom.xml
+++ b/pomba/network-discovery-api/pom.xml
@@ -39,7 +39,11 @@ limitations under the License.
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.onap.logging-analytics.pomba</groupId>
+            <artifactId>pomba-audit-common</artifactId>
+            <version>1.3.1-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/Attribute.java b/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/Attribute.java
index 131b708..8c76987 100644
--- a/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/Attribute.java
+++ b/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/Attribute.java
@@ -17,6 +17,8 @@
  */
 package org.onap.sdnc.apps.pomba.networkdiscovery.datamodel;
 
+import org.onap.pomba.common.datatypes.DataQuality;
+
 public class Attribute {
     private String name;
     private String value;
diff --git a/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/DataQuality.java b/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/DataQuality.java
deleted file mode 100644
index f8c677a..0000000
--- a/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/DataQuality.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
- * ============================================================================
- * 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.sdnc.apps.pomba.networkdiscovery.datamodel;
-
-public class DataQuality {
-    public enum Status {
-        ok, error
-    }
-
-    private Status status;
-    private String errorText;
-
-
-    public Status getStatus() {
-        return this.status;
-    }
-
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    public String getErrorText() {
-        return this.errorText;
-    }
-
-    public void setErrorText(String errorText) {
-        this.errorText = errorText;
-    }
-
-
-    public static DataQuality ok() {
-        // as a non-mutable class, it is not safe to define a constant for this
-        DataQuality result = new DataQuality();
-        result.setStatus(Status.ok);
-        return result;
-    }
-
-    public static DataQuality error(String text) {
-        // as a non-mutable class, it is not safe to define a constant for this
-        DataQuality result = new DataQuality();
-        result.setStatus(Status.error);
-        result.setErrorText(text);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "DataQuality [status=" + this.status + ", errorText=" + this.errorText + "]";
-    }
-}
diff --git a/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/Resource.java b/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/Resource.java
index a98d457..f3fb589 100644
--- a/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/Resource.java
+++ b/pomba/network-discovery-api/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/Resource.java
@@ -18,6 +18,7 @@
 package org.onap.sdnc.apps.pomba.networkdiscovery.datamodel;
 
 import java.util.List;
+import org.onap.pomba.common.datatypes.DataQuality;
 
 public class Resource {
     private String id;
diff --git a/pomba/network-discovery-api/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/test/PojoTest.java b/pomba/network-discovery-api/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/test/PojoTest.java
index 0aa0809..238a671 100644
--- a/pomba/network-discovery-api/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/test/PojoTest.java
+++ b/pomba/network-discovery-api/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/datamodel/test/PojoTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  * ============LICENSE_END=====================================================
  */
+
 package org.onap.sdnc.apps.pomba.networkdiscovery.datamodel.test;
 
 import static org.junit.Assert.assertEquals;
@@ -24,8 +25,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Test;
+import org.onap.pomba.common.datatypes.DataQuality;
 import org.onap.sdnc.apps.pomba.networkdiscovery.datamodel.Attribute;
-import org.onap.sdnc.apps.pomba.networkdiscovery.datamodel.DataQuality;
 import org.onap.sdnc.apps.pomba.networkdiscovery.datamodel.NetworkDiscoveryNotification;
 import org.onap.sdnc.apps.pomba.networkdiscovery.datamodel.Resource;
 
@@ -68,15 +69,4 @@ public class PojoTest {
         }
         assertEquals(0, expectedValues.size());
     }
-
-    @Test
-    public void dataQualityHelpers() {
-        DataQuality value = DataQuality.ok();
-        assertEquals(DataQuality.Status.ok, value.getStatus());
-        assertNull(value.getErrorText());
-
-        value = DataQuality.error("test");
-        assertEquals(DataQuality.Status.error, value.getStatus());
-        assertEquals("test", value.getErrorText());
-    }
 }