From add0df04cc24deae1f16a215dffa32393ed586ca Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Thu, 30 Aug 2018 14:26:55 -0400 Subject: Create a Reference Table for Controller Selection Also: Modify Alacarte Reference Data This commit consolidates changes from three abandoned commits: https://gerrit.onap.org/r/60959 https://gerrit.onap.org/r/60953 https://gerrit.onap.org/r/60397 Change-Id: I295a79cb05ca742ae5743892397e75c7c228bde3 Issue-ID: SO-763 Issue-ID: SO-676 Signed-off-by: Rob Daugherty --- .../main/java/org/onap/so/db/catalog/client/CatalogDbClient.java | 7 ------- .../data/repository/ControllerSelectionReferenceRepository.java | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'mso-catalog-db/src/main/java/org') diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java index a0e2409023..dbe69d9d08 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java @@ -433,13 +433,6 @@ public class CatalogDbClient { .queryParam(ACTION,action).build()); } - public ControllerSelectionReference getControllerSelectionReferenceByVnfType(String vnfType) { - return this.getSingleResource(controllerSelectionReferenceClient, UriBuilder - .fromUri(endpoint + "/controllerSelectionReference/search/findControllerSelectionReferenceByVnfType") - .queryParam("VNF_TYPE", vnfType).build()); - - } - public ControllerSelectionReference getControllerSelectionReferenceByVnfTypeAndActionCategory(String vnfType, String actionCategory) { return this.getSingleResource(controllerSelectionReferenceClient, UriBuilder .fromUri(endpoint + "/controllerSelectionReference/search/findControllerSelectionReferenceByVnfTypeAndActionCategory") diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ControllerSelectionReferenceRepository.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ControllerSelectionReferenceRepository.java index ad1bbc3f68..ad162b547a 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ControllerSelectionReferenceRepository.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ControllerSelectionReferenceRepository.java @@ -29,9 +29,7 @@ import org.springframework.data.rest.core.annotation.RepositoryRestResource; @RepositoryRestResource(collectionResourceRel = "controllerSelectionReference", path = "controllerSelectionReference") public interface ControllerSelectionReferenceRepository extends JpaRepository { - public ControllerSelectionReference findControllerSelectionReferenceByVnfType(@Param("VNF_TYPE") String vnfType); - public ControllerSelectionReference findControllerSelectionReferenceByVnfTypeAndActionCategory(@Param("VNF_TYPE") String vnfType, @Param("ACTION_CATEGORY") String actionCategory); - } \ No newline at end of file + } -- cgit 1.2.3-korg