update to dropwizard 5.0-rc.4;

remove admin context identification in logs (because it doesn't work anymore)

Author: xvik

CHANGELOG.md

@@ -1,6 +1,4 @@
 * Update to dropwizard 5 (requires java 17)
-* [admin-rest]
-    - Add identifyAdminContextInRequestLogs bundle option to highlight admin requests in logs
 
 ### 7.2.1 (2025-05-12)
 * Fix NoClassDefFoundError on guicey startup due to junit classes leak into core (#428)

build.gradle

@@ -19,7 +19,7 @@ wrapper {
 description = 'Dropwizard guice integration'
 
 ext {
-    dropwizard = '5.0.0-rc.3'
+    dropwizard = '5.0.0-rc.4'
     guice = '7.0.0'
     hk2 = '3.0.6'
     spockJunit5 = '1.2.0'

guicey-admin-rest/src/main/java/ru/vyarus/guicey/admin/AdminRestBundle.java

@@ -34,7 +34,6 @@ public class AdminRestBundle extends UniqueGuiceyBundle {
     private final Logger logger = LoggerFactory.getLogger(AdminRestBundle.class);
 
     private final String path;
-    private boolean identifyAdminContext;
 
     /**
      * Admin rest will be mapped on the same path as main rest if rest mapping is different from '/*'.
@@ -54,28 +53,6 @@ public AdminRestBundle(final String path) {
         this.path = path;
     }
 
-    /**
-     * Shortcut for {@code identifyAdminPathsInRequestLogs(true)}.
-     *
-     * @return bundle instance
-     */
-    public AdminRestBundle identifyAdminContextInRequestLogs() {
-        return identifyAdminContextInRequestLogs(true);
-    }
-
-    /**
-     * As admin rest just redirects to main context rest, then all admin rest calls would be logged. It might
-     * be hard to identify admin calls in such logs (if rest contexts are the same and resources used from both
-     * contexts). When enabled, " (ADMIN REST)" string is appended for loggable request uri.
-     *
-     * @param identifyAdminPathsInRequestLogs true to identify admin calls in request logs
-     * @return bundle instance
-     */
-    public AdminRestBundle identifyAdminContextInRequestLogs(final boolean identifyAdminPathsInRequestLogs) {
-        this.identifyAdminContext = identifyAdminPathsInRequestLogs;
-        return this;
-    }
-
     @Override
     public void run(final GuiceyEnvironment environment) throws Exception {
         environment.manage(new ServletRegistration(environment.environment()));
@@ -91,7 +68,7 @@ private void registerServlet(final String path, final Environment environment) {
         // In admin context LogbackAccessRequestLogAwareHandler not registered, but our admin servlet calls
         // the main context, which will trigger LogbackAccessRequestLog, but without a proper handler it would fail
         environment.getAdminContext()
-                .insertHandler(new LogbackAccessRequestLogAwareCustomHandler(identifyAdminContext));
+                .insertHandler(new LogbackAccessRequestLogAwareCustomHandler());
         logger.info("Admin REST registered on path: {}", path);
     }
 

guicey-admin-rest/src/main/java/ru/vyarus/guicey/admin/log/LogbackAccessRequestLogAwareCustomHandler.java

@@ -1,7 +1,6 @@
 package ru.vyarus.guicey.admin.log;
 
 import org.eclipse.jetty.ee10.servlet.ServletContextRequest;
-import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
@@ -26,31 +25,14 @@
  */
 public class LogbackAccessRequestLogAwareCustomHandler extends Handler.Wrapper {
 
-    private final boolean identifyAdminContext;
-
-    /**
-     * Creates custom logback handler.
-     *
-     * @param identifyAdminContext true to identify admin context logs
-     */
-    public LogbackAccessRequestLogAwareCustomHandler(final boolean identifyAdminContext) {
-        this.identifyAdminContext = identifyAdminContext;
-    }
-
     @Override
     public boolean handle(final Request request,
                           final Response response,
                           final Callback callback) throws Exception {
         final boolean handled = super.handle(request, response, callback);
         // apply ONLY for rest simulation (for other cases simply not required, because requests not logged)
         if (handled && request.getAttribute(AdminRestServlet.ADMIN_PROPERTY) != null) {
-            ServletContextRequest servletContextRequest = Request.as(request, ServletContextRequest.class);
-            if (identifyAdminContext) {
-                // indicate admin context call in log
-                servletContextRequest = (ServletContextRequest) servletContextRequest
-                        .wrap(request, HttpURI.build(request.getHttpURI())
-                                .uri(request.getHttpURI() + " (ADMIN REST)"));
-            }
+            final ServletContextRequest servletContextRequest = Request.as(request, ServletContextRequest.class);
             if (servletContextRequest != null) {
                 final Request unwrapped = Request.unWrap(request);
                 if (!(unwrapped instanceof HttpChannelState.ChannelRequest channelRequest)) {

guicey-admin-rest/src/test/groovy/ru/vyarus/guicey/admin/AdminRestIdentityInLogsTest.groovy

@@ -35,7 +35,7 @@ class AdminRestIdentityInLogsTest extends AbstractTest {
         res = new URL("http://localhost:8081/api/hybrid/hello").getText()
         sleep(100)
         then: "admin context identified"
-        out.getText().replace("\r", "").contains("\"GET /api/hybrid/hello (ADMIN REST) HTTP/1.1\"")
+        out.getText().replace("\r", "").contains("\"GET /api/hybrid/hello HTTP/1.1\"")
 
     }
 
@@ -45,8 +45,7 @@ class AdminRestIdentityInLogsTest extends AbstractTest {
         @Override
         void initialize(Bootstrap<Configuration> bootstrap) {
             bootstrap.addBundle(GuiceBundle.builder()
-                    .bundles(new AdminRestBundle()
-                            .identifyAdminContextInRequestLogs())
+                    .bundles(new AdminRestBundle())
                     .extensions(HybridResource)
                     .build()
             )

guicey-admin-rest/src/test/groovy/ru/vyarus/guicey/admin/AsyncResourceTest.groovy

@@ -39,7 +39,7 @@ class AsyncResourceTest extends Specification {
         @Override
         void initialize(Bootstrap<Configuration> bootstrap) {
             bootstrap.addBundle(GuiceBundle.builder()
-                    .bundles(new AdminRestBundle("/api/*").identifyAdminContextInRequestLogs())
+                    .bundles(new AdminRestBundle("/api/*"))
                     .extensions(AsyncResource)
                     .build())
         }