chore: Minor changes to be v2 and v3 in sync (#4533)

pavel-jares-bcm · nxhafa · web-flow · commit 516c1f808b95 · 2026-03-30T11:06:56.000+02:00
Signed-off-by: Pavel Jareš &lt;Pavel.Jares@broadcom.com&gt;
Signed-off-by: nxhafa &lt;nxhafa11@gmail.com&gt;
Co-authored-by: nxhafa &lt;nxhafa11@gmail.com&gt;
diff --git a/caching-service/src/main/java/org/zowe/apiml/caching/health/CachingHealthIndicator.java b/caching-service/src/main/java/org/zowe/apiml/caching/health/CachingHealthIndicator.java
@@ -24,7 +24,7 @@
 import org.zowe.apiml.product.constants.CoreService;
 
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Caching service health information (/cachingservice/application/health)
@@ -34,10 +34,10 @@
 @ConditionalOnMissingBean(name = "modulithConfig")
 public class CachingHealthIndicator extends AbstractHealthIndicator implements ApplicationListener<ApplicationReadyEvent> {
 
-    private final AtomicReference<Boolean> serviceUp = new AtomicReference<>(false);
+    private final AtomicBoolean serviceUp = new AtomicBoolean();
 
     private final ApiMediationClient apiMediationClient;
-    private final Optional<CachesHealthIndicator> cachesHealthIndicator;
+    private final Optional<InfinispanHealthIndicator> infinispanHealthIndicator;
 
     @Override
     protected void doHealthCheck(Health.Builder builder) {
@@ -46,12 +46,13 @@ protected void doHealthCheck(Health.Builder builder) {
         boolean gatewayUp = Optional.ofNullable(apiMediationClient.getEurekaClient())
             .map(eurekaClient -> eurekaClient.getApplication(CoreService.GATEWAY.getServiceId()))
             .map(Application::getInstances)
-            .map(i -> !i.isEmpty())
+            .map(instanceList -> !instanceList.isEmpty())
             .orElse(false);
         builder.withDetail(CoreService.GATEWAY.getServiceId(), gatewayUp ? Status.UP : Status.DOWN);
 
-        cachesHealthIndicator.ifPresent(i -> i.doHealthCheck(builder));
-        if ((!(boolean) serviceUp.get()) || !gatewayUp) {
+        infinispanHealthIndicator.ifPresent(indicator -> indicator.doHealthCheck(builder));
+        boolean isCachingUp = this.serviceUp.get();
+        if (!(isCachingUp && gatewayUp)) {
             builder.down();
         }
     }
diff --git a/caching-service/src/main/java/org/zowe/apiml/caching/health/InfinispanHealthIndicator.java b/caching-service/src/main/java/org/zowe/apiml/caching/health/InfinispanHealthIndicator.java
@@ -30,7 +30,7 @@
 
 @Component
 @ConditionalOnProperty(name = "caching.storage.mode", havingValue = "infinispan")
-public class CachesHealthIndicator extends AbstractHealthIndicator {
+public class InfinispanHealthIndicator extends AbstractHealthIndicator {
 
     @Value("${caching.storage.infinispan.initialHosts:}")
     private String initialHosts;
@@ -69,7 +69,7 @@ protected void doHealthCheck(Health.Builder builder) {
             var initialHostsArray = StringUtils.split(initialHosts, ",");
             boolean allMembers = initialHostsArray.length <= nativeCacheManager.getMembers().size();
             var cluster = Map.of(
-                "status", allMembers ? Status.UP : Status.DOWN,
+                "status", allMembers ? Status.UP.getCode() : Status.DOWN.getCode(),
                 "address", nativeCacheManager.getAddress().toString(),
                 "initialHosts", initialHostsArray,
                 "members", nativeCacheManager.getMembers().stream().map(Address::toString).toList()
diff --git a/caching-service/src/test/java/org/zowe/apiml/caching/health/CachingHealthIndicatorTest.java b/caching-service/src/test/java/org/zowe/apiml/caching/health/CachingHealthIndicatorTest.java
@@ -15,6 +15,9 @@
 import com.netflix.discovery.shared.Application;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.Status;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -26,10 +29,14 @@
 
 import static org.mockito.Mockito.*;
 
+@ExtendWith(MockitoExtension.class)
 class CachingHealthIndicatorTest {
 
-    private ApiMediationClient apiMediationClient = mock(ApiMediationClient.class);
-    private Health.Builder builder = mock(Health.Builder.class);
+    @Mock
+    private ApiMediationClient apiMediationClient;
+
+    @Mock
+    private Health.Builder builder;
 
     void initEureka(boolean hasGw, boolean hasGwInstance) {
         var eurekaClient = mock(EurekaClient.class);
@@ -92,34 +99,35 @@ void givenGatewayInstanceAfterStartUp_whenBuildHealthIndicator_thenItIsUp() {
     @Nested
     class WithCacheIndicator {
 
-        private CachesHealthIndicator cachesHealthIndicator = mock(CachesHealthIndicator.class);
+        @Mock
+        private InfinispanHealthIndicator infinispanHealthIndicator;
 
         @Test
         void givenNoGateway_whenBuildHealthIndicator_thenItIsDown() {
             initEureka(false, false);
-            var cachingHealthIndicator = new CachingHealthIndicator(apiMediationClient, Optional.of(cachesHealthIndicator));
+            var cachingHealthIndicator = new CachingHealthIndicator(apiMediationClient, Optional.of(infinispanHealthIndicator));
             cachingHealthIndicator.onApplicationEvent(mock(ApplicationReadyEvent.class));
             cachingHealthIndicator.doHealthCheck(builder);
-            verify(cachesHealthIndicator).doHealthCheck(builder);
+            verify(infinispanHealthIndicator).doHealthCheck(builder);
             verify(builder).down();
         }
 
         @Test
         void givenNoStartUpEvent_whenBuildHealthIndicator_thenItIsDown() {
             initEureka(true, true);
-            var cachingHealthIndicator = new CachingHealthIndicator(apiMediationClient, Optional.of(cachesHealthIndicator));
+            var cachingHealthIndicator = new CachingHealthIndicator(apiMediationClient, Optional.of(infinispanHealthIndicator));
             cachingHealthIndicator.doHealthCheck(builder);
-            verify(cachesHealthIndicator).doHealthCheck(builder);
+            verify(infinispanHealthIndicator).doHealthCheck(builder);
             verify(builder).down();
         }
 
         @Test
         void givenEverythingReady_whenBuildHealthIndicator_thenItIsUp() {
             initEureka(true, true);
-            var cachingHealthIndicator = new CachingHealthIndicator(apiMediationClient, Optional.of(cachesHealthIndicator));
+            var cachingHealthIndicator = new CachingHealthIndicator(apiMediationClient, Optional.of(infinispanHealthIndicator));
             cachingHealthIndicator.onApplicationEvent(mock(ApplicationReadyEvent.class));
             cachingHealthIndicator.doHealthCheck(builder);
-            verify(cachesHealthIndicator).doHealthCheck(builder);
+            verify(infinispanHealthIndicator).doHealthCheck(builder);
             verify(builder, never()).down();
         }
 
diff --git a/caching-service/src/test/java/org/zowe/apiml/caching/health/InfinispanHealthIndicatorTest.java b/caching-service/src/test/java/org/zowe/apiml/caching/health/InfinispanHealthIndicatorTest.java
@@ -39,16 +39,16 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.*;
 
-class CachesHealthIndicatorTest {
+class InfinispanHealthIndicatorTest {
 
     @Nested
     class BeforeSpringStartup {
 
         @Test
         void givenApplication_whenStarting_thenReturnUnknownStatus() {
-            var cachesHealthIndicator = new CachesHealthIndicator();
+            var infinispanHealthIndicator = new InfinispanHealthIndicator();
             var builder = mock(Health.Builder.class);
-            cachesHealthIndicator.doHealthCheck(builder);
+            infinispanHealthIndicator.doHealthCheck(builder);
             verify(builder).unknown();
         }
 
@@ -59,11 +59,11 @@ class UnsupportedCacheManager {
 
         @Test
         void givenUnsupportedCacheManager_whenBuildHealth_thenNoDetailsAdded() {
-            var cachesHealthIndicator = new CachesHealthIndicator();
-            ((AtomicReference<CacheManager>) ReflectionTestUtils.getField(cachesHealthIndicator, "cacheManager"))
+            var infinispanHealthIndicator = new InfinispanHealthIndicator();
+            ((AtomicReference<CacheManager>) ReflectionTestUtils.getField(infinispanHealthIndicator, "cacheManager"))
                 .set(mock(CacheManager.class));
             var builder = mock(Health.Builder.class);
-            cachesHealthIndicator.doHealthCheck(builder);
+            infinispanHealthIndicator.doHealthCheck(builder);
             verify(builder, never()).withDetail(any(), any());
         }
 
@@ -112,12 +112,12 @@ void givenNonRunningCache_whenBuildHealth_thenItIsDown(
             doReturn(cache).when(nativeCacheManager).getCache(CACHE_1);
             doReturn(cacheStatus).when(cache).getStatus();
 
-            var cachesHealthIndicator = new CachesHealthIndicator();
-            ((AtomicReference<CacheManager>) ReflectionTestUtils.getField(cachesHealthIndicator, "cacheManager"))
+            var infinispanHealthIndicator = new InfinispanHealthIndicator();
+            ((AtomicReference<CacheManager>) ReflectionTestUtils.getField(infinispanHealthIndicator, "cacheManager"))
                 .set(cacheManager);
-            ReflectionTestUtils.setField(cachesHealthIndicator, "initialHosts", "");
+            ReflectionTestUtils.setField(infinispanHealthIndicator, "initialHosts", "");
             var builder = mock(Health.Builder.class);
-            cachesHealthIndicator.doHealthCheck(builder);
+            infinispanHealthIndicator.doHealthCheck(builder);
 
             verify(builder).withDetail(eq(INFINISPAN), mapCaptor.capture());
             var mapDetails = mapCaptor.getValue();
diff --git a/integration-tests/src/test/java/org/zowe/apiml/functional/caching/JGroupStabilityTest.java b/integration-tests/src/test/java/org/zowe/apiml/functional/caching/JGroupStabilityTest.java
@@ -271,7 +271,7 @@ public boolean isUp() {
                 log.trace("URI: {}, JsonResponse is {}", request.getURI().toString(), jsonResponse);
 
                 if (StringUtils.isNotEmpty(jsonResponse)) {
-                    var status = JsonPath.parse(jsonResponse).read("components.caches.details.infinispan.cluster.status.status", String.class);
+                    var status = JsonPath.parse(jsonResponse).read("components.caching.details.infinispan.cluster.status", String.class);
                     return "UP".equals(status);
                 }
                 return false;

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ public boolean isUp() {`
`271`	`271`	`log.trace("URI: {}, JsonResponse is {}", request.getURI().toString(), jsonResponse);`
`272`	`272`
`273`	`273`	`if (StringUtils.isNotEmpty(jsonResponse)) {`
`274`		`- var status = JsonPath.parse(jsonResponse).read("components.caches.details.infinispan.cluster.status.status", String.class);`
	`274`	`+ var status = JsonPath.parse(jsonResponse).read("components.caching.details.infinispan.cluster.status", String.class);`
`275`	`275`	`return "UP".equals(status);`
`276`	`276`	`}`
`277`	`277`	`return false;`