From 471c4e0aece61e6e4c4a96f0259fcd1f7b63f3b7 Mon Sep 17 00:00:00 2001
From: nameisaravind <Aravindhan.murugan@capitalone.com>
Date: Tue, 17 Mar 2020 17:25:02 -0400
Subject: [PATCH] MaturityModel API implementation update (#113)

* auth header str format check

* maturity models api json mapping exception fix

* revert auth token space check

* removed unused import
---
 pom.xml                                                    | 2 +-
 .../dashboard/auth/apitoken/ApiTokenRequestFilter.java     | 2 +-
 .../dashboard/service/MaturityModelServiceImpl.java        | 7 +++++--
 .../dashboard/service/MaturityModelServiceImplTest.java    | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index d954bd2f..0baed2e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     </parent>
 
     <properties>
-        <com.capitalone.dashboard.core.version>3.5.7</com.capitalone.dashboard.core.version>
+        <com.capitalone.dashboard.core.version>3.5.8</com.capitalone.dashboard.core.version>
         <apache.rat.plugin.version>0.13</apache.rat.plugin.version>
         <coveralls.maven.plugin.version>4.3.0</coveralls.maven.plugin.version>
         <guava.version>18.0</guava.version>
diff --git a/src/main/java/com/capitalone/dashboard/auth/apitoken/ApiTokenRequestFilter.java b/src/main/java/com/capitalone/dashboard/auth/apitoken/ApiTokenRequestFilter.java
index 8a4e3e4f..9d184b68 100644
--- a/src/main/java/com/capitalone/dashboard/auth/apitoken/ApiTokenRequestFilter.java
+++ b/src/main/java/com/capitalone/dashboard/auth/apitoken/ApiTokenRequestFilter.java
@@ -97,4 +97,4 @@ protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServle
         response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "ApiToken Authentication Failed");
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/capitalone/dashboard/service/MaturityModelServiceImpl.java b/src/main/java/com/capitalone/dashboard/service/MaturityModelServiceImpl.java
index 378e7497..2703887e 100644
--- a/src/main/java/com/capitalone/dashboard/service/MaturityModelServiceImpl.java
+++ b/src/main/java/com/capitalone/dashboard/service/MaturityModelServiceImpl.java
@@ -5,7 +5,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 public class MaturityModelServiceImpl implements MaturityModelService {
@@ -25,8 +28,8 @@ public MaturityModel getMaturityModel(String profile) {
 
     @Override
     public List<String> getProfiles() {
-        return maturityModelRepository.getAllProfiles();
-
+        List<MaturityModel> maturityModels = Optional.ofNullable(maturityModelRepository.getAllProfiles()).orElse(Collections.emptyList());
+        return maturityModels.stream().map(MaturityModel::getProfile).collect(Collectors.toList());
     }
 
 }
diff --git a/src/test/java/com/capitalone/dashboard/service/MaturityModelServiceImplTest.java b/src/test/java/com/capitalone/dashboard/service/MaturityModelServiceImplTest.java
index e444f035..f14616cc 100644
--- a/src/test/java/com/capitalone/dashboard/service/MaturityModelServiceImplTest.java
+++ b/src/test/java/com/capitalone/dashboard/service/MaturityModelServiceImplTest.java
@@ -237,7 +237,7 @@ public void getProfileAndRules() {
 
     @Test
     public void getAllProfiles() {
-        when(maturityModelRepository.getAllProfiles()).thenReturn(new ArrayList<String>());
+        when(maturityModelRepository.getAllProfiles()).thenReturn(new ArrayList<>());
         assertNotNull(service.getProfiles());
     }