From 8bcaac8a555375f1aa1c6bf5e1876a4e9e7a5beb Mon Sep 17 00:00:00 2001 From: Davide Date: Wed, 19 Jan 2022 11:10:27 +0000 Subject: [PATCH 1/2] Format DefaultVertxInstance --- .../vertx/impl/DefaultVertxInstance.java | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/vertx/impl/DefaultVertxInstance.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/vertx/impl/DefaultVertxInstance.java index 91cf467c1..ffdeaac39 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/vertx/impl/DefaultVertxInstance.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/vertx/impl/DefaultVertxInstance.java @@ -21,39 +21,39 @@ * demand and destroyed automatically along with the Hibernate * {@link org.hibernate.SessionFactory#close() session factory}. * - * @see ProvidedVertxInstance if you need to a different instance - * * @author Sanne Grinovero + * @see ProvidedVertxInstance if you need to a different instance */ public final class DefaultVertxInstance implements VertxInstance, Stoppable, Startable { - private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() ); - - private Vertx vertx; - private boolean vertxCreator; - - @Override - public Vertx getVertx() { - if ( vertx == null ) { - throw LOG.serviceNotInitialized(); - } - return vertx; - } - - @Override - public void stop() { - if ( vertxCreator && vertx != null ) { - vertx.close().toCompletionStage().toCompletableFuture().join(); - } - } - - @Override - public void start() { - final Context context = Vertx.currentContext(); - vertxCreator = context == null || context.owner() == null; - vertx = vertxCreator - ? Vertx.vertx() // Create a new one - : context.owner(); // Get the existing one - } + private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() ); + + private Vertx vertx; + private boolean vertxCreator; + + @Override + public Vertx getVertx() { + if ( vertx == null ) { + throw LOG.serviceNotInitialized(); + } + return vertx; + } + + @Override + public void stop() { + if ( vertxCreator && vertx != null ) { + vertx.close().toCompletionStage().toCompletableFuture().join(); + } + } + + @Override + public void start() { + final Context context = Vertx.currentContext(); + vertxCreator = context == null || context.owner() == null; + vertx = vertxCreator + ? Vertx.vertx() // Create a new one + : context.owner(); // Get the existing one + + } } From cb5288946d7faa0df88b9def2f351fb397dc83c1 Mon Sep 17 00:00:00 2001 From: Davide Date: Wed, 19 Jan 2022 11:28:57 +0000 Subject: [PATCH 2/2] [#1134] Add log message for Vert.x at startup If not detected: ``` [INFO] HR000002: Vert.x not detected, creating a new instance ``` if detected: ``` [DEBUG] Vert.x instance detected ``` --- .../org/hibernate/reactive/logging/impl/Log.java | 4 ++++ .../reactive/vertx/impl/DefaultVertxInstance.java | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/logging/impl/Log.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/logging/impl/Log.java index c2ec4cf3b..08dc5c1b4 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/logging/impl/Log.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/logging/impl/Log.java @@ -32,6 +32,10 @@ public interface Log extends BasicLogger { @Message(id = 1, value = "Hibernate Reactive") void startHibernateReactive(); + @LogMessage(level = INFO) + @Message(id = 2, value = "Vert.x not detected, creating a new instance") + void creatingVertxInstance(); + @LogMessage(level = INFO) @Message(id = 11, value = "SQL Client URL [%1$s]") void sqlClientUrl(String url); diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/vertx/impl/DefaultVertxInstance.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/vertx/impl/DefaultVertxInstance.java index ffdeaac39..8bf81fb9e 100644 --- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/vertx/impl/DefaultVertxInstance.java +++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/vertx/impl/DefaultVertxInstance.java @@ -50,10 +50,14 @@ public void stop() { public void start() { final Context context = Vertx.currentContext(); vertxCreator = context == null || context.owner() == null; - vertx = vertxCreator - ? Vertx.vertx() // Create a new one - : context.owner(); // Get the existing one - + if ( vertxCreator ) { + LOG.creatingVertxInstance(); + vertx = Vertx.vertx(); + } + else { + LOG.debugf( "Vert.x instance detected" ); + vertx = context.owner(); + } } }