Adapt for quarkus 3.3+

quarkiverse · Aug 30, 2023 · cdc16cf · cdc16cf
1 parent d0160cf
commit cdc16cf
Show file tree

Hide file tree

Showing 23 changed files with 149 additions and 598 deletions.
diff --git a/README.md b/README.md
@@ -7,10 +7,10 @@ log level of your loggers.
 
 | Endpoint        | Http Method           | Description  |
 | ------------- |:-------------:|:-----:|
-| `/loggers`      | `GET` | Returns the list of all loggers, with information about the configured and effective level |
-| `/loggers?loggerName={loggerName}`     | `GET`      |   Returns the logger specified by this name, with information about the configured and effective level |
-| `/loggers` | `POST`      |    Changes the log level of the specified logger |
-| `/loggers/levels` | `GET`      |    Get all the available level |
+| `/logging-manager`      | `GET` | Returns the list of all loggers, with information about the configured and effective level |
+| `/logging-manager?loggerName={loggerName}`     | `GET`      |   Returns the logger specified by this name, with information about the configured and effective level |
+| `/logging-manager` | `POST`      |    Changes the log level of the specified logger |
+| `/logging-manager/levels` | `GET`      |    Get all the available level |
 
 ## Security
 Security of endpoints is important and we do not want to allow unknown people to know (or worse, change!) the log levels of
@@ -46,10 +46,6 @@ To use this in your application, simply add this in your pom.xml:
 
 Note: Replace `${logger-manager.version}` with the latest version
 
