Merge "Sonar fixes"

2 files changed, 6 insertions, 7 deletions

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/AbstractAuditService.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/AbstractAuditService.java
index 96a0ddc328..8cdd37d43f 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/AbstractAuditService.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/AbstractAuditService.java
@@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
-import java.util.Optional;
 
 @Component
 public abstract class AbstractAuditService extends ExternalTaskUtils {
@@ -53,13 +52,13 @@ public abstract class AbstractAuditService extends ExternalTaskUtils {
      * @param auditList
      * @return
      */
-    protected boolean didCreateAuditFail(Optional<AAIObjectAuditList> auditList) {
-        if (auditList.isPresent() && isAuditListNotNullAndNotEmpty(auditList.get())) {
+    protected boolean didCreateAuditFail(AAIObjectAuditList auditList) {
+        if (isAuditListNotNullAndNotEmpty(auditList)) {
             if (logger.isInfoEnabled()) {
-                logger.info("Audit Results: {}", auditList.get().toString());
+                logger.info("Audit Results: {}", auditList.toString());
             }
-            return auditList.get().getAuditList().stream().filter(auditObject -> !auditObject.isDoesObjectExist())
-                    .findFirst().map(v -> true).orElse(false);
+            return auditList.getAuditList().stream().filter(auditObject -> !auditObject.isDoesObjectExist()).findFirst()
+                    .map(v -> true).orElse(false);
         } else {
             return false;
         }
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/AuditCreateStackService.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/AuditCreateStackService.java
index 010475c87a..c06460c386 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/AuditCreateStackService.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/tasks/audit/AuditCreateStackService.java
@@ -67,7 +67,7 @@ public class AuditCreateStackService extends AbstractAuditService {
                 auditListOpt.get().setHeatStackName(auditInventory.getHeatStackName());
                 GraphInventoryCommonObjectMapperProvider objectMapper = new GraphInventoryCommonObjectMapperProvider();
                 variables.put("auditInventoryResult", objectMapper.getMapper().writeValueAsString(auditListOpt.get()));
-                success = !didCreateAuditFail(auditListOpt);
+                success = !didCreateAuditFail(auditListOpt.get());
             }
         } catch (Exception e) {
             logger.error("Error during audit of stack", e);