Merge 'origin/casablanca' into master

[so.git] / adapters / mso-requests-db-adapter / src / main / java / org / onap / so / adapters / requestsdb / MsoRequestsDbAdapterImpl.java

diff --git a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
index a849478..626e356 100644 (file)
--- a/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
+++ b/adapters/mso-requests-db-adapter/src/main/java/org/onap/so/adapters/requestsdb/MsoRequestsDbAdapterImpl.java
@@ -301,7 +301,9 @@ public class MsoRequestsDbAdapterImpl implements MsoRequestsDbAdapter {
                        String resourceTemplateUUID) throws MsoRequestsDbException {
 
                return resourceOperationStatusRepository
-                               .findOne(new ResourceOperationStatusId(serviceId, operationId, resourceTemplateUUID));
+                               .findById(new ResourceOperationStatusId(serviceId, operationId, resourceTemplateUUID)).
+                               orElseThrow( () -> new MsoRequestsDbException("Operation not found:" + operationId));
+                               
        }
 
        /**