Merge "Guard policy Backend"

[clamp.git] / src / main / java / org / onap / clamp / clds / model / CldsServiceData.java

diff --git a/src/main/java/org/onap/clamp/clds/model/CldsServiceData.java b/src/main/java/org/onap/clamp/clds/model/CldsServiceData.java
index 943532f..3b5dd11 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/model/CldsServiceData.java
+++ b/src/main/java/org/onap/clamp/clds/model/CldsServiceData.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 
 package org.onap.clamp.clds.model;
@@ -32,20 +32,17 @@ import java.util.List;
 
 import javax.ws.rs.NotAuthorizedException;
 
-import org.onap.clamp.clds.dao.CldsDao;
 import org.onap.clamp.clds.service.CldsService;
 
 public class CldsServiceData implements Serializable {
 
-    private static final long         serialVersionUID = -9153372664377279423L;
-
-    protected static final EELFLogger logger           = EELFManager.getInstance().getLogger(CldsServiceData.class);
-    protected static final EELFLogger auditLogger      = EELFManager.getInstance().getAuditLogger();
-
-    private String                    serviceInvariantUUID;
-    private String                    serviceUUID;
-    private Long                      ageOfRecord;
-    private List<CldsVfData>          cldsVfs;
+    private static final long serialVersionUID = -9153372664377279423L;
+    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsServiceData.class);
+    protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
+    private String serviceInvariantUUID;
+    private String serviceUUID;
+    private Long ageOfRecord;
+    private List<CldsVfData> cldsVfs;
 
     public String getServiceInvariantUUID() {
         return serviceInvariantUUID;
@@ -71,14 +68,6 @@ public class CldsServiceData implements Serializable {
         this.serviceUUID = serviceUUID;
     }
 
-    public CldsServiceData getCldsServiceCache(CldsDao cldsDao, String invariantServiceUUID) {
-        return cldsDao.getCldsServiceCache(invariantServiceUUID);
-    }
-
-    public void setCldsServiceCache(CldsDao cldsDao, CldsDBServiceCache cldsDBServiceCache) {
-        cldsDao.setCldsServiceCache(cldsDBServiceCache);
-    }
-
     public Long getAgeOfRecord() {
         return ageOfRecord;
     }