-Then browse to [http://localhost:8080/q/logging-manager-ui/](http://localhost:8080/q/logging-manager-ui/)
-
-![logger_manager_log_screenshot](logstream.gif "Log stream Screenshot")
-
 ## OpenAPI
 
 You can include the Logger Manager API in the OpenAPI document (and thus also Swagger UI). This needs to be
@@ -64,8 +60,6 @@ This will then add the following to your OpenAPI:
 ![swagger_manager screenshot](openapi.png "Swagger UI Screenshot")
 
 ## Roadmap
-- [x] Add online log viewer option
-- [x] Graphical UI to read logger level
 - [x] OpenApiSpec for the endpoints
 - [x] Make endpoint configurable
 - [x] Enable customizable security on the endpoint (see readme file)

diff --git a/deployment/pom.xml b/deployment/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkiverse.loggingmanager</groupId>
         <artifactId>quarkus-logging-manager-parent</artifactId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerConfig.java b/deployment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerConfig.java
@@ -1,6 +1,5 @@
 package io.quarkiverse.loggingmanager.deployment;
 
-import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
 
@@ -31,17 +30,4 @@ public class LoggingManagerConfig {
      */
     @ConfigItem(defaultValue = "true")
     boolean alwaysInclude;
-
-    /**
-     * The number of history log entries to remember.
-     */
-    @ConfigItem(defaultValue = "50")
-    public int historySize;
-
-    /**
-     * UI configuration
-     */
-    @ConfigItem
-    @ConfigDocSection
-    LoggingManagerUIConfig ui;
 }
diff --git a/...t/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerOpenAPIFilter.java b/...t/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerOpenAPIFilter.java
@@ -11,7 +11,7 @@
 import org.eclipse.microprofile.openapi.models.media.Schema;
 import org.eclipse.microprofile.openapi.models.parameters.Parameter;
 
-import io.quarkus.vertx.http.runtime.logstream.LogController;
+import io.quarkiverse.loggingmanager.LogController;
 import io.smallrye.openapi.api.models.media.SchemaImpl;
 
 /**

diff --git a/...yment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerProcessor.java b/...yment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerProcessor.java
diff --git a/...oyment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerUIConfig.java b/...oyment/src/main/java/io/quarkiverse/loggingmanager/deployment/LoggingManagerUIConfig.java
diff --git a/deployment/src/main/resources/META-INF/resources/template/loggermanager.html b/deployment/src/main/resources/META-INF/resources/template/loggermanager.html
diff --git a/...ent/src/main/resources/META-INF/resources/template/quarkiverse_icon_reverse.svg b/...ent/src/main/resources/META-INF/resources/template/quarkiverse_icon_reverse.svg
diff --git a/deployment/src/main/resources/dev-templates/embedded.html b/deployment/src/main/resources/dev-templates/embedded.html
diff --git a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomConfigTest.java b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomConfigTest.java
@@ -1,7 +1,5 @@
 package io.quarkiverse.loggingmanager.deployment;
 
-import static org.hamcrest.Matchers.containsString;
-
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -16,11 +14,10 @@ public class CustomConfigTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addAsResource(new StringAsset("quarkus.logging-manager.ui.root-path=custom"), "application.properties"));
+                    .addAsResource(new StringAsset("quarkus.logging-manager.base-path=custom"), "application.properties"));
 
     @Test
     public void shouldUseCustomConfig() {
-        RestAssured.when().get("/q/custom").then().statusCode(200).body(containsString("Logging manager"));
-        RestAssured.when().get("/q/custom/index.html").then().statusCode(200).body(containsString("Logging manager"));
+        RestAssured.when().get("/q/custom").then().statusCode(200);
     }
 }
diff --git a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomHttpRootTest.java b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/CustomHttpRootTest.java
@@ -1,7 +1,5 @@
 package io.quarkiverse.loggingmanager.deployment;
 
-import static org.hamcrest.Matchers.containsString;
-
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -20,8 +18,6 @@ public class CustomHttpRootTest {
 
     @Test
     public void shouldUseCustomConfig() {
-        RestAssured.when().get("/q/logging-manager-ui").then().statusCode(200).body(containsString("Logging manager"));
-        RestAssured.when().get("/q/logging-manager-ui/index.html").then().statusCode(200)
-                .body(containsString("Logging manager"));
+        RestAssured.when().get("/q/logging-manager").then().statusCode(200);
     }
-}
+}
diff --git a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/DisabledTest.java b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/DisabledTest.java
diff --git a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/ErroneousConfigTest.java b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/ErroneousConfigTest.java
@@ -7,16 +7,16 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.quarkus.deployment.configuration.ConfigurationError;
+import io.quarkus.runtime.configuration.ConfigurationException;
 import io.quarkus.test.QuarkusUnitTest;
 
 public class ErroneousConfigTest {
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .setExpectedException(ConfigurationError.class)
+            .setExpectedException(ConfigurationException.class)
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addAsResource(new StringAsset("quarkus.logging-manager.ui.root-path=/\n"), "application.properties"));
+                    .addAsResource(new StringAsset("quarkus.logging-manager.base-path=/\n"), "application.properties"));
 
     @Test
     public void shouldNotStartApplicationIfPathIsASlash() {

diff --git a/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/NoConfigTest.java b/deployment/src/test/java/io/quarkiverse/loggingmanager/deployment/NoConfigTest.java
@@ -1,7 +1,5 @@
 package io.quarkiverse.loggingmanager.deployment;
 
-import static org.hamcrest.Matchers.containsString;
-
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
@@ -18,8 +16,6 @@ public class NoConfigTest {
 
     @Test
     public void shouldUseDefaultConfig() {
-        RestAssured.when().get("/q/logging-manager-ui").then().statusCode(200).body(containsString("Logging manager"));
-        RestAssured.when().get("/q/logging-manager-ui/index.html").then().statusCode(200)
-                .body(containsString("Logging manager"));
+        RestAssured.when().get("/q/logging-manager").then().statusCode(200);
     }
-}
+}
diff --git a/logstream.gif b/logstream.gif
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>io.quarkiverse.loggingmanager</groupId>
     <artifactId>quarkus-logging-manager-parent</artifactId>
-    <version>3.0.2-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>Quarkus - Logging Manager - Parent</name>
 
     <packaging>pom</packaging>
@@ -22,7 +22,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.release>11</maven.compiler.release>
         <maven.compiler.parameters>true</maven.compiler.parameters>
-        <quarkus.version>3.2.4.Final</quarkus.version>
+        <quarkus.version>3.3.1</quarkus.version>
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
     </properties>
 

diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkiverse.loggingmanager</groupId>
         <artifactId>quarkus-logging-manager-parent</artifactId>
-        <version>3.0.2-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/runtime/src/main/java/io/quarkiverse/loggingmanager/LevelHandler.java b/runtime/src/main/java/io/quarkiverse/loggingmanager/LevelHandler.java
@@ -2,7 +2,6 @@
 
 import static io.vertx.core.http.HttpMethod.GET;
 
-import io.quarkus.vertx.http.runtime.logstream.LogController;
 import io.vertx.core.Handler;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServerRequest;