E2EServiceInstances to be free of catalogdb

Fixing Junits
Making MSO requests free from direct repository calls
Add @Param annotation so as to fix JPA methods with query parameters
Fix createE2EServiceInstance Test
Add Unit Tests for Sunny day scenarios
revert import auto-alignment

Issue-ID: SO-811
Change-Id: I9f69d817622b0807642a783311d6959817a77970
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java
index c51e4edcea..22a1604bdd 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java
@@ -23,12 +23,13 @@ package org.onap.so.db.request.data.repository;
 import org.onap.so.db.request.beans.OperationStatus;
 import org.onap.so.db.request.beans.OperationStatusId;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 
-@Repository
+@RepositoryRestResource(collectionResourceRel = "operationStatusRepository", path = "operationStatusRepository")
 public interface OperationStatusRepository extends JpaRepository<OperationStatus, OperationStatusId> {
 	
-	OperationStatus findOneByServiceIdAndOperationId(String serviceId, String operationId);
+	OperationStatus findOneByServiceIdAndOperationId(@Param("SERVICE_ID") String serviceId, @Param("OPERATION_ID") String operationId);
 	public OperationStatus findOneByServiceName(String serviceName);
 	public OperationStatus findOneByServiceId(String serviceId);
 }