From f8992573830ab40659c80a968e2af0f5f3970afc Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 3 Jun 2022 11:02:31 +0900 Subject: [PATCH] Fix Checkstyle violations --- .../dropwizard/ArmeriaServerFactory.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dropwizard2/src/main/java/com/linecorp/armeria/dropwizard/ArmeriaServerFactory.java b/dropwizard2/src/main/java/com/linecorp/armeria/dropwizard/ArmeriaServerFactory.java index 50a4607eb41..55aa990eea9 100644 --- a/dropwizard2/src/main/java/com/linecorp/armeria/dropwizard/ArmeriaServerFactory.java +++ b/dropwizard2/src/main/java/com/linecorp/armeria/dropwizard/ArmeriaServerFactory.java @@ -120,13 +120,10 @@ private Handler createAdminServlet0(Server server, Environment environment, Metr final MutableServletContextHandler adminContext = environment.getAdminContext(); final HealthCheckRegistry healthChecks = environment.healthChecks(); try { - final Method method = AbstractServerFactory.class.getDeclaredMethod("createAdminServlet", - Server.class, - MutableServletContextHandler.class, - MetricRegistry.class, - HealthCheckRegistry.class, - AdminEnvironment.class); - logger.debug("createAdminServlet0 resolves to dropwizard2.1 version"); + final Method method = AbstractServerFactory.class.getDeclaredMethod( + "createAdminServlet", Server.class, MutableServletContextHandler.class, + MetricRegistry.class, HealthCheckRegistry.class, AdminEnvironment.class); + logger.debug("createAdminServlet resolves to Dropwizard v2.1."); final AdminEnvironment adminEnvironment = environment.admin(); return (Handler) method.invoke(this, server, adminContext, metrics, healthChecks, adminEnvironment); } catch (NoSuchMethodException e) { @@ -137,12 +134,10 @@ private Handler createAdminServlet0(Server server, Environment environment, Metr try { //noinspection JavaReflectionMemberAccess - this is false warning on dropwizard2 module - final Method method = AbstractServerFactory.class.getDeclaredMethod("createAdminServlet", - Server.class, - MutableServletContextHandler.class, - MetricRegistry.class, - HealthCheckRegistry.class); - logger.debug("createAdminServlet0 resolves to dropwizard1 or 2.0 version"); + final Method method = AbstractServerFactory.class.getDeclaredMethod( + "createAdminServlet", Server.class, MutableServletContextHandler.class, + MetricRegistry.class, HealthCheckRegistry.class); + logger.debug("createAdminServlet resolves to Dropwizard v1 or v2.0."); return (Handler) method.invoke(this, server, adminContext, metrics, healthChecks); } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { return Exceptions.throwUnsafely(e);