Fixed Checkstyle issues

[clamp.git] / src / main / java / org / onap / clamp / clds / service / CldsToscaService.java

diff --git a/src/main/java/org/onap/clamp/clds/service/CldsToscaService.java b/src/main/java/org/onap/clamp/clds/service/CldsToscaService.java
index 81bafef..0d53e91 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/service/CldsToscaService.java
+++ b/src/main/java/org/onap/clamp/clds/service/CldsToscaService.java
@@ -25,6 +25,7 @@
 
 package org.onap.clamp.clds.service;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -92,9 +93,7 @@ public class CldsToscaService extends SecureServiceBase {
         isAuthorized(permissionUpdateTosca);
         cldsToscaModel.setToscaModelName(toscaModelName);
         cldsToscaModel = cldsToscaModel.save(cldsDao, refProp, policyClient, getUserId());
-        LoggingUtils.setTimeContext(startTime, new Date());
-        LoggingUtils.setResponseContext("0", "Parse Tosca model and save success", this.getClass().getName());
-        auditLogger.info("Parse Tosca model and save completed");
+        auditLogInfo("Parse Tosca model and save", startTime);
         return new ResponseEntity<>(cldsToscaModel, HttpStatus.CREATED);
     }
 
@@ -104,16 +103,14 @@ public class CldsToscaService extends SecureServiceBase {
      * @return clds tosca models - list of CLDS tosca models
      */
     public List<CldsToscaModel> getAllToscaModels() {
-
-        Date startTime = new Date();
-        LoggingUtils.setRequestContext("CldsToscaService: Get All tosca models", getPrincipalName());
         // TODO revisit based on new permissions
+        final Date startTime = new Date();
+        LoggingUtils.setRequestContext("CldsToscaService: Get All tosca models", getPrincipalName());
         isAuthorized(permissionReadTosca);
-        final List<CldsToscaModel> cldsToscaModels = Optional.ofNullable(cldsDao.getAllToscaModels()).get();
-        LoggingUtils.setTimeContext(startTime, new Date());
-        LoggingUtils.setResponseContext("0", "Get All tosca models success", this.getClass().getName());
-        auditLogger.info("Get All tosca models");
-        return cldsToscaModels;
+
+        Optional<List<CldsToscaModel>> cldsToscaModels = Optional.ofNullable(cldsDao.getAllToscaModels());
+        auditLogInfo("Get All tosca models", startTime);
+        return cldsToscaModels.orElse(Collections.emptyList());
     }
 
     /**
@@ -126,44 +123,41 @@ public class CldsToscaService extends SecureServiceBase {
      * @return clds tosca model - CLDS tosca model for a given tosca model name
      */
     public CldsToscaModel getToscaModel(String toscaModelName) {
-        Date startTime = new Date();
+        final Date startTime = new Date();
         LoggingUtils.setRequestContext("CldsToscaService: Get tosca models by model name", getPrincipalName());
         // TODO revisit based on new permissions
         isAuthorized(permissionReadTosca);
-        final List<CldsToscaModel> cldsToscaModels = Optional.ofNullable(cldsDao.getToscaModelByName(toscaModelName))
-                .get();
-        LoggingUtils.setTimeContext(startTime, new Date());
-        LoggingUtils.setResponseContext("0", "Get tosca models by model name success", this.getClass().getName());
-        auditLogger.info("GET tosca models by model name completed");
-        return cldsToscaModels.get(0);
+
+        Optional<List<CldsToscaModel>> cldsToscaModels = Optional.ofNullable(
+                cldsDao.getToscaModelByName(toscaModelName));
+        auditLogInfo("Get tosca models by model name", startTime);
+        return cldsToscaModels.map(models -> models.get(0)).orElse(null);
     }
 
     /**
      * REST service that retrieves a CLDS Tosca model lists for a policy type
      * from the database.
-     * 
      * @param policyType
      *            The type of the policy
      * @return clds tosca model - CLDS tosca model for a given policy type
      */
     public CldsToscaModel getToscaModelsByPolicyType(String policyType) {
-        Date startTime = new Date();
+        final Date startTime = new Date();
         LoggingUtils.setRequestContext("CldsToscaService: Get tosca models by policyType", getPrincipalName());
         // TODO revisit based on new permissions
         isAuthorized(permissionReadTosca);
-        final List<CldsToscaModel> cldsToscaModels = Optional.ofNullable(cldsDao.getToscaModelByPolicyType(policyType))
-                .get();
-        LoggingUtils.setTimeContext(startTime, new Date());
-        LoggingUtils.setResponseContext("0", "Get tosca models by policyType success", this.getClass().getName());
-        auditLogger.info("GET tosca models by policyType completed");
-        return cldsToscaModels.get(0);
+
+        Optional<List<CldsToscaModel>> cldsToscaModels = Optional.ofNullable(
+                cldsDao.getToscaModelByPolicyType(policyType));
+        auditLogInfo("Get tosca models by policyType", startTime);
+        return cldsToscaModels.map(models -> models.get(0)).orElse(null);
     }
 
     public ResponseEntity<?> deleteToscaModelById(String toscaModeId) {
         // TODO
         return null;
     }
-    
+
     // Created for the integration test
     public void setLoggingUtil(LoggingUtils utilP) {
         util = utilP;