1 files changed, 4 insertions, 7 deletions
diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProvider.java b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProvider.java
index 755bfeb0..190bb28a 100644
--- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProvider.java
+++ b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProvider.java
@@ -21,11 +21,10 @@
 package org.onap.aaf.certservice.certification.configuration;
 
 import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Optional;
-
 @Component
 public class Cmpv2ServerProvider {
 
@@ -36,11 +35,9 @@ public class Cmpv2ServerProvider {
         this.cmpServersConfig = cmpServersConfig;
     }
 
-    public Optional<Cmpv2Server> getCmpv2Server(String caName) {
-        return cmpServersConfig.getCmpServers()
-                .stream()
-                .filter(server -> server.getCaName().equals(caName))
-                .findFirst();
+    public Cmpv2Server getCmpv2Server(String caName) {
+        return cmpServersConfig.getCmpServers().stream().filter(server -> server.getCaName().equals(caName)).findFirst()
+                       .orElseThrow(() -> new Cmpv2ServerNotFoundException("No server found for given CA name"));
     }
 
 }