diff options
author | Benjamin, Max <max.benjamin@att.com> | 2020-05-18 16:37:51 -0400 |
---|---|---|
committer | Benjamin, Max (mb388a) <mb388a@att.com> | 2020-06-18 10:53:59 -0400 |
commit | 9868f1749ac413b5b7df287d35983bf24ce517ea (patch) | |
tree | d0ccf620547486e4ea032976eccf71646a779023 /mso-api-handlers/mso-requests-db-repositories | |
parent | b60a09ddf1e6f42539ca58d0376196b9642d5cff (diff) |
Prepare for java 11
final changes for java11 groovy compatibility
removed unnecessary dependencies and cleaned up poms
added missing jaxws-api dependency to pom.xml
java8 profile is now active by default in parent pom
update beans to have RemoteResource annotation
always use the compiler plugin from parent pom
Update external task timeout to longer value to hold lock
update remote resource annotation to match catalog db client
add remote resource annotation to bean for bowman
completely remove bowman from requests db client
Issue-ID: SO-2059
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: If6f0df36e8077ccd703abce9f64290daed63955b
Diffstat (limited to 'mso-api-handlers/mso-requests-db-repositories')
3 files changed, 4 insertions, 6 deletions
diff --git a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java index f0d717df3c..ea1aeb95a6 100644 --- a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java +++ b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java @@ -20,7 +20,6 @@ package org.onap.so.db.request.data.repository; -import java.util.List; import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus; import org.onap.so.db.request.beans.OperationalEnvServiceModelStatusId; import org.springframework.data.jpa.repository.JpaRepository; @@ -35,7 +34,7 @@ public interface OperationalEnvServiceModelStatusRepository public OperationalEnvServiceModelStatus findOneByOperationalEnvIdAndRequestId(String operationalEnvId, String requestId); - public List<OperationalEnvServiceModelStatus> findAllByOperationalEnvIdAndRequestId( + public OperationalEnvServiceModelStatus[] findAllByOperationalEnvIdAndRequestId( @Param("OPERATIONAL_ENV_ID") String operationalEnvId, @Param("REQUEST_ID") String requestId); public OperationalEnvServiceModelStatus findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId( diff --git a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OrchestrationTaskRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OrchestrationTaskRepository.java index 1093c79638..953361fd40 100644 --- a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OrchestrationTaskRepository.java +++ b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OrchestrationTaskRepository.java @@ -24,10 +24,9 @@ import org.onap.so.db.request.beans.OrchestrationTask; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.query.Param; import org.springframework.data.rest.core.annotation.RepositoryRestResource; -import java.util.List; @RepositoryRestResource(collectionResourceRel = "orchestrationTask", path = "orchestrationTask") public interface OrchestrationTaskRepository extends JpaRepository<OrchestrationTask, String> { - public List<OrchestrationTask> findByStatus(@Param("status") String status); + public OrchestrationTask[] findByStatus(@Param("status") String status); } diff --git a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java index cb02b7c491..21bc2a697a 100644 --- a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java +++ b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java @@ -37,11 +37,11 @@ public interface RequestProcessingDataRepository extends JpaRepository<RequestPr RequestProcessingData findOneBySoRequestIdAndName(@Param("SO_REQUEST_ID") String soRequestId, @Param("NAME") String name); - List<RequestProcessingData> findBySoRequestIdOrderByGroupingIdDesc(@Param("SO_REQUEST_ID") String soRequestId); + RequestProcessingData[] findBySoRequestIdOrderByGroupingIdDesc(@Param("SO_REQUEST_ID") String soRequestId); RequestProcessingData[] findBySoRequestIdAndIsDataInternalOrderByGroupingIdDesc( @Param("SO_REQUEST_ID") String soRequestId, @Param("IS_INTERNAL_DATA") Boolean isDataInternal); - List<RequestProcessingData> findByGroupingIdAndNameAndTag(@Param("GROUPING_ID") String groupingId, + RequestProcessingData[] findByGroupingIdAndNameAndTag(@Param("GROUPING_ID") String groupingId, @Param("NAME") String name, @Param("TAG") String tag); } |