From 143f6da12df5b69135d117c93bc0aeb1a2f00d68 Mon Sep 17 00:00:00 2001 From: Andrea Tabone Date: Thu, 5 Mar 2020 13:59:25 +0100 Subject: [PATCH] Fix problem in CachedProductFamilyService which was preventing the apiml log message in TransformService to be displayed Signed-off-by: at670475 Signed-off-by: at670475 --- .../cached/CachedProductFamilyService.java | 23 ++++++++++--------- .../cached/CachedProductFamilyTest.java | 6 ++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/services/cached/CachedProductFamilyService.java b/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/services/cached/CachedProductFamilyService.java index 13898704c7..acaefed18c 100644 --- a/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/services/cached/CachedProductFamilyService.java +++ b/api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/services/cached/CachedProductFamilyService.java @@ -9,13 +9,13 @@ */ package org.zowe.apiml.apicatalog.services.cached; +import org.springframework.beans.factory.annotation.Value; import org.zowe.apiml.apicatalog.model.APIContainer; import org.zowe.apiml.apicatalog.model.APIService; import org.zowe.apiml.apicatalog.model.SemanticVersion; import org.zowe.apiml.eurekaservice.client.util.EurekaMetadataParser; import org.zowe.apiml.message.log.ApimlLogger; import org.zowe.apiml.product.constants.CoreService; -import org.zowe.apiml.product.gateway.GatewayClient; import org.zowe.apiml.product.logging.annotations.InjectApimlLogger; import org.zowe.apiml.product.routing.RoutedServices; import org.zowe.apiml.product.routing.ServiceType; @@ -25,8 +25,6 @@ import com.netflix.discovery.shared.Application; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; @@ -55,23 +53,26 @@ @Service @CacheConfig(cacheNames = {"products"}) public class CachedProductFamilyService { - private final Map products = new HashMap<>(); - private final CachedServicesService cachedServicesService; + @InjectApimlLogger + private final ApimlLogger apimlLog = ApimlLogger.empty(); + private final Integer cacheRefreshUpdateThresholdInMillis; + + private final CachedServicesService cachedServicesService; private final EurekaMetadataParser metadataParser = new EurekaMetadataParser(); private final TransformService transformService; - @InjectApimlLogger - private final ApimlLogger apimlLog = ApimlLogger.empty(); - @Autowired - public CachedProductFamilyService(GatewayClient gatewayClient, - CachedServicesService cachedServicesService, + private final Map products = new HashMap<>(); + + + public CachedProductFamilyService(CachedServicesService cachedServicesService, + TransformService transformService, @Value("${apiml.service-registry.cacheRefreshUpdateThresholdInMillis}") Integer cacheRefreshUpdateThresholdInMillis) { this.cachedServicesService = cachedServicesService; + this.transformService = transformService; this.cacheRefreshUpdateThresholdInMillis = cacheRefreshUpdateThresholdInMillis; - this.transformService = new TransformService(gatewayClient); } /** diff --git a/api-catalog-services/src/test/java/org/zowe/apiml/apicatalog/services/cached/CachedProductFamilyTest.java b/api-catalog-services/src/test/java/org/zowe/apiml/apicatalog/services/cached/CachedProductFamilyTest.java index bc50e50ea9..696fcbb8b3 100644 --- a/api-catalog-services/src/test/java/org/zowe/apiml/apicatalog/services/cached/CachedProductFamilyTest.java +++ b/api-catalog-services/src/test/java/org/zowe/apiml/apicatalog/services/cached/CachedProductFamilyTest.java @@ -193,8 +193,8 @@ public void testCalculationOfContainerTotalsWithAllServicesUp() { when(cachedServicesService.getService("service")).thenReturn(application); service = new CachedProductFamilyService( - null, cachedServicesService, + null, cacheRefreshUpdateThresholdInMillis); service.getContainer("demoapp", instance1); @@ -224,8 +224,8 @@ public void testCalculationOfContainerTotalsWithAllServicesDown() { when(cachedServicesService.getService("service1")).thenReturn(application1); when(cachedServicesService.getService("service2")).thenReturn(application2); service = new CachedProductFamilyService( - null, cachedServicesService, + null, cacheRefreshUpdateThresholdInMillis); service.getContainer("demoapp", instance1); @@ -254,8 +254,8 @@ public void testCalculationOfContainerTotalsWithSomeServicesDown() { when(cachedServicesService.getService("service1")).thenReturn(application1); when(cachedServicesService.getService("service2")).thenReturn(application2); service = new CachedProductFamilyService( - null, cachedServicesService, + null, cacheRefreshUpdateThresholdInMillis); service.getContainer("demoapp", instance1);