MODINVSTOR-624: Upgrade to Vert.x 4 (WIP)

pom.xml

@@ -118,11 +118,11 @@
   </dependencies>
 
   <properties>
-    <vertx.version>3.9.4</vertx.version>
+    <vertx.version>4.0.0.CR1</vertx.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <ramlfiles_path>${basedir}/ramls/</ramlfiles_path>
-    <raml-module-builder-version>31.1.5</raml-module-builder-version>
+    <raml-module-builder-version>32.0.0-SNAPSHOT</raml-module-builder-version>
     <generate_routing_context>/instance-storage/instances,/holdings-storage/holdings,/item-storage/items,/instance-bulk/ids,/oai-pmh-view/instances,/oai-pmh-view/updatedInstanceIds,/oai-pmh-view/enrichedInstances,/inventory-hierarchy/updated-instance-ids,/inventory-hierarchy/items-and-holdings</generate_routing_context>
     <argLine />
   </properties>
@@ -412,6 +412,7 @@
                   <manifestEntries>
                     <Main-Class>org.folio.rest.RestLauncher</Main-Class>
                     <Main-Verticle>org.folio.rest.RestVerticle</Main-Verticle>
+                    <Multi-Release>true</Multi-Release>
                   </manifestEntries>
                 </transformer>
               </transformers>

src/main/java/org/folio/rest/impl/AbstractInstanceRecordsAPI.java

@@ -4,7 +4,6 @@
 import static org.folio.rest.jaxrs.resource.OaiPmhView.GetOaiPmhViewInstancesResponse.respond400WithTextPlain;
 import static org.folio.rest.jaxrs.resource.OaiPmhView.GetOaiPmhViewInstancesResponse.respond500WithTextPlain;
 
-import java.lang.invoke.MethodHandles;
 import java.time.OffsetDateTime;
 import java.util.Map;
 import java.util.Optional;
