Loading src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCandidateRepoService.java +2 −1 Changes for src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCandidateRepoService.java: 2 added lines, 1 removed line. Original line number Original line Diff line number Diff line Loading @@ -158,7 +158,8 @@ public class ResourceCandidateRepoService { if ( catObj!=null){ if ( catObj!=null){ catObj.getResourceCandidateObj().add(savedCand); //add candidate ref to category catObj.getResourceCandidateObj().add(savedCand); //add candidate ref to category catObj = this.categsRepoService.categsRepoSave(catObj); catObj = this.categsRepoService.addCategory(catObj); } } } } Loading src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCatalogRepoService.java +5 −1 Changes for src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCatalogRepoService.java: 5 added lines, 1 removed line. Original line number Original line Diff line number Diff line Loading @@ -176,7 +176,6 @@ public class ResourceCatalogRepoService { } } ---------------------------------------------------------------------------------------------------------------*/ ---------------------------------------------------------------------------------------------------------------*/ @Transactional @Transactional public ResourceCatalog findByName(String aName) { public ResourceCatalog findByName(String aName) { Optional<ResourceCatalog> optionalCat = this.catalogRepo.findByName( aName ); Optional<ResourceCatalog> optionalCat = this.catalogRepo.findByName( aName ); Loading @@ -185,6 +184,11 @@ public class ResourceCatalogRepoService { optionalCat.get().getRelatedParty().size(); optionalCat.get().getRelatedParty().size(); } } optionalCat.get().getCategoryObj().size(); optionalCat.get().getCategoryObj().size(); for (ResourceCategory rc : optionalCat.get().getCategoryObj()) { rc.getCategoryObj().size(); rc.getCategoryRefs().size(); rc.getResourceCandidateObj().size(); } } } return optionalCat.orElse(null); return optionalCat.orElse(null); } } Loading src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCategoryRepoService.java +1 Changes for src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCategoryRepoService.java: 1 added line, 0 removed lines. Original line number Original line Diff line number Diff line Loading @@ -286,6 +286,7 @@ public class ResourceCategoryRepoService { } } @Transactional public ResourceCategory findByName(String aName) { public ResourceCategory findByName(String aName) { Optional<ResourceCategory> optionalCat = this.categsRepo.findByName( aName ); Optional<ResourceCategory> optionalCat = this.categsRepo.findByName( aName ); if (optionalCat.isPresent()) { if (optionalCat.isPresent()) { Loading src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiRouteBuilder.java +19 Changes for src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiRouteBuilder.java: 19 added lines, 0 removed lines. Original line number Original line Diff line number Diff line Loading @@ -58,7 +58,11 @@ public class ResourceApiRouteBuilder extends RouteBuilder { @Value("${CATALOG_GET_RESOURCE_BY_ID}") @Value("${CATALOG_GET_RESOURCE_BY_ID}") private String CATALOG_GET_RESOURCE_BY_ID = ""; private String CATALOG_GET_RESOURCE_BY_ID = ""; @Value("${CATALOG_GET_RESOURCES_BY_CATEGORY}") private String CATALOG_GET_RESOURCES_BY_CATEGORY = ""; @Value("${CATALOG_SEARCH_RESOURCES}") private String CATALOG_SEARCH_RESOURCES = ""; @Value("${CATALOG_RESOURCES_OF_PARTNERS}") @Value("${CATALOG_RESOURCES_OF_PARTNERS}") private String CATALOG_RESOURCES_OF_PARTNERS = ""; private String CATALOG_RESOURCES_OF_PARTNERS = ""; Loading Loading @@ -91,6 +95,21 @@ public class ResourceApiRouteBuilder extends RouteBuilder { .bean( resourceRepoService, "getResourceEagerAsString") .bean( resourceRepoService, "getResourceEagerAsString") .convertBodyTo( String.class ); .convertBodyTo( String.class ); from( CATALOG_GET_RESOURCES_BY_CATEGORY ) .log(LoggingLevel.DEBUG, log, CATALOG_GET_RESOURCES_BY_CATEGORY + " message received!") .to("log:DEBUG?showBody=true&showHeaders=true") .bean( resourceRepoService, "getDetailedResourcesByCategory(${header.category})") .marshal().json( JsonLibrary.Jackson) .convertBodyTo( String.class ); from( CATALOG_SEARCH_RESOURCES ) .log(LoggingLevel.DEBUG, log, CATALOG_SEARCH_RESOURCES + " message received!") .to("log:DEBUG?showBody=true&showHeaders=true") .bean( resourceRepoService, "searchResources(${header.text})") .marshal().json( JsonLibrary.Jackson) .convertBodyTo( String.class ); from( CATALOG_UPD_RESOURCE ) from( CATALOG_UPD_RESOURCE ) .log(LoggingLevel.DEBUG, log, CATALOG_UPD_RESOURCE + " message received!") .log(LoggingLevel.DEBUG, log, CATALOG_UPD_RESOURCE + " message received!") .to("log:DEBUG?showBody=true&showHeaders=true") .to("log:DEBUG?showBody=true&showHeaders=true") Loading src/main/java/org/etsi/osl/tmf/ri639/repo/ResourceRepository.java +1 Changes for src/main/java/org/etsi/osl/tmf/ri639/repo/ResourceRepository.java: 1 added line, 0 removed lines. Original line number Original line Diff line number Diff line Loading @@ -60,6 +60,7 @@ public interface ResourceRepository extends JpaRepository<Resource, Long> { List<Resource> findByNameAndResourceVersion(String aname, String aversion); List<Resource> findByNameAndResourceVersion(String aname, String aversion); List<Resource> findByNameAndCategoryAndResourceVersion(String aname, String acategory, String aversion); List<Resource> findByNameAndCategoryAndResourceVersion(String aname, String acategory, String aversion); List<Resource> findByCategory(String acategory); // Methods for metrics // Methods for metrics Loading Loading
src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCandidateRepoService.java +2 −1 Changes for src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCandidateRepoService.java: 2 added lines, 1 removed line. Original line number Original line Diff line number Diff line Loading @@ -158,7 +158,8 @@ public class ResourceCandidateRepoService { if ( catObj!=null){ if ( catObj!=null){ catObj.getResourceCandidateObj().add(savedCand); //add candidate ref to category catObj.getResourceCandidateObj().add(savedCand); //add candidate ref to category catObj = this.categsRepoService.categsRepoSave(catObj); catObj = this.categsRepoService.addCategory(catObj); } } } } Loading
src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCatalogRepoService.java +5 −1 Changes for src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCatalogRepoService.java: 5 added lines, 1 removed line. Original line number Original line Diff line number Diff line Loading @@ -176,7 +176,6 @@ public class ResourceCatalogRepoService { } } ---------------------------------------------------------------------------------------------------------------*/ ---------------------------------------------------------------------------------------------------------------*/ @Transactional @Transactional public ResourceCatalog findByName(String aName) { public ResourceCatalog findByName(String aName) { Optional<ResourceCatalog> optionalCat = this.catalogRepo.findByName( aName ); Optional<ResourceCatalog> optionalCat = this.catalogRepo.findByName( aName ); Loading @@ -185,6 +184,11 @@ public class ResourceCatalogRepoService { optionalCat.get().getRelatedParty().size(); optionalCat.get().getRelatedParty().size(); } } optionalCat.get().getCategoryObj().size(); optionalCat.get().getCategoryObj().size(); for (ResourceCategory rc : optionalCat.get().getCategoryObj()) { rc.getCategoryObj().size(); rc.getCategoryRefs().size(); rc.getResourceCandidateObj().size(); } } } return optionalCat.orElse(null); return optionalCat.orElse(null); } } Loading
src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCategoryRepoService.java +1 Changes for src/main/java/org/etsi/osl/tmf/rcm634/reposervices/ResourceCategoryRepoService.java: 1 added line, 0 removed lines. Original line number Original line Diff line number Diff line Loading @@ -286,6 +286,7 @@ public class ResourceCategoryRepoService { } } @Transactional public ResourceCategory findByName(String aName) { public ResourceCategory findByName(String aName) { Optional<ResourceCategory> optionalCat = this.categsRepo.findByName( aName ); Optional<ResourceCategory> optionalCat = this.categsRepo.findByName( aName ); if (optionalCat.isPresent()) { if (optionalCat.isPresent()) { Loading
src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiRouteBuilder.java +19 Changes for src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiRouteBuilder.java: 19 added lines, 0 removed lines. Original line number Original line Diff line number Diff line Loading @@ -58,7 +58,11 @@ public class ResourceApiRouteBuilder extends RouteBuilder { @Value("${CATALOG_GET_RESOURCE_BY_ID}") @Value("${CATALOG_GET_RESOURCE_BY_ID}") private String CATALOG_GET_RESOURCE_BY_ID = ""; private String CATALOG_GET_RESOURCE_BY_ID = ""; @Value("${CATALOG_GET_RESOURCES_BY_CATEGORY}") private String CATALOG_GET_RESOURCES_BY_CATEGORY = ""; @Value("${CATALOG_SEARCH_RESOURCES}") private String CATALOG_SEARCH_RESOURCES = ""; @Value("${CATALOG_RESOURCES_OF_PARTNERS}") @Value("${CATALOG_RESOURCES_OF_PARTNERS}") private String CATALOG_RESOURCES_OF_PARTNERS = ""; private String CATALOG_RESOURCES_OF_PARTNERS = ""; Loading Loading @@ -91,6 +95,21 @@ public class ResourceApiRouteBuilder extends RouteBuilder { .bean( resourceRepoService, "getResourceEagerAsString") .bean( resourceRepoService, "getResourceEagerAsString") .convertBodyTo( String.class ); .convertBodyTo( String.class ); from( CATALOG_GET_RESOURCES_BY_CATEGORY ) .log(LoggingLevel.DEBUG, log, CATALOG_GET_RESOURCES_BY_CATEGORY + " message received!") .to("log:DEBUG?showBody=true&showHeaders=true") .bean( resourceRepoService, "getDetailedResourcesByCategory(${header.category})") .marshal().json( JsonLibrary.Jackson) .convertBodyTo( String.class ); from( CATALOG_SEARCH_RESOURCES ) .log(LoggingLevel.DEBUG, log, CATALOG_SEARCH_RESOURCES + " message received!") .to("log:DEBUG?showBody=true&showHeaders=true") .bean( resourceRepoService, "searchResources(${header.text})") .marshal().json( JsonLibrary.Jackson) .convertBodyTo( String.class ); from( CATALOG_UPD_RESOURCE ) from( CATALOG_UPD_RESOURCE ) .log(LoggingLevel.DEBUG, log, CATALOG_UPD_RESOURCE + " message received!") .log(LoggingLevel.DEBUG, log, CATALOG_UPD_RESOURCE + " message received!") .to("log:DEBUG?showBody=true&showHeaders=true") .to("log:DEBUG?showBody=true&showHeaders=true") Loading
src/main/java/org/etsi/osl/tmf/ri639/repo/ResourceRepository.java +1 Changes for src/main/java/org/etsi/osl/tmf/ri639/repo/ResourceRepository.java: 1 added line, 0 removed lines. Original line number Original line Diff line number Diff line Loading @@ -60,6 +60,7 @@ public interface ResourceRepository extends JpaRepository<Resource, Long> { List<Resource> findByNameAndResourceVersion(String aname, String aversion); List<Resource> findByNameAndResourceVersion(String aname, String aversion); List<Resource> findByNameAndCategoryAndResourceVersion(String aname, String acategory, String aversion); List<Resource> findByNameAndCategoryAndResourceVersion(String aname, String acategory, String aversion); List<Resource> findByCategory(String acategory); // Methods for metrics // Methods for metrics Loading