fix formatting

appform-io · Nov 21, 2024 · 6f37b09 · 6f37b09
1 parent 63d292c
commit 6f37b09
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 35 deletions.
diff --git a/ranger-client/src/main/java/io/appform/ranger/client/AbstractRangerHubClient.java b/ranger-client/src/main/java/io/appform/ranger/client/AbstractRangerHubClient.java
@@ -169,10 +169,7 @@ public List<ServiceNode<T>> getAllNodes(
     @Override
     public Collection<Service> getRegisteredServices() {
         try {
-            return this.getHub().getServiceDataSource().services()
-                    .stream()
-                    .filter(service -> !excludedServices.contains(service.getServiceName()))
-                    .collect(Collectors.toSet());
+            return this.getHub().getServiceDataSource().services();
         }
         catch (Exception e) {
             log.error("Call to the hub failed with exception, {}", e.getMessage());

diff --git a/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHub.java b/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHub.java
@@ -82,7 +82,7 @@ public class ServiceFinderHub<T, R extends ServiceRegistry<T>> {
     public ServiceFinderHub(
             ServiceDataSource serviceDataSource,
             ServiceFinderFactory<T, R> finderFactory
-    ) {
+                           ) {
         this(serviceDataSource, finderFactory,
                 HubConstants.SERVICE_REFRESH_TIMEOUT_MS, HubConstants.HUB_START_TIMEOUT_MS, Set.of());
     }
@@ -98,9 +98,9 @@ public ServiceFinderHub(
         this.serviceRefreshTimeoutMs = serviceRefreshTimeoutMs == 0 ? HubConstants.SERVICE_REFRESH_TIMEOUT_MS : serviceRefreshTimeoutMs;
         this.hubStartTimeoutMs = hubStartTimeoutMs == 0 ? HubConstants.HUB_START_TIMEOUT_MS : hubStartTimeoutMs;
         this.refreshSignals.add(new ScheduledSignal<>("service-hub-updater",
-                () -> null,
-                Collections.emptyList(),
-                10_000));
+                                                      () -> null,
+                                                      Collections.emptyList(),
+                                      10_000));
         this.refresherPool = createRefresherPool();
         this.excludedServices = excludedServices;
     }
@@ -245,10 +245,10 @@ private void updateRegistry() {
     private void waitTillHubIsReady() {
         val services = getEligibleServices();
         val timeToRefresh = Math.max(hubStartTimeoutMs,
-                (serviceRefreshTimeoutMs * services.size()) / refresherPool.getParallelism());
+                                     (serviceRefreshTimeoutMs * services.size()) / refresherPool.getParallelism());
         if (timeToRefresh != hubStartTimeoutMs) {
             log.warn("Max hub refresh time has been dynamically adjusted to {} ms from the provided {} ms as the " +
-                            "provided time would have been insufficient to refresh {} services.",
+                             "provided time would have been insufficient to refresh {} services.",
                     timeToRefresh, hubStartTimeoutMs, services.size());
         }
         val hubRefresher = CompletableFuture.allOf(

diff --git a/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHubBuilder.java b/ranger-core/src/main/java/io/appform/ranger/core/finderhub/ServiceFinderHubBuilder.java
@@ -74,13 +74,13 @@ public ServiceFinderHubBuilder<T, R> withExtraRefreshSignal(Signal<Void> extraRe
         return this;
     }
 
-    public ServiceFinderHubBuilder<T, R> withServiceRefreshDuration(long serviceRefreshDurationMs) {
-        this.serviceRefreshTimeoutMs = serviceRefreshDurationMs;
+    public ServiceFinderHubBuilder<T, R> withServiceRefreshTimeout(long serviceRefreshTimeoutMs) {
+        this.serviceRefreshTimeoutMs = serviceRefreshTimeoutMs;
         return this;
     }
 
-    public ServiceFinderHubBuilder<T, R> withHubRefreshDuration(long hubRefreshDurationMs) {
-        this.hubStartTimeoutMs = hubRefreshDurationMs;
+    public ServiceFinderHubBuilder<T, R> withHubStartTimeout(long hubStartTimeoutMs) {
+        this.hubStartTimeoutMs = hubStartTimeoutMs;
         return this;
     }
 
@@ -97,9 +97,9 @@ public ServiceFinderHub<T, R> build() {
         val hub = new ServiceFinderHub<>(serviceDataSource, serviceFinderFactory, serviceRefreshTimeoutMs,
                 hubStartTimeoutMs, excludedServices);
         final ScheduledSignal<Void> refreshSignal = new ScheduledSignal<>("service-hub-refresh-timer",
-                () -> null,
-                Collections.emptyList(),
-                refreshFrequencyMs);
+                                                                          () -> null,
+                                                                          Collections.emptyList(),
+                                                                          refreshFrequencyMs);
         hub.registerUpdateSignal(refreshSignal);
         extraRefreshSignals.forEach(hub::registerUpdateSignal);
 

diff --git a/ranger-core/src/test/java/io/appform/ranger/core/finderhub/ServiceFinderHubTest.java b/ranger-core/src/test/java/io/appform/ranger/core/finderhub/ServiceFinderHubTest.java
@@ -83,7 +83,7 @@ void testDelayedServiceAddition() {
                         .withServiceName(service.getServiceName())
                         .withDeserializer(new Deserializer<TestNodeData>() {})
                         .withSleepDuration(1)
-                        .build(), 5_000, 5_000,Set.of()
+                        .build(), 5_000, 5_000, Set.of()
         );
         serviceFinderHub.start();
         Assertions.assertTrue(serviceFinderHub.finder(new Service("NS", "SERVICE")).isPresent());

diff --git a/...ove-client/src/main/java/io/appform/ranger/client/drove/AbstractRangerDroveHubClient.java b/...ove-client/src/main/java/io/appform/ranger/client/drove/AbstractRangerDroveHubClient.java
@@ -51,12 +51,12 @@ protected ServiceDataSource getDefaultDataSource() {
   @Override
   protected ServiceFinderHub<T, R> buildHub() {
     return new DroveServiceFinderHubBuilder<T, R>()
-            .withServiceDataSource(getServiceDataSource())
-            .withServiceFinderFactory(getFinderFactory())
-            .withRefreshFrequencyMs(getNodeRefreshTimeMs())
-            .withHubRefreshDuration(getHubStartTimeoutMs())
-            .withServiceRefreshDuration(getServiceRefreshTimeoutMs())
-            .withExcludedServices(getExcludedServices())
-            .build();
+        .withServiceDataSource(getServiceDataSource())
+        .withServiceFinderFactory(getFinderFactory())
+        .withRefreshFrequencyMs(getNodeRefreshTimeMs())
+        .withHubStartTimeout(getHubStartTimeoutMs())
+        .withServiceRefreshTimeout(getServiceRefreshTimeoutMs())
+        .withExcludedServices(getExcludedServices())
+        .build();
   }
 }
diff --git a/...-http-client/src/main/java/io/appform/ranger/client/http/AbstractRangerHttpHubClient.java b/...-http-client/src/main/java/io/appform/ranger/client/http/AbstractRangerHttpHubClient.java
@@ -63,8 +63,8 @@ protected ServiceFinderHub<T, R> buildHub() {
                 .withServiceDataSource(getServiceDataSource())
                 .withServiceFinderFactory(getFinderFactory())
                 .withRefreshFrequencyMs(getNodeRefreshTimeMs())
-                .withHubRefreshDuration(getHubStartTimeoutMs())
-                .withServiceRefreshDuration(getServiceRefreshTimeoutMs())
+                .withHubStartTimeout(getHubStartTimeoutMs())
+                .withServiceRefreshTimeout(getServiceRefreshTimeoutMs())
                 .withExcludedServices(getExcludedServices())
                 .build();
     }

diff --git a/ranger-http/src/main/java/io/appform/ranger/http/servicefinderhub/HttpServiceDataSource.java b/ranger-http/src/main/java/io/appform/ranger/http/servicefinderhub/HttpServiceDataSource.java
@@ -36,7 +36,7 @@ public HttpServiceDataSource(HttpClientConfig config, HttpCommunicator<T> httpCl
 
     @Override
     public Collection<Service> services() {
-        Objects.requireNonNull(config, "client config has not been set for node data");
+       Objects.requireNonNull(config, "client config has not been set for node data");
         return httpCommunicator.services();
     }
 }
diff --git a/...erver-bundle/src/main/java/io/appform/ranger/hub/server/bundle/RangerHubServerBundle.java b/...erver-bundle/src/main/java/io/appform/ranger/hub/server/bundle/RangerHubServerBundle.java
@@ -81,7 +81,7 @@ protected List<Signal<ShardInfo>> withLifecycleSignals(U configuration) {
 
     @Override
     protected List<HealthCheck> withHealthChecks(U configuration) {
-        return Collections.singletonList((HealthCheck) new RangerHealthCheck(curatorFrameworks));
+        return List.of(new RangerHealthCheck(curatorFrameworks));
     }
 
     @AllArgsConstructor

diff --git a/...ain/java/io/appform/ranger/hub/server/bundle/configuration/RangerServerConfiguration.java b/...ain/java/io/appform/ranger/hub/server/bundle/configuration/RangerServerConfiguration.java
@@ -45,9 +45,7 @@ public class RangerServerConfiguration {
     Set<String> excludedServices;
 
     public Set<String> getExcludedServices() {
-        return Objects.isNull(excludedServices)
-               ? Collections.emptySet() :
-               excludedServices;
+        return Objects.requireNonNullElseGet(excludedServices,Set::of);
     }
 
 }
diff --git a/ranger-zk-client/src/main/java/io/appform/ranger/client/zk/AbstractRangerZKHubClient.java b/ranger-zk-client/src/main/java/io/appform/ranger/client/zk/AbstractRangerZKHubClient.java
@@ -46,8 +46,8 @@ protected ServiceFinderHub<T, R> buildHub() {
                 .withRefreshFrequencyMs(getNodeRefreshTimeMs())
                 .withServiceDataSource(getServiceDataSource())
                 .withServiceFinderFactory(getFinderFactory())
-                .withHubRefreshDuration(getHubStartTimeoutMs())
-                .withServiceRefreshDuration(getServiceRefreshTimeoutMs())
+                .withHubStartTimeout(getHubStartTimeoutMs())
+                .withServiceRefreshTimeout(getServiceRefreshTimeoutMs())
                 .withExcludedServices(getExcludedServices())
                 .build();
     }

diff --git a/...eeper/src/main/java/io/appform/ranger/zookeeper/servicefinderhub/ZkServiceDataSource.java b/...eeper/src/main/java/io/appform/ranger/zookeeper/servicefinderhub/ZkServiceDataSource.java
@@ -19,7 +19,6 @@
 import io.appform.ranger.core.finderhub.ServiceDataSource;
 import io.appform.ranger.core.model.Service;
 import io.appform.ranger.zookeeper.util.PathBuilder;
-import java.util.Set;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;