MODINV-986: code review remark fixes

folio-org · Apr 23, 2024 · 85cf374 · 85cf374
1 parent 0f9478c
commit 85cf374
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 34 deletions.
diff --git a/src/main/java/org/folio/inventory/DataImportConsumerVerticle.java b/src/main/java/org/folio/inventory/DataImportConsumerVerticle.java
@@ -79,7 +79,7 @@ public class DataImportConsumerVerticle extends KafkaConsumerVerticle {
   public void start(Promise<Void> startPromise) {
     EventManager.registerKafkaEventPublisher(getKafkaConfig(), vertx, getMaxDistributionNumber());
 
-    var profileSnapshotExpirationTime = getCacheEnvVariable(getConfig(), "inventory.profile-snapshot-cache.expiration.time.seconds");
+    var profileSnapshotExpirationTime = getCacheEnvVariable("inventory.profile-snapshot-cache.expiration.time.seconds");
 
     var profileSnapshotCache = new ProfileSnapshotCache(vertx, getHttpClient(), Long.parseLong(profileSnapshotExpirationTime));
     var consortiumDataCache = new ConsortiumDataCache(vertx, getHttpClient());

diff --git a/src/main/java/org/folio/inventory/Launcher.java b/src/main/java/org/folio/inventory/Launcher.java
@@ -108,7 +108,7 @@ private static void startConsumerVerticles(Map<String, Object> consumerVerticles
     CompletableFuture<String> future6 = new CompletableFuture<>();
     vertxAssistant.deployVerticle(DataImportConsumerVerticle.class.getName(),
       consumerVerticlesConfig, dataImportConsumerVerticleNumber, future1);
-    vertxAssistant.deployVerticle(MarcHridSetConsumerVerticle.class.getName(),
+    vertxAssistant.deployVerticle(MarcBibInstanceHridSetConsumerVerticle.class.getName(),
       consumerVerticlesConfig, instanceHridSetConsumerVerticleNumber, future2);
     vertxAssistant.deployVerticle(QuickMarcConsumerVerticle.class.getName(),
       consumerVerticlesConfig, quickMarcConsumerVerticleNumber, future3);

diff --git a/...nventory/MarcHridSetConsumerVerticle.java → ...rcBibInstanceHridSetConsumerVerticle.java b/...nventory/MarcHridSetConsumerVerticle.java → ...rcBibInstanceHridSetConsumerVerticle.java
@@ -15,9 +15,9 @@
 import org.folio.inventory.services.HoldingsCollectionService;
 import org.folio.inventory.support.KafkaConsumerVerticle;
 
-public class MarcHridSetConsumerVerticle extends KafkaConsumerVerticle {
+public class MarcBibInstanceHridSetConsumerVerticle extends KafkaConsumerVerticle {
 
-  private static final Logger LOGGER = LogManager.getLogger(MarcHridSetConsumerVerticle.class);
+  private static final Logger LOGGER = LogManager.getLogger(MarcBibInstanceHridSetConsumerVerticle.class);
 
   @Override
   public void start(Promise<Void> startPromise) {

diff --git a/src/main/java/org/folio/inventory/support/KafkaConsumerVerticle.java b/src/main/java/org/folio/inventory/support/KafkaConsumerVerticle.java
@@ -1,9 +1,10 @@
 package org.folio.inventory.support;
 
 import static java.lang.Integer.parseInt;
+import static java.lang.Long.*;
 import static java.lang.String.format;
 import static java.lang.System.getProperty;
-import static java.util.Optional.ofNullable;
+import static java.util.Objects.isNull;
 import static org.apache.commons.lang.StringUtils.isBlank;
 import static org.folio.inventory.dataimport.util.KafkaConfigConstants.KAFKA_ENV;
 import static org.folio.inventory.dataimport.util.KafkaConfigConstants.KAFKA_HOST;
@@ -15,7 +16,6 @@
 import static org.folio.kafka.KafkaTopicNameHelper.getDefaultNameSpace;
 
 import io.vertx.core.AbstractVerticle;
-import io.vertx.core.Future;
 import io.vertx.core.Promise;
 import io.vertx.core.Verticle;
 import io.vertx.core.http.HttpClient;
@@ -47,7 +47,7 @@ public abstract class KafkaConsumerVerticle extends AbstractVerticle {
 
   @Override
   public void stop(Promise<Void> stopPromise) {
-    List<Future<Void>> stopFutures = consumerWrappers.stream()
+    var stopFutures = consumerWrappers.stream()
       .map(KafkaConsumerWrapper::stop)
       .toList();
 
@@ -70,15 +70,8 @@ protected KafkaConsumerWrapper<String, String> createConsumer(String eventType)
     return kafkaConsumerWrapper;
   }
 
-  protected JsonObject getConfig() {
-    return ofNullable(config).orElseGet(() -> {
-      config = vertx.getOrCreateContext().config();
-      return config;
-    });
-  }
-
   protected KafkaConfig getKafkaConfig() {
-    return ofNullable(kafkaConfig).orElseGet(() -> {
+    if (isNull(kafkaConfig)) {
       kafkaConfig = KafkaConfig.builder()
         .envId(getConfig().getString(KAFKA_ENV))
         .kafkaHost(getConfig().getString(KAFKA_HOST))
@@ -88,35 +81,34 @@ protected KafkaConfig getKafkaConfig() {
         .maxRequestSize(parseInt(getConfig().getString(KAFKA_MAX_REQUEST_SIZE)))
         .build();
       getLogger().info("kafkaConfig: {}", kafkaConfig);
-      return kafkaConfig;
-    });
+    }
+    return kafkaConfig;
   }
 
   protected HttpClient getHttpClient() {
-    return ofNullable(httpClient).orElseGet(() -> {
+    if (isNull(httpClient)) {
       httpClient = vertx.createHttpClient();
-      return httpClient;
-    });
+    }
+    return httpClient;
   }
 
   protected Storage getStorage() {
-    return ofNullable(storage).orElseGet(() -> {
+    if (isNull(storage)) {
       storage = Storage.basedUpon(getConfig(), vertx.createHttpClient());
-      return storage;
-    });
+    }
+    return storage;
   }
 
   protected MappingMetadataCache getMappingMetadataCache() {
-    return ofNullable(mappingMetadataCache).orElseGet(() -> {
-      var mappingMetadataExpirationTime = getCacheEnvVariable(getConfig(), METADATA_EXPIRATION_TIME);
-      mappingMetadataCache = new MappingMetadataCache(vertx, getHttpClient(),
-        Long.parseLong(mappingMetadataExpirationTime));
-      return mappingMetadataCache;
-    });
+    if (isNull(mappingMetadataCache)) {
+      var mappingMetadataExpirationTime = getCacheEnvVariable(METADATA_EXPIRATION_TIME);
+      mappingMetadataCache = new MappingMetadataCache(vertx, getHttpClient(), parseLong(mappingMetadataExpirationTime));
+    }
+    return mappingMetadataCache;
   }
 
-  protected String getCacheEnvVariable(JsonObject config, String variableName) {
-    var cacheExpirationTime = config.getString(variableName);
+  protected String getCacheEnvVariable(String variableName) {
+    var cacheExpirationTime = getConfig().getString(variableName);
     if (isBlank(cacheExpirationTime)) {
       cacheExpirationTime = CACHE_EXPIRATION_DEFAULT;
     }
@@ -127,6 +119,13 @@ protected int getMaxDistributionNumber() {
     return getConsumerProperty(MAX_DISTRIBUTION_NUMBER_TEMPLATE, MAX_DISTRIBUTION_NUMBER_DEFAULT);
   }
 
+  private JsonObject getConfig() {
+    if (isNull(config)) {
+      config = vertx.getOrCreateContext().config();
+    }
+    return config;
+  }
+
   private SubscriptionDefinition getSubscriptionDefinition(String envId, String eventType) {
     return createSubscriptionDefinition(envId, getDefaultNameSpace(), eventType);
   }

diff --git a/...mers/MarcHridSetConsumerVerticleTest.java → ...bInstanceHridSetConsumerVerticleTest.java b/...mers/MarcHridSetConsumerVerticleTest.java → ...bInstanceHridSetConsumerVerticleTest.java
@@ -8,7 +8,7 @@
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import net.mguenther.kafka.junit.EmbeddedKafkaCluster;
-import org.folio.inventory.MarcHridSetConsumerVerticle;
+import org.folio.inventory.MarcBibInstanceHridSetConsumerVerticle;
 import org.junit.AfterClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,7 +22,7 @@
 import static org.folio.inventory.dataimport.util.KafkaConfigConstants.KAFKA_REPLICATION_FACTOR;
 
 @RunWith(VertxUnitRunner.class)
-public class MarcHridSetConsumerVerticleTest {
+public class MarcBibInstanceHridSetConsumerVerticleTest {
 
   private static final String TENANT_ID = "diku";
   private static final String KAFKA_ENV_NAME = "test-env";
@@ -46,7 +46,7 @@ public void shouldDeployVerticle(TestContext context) {
       .setWorker(true);
 
     Promise<String> promise = Promise.promise();
-    vertx.deployVerticle(MarcHridSetConsumerVerticle.class.getName(), options, promise);
+    vertx.deployVerticle(MarcBibInstanceHridSetConsumerVerticle.class.getName(), options, promise);
 
     promise.future().onComplete(ar -> {
       context.assertTrue(ar.succeeded());