@@ -15,19 +14,18 @@
 import javax.ws.rs.core.Response;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.rest.persist.PgUtil;
 import org.folio.rest.persist.PostgresClient;
 import com.google.common.collect.Iterables;
 
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Context;
-import io.vertx.core.Future;
 import io.vertx.core.Handler;
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.RowStream;
@@ -36,7 +34,7 @@
 
 public abstract class AbstractInstanceRecordsAPI {
 
-  protected static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+  protected static final Logger log = LogManager.getLogger();
 
   private HttpServerResponse getResponse(RoutingContext routingContext) {
     final HttpServerResponse response = routingContext.response();

src/main/java/org/folio/rest/impl/AlternativeTitleTypeAPI.java

@@ -22,8 +22,8 @@
 import io.vertx.core.Context;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.rest.annotations.Validate;
 
 /**
@@ -34,7 +34,7 @@ public class AlternativeTitleTypeAPI implements org.folio.rest.jaxrs.resource.Al
   public static final String REFERENCE_TABLE  = "alternative_title_type";
 
   private static final String LOCATION_PREFIX = "/alternative-title-types/";
-  private static final Logger log             = LoggerFactory.getLogger(AlternativeTitleTypeAPI.class);
+  private static final Logger log             = LogManager.getLogger();
   private final Messages messages             = Messages.getInstance();
 
   @Validate

src/main/java/org/folio/rest/impl/CallNumberTypeAPI.java

@@ -22,8 +22,8 @@
 import io.vertx.core.Context;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.rest.annotations.Validate;
 
 /**
@@ -34,7 +34,7 @@ public class CallNumberTypeAPI implements org.folio.rest.jaxrs.resource.CallNumb
   public static final String REFERENCE_TABLE  = "call_number_type";
 
   private static final String LOCATION_PREFIX = "/call-number-types/";
-  private static final Logger log             = LoggerFactory.getLogger(CallNumberTypeAPI.class);
+  private static final Logger log             = LogManager.getLogger();
   private final Messages messages             = Messages.getInstance();
 
   /**

src/main/java/org/folio/rest/impl/ClassificationTypeAPI.java

@@ -5,7 +5,8 @@
 import java.util.UUID;
 
 import javax.ws.rs.core.Response;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.cql2pgjson.CQL2PgJSON;
 import org.folio.cql2pgjson.exception.FieldException;
 import org.folio.rest.annotations.Validate;
@@ -25,8 +26,6 @@
 import io.vertx.core.Context;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 
 /**
  * Implements the instance classification type persistency using postgres jsonb.
@@ -36,7 +35,7 @@ public class ClassificationTypeAPI implements org.folio.rest.jaxrs.resource.Clas
   public static final String CLASSIFICATION_TYPE_TABLE   = "classification_type";
 
   private static final String LOCATION_PREFIX       = "/classification-types/";
-  private static final Logger log                 = LoggerFactory.getLogger(ClassificationTypeAPI.class);
+  private static final Logger log                 = LogManager.getLogger();
   private final Messages messages                 = Messages.getInstance();
 
   private CQLWrapper getCQL(String query, int limit, int offset) throws FieldException {

src/main/java/org/folio/rest/impl/ContributorNameTypeAPI.java

@@ -1,9 +1,8 @@
 package org.folio.rest.impl;
 
 import io.vertx.core.*;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.rest.annotations.Validate;
 import org.folio.rest.jaxrs.model.ContributorNameType;
 import org.folio.rest.jaxrs.model.ContributorNameTypes;
@@ -25,7 +24,7 @@ public class ContributorNameTypeAPI implements org.folio.rest.jaxrs.resource.Con
   public static final String CONTRIBUTOR_NAME_TYPE_TABLE   = "contributor_name_type";
 
   private static final String LOCATION_PREFIX       = "/contributor-name-types/";
-  private static final Logger log                 = LoggerFactory.getLogger(ContributorNameTypeAPI.class);
+  private static final Logger log                 = LogManager.getLogger();
   private final Messages messages                 = Messages.getInstance();
 
   @Validate

src/main/java/org/folio/rest/impl/ContributorTypeAPI.java

@@ -1,9 +1,8 @@
 package org.folio.rest.impl;
 
 import io.vertx.core.*;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.cql2pgjson.CQL2PgJSON;
 import org.folio.cql2pgjson.exception.FieldException;
 import org.folio.rest.annotations.Validate;
@@ -32,7 +31,7 @@ public class ContributorTypeAPI implements org.folio.rest.jaxrs.resource.Contrib
   public static final String CONTRIBUTOR_TYPE_TABLE   = "contributor_type";
 
   private static final String LOCATION_PREFIX       = "/contributor-types/";
-  private static final Logger log                 = LoggerFactory.getLogger(ContributorTypeAPI.class);
+  private static final Logger log                 = LogManager.getLogger();
   private final Messages messages                 = Messages.getInstance();
 
   private CQLWrapper getCQL(String query, int limit, int offset) throws FieldException {

src/main/java/org/folio/rest/impl/ElectronicAccessRelationshipAPI.java

@@ -11,7 +11,8 @@
 import java.util.UUID;
 
 import javax.ws.rs.core.Response;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.cql2pgjson.CQL2PgJSON;
 import org.folio.cql2pgjson.exception.FieldException;
 import org.folio.rest.RestVerticle;
@@ -28,8 +29,6 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Context;
 import io.vertx.core.Handler;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 
 /**
  *
@@ -40,7 +39,7 @@ public class ElectronicAccessRelationshipAPI implements org.folio.rest.jaxrs.res
   public static final String RESOURCE_TABLE = "electronic_access_relationship";
 
   private static final String LOCATION_PREFIX = "/electronic-access-relationships/";
-  private static final Logger LOG = LoggerFactory.getLogger(ElectronicAccessRelationshipAPI.class);
+  private static final Logger LOG = LogManager.getLogger();
   private static final Messages MESSAGES = Messages.getInstance();
 
   @Override

src/main/java/org/folio/rest/impl/HoldingsBatchSyncAPI.java

@@ -40,17 +40,13 @@ public void postHoldingsStorageBatchSynchronous(boolean upsert, HoldingsrecordsP
       futures.add(setHrid(holdingsRecord, hridManager));
     }
 
-    CompositeFuture.all(futures).setHandler(ar -> {
-      if (ar.succeeded()) {
-        StorageHelper.postSync(HoldingsStorageAPI.HOLDINGS_RECORD_TABLE, holdingsRecords,
-            okapiHeaders, upsert, asyncResultHandler, vertxContext,
-            HoldingsStorageBatchSynchronous.PostHoldingsStorageBatchSynchronousResponse::respond201);
-      } else {
-        asyncResultHandler.handle(
-            Future.succeededFuture(PostHoldingsStorageBatchSynchronousResponse
-                .respond500WithTextPlain(ar.cause().getMessage())));
-      }
-    });
+    CompositeFuture.all(futures)
+    .onSuccess(success -> StorageHelper.postSync(HoldingsStorageAPI.HOLDINGS_RECORD_TABLE, holdingsRecords,
+        okapiHeaders, upsert, asyncResultHandler, vertxContext,
+        HoldingsStorageBatchSynchronous.PostHoldingsStorageBatchSynchronousResponse::respond201))
+    .onFailure(cause -> asyncResultHandler.handle(
+        Future.succeededFuture(PostHoldingsStorageBatchSynchronousResponse
+            .respond500WithTextPlain(cause.getMessage()))));
   }
 
   private Future<Void> setHrid(HoldingsRecord holdingsRecord, HridManager hridManager) {

src/main/java/org/folio/rest/impl/HoldingsNoteTypeAPI.java

@@ -10,7 +10,8 @@
 import java.util.UUID;
 
 import javax.ws.rs.core.Response;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.cql2pgjson.CQL2PgJSON;
 import org.folio.cql2pgjson.exception.FieldException;
 import org.folio.rest.jaxrs.model.HoldingsNoteType;
@@ -29,8 +30,6 @@
 import io.vertx.core.Context;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 
 /**
  *
@@ -41,7 +40,7 @@ public class HoldingsNoteTypeAPI implements org.folio.rest.jaxrs.resource.Holdin
   public static final String REFERENCE_TABLE  = "holdings_note_type";
 
   private static final String LOCATION_PREFIX = "/holdings-note-types/";
-  private static final Logger log             = LoggerFactory.getLogger(HoldingsNoteTypeAPI.class);
+  private static final Logger log             = LogManager.getLogger();
   private final Messages messages             = Messages.getInstance();
 
   @Override

src/main/java/org/folio/rest/impl/HoldingsRecordsSourceAPI.java

@@ -5,7 +5,8 @@
 import java.util.Map;
 
 import javax.ws.rs.core.Response;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.rest.jaxrs.model.HoldingsRecordsSource;
 import org.folio.rest.jaxrs.model.HoldingsRecordsSource.Source;
 import org.folio.rest.jaxrs.model.HoldingsRecordsSources;
@@ -18,14 +19,12 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Context;
 import io.vertx.core.Handler;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 
 public class HoldingsRecordsSourceAPI implements org.folio.rest.jaxrs.resource.HoldingsSources {
 
   private static final String REFERENCE_TABLE = "holdings_records_source";
   public static final String HOLDINGS_RECORD_TABLE = "holdings_record";
-  private static final Logger log = LoggerFactory.getLogger(HoldingsRecordsSourceAPI.class);
+  private static final Logger log = LogManager.getLogger();
   private final Messages messages = Messages.getInstance();
 
   @Override

src/main/java/org/folio/rest/impl/HoldingsStorageAPI.java

@@ -14,6 +14,8 @@
 
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.RowSet;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.cql2pgjson.CQL2PgJSON;
 import org.folio.rest.annotations.Validate;
 import org.folio.rest.jaxrs.model.HoldingsRecord;
@@ -37,8 +39,6 @@
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 import io.vertx.ext.web.RoutingContext;
 
 /**
@@ -47,7 +47,7 @@
  */
 public class HoldingsStorageAPI implements HoldingsStorage {
 
-  private static final Logger log = LoggerFactory.getLogger(HoldingsStorageAPI.class);
+  private static final Logger log = LogManager.getLogger();
 
   // Has to be lowercase because raml-module-builder uses case sensitive
   // lower case headers
@@ -128,7 +128,6 @@ public void postHoldingsStorageHoldings(String lang,
               return;
             }
           }
-
           final Future<String> hridFuture =
               setHoldingsHrid(entity, vertxContext, postgresClient);
 

src/main/java/org/folio/rest/impl/HoldingsTypeAPI.java

@@ -8,7 +8,8 @@
 import java.util.UUID;
 
 import javax.ws.rs.core.Response;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.cql2pgjson.CQL2PgJSON;
 import org.folio.cql2pgjson.exception.FieldException;
 import org.folio.rest.jaxrs.model.Error;
@@ -31,8 +32,6 @@
 import io.vertx.core.Context;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 
 /**
  *
@@ -43,7 +42,7 @@ public class HoldingsTypeAPI implements org.folio.rest.jaxrs.resource.HoldingsTy
   public static final String REFERENCE_TABLE  = "holdings_type";
 
   private static final String LOCATION_PREFIX = "/holdings-types/";
-  private static final Logger log             = LoggerFactory.getLogger(HoldingsTypeAPI.class);
+  private static final Logger log = LogManager.getLogger();
   private final Messages messages             = Messages.getInstance();
 
   @Override
@@ -211,9 +210,8 @@ private void internalServerErrorDuringPut(Throwable e, String lang, Handler<Asyn
   }
 
   private Future<String> saveHoldingsType(PostgresClient pgClient, HoldingsType entity) {
-    Future<String> future = Future.future();
-    pgClient.save(REFERENCE_TABLE, entity.getId(), entity, future);
-    return future;
+    return Future.future(promise
+        -> pgClient.save(REFERENCE_TABLE, entity.getId(), entity, promise));
   }
 
   private PostHoldingsTypesResponse handleSaveHoldingsTypeException(Throwable t) {

src/main/java/org/folio/rest/impl/HridSettingsStorageAPI.java

@@ -3,7 +3,8 @@
 import java.util.Map;
 
 import javax.ws.rs.core.Response;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.rest.annotations.Validate;
 import org.folio.rest.jaxrs.model.HridSettings;
 import org.folio.rest.jaxrs.resource.HridSettingsStorage;
@@ -15,11 +16,9 @@
 import io.vertx.core.Context;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
 
 public class HridSettingsStorageAPI implements HridSettingsStorage {
-  private static final Logger log = LoggerFactory.getLogger(HridSettingsStorageAPI.class);
+  private static final Logger log = LogManager.getLogger();
 
   @Validate
   @Override

src/main/java/org/folio/rest/impl/IdentifierTypeAPI.java

@@ -1,9 +1,8 @@
 package org.folio.rest.impl;
 
 import io.vertx.core.*;
-import io.vertx.core.logging.Logger;
-import io.vertx.core.logging.LoggerFactory;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.folio.cql2pgjson.CQL2PgJSON;
 import org.folio.cql2pgjson.exception.FieldException;
 import org.folio.rest.annotations.Validate;
@@ -32,7 +31,7 @@ public class IdentifierTypeAPI implements org.folio.rest.jaxrs.resource.Identifi
   public static final String IDENTIFIER_TYPE_TABLE   = "identifier_type";
 
   private static final String LOCATION_PREFIX       = "/identifier-types/";
-  private static final Logger log                 = LoggerFactory.getLogger(IdentifierTypeAPI.class);
+  private static final Logger log                 = LogManager.getLogger();
   private final Messages messages                 = Messages.getInstance();
 
   private CQLWrapper getCQL(String query, int limit, int offset) throws FieldException {