Rework the Clamp db model

[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 8910839..dad7cb6 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/model/CldsServiceData.java
+++ b/src/main/java/org/onap/clamp/clds/model/CldsServiceData.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
+ * 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 
+ *
+ * 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============================================
  * ===================================================================
@@ -23,25 +23,29 @@
 
 package org.onap.clamp.clds.model;
 
-import org.onap.clamp.clds.dao.CldsDao;
-import org.onap.clamp.clds.service.CldsService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.NotAuthorizedException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.ws.rs.NotAuthorizedException;
+
+import org.onap.clamp.clds.dao.CldsDao;
+import org.onap.clamp.clds.service.CldsService;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
 public class CldsServiceData implements Serializable {
-    private static final Logger logger = LoggerFactory.getLogger(CldsServiceData.class);
 
-    private static final long serialVersionUID = 1L;
+    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 String                  serviceInvariantUUID;
+    private String                  serviceUUID;
+    private Long                    ageOfRecord;
+    private List<CldsVfData>        cldsVfs;
 
     public String getServiceInvariantUUID() {
         return serviceInvariantUUID;
@@ -84,8 +88,8 @@ public class CldsServiceData implements Serializable {
     }
 
     /**
-     * Filter out any VFs that the user is not authorized for.
-     * Use the CldsService to determine if the user is authorized for a VF.
+     * Filter out any VFs that the user is not authorized for. Use the
+     * CldsService to determine if the user is authorized for a VF.
      *
      * @param svc
      */
@@ -95,14 +99,16 @@ public class CldsServiceData implements Serializable {
             logger.debug("cldsVfs == null");
         } else {
             for (CldsVfData vf : cldsVfs) {
-                // if user is authorized for the VF then add it to the filtered list
+                // if user is authorized for the VF then add it to the filtered
+                // list
                 try {
                     if (svc.isAuthorizedForVf(vf.getVfInvariantResourceUUID())) {
                         filteredCldsVfs.add(vf);
                     }
                 } catch (NotAuthorizedException e) {
                     logger.debug("user not authorized for {}", vf.getVfInvariantResourceUUID());
-                    // when not NotAuthorizedException - don't add to filteredCldsVfs list
+                    // when not NotAuthorizedException - don't add to
+                    // filteredCldsVfs list
                 }
             }
         }