From c93acdcb32d85343732bb97896731098e7e86fbb Mon Sep 17 00:00:00 2001
From: Pierre-Alexandre Meyer <pierre@mouraf.org>
Date: Wed, 4 Nov 2020 14:39:47 +0000
Subject: [PATCH 1/5] skeleton: update jersey from 1.19.4 to 2.32

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
---
 .idea/codeStyles/Project.xml                  |  18 ++
 pom.xml                                       |   2 +-
 skeleton/pom.xml                              |  60 ++++---
 .../metrics/TimedResourceInterceptor.java     |  13 +-
 .../metrics/TimedResourceListener.java        |  15 +-
 .../modules/BaseServerModuleBuilder.java      |  14 +-
 .../modules/GuiceServletContainer.java        |  53 ++++++
 .../modules/Jersey2CompatGuiceContainer.java  | 164 ------------------
 .../modules/Jersey2CompatServerModule.java    |  50 ------
 .../modules/JerseyBaseServerModule.java       |  27 ++-
 .../commons/skeleton/modules/StatsModule.java |   5 +-
 .../metrics/TestTimedResourceInterceptor.java |  10 +-
 .../skeleton/modules/HelloResource.java       |  12 ++
 ...oModule.java => SomeGuiceyDependency.java} |  12 +-
 .../modules/TestJerseyBaseServerModule.java   |  12 +-
 15 files changed, 169 insertions(+), 298 deletions(-)
 create mode 100644 skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java
 delete mode 100644 skeleton/src/main/java/org/killbill/commons/skeleton/modules/Jersey2CompatGuiceContainer.java
 delete mode 100644 skeleton/src/main/java/org/killbill/commons/skeleton/modules/Jersey2CompatServerModule.java
 rename skeleton/src/test/java/org/killbill/commons/skeleton/modules/{HelloModule.java => SomeGuiceyDependency.java} (71%)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index f8e563fc0..1286f6525 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -26,6 +26,24 @@
         </value>
       </option>
     </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <XML>
       <option name="XML_ATTRIBUTE_WRAP" value="0" />
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
diff --git a/pom.xml b/pom.xml
index 49532eb1a..dfed5afe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.144.34</version>
+        <version>0.144.38-SNAPSHOT</version>
     </parent>
     <groupId>org.kill-bill.commons</groupId>
     <artifactId>killbill-commons</artifactId>
diff --git a/skeleton/pom.xml b/skeleton/pom.xml
index 4f85bc169..94cf4ef8c 100644
--- a/skeleton/pom.xml
+++ b/skeleton/pom.xml
@@ -77,21 +77,6 @@
             <artifactId>metrics-guice</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey.contribs</groupId>
-            <artifactId>jersey-guice</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
@@ -102,12 +87,6 @@
             <artifactId>metrics-healthchecks</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-jersey</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-servlet</artifactId>
@@ -119,19 +98,20 @@
             <artifactId>metrics-servlets</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.asynchttpclient</groupId>
             <artifactId>async-http-client</artifactId>
@@ -153,10 +133,40 @@
             <artifactId>jetty-servlet</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>guice-bridge</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>hk2-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.kill-bill.commons</groupId>
             <artifactId>killbill-metrics</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.skife.config</groupId>
             <artifactId>config-magic</artifactId>
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceInterceptor.java b/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceInterceptor.java
index 191934664..643c72c79 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceInterceptor.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceInterceptor.java
@@ -32,11 +32,10 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 
+import org.glassfish.jersey.spi.ExceptionMappers;
 import org.killbill.commons.metrics.MetricTag;
 
 import com.codahale.metrics.MetricRegistry;
-import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
-import com.sun.jersey.spi.container.ExceptionMapperContext;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -46,18 +45,18 @@
 public class TimedResourceInterceptor implements MethodInterceptor {
 
     private final Map<String, Map<String, Object>> metricTagsByMethod = new ConcurrentHashMap<String, Map<String, Object>>();
-    private final Provider<GuiceContainer> jerseyContainer;
+    private final Provider<ExceptionMappers> exceptionMappers;
     private final Provider<MetricRegistry> metricRegistry;
     private final String resourcePath;
     private final String metricName;
     private final String httpMethod;
 
-    public TimedResourceInterceptor(final Provider<GuiceContainer> jerseyContainer,
+    public TimedResourceInterceptor(final Provider<ExceptionMappers> exceptionMappers,
                                     final Provider<MetricRegistry> metricRegistry,
                                     final String resourcePath,
                                     final String metricName,
                                     final String httpMethod) {
-        this.jerseyContainer = jerseyContainer;
+        this.exceptionMappers = exceptionMappers;
         this.metricRegistry = metricRegistry;
         this.resourcePath = resourcePath;
         this.metricName = metricName;
@@ -96,8 +95,8 @@ public Object invoke(final MethodInvocation invocation) throws Throwable {
     }
 
     private int mapException(final Throwable e) throws Exception {
-        final ExceptionMapperContext exceptionMapperContext = jerseyContainer.get().getWebApplication().getExceptionMapperContext();
-        @SuppressWarnings("unchecked") final ExceptionMapper<Throwable> exceptionMapper = exceptionMapperContext.find(e.getClass());
+        final ExceptionMappers actualMappers = exceptionMappers.get();
+        final ExceptionMapper<Throwable> exceptionMapper = (actualMappers != null) ? actualMappers.findMapping(e) : null;
 
         if (exceptionMapper != null) {
             return exceptionMapper.toResponse(e).getStatus();
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceListener.java b/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceListener.java
index 68ec65447..4627d22a9 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceListener.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceListener.java
@@ -26,6 +26,7 @@
 import javax.ws.rs.HttpMethod;
 import javax.ws.rs.Path;
 
+import org.glassfish.jersey.spi.ExceptionMappers;
 import org.killbill.commons.metrics.TimedResource;
 
 import com.codahale.metrics.MetricRegistry;
@@ -33,20 +34,19 @@
 import com.google.inject.matcher.Matchers;
 import com.google.inject.spi.TypeEncounter;
 import com.google.inject.spi.TypeListener;
-import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
 
 /**
  * A listener which adds method interceptors to timed resource methods.
  */
 public class TimedResourceListener implements TypeListener {
 
-    private final Provider<GuiceContainer> guiceContainer;
+    private final Provider<ExceptionMappers> exceptionMappers;
 
     private final Provider<MetricRegistry> metricRegistry;
 
-    public TimedResourceListener(final Provider<GuiceContainer> guiceContainer,
+    public TimedResourceListener(final Provider<ExceptionMappers> exceptionMappers,
                                  final Provider<MetricRegistry> metricRegistry) {
-        this.guiceContainer = guiceContainer;
+        this.exceptionMappers = exceptionMappers;
         this.metricRegistry = metricRegistry;
     }
 
@@ -68,8 +68,11 @@ public <T> void hear(final TypeLiteral<T> literal,
                         } else {
                             metricName = method.getName();
                         }
-                        final TimedResourceInterceptor timedResourceInterceptor = new TimedResourceInterceptor(
-                                guiceContainer, metricRegistry, resourcePath, metricName, httpMethod.value());
+                        final TimedResourceInterceptor timedResourceInterceptor = new TimedResourceInterceptor(exceptionMappers,
+                                                                                                               metricRegistry,
+                                                                                                               resourcePath,
+                                                                                                               metricName,
+                                                                                                               httpMethod.value());
                         encounter.bindInterceptor(Matchers.only(method), timedResourceInterceptor);
                     }
                 }
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java
index 304db19ea..6ac17f773 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java
@@ -34,8 +34,7 @@ public class BaseServerModuleBuilder {
 
     public enum JaxrsImplementation {
         NONE,
-        JERSEY,
-        JERSEY2_COMPAT
+        JERSEY
     }
 
     // By default, proxy all requests to the Guice/Jax-RS servlet
@@ -164,17 +163,6 @@ public BaseServerModule build() {
                                                   jaxrsResources,
                                                   jerseyFilters,
                                                   jerseyParams);
-            case JERSEY2_COMPAT:
-                return new Jersey2CompatServerModule(filters,
-                                                     filtersRegex,
-                                                     servlets,
-                                                     servletsRegex,
-                                                     jaxrsServlets,
-                                                     jaxrsServletsRegex,
-                                                     jaxrsUriPattern,
-                                                     jaxrsResources,
-                                                     jerseyFilters,
-                                                     jerseyParams);
             default:
                 throw new IllegalArgumentException();
         }
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java
new file mode 100644
index 000000000..92959609a
--- /dev/null
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2020-2020 Equinix, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.killbill.commons.skeleton.modules;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.ServletException;
+
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.jersey.servlet.ServletContainer;
+import org.glassfish.jersey.servlet.WebConfig;
+import org.jvnet.hk2.guice.bridge.api.GuiceBridge;
+import org.jvnet.hk2.guice.bridge.api.GuiceIntoHK2Bridge;
+
+import com.google.inject.Injector;
+
+@Singleton
+public class GuiceServletContainer extends ServletContainer {
+
+    private final Injector injector;
+
+    @Inject
+    public GuiceServletContainer(final Injector injector) {
+        super();
+        this.injector = injector;
+    }
+
+    @Override
+    protected void init(final WebConfig webConfig) throws ServletException {
+        super.init(webConfig);
+
+        // HK2 will instantiate the Jersey resources, but will delegate injection of the bindings it doesn't know about to Guice
+        final ServiceLocator serviceLocator = getApplicationHandler().getInjectionManager().getInstance(ServiceLocator.class);
+        GuiceBridge.getGuiceBridge().initializeGuiceBridge(serviceLocator);
+        final GuiceIntoHK2Bridge guiceBridge = serviceLocator.getService(GuiceIntoHK2Bridge.class);
+        guiceBridge.bridgeGuiceInjector(injector);
+    }
+}
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/Jersey2CompatGuiceContainer.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/Jersey2CompatGuiceContainer.java
deleted file mode 100644
index bf1195282..000000000
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/Jersey2CompatGuiceContainer.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2010-2014 Ning, Inc.
- * Copyright 2014-2020 Groupon, Inc
- * Copyright 2020-2020 Equinix, Inc
- * Copyright 2014-2020 The Billing Project, LLC
- *
- * The Billing Project licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package org.killbill.commons.skeleton.modules;
-
-import java.io.IOException;
-import java.net.URI;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilder;
-
-import com.google.inject.Injector;
-import com.sun.jersey.api.container.ContainerException;
-import com.sun.jersey.api.uri.UriComponent;
-import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
-
-import static javax.ws.rs.core.UriBuilder.fromUri;
-
-@Singleton
-public class Jersey2CompatGuiceContainer extends GuiceContainer {
-
-    @Inject
-    public Jersey2CompatGuiceContainer(final Injector injector) {
-        super(injector);
-    }
-
-    /**
-     * Dispatches client requests to the {@link #service(java.net.URI, java.net.URI, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)  }
-     * method.
-     *
-     * @param request  the {@link HttpServletRequest} object that
-     *                 contains the request the client made to
-     *                 the servlet.
-     * @param response the {@link HttpServletResponse} object that
-     *                 contains the response the servlet returns
-     *                 to the client.
-     * @throws IOException      if an input or output error occurs
-     *                          while the servlet is handling the
-     *                          HTTP request.
-     * @throws ServletException if the HTTP request cannot
-     *                          be handled.
-     */
-    @Override
-    public void service(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
-        /**
-         * There is an annoying edge case where the service method is
-         * invoked for the case when the URI is equal to the deployment URL
-         * minus the '/', for example http://locahost:8080/HelloWorldWebApp
-         */
-        final String servletPath = request.getServletPath();
-        final String pathInfo = request.getPathInfo();
-        final StringBuffer requestURL = request.getRequestURL();
-        String requestURI = request.getRequestURI();
-        final boolean checkPathInfo = pathInfo == null || pathInfo.isEmpty() || pathInfo.equals("/");
-
-        /**
-         * The HttpServletRequest.getRequestURL() contains the complete URI
-         * minus the query and fragment components.
-         */
-        final UriBuilder absoluteUriBuilder;
-        try {
-            absoluteUriBuilder = fromUriJersey2Compat(requestURL.toString());
-        } catch (final IllegalArgumentException iae) {
-            final Response.Status badRequest = Response.Status.BAD_REQUEST;
-            response.sendError(badRequest.getStatusCode(), badRequest.getReasonPhrase());
-            return;
-        }
-
-        if (checkPathInfo && !request.getRequestURI().endsWith("/")) {
-            // Only do this if the last segment of the servlet path does not contain '.'
-            // This handles the case when the extension mapping is used with the servlet
-            // see issue 506
-            // This solution does not require parsing the deployment descriptor,
-            // however still leaves it broken for the very rare case if a standard path
-            // servlet mapping would include dot in the last segment (e.g. /.webresources/*)
-            // and somebody would want to hit the root resource without the trailing slash
-            final int i = servletPath.lastIndexOf("/");
-            if (servletPath.substring(i + 1).indexOf('.') < 0) {
-                // PIERRE webComponent is private
-                /*
-                if (webComponent.getResourceConfig().getFeature(ResourceConfig.FEATURE_REDIRECT)) {
-                    URI l = absoluteUriBuilder.
-                                                      path("/").
-                                                      replaceQuery(request.getQueryString()).build();
-
-                    response.setStatus(307);
-                    response.setHeader("Location", l.toASCIIString());
-                    return;
-                } else {
-                    requestURL.append("/");
-                    requestURI += "/";
-                }
-                */
-                requestURL.append("/");
-                requestURI += "/";
-            }
-        }
-
-        /**
-         * The HttpServletRequest.getPathInfo() and
-         * HttpServletRequest.getServletPath() are in decoded form.
-         *
-         * On some servlet implementations the getPathInfo() removed
-         * contiguous '/' characters. This is problematic if URIs
-         * are embedded, for example as the last path segment.
-         * We need to work around this and not use getPathInfo
-         * for the decodedPath.
-         */
-        final String decodedBasePath = request.getContextPath() + servletPath + "/";
-
-        final String encodedBasePath = UriComponent.encode(decodedBasePath,
-                                                           UriComponent.Type.PATH);
-
-        if (!decodedBasePath.equals(encodedBasePath)) {
-            throw new ContainerException("The servlet context path and/or the " +
-                                         "servlet path contain characters that are percent encoded");
-        }
-
-        final URI baseUri = absoluteUriBuilder.replacePath(encodedBasePath).
-                build();
-
-        String queryParameters = request.getQueryString();
-        if (queryParameters == null) {
-            queryParameters = "";
-        }
-
-        final URI requestUri = absoluteUriBuilder.replacePath(requestURI).
-                replaceQuery(queryParameters).
-                                                         build();
-
-        service(baseUri, requestUri, request, response);
-    }
-
-    public static UriBuilder fromUriJersey2Compat(final String uri) throws IllegalArgumentException {
-        final URI u;
-        try {
-            u = URI.create(uri);
-        } catch (final NullPointerException ex) {
-            throw new IllegalArgumentException(ex.getMessage(), ex);
-        }
-        return fromUri(u);
-    }
-}
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/Jersey2CompatServerModule.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/Jersey2CompatServerModule.java
deleted file mode 100644
index fc821194f..000000000
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/Jersey2CompatServerModule.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-2014 Ning, Inc.
- * Copyright 2014-2020 Groupon, Inc
- * Copyright 2020-2020 Equinix, Inc
- * Copyright 2014-2020 The Billing Project, LLC
- *
- * The Billing Project licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package org.killbill.commons.skeleton.modules;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.servlet.Filter;
-import javax.servlet.http.HttpServlet;
-
-public class Jersey2CompatServerModule extends JerseyBaseServerModule {
-
-    public Jersey2CompatServerModule(final Map<String, ArrayList<Entry<Class<? extends Filter>, Map<String, String>>>> filters,
-                                     final Map<String, ArrayList<Entry<Class<? extends Filter>, Map<String, String>>>> filtersRegex,
-                                     final Map<String, Class<? extends HttpServlet>> servlets,
-                                     final Map<String, Class<? extends HttpServlet>> servletsRegex,
-                                     final Map<String, Class<? extends HttpServlet>> jaxrsServlets,
-                                     final Map<String, Class<? extends HttpServlet>> jaxrsServletsRegex,
-                                     final String jaxrsUriPattern,
-                                     final Collection<String> jaxrsResources,
-                                     final List<String> jerseyFilters,
-                                     final Map<String, String> jerseyParams) {
-        super(filters, filtersRegex, servlets, servletsRegex, jaxrsServlets, jaxrsServletsRegex, jaxrsUriPattern, jaxrsResources, jerseyFilters, jerseyParams);
-    }
-
-    @Override
-    protected void serveJaxrsResources() {
-        serveRegex(jaxrsUriPattern).with(Jersey2CompatGuiceContainer.class, jerseyParams.build());
-    }
-}
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java
index 590c3dcb4..913aa8760 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java
@@ -28,26 +28,29 @@
 import javax.servlet.Filter;
 import javax.servlet.http.HttpServlet;
 
+import org.glassfish.jersey.servlet.ServletContainer;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
 
 public class JerseyBaseServerModule extends BaseServerModule {
 
     private static final Joiner joiner = Joiner.on(";");
 
     @VisibleForTesting
-    static final String JERSEY_CONTAINER_REQUEST_FILTERS = "com.sun.jersey.spi.container.ContainerRequestFilters";
+    static final String JERSEY_CONTAINER_REQUEST_FILTERS = "javax.ws.rs.container.ContainerRequestFilter";
+    @VisibleForTesting
+    static final String JERSEY_CONTAINER_RESPONSE_FILTERS = "javax.ws.rs.container.ContainerResponseFilter";
     @VisibleForTesting
-    static final String JERSEY_CONTAINER_RESPONSE_FILTERS = "com.sun.jersey.spi.container.ContainerResponseFilters";
+    static final String JERSEY_LOGGING_VERBOSITY = "jersey.config.logging.verbosity";
     @VisibleForTesting
-    static final String JERSEY_DISABLE_ENTITYLOGGING = "com.sun.jersey.config.feature.logging.DisableEntitylogging";
+    static final String JAXRS_APPLICATION_CLASS = "javax.ws.rs.Application";
 
-    // See com.sun.jersey.api.core.ResourceConfig
+    // See org.glassfish.jersey.servlet.ServletProperties and org.glassfish.jersey.logging.LoggingFeature
     protected final ImmutableMap.Builder<String, String> jerseyParams;
 
     public JerseyBaseServerModule(final Map<String, ArrayList<Entry<Class<? extends Filter>, Map<String, String>>>> filters,
@@ -84,9 +87,14 @@ public JerseyBaseServerModule(final Map<String, ArrayList<Entry<Class<? extends
         }
 
         // The LoggingFilter will log the body by default, which breaks StreamingOutput
-        final String disableEntityLogging = MoreObjects.firstNonNull(Strings.emptyToNull(jerseyParams.remove(JERSEY_DISABLE_ENTITYLOGGING)), "true");
-        this.jerseyParams.put(JERSEY_DISABLE_ENTITYLOGGING, disableEntityLogging)
+        final String jerseyLoggingVerbosity = MoreObjects.firstNonNull(Strings.emptyToNull(jerseyParams.remove(JERSEY_LOGGING_VERBOSITY)), "HEADERS_ONLY");
+        this.jerseyParams.put(JERSEY_LOGGING_VERBOSITY, jerseyLoggingVerbosity)
                          .putAll(jerseyParams);
+
+        final String jaxrsApplicationClassName = Strings.emptyToNull(jerseyParams.remove(JERSEY_CONTAINER_REQUEST_FILTERS));
+        if (jaxrsApplicationClassName != null) {
+            this.jerseyParams.put(JERSEY_CONTAINER_REQUEST_FILTERS, jaxrsApplicationClassName);
+        }
     }
 
     @Override
@@ -101,13 +109,14 @@ protected void configureResources() {
 
         // Catch-all resources
         if (!jaxrsResources.isEmpty()) {
-            jerseyParams.put("com.sun.jersey.config.property.packages", joiner.join(jaxrsResources));
+            jerseyParams.put("jersey.config.server.provider.packages", joiner.join(jaxrsResources));
             serveJaxrsResources();
         }
     }
 
     protected void serveJaxrsResources() {
-        serveRegex(jaxrsUriPattern).with(GuiceContainer.class, jerseyParams.build());
+        bind(GuiceServletContainer.class).asEagerSingleton();
+        serveRegex(jaxrsUriPattern).with(GuiceServletContainer.class, jerseyParams.build());
     }
 
     @VisibleForTesting
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/StatsModule.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/StatsModule.java
index aea1bdd3a..0ea12ac27 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/StatsModule.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/StatsModule.java
@@ -19,6 +19,7 @@
 
 package org.killbill.commons.skeleton.modules;
 
+import org.glassfish.jersey.spi.ExceptionMappers;
 import org.killbill.commons.skeleton.metrics.TimedResourceListener;
 import org.killbill.commons.skeleton.metrics.health.KillBillHealthCheckRegistry;
 
@@ -30,7 +31,6 @@
 import com.google.inject.matcher.Matchers;
 import com.google.inject.multibindings.Multibinder;
 import com.palominolabs.metrics.guice.MetricsInstrumentationModule;
-import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
 
 public class StatsModule extends AbstractModule {
 
@@ -80,8 +80,7 @@ protected void configure() {
         install(new AdminServletModule(healthCheckUri, metricsUri, pingUri, threadsUri));
 
         // Metrics/Jersey integration
-        final TimedResourceListener timedResourceTypeListener =
-                new TimedResourceListener(getProvider(GuiceContainer.class), getProvider(MetricRegistry.class));
+        final TimedResourceListener timedResourceTypeListener = new TimedResourceListener(getProvider(ExceptionMappers.class), getProvider(MetricRegistry.class));
         bindListener(Matchers.any(), timedResourceTypeListener);
 
         bind(HealthCheckRegistry.class).toInstance(createHealthCheckRegistry());
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/metrics/TestTimedResourceInterceptor.java b/skeleton/src/test/java/org/killbill/commons/skeleton/metrics/TestTimedResourceInterceptor.java
index 2ad0fc93f..0b3596239 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/metrics/TestTimedResourceInterceptor.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/metrics/TestTimedResourceInterceptor.java
@@ -27,19 +27,20 @@
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 
-import com.codahale.metrics.Timer;
+import org.glassfish.jersey.spi.ExceptionMappers;
 import org.killbill.commons.metrics.MetricTag;
 import org.killbill.commons.metrics.TimedResource;
+import org.mockito.Mockito;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.Timer;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.matcher.Matchers;
-import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
 
 @Test(groups = "fast")
 public class TestTimedResourceInterceptor {
@@ -181,12 +182,11 @@ public void createWebApplicationException() {
     public static class TestResourceModule extends AbstractModule {
         @Override
         protected void configure() {
-            bind(GuiceContainer.class);
+            bind(ExceptionMappers.class).toInstance(Mockito.mock(ExceptionMappers.class));
             bind(TestResource.class).asEagerSingleton();
             bind(MetricRegistry.class).asEagerSingleton();
 
-            final TimedResourceListener timedResourceTypeListener =
-                    new TimedResourceListener(getProvider(GuiceContainer.class), getProvider(MetricRegistry.class));
+            final TimedResourceListener timedResourceTypeListener = new TimedResourceListener(getProvider(ExceptionMappers.class), getProvider(MetricRegistry.class));
             bindListener(Matchers.any(), timedResourceTypeListener);
         }
     }
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java
index 79c34ac45..bb255e888 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java
@@ -19,13 +19,25 @@
 
 package org.killbill.commons.skeleton.modules;
 
+import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 
+import org.testng.Assert;
+
+import com.google.inject.Injector;
+
 @Path("hello")
 public class HelloResource {
 
+    @Inject
+    public HelloResource(final SomeGuiceyDependency someGuiceyDependency, final Injector guiceInjector) {
+        // HelloResource is being created by HK2 but these injections come from Guice
+        // (my understanding is that HK2 won't do JIT binding by default: https://javaee.github.io/hk2/getting-started.html#automatic-service-population)
+        Assert.assertEquals(someGuiceyDependency, guiceInjector.getInstance(SomeGuiceyDependency.class));
+    }
+
     @GET
     @Path("/{name}")
     public String hello(@PathParam("name") final String name) {
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloModule.java b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/SomeGuiceyDependency.java
similarity index 71%
rename from skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloModule.java
rename to skeleton/src/test/java/org/killbill/commons/skeleton/modules/SomeGuiceyDependency.java
index c7ee1beb0..32ba4c5ca 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloModule.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/SomeGuiceyDependency.java
@@ -1,6 +1,4 @@
 /*
- * Copyright 2010-2014 Ning, Inc.
- * Copyright 2014-2020 Groupon, Inc
  * Copyright 2020-2020 Equinix, Inc
  * Copyright 2014-2020 The Billing Project, LLC
  *
@@ -19,12 +17,8 @@
 
 package org.killbill.commons.skeleton.modules;
 
-import com.google.inject.Binder;
-import com.google.inject.Module;
+import javax.inject.Singleton;
 
-public class HelloModule implements Module {
-
-    public void configure(final Binder binder) {
-        binder.bind(HelloResource.class).asEagerSingleton();
-    }
+@Singleton
+public class SomeGuiceyDependency {
 }
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
index 87350014c..cd22c07ec 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
@@ -36,7 +36,7 @@ public class TestJerseyBaseServerModule extends AbstractBaseServerModuleTest {
     public void testJerseyIntegration() throws Exception {
         final BaseServerModuleBuilder builder = new BaseServerModuleBuilder();
         builder.addJaxrsResource("org.killbill.commons.skeleton.modules");
-        final Server server = startServer(builder.build(), new HelloModule());
+        final Server server = startServer(builder.build());
 
         final AsyncHttpClient client = new DefaultAsyncHttpClient();
         final Future<Response> responseFuture = client.prepareGet("http://127.0.0.1:" + ((NetworkConnector) server.getConnectors()[0]).getPort() + "/hello/alhuile/").execute();
@@ -52,7 +52,7 @@ public void testJerseyParams() throws Exception {
         final JerseyBaseServerModule module1 = (JerseyBaseServerModule) builder1.build();
         final Map<String, String> jerseyParams1 = module1.getJerseyParams().build();
         Assert.assertEquals(jerseyParams1.size(), 1);
-        Assert.assertEquals(jerseyParams1.get(JerseyBaseServerModule.JERSEY_DISABLE_ENTITYLOGGING), "true");
+        Assert.assertEquals(jerseyParams1.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "HEADERS_ONLY");
 
         final BaseServerModuleBuilder builder2 = new BaseServerModuleBuilder();
         builder2.addJerseyFilter("filter1").addJerseyFilter("filter2").addJerseyFilter("filter3");
@@ -61,7 +61,7 @@ public void testJerseyParams() throws Exception {
         Assert.assertEquals(jerseyParams2.size(), 3);
         Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_CONTAINER_REQUEST_FILTERS), "filter1;filter2;filter3");
         Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_CONTAINER_RESPONSE_FILTERS), "filter3;filter2;filter1");
-        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_DISABLE_ENTITYLOGGING), "true");
+        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "HEADERS_ONLY");
 
         final BaseServerModuleBuilder builder3 = new BaseServerModuleBuilder();
         builder3.addJerseyFilter("filter1").addJerseyFilter("filter2").addJerseyFilter("filter3");
@@ -71,13 +71,13 @@ public void testJerseyParams() throws Exception {
         Assert.assertEquals(jerseyParams3.size(), 4);
         Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_CONTAINER_REQUEST_FILTERS), "bar;filter1;filter2;filter3");
         Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_CONTAINER_RESPONSE_FILTERS), "filter3;filter2;filter1");
-        Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_DISABLE_ENTITYLOGGING), "true");
+        Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "HEADERS_ONLY");
         Assert.assertEquals(jerseyParams3.get("foo"), "qux");
 
         final BaseServerModuleBuilder builder4 = new BaseServerModuleBuilder();
         builder4.addJerseyParam(JerseyBaseServerModule.JERSEY_CONTAINER_REQUEST_FILTERS, "bar")
                 .addJerseyParam(JerseyBaseServerModule.JERSEY_CONTAINER_RESPONSE_FILTERS, "bar2")
-                .addJerseyParam(JerseyBaseServerModule.JERSEY_DISABLE_ENTITYLOGGING, "false")
+                .addJerseyParam(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY, "PAYLOAD_TEXT")
                 .addJerseyParam("foo", "qux");
         builder4.addJerseyFilter("filter1").addJerseyFilter("filter2").addJerseyFilter("filter3");
         final JerseyBaseServerModule module4 = (JerseyBaseServerModule) builder4.build();
@@ -85,7 +85,7 @@ public void testJerseyParams() throws Exception {
         Assert.assertEquals(jerseyParams4.size(), 4);
         Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_CONTAINER_REQUEST_FILTERS), "bar;filter1;filter2;filter3");
         Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_CONTAINER_RESPONSE_FILTERS), "bar2;filter3;filter2;filter1");
-        Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_DISABLE_ENTITYLOGGING), "false");
+        Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "PAYLOAD_TEXT");
         Assert.assertEquals(jerseyParams4.get("foo"), "qux");
     }
 }

From 1fcc50256a004df8b8bbfdcb2515089385395935 Mon Sep 17 00:00:00 2001
From: Pierre-Alexandre Meyer <pierre@mouraf.org>
Date: Tue, 10 Nov 2020 15:43:21 +0000
Subject: [PATCH 2/5] skeleton: fix Jersey 2 upgrade issues

* Fix wiring of Jersey resources and providers
* Fix Jersey logging
* Allow for Guice-injected ObjectMapper (JacksonJsonProvider is now managed by HK2, not Guice)

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
---
 skeleton/pom.xml                              | 10 ++--
 .../skeleton/modules/BaseServerModule.java    |  6 +--
 .../modules/BaseServerModuleBuilder.java      |  3 +-
 .../modules/GuiceServletContainer.java        | 21 +++++++-
 .../skeleton/modules/JaxrsJacksonModule.java  | 45 ----------------
 .../modules/JerseyBaseServerModule.java       | 54 +++++++------------
 .../commons/skeleton/modules/HelloFilter.java | 52 ++++++++++++++++++
 .../skeleton/modules/HelloResource.java       | 20 +++++++
 .../modules/TestJerseyBaseServerModule.java   | 54 ++++++++++++++-----
 9 files changed, 161 insertions(+), 104 deletions(-)
 delete mode 100644 skeleton/src/main/java/org/killbill/commons/skeleton/modules/JaxrsJacksonModule.java
 create mode 100644 skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloFilter.java

diff --git a/skeleton/pom.xml b/skeleton/pom.xml
index 94cf4ef8c..9ea49c018 100644
--- a/skeleton/pom.xml
+++ b/skeleton/pom.xml
@@ -38,9 +38,9 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-base</artifactId>
-            <optional>true</optional>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-joda</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -112,6 +112,10 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.asynchttpclient</groupId>
             <artifactId>async-http-client</artifactId>
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModule.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModule.java
index fc48644a3..7d2b496b0 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModule.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModule.java
@@ -20,7 +20,6 @@
 package org.killbill.commons.skeleton.modules;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -42,7 +41,6 @@ public class BaseServerModule extends ServletModule {
     final Map<String, Class<? extends HttpServlet>> jaxrsServlets;
     final Map<String, Class<? extends HttpServlet>> jaxrsServletsRegex;
     final String jaxrsUriPattern;
-    final Collection<String> jaxrsResources = new ArrayList<String>();
 
     public BaseServerModule(final Map<String, ArrayList<Entry<Class<? extends Filter>, Map<String, String>>>> filters,
                             final Map<String, ArrayList<Entry<Class<? extends Filter>, Map<String, String>>>> filtersRegex,
@@ -50,8 +48,7 @@ public BaseServerModule(final Map<String, ArrayList<Entry<Class<? extends Filter
                             final Map<String, Class<? extends HttpServlet>> servletsRegex,
                             final Map<String, Class<? extends HttpServlet>> jaxrsServlets,
                             final Map<String, Class<? extends HttpServlet>> jaxrsServletsRegex,
-                            final String jaxrsUriPattern,
-                            final Collection<String> jaxrsResources) {
+                            final String jaxrsUriPattern) {
         this.filters = filters;
         this.filtersRegex = filtersRegex;
         this.servlets = servlets;
@@ -59,7 +56,6 @@ public BaseServerModule(final Map<String, ArrayList<Entry<Class<? extends Filter
         this.jaxrsServlets = jaxrsServlets;
         this.jaxrsServletsRegex = jaxrsServletsRegex;
         this.jaxrsUriPattern = jaxrsUriPattern;
-        this.jaxrsResources.addAll(jaxrsResources);
     }
 
     @Override
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java
index 6ac17f773..b9bffe860 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java
@@ -150,8 +150,7 @@ public BaseServerModule build() {
                                             servletsRegex,
                                             jaxrsServlets,
                                             jaxrsServletsRegex,
-                                            jaxrsUriPattern,
-                                            jaxrsResources);
+                                            jaxrsUriPattern);
             case JERSEY:
                 return new JerseyBaseServerModule(filters,
                                                   filtersRegex,
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java
index 92959609a..08d64af8e 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java
@@ -20,14 +20,19 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.servlet.ServletException;
+import javax.ws.rs.ext.MessageBodyWriter;
 
 import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.glassfish.jersey.servlet.WebConfig;
 import org.jvnet.hk2.guice.bridge.api.GuiceBridge;
 import org.jvnet.hk2.guice.bridge.api.GuiceIntoHK2Bridge;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.google.inject.Injector;
+import com.google.inject.TypeLiteral;
 
 @Singleton
 public class GuiceServletContainer extends ServletContainer {
@@ -42,12 +47,26 @@ public GuiceServletContainer(final Injector injector) {
 
     @Override
     protected void init(final WebConfig webConfig) throws ServletException {
+        // This will instantiate a new instance of ResourceConfig (see WebComponent#createResourceConfig) initialized with the Jersey parameters we specified (see JerseyBaseServerModule)
         super.init(webConfig);
 
         // HK2 will instantiate the Jersey resources, but will delegate injection of the bindings it doesn't know about to Guice
-        final ServiceLocator serviceLocator = getApplicationHandler().getInjectionManager().getInstance(ServiceLocator.class);
+        final InjectionManager injectionManager = getApplicationHandler().getInjectionManager();
+        final ServiceLocator serviceLocator = injectionManager.getInstance(ServiceLocator.class);
         GuiceBridge.getGuiceBridge().initializeGuiceBridge(serviceLocator);
         final GuiceIntoHK2Bridge guiceBridge = serviceLocator.getService(GuiceIntoHK2Bridge.class);
         guiceBridge.bridgeGuiceInjector(injector);
+
+        final boolean hasObjectMapperBinding = !injector.findBindingsByType(TypeLiteral.get(ObjectMapper.class)).isEmpty();
+        if (hasObjectMapperBinding) {
+            // JacksonJsonProvider is constructed by HK2, but we need to inject the ObjectMapper we constructed via Guice
+            final ObjectMapper objectMapper = injector.getInstance(ObjectMapper.class);
+            for (final MessageBodyWriter messageBodyWriter : injectionManager.<MessageBodyWriter>getAllInstances(MessageBodyWriter.class)) {
+                if (messageBodyWriter instanceof JacksonJsonProvider) {
+                    ((JacksonJsonProvider) messageBodyWriter).setMapper(objectMapper);
+                    break;
+                }
+            }
+        }
     }
 }
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JaxrsJacksonModule.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JaxrsJacksonModule.java
deleted file mode 100644
index f1af3310a..000000000
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JaxrsJacksonModule.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2010-2014 Ning, Inc.
- * Copyright 2014-2020 Groupon, Inc
- * Copyright 2020-2020 Equinix, Inc
- * Copyright 2014-2020 The Billing Project, LLC
- *
- * The Billing Project licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package org.killbill.commons.skeleton.modules;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.jaxrs.cfg.Annotations;
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import com.google.inject.AbstractModule;
-
-public class JaxrsJacksonModule extends AbstractModule {
-
-    private final ObjectMapper mapper;
-    private final Annotations[] annotationsToUse;
-
-    public JaxrsJacksonModule(final ObjectMapper mapper) {
-        this(mapper, Annotations.JACKSON, Annotations.JAXB);
-    }
-
-    public JaxrsJacksonModule(final ObjectMapper mapper, final Annotations... annotationsToUse) {
-        this.mapper = mapper;
-        this.annotationsToUse = annotationsToUse;
-    }
-
-    @Override
-    protected void configure() {
-        bind(JacksonJsonProvider.class).toInstance(new JacksonJsonProvider(mapper, annotationsToUse));
-    }
-}
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java
index 913aa8760..91e9de5d2 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java
@@ -21,35 +21,29 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
 import javax.servlet.Filter;
 import javax.servlet.http.HttpServlet;
 
-import org.glassfish.jersey.servlet.ServletContainer;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
 
 public class JerseyBaseServerModule extends BaseServerModule {
 
     private static final Joiner joiner = Joiner.on(";");
 
     @VisibleForTesting
-    static final String JERSEY_CONTAINER_REQUEST_FILTERS = "javax.ws.rs.container.ContainerRequestFilter";
-    @VisibleForTesting
-    static final String JERSEY_CONTAINER_RESPONSE_FILTERS = "javax.ws.rs.container.ContainerResponseFilter";
+    static final String JERSEY_PROVIDER_CLASSNAMES = "jersey.config.server.provider.classnames";
     @VisibleForTesting
     static final String JERSEY_LOGGING_VERBOSITY = "jersey.config.logging.verbosity";
-    @VisibleForTesting
-    static final String JAXRS_APPLICATION_CLASS = "javax.ws.rs.Application";
+    static final String JERSEY_LOGGING_LEVEL = "jersey.config.logging.logger.level";
 
+    protected final Collection<String> jerseyResourcesAndProvidersPackages;
     // See org.glassfish.jersey.servlet.ServletProperties and org.glassfish.jersey.logging.LoggingFeature
     protected final ImmutableMap.Builder<String, String> jerseyParams;
 
@@ -60,41 +54,31 @@ public JerseyBaseServerModule(final Map<String, ArrayList<Entry<Class<? extends
                                   final Map<String, Class<? extends HttpServlet>> jaxrsServlets,
                                   final Map<String, Class<? extends HttpServlet>> jaxrsServletsRegex,
                                   final String jaxrsUriPattern,
-                                  final Collection<String> jaxrsResources,
-                                  final List<String> jerseyFilters,
+                                  final Collection<String> jerseyResourcesAndProvidersPackages,
+                                  final Collection<String> jerseyFilters,
                                   final Map<String, String> jerseyParams) {
-        super(filters, filtersRegex, servlets, servletsRegex, jaxrsServlets, jaxrsServletsRegex, jaxrsUriPattern, jaxrsResources);
+        super(filters, filtersRegex, servlets, servletsRegex, jaxrsServlets, jaxrsServletsRegex, jaxrsUriPattern);
+        this.jerseyResourcesAndProvidersPackages = jerseyResourcesAndProvidersPackages;
+        this.jerseyParams = new ImmutableMap.Builder<String, String>();
 
-        String manuallySpecifiedRequestFilters = Strings.nullToEmpty(jerseyParams.remove(JERSEY_CONTAINER_REQUEST_FILTERS));
-        String manuallySpecifiedResponseFilters = Strings.nullToEmpty(jerseyParams.remove(JERSEY_CONTAINER_RESPONSE_FILTERS));
+        String jerseyResourcesAndProvidersClasses = Strings.nullToEmpty(jerseyParams.remove(JERSEY_PROVIDER_CLASSNAMES));
         if (!jerseyFilters.isEmpty()) {
-            if (!manuallySpecifiedRequestFilters.isEmpty()) {
-                manuallySpecifiedRequestFilters += ";";
-            }
-            if (!manuallySpecifiedResponseFilters.isEmpty()) {
-                manuallySpecifiedResponseFilters += ";";
+            if (!jerseyResourcesAndProvidersClasses.isEmpty()) {
+                jerseyResourcesAndProvidersClasses += ";";
             }
         }
-        final String containerRequestFilters = manuallySpecifiedRequestFilters + joiner.join(jerseyFilters);
-        final String containerResponseFilters = manuallySpecifiedResponseFilters + joiner.join(Lists.reverse(jerseyFilters));
-
-        this.jerseyParams = new ImmutableMap.Builder<String, String>();
-        if (!containerRequestFilters.isEmpty()) {
-            this.jerseyParams.put(JERSEY_CONTAINER_REQUEST_FILTERS, containerRequestFilters);
-        }
-        if (!containerResponseFilters.isEmpty()) {
-            this.jerseyParams.put(JERSEY_CONTAINER_RESPONSE_FILTERS, containerResponseFilters);
+        final String allJerseyResourcesAndProvidersClasses = jerseyResourcesAndProvidersClasses + joiner.join(jerseyFilters);
+        if (!allJerseyResourcesAndProvidersClasses.isEmpty()) {
+            this.jerseyParams.put(JERSEY_PROVIDER_CLASSNAMES, allJerseyResourcesAndProvidersClasses);
         }
 
         // The LoggingFilter will log the body by default, which breaks StreamingOutput
         final String jerseyLoggingVerbosity = MoreObjects.firstNonNull(Strings.emptyToNull(jerseyParams.remove(JERSEY_LOGGING_VERBOSITY)), "HEADERS_ONLY");
+        final String jerseyLoggingLevel = MoreObjects.firstNonNull(Strings.emptyToNull(jerseyParams.remove(JERSEY_LOGGING_LEVEL)), "INFO");
         this.jerseyParams.put(JERSEY_LOGGING_VERBOSITY, jerseyLoggingVerbosity)
-                         .putAll(jerseyParams);
+                         .put(JERSEY_LOGGING_LEVEL, jerseyLoggingLevel);
 
-        final String jaxrsApplicationClassName = Strings.emptyToNull(jerseyParams.remove(JERSEY_CONTAINER_REQUEST_FILTERS));
-        if (jaxrsApplicationClassName != null) {
-            this.jerseyParams.put(JERSEY_CONTAINER_REQUEST_FILTERS, jaxrsApplicationClassName);
-        }
+        this.jerseyParams.putAll(jerseyParams);
     }
 
     @Override
@@ -108,8 +92,8 @@ protected void configureResources() {
         }
 
         // Catch-all resources
-        if (!jaxrsResources.isEmpty()) {
-            jerseyParams.put("jersey.config.server.provider.packages", joiner.join(jaxrsResources));
+        if (!jerseyResourcesAndProvidersPackages.isEmpty()) {
+            jerseyParams.put("jersey.config.server.provider.packages", joiner.join(jerseyResourcesAndProvidersPackages));
             serveJaxrsResources();
         }
     }
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloFilter.java b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloFilter.java
new file mode 100644
index 000000000..d07061184
--- /dev/null
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloFilter.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020-2020 Equinix, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.killbill.commons.skeleton.modules;
+
+import java.io.IOException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+
+import org.testng.Assert;
+
+@Singleton
+public class HelloFilter implements ContainerRequestFilter, ContainerResponseFilter {
+
+    private static boolean initialized = false;
+    static int invocations = 0;
+
+    @Inject
+    public HelloFilter() {
+        // Verify it's indeed a Singleton
+        Assert.assertFalse(initialized);
+        initialized = true;
+    }
+
+    @Override
+    public void filter(final ContainerRequestContext requestContext) throws IOException {
+        invocations += 1;
+    }
+
+    @Override
+    public void filter(final ContainerRequestContext requestContext, final ContainerResponseContext responseContext) throws IOException {
+    }
+}
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java
index bb255e888..5ad49b4a4 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java
@@ -19,20 +19,34 @@
 
 package org.killbill.commons.skeleton.modules;
 
+import java.util.Map;
+
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 
+import org.joda.time.LocalDate;
 import org.testng.Assert;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.inject.Injector;
 
 @Path("hello")
+@Singleton
 public class HelloResource {
 
+    private static boolean initialized = false;
+
     @Inject
     public HelloResource(final SomeGuiceyDependency someGuiceyDependency, final Injector guiceInjector) {
+        // Verify it's indeed a Singleton
+        Assert.assertFalse(initialized);
+        initialized = true;
+
         // HelloResource is being created by HK2 but these injections come from Guice
         // (my understanding is that HK2 won't do JIT binding by default: https://javaee.github.io/hk2/getting-started.html#automatic-service-population)
         Assert.assertEquals(someGuiceyDependency, guiceInjector.getInstance(SomeGuiceyDependency.class));
@@ -43,4 +57,10 @@ public HelloResource(final SomeGuiceyDependency someGuiceyDependency, final Inje
     public String hello(@PathParam("name") final String name) {
         return "Hello " + name;
     }
+
+    @POST
+    @Produces("application/json")
+    public Map<String, ?> hello() {
+        return ImmutableMap.<String, Object>of("key", "hello", "date", new LocalDate("2010-01-01"));
+    }
 }
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
index cd22c07ec..6805b714f 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
@@ -30,18 +30,45 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.google.inject.AbstractModule;
+
 public class TestJerseyBaseServerModule extends AbstractBaseServerModuleTest {
 
     @Test(groups = "slow")
     public void testJerseyIntegration() throws Exception {
         final BaseServerModuleBuilder builder = new BaseServerModuleBuilder();
         builder.addJaxrsResource("org.killbill.commons.skeleton.modules");
-        final Server server = startServer(builder.build());
+        builder.addJerseyFilter(HelloFilter.class.getName());
+        builder.addJerseyFilter(JacksonJsonProvider.class.getName());
+        final Server server = startServer(builder.build(), new AbstractModule() {
+            @Override
+            protected void configure() {
+                final ObjectMapper objectMapper = new ObjectMapper();
+                objectMapper.registerModule(new JodaModule());
+                objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+                binder().bind(ObjectMapper.class).toInstance(objectMapper);
+            }
+        });
+
+        Assert.assertEquals(HelloFilter.invocations, 0);
+
+        // Do multiple passes to verify Singleton pattern
+        for (int i = 0; i < 5; i++) {
+            final AsyncHttpClient client = new DefaultAsyncHttpClient();
+            final Future<Response> responseFuture = client.prepareGet("http://127.0.0.1:" + ((NetworkConnector) server.getConnectors()[0]).getPort() + "/hello/alhuile/").execute();
+            final String body = responseFuture.get().getResponseBody();
+            Assert.assertEquals(body, "Hello alhuile");
+            Assert.assertEquals(HelloFilter.invocations, i + 1);
+        }
 
         final AsyncHttpClient client = new DefaultAsyncHttpClient();
-        final Future<Response> responseFuture = client.prepareGet("http://127.0.0.1:" + ((NetworkConnector) server.getConnectors()[0]).getPort() + "/hello/alhuile/").execute();
+        final Future<Response> responseFuture = client.preparePost("http://127.0.0.1:" + ((NetworkConnector) server.getConnectors()[0]).getPort() + "/hello").execute();
         final String body = responseFuture.get().getResponseBody();
-        Assert.assertEquals(body, "Hello alhuile");
+        Assert.assertEquals(body, "{\"key\":\"hello\",\"date\":\"2010-01-01\"}");
 
         server.stop();
     }
@@ -51,41 +78,42 @@ public void testJerseyParams() throws Exception {
         final BaseServerModuleBuilder builder1 = new BaseServerModuleBuilder();
         final JerseyBaseServerModule module1 = (JerseyBaseServerModule) builder1.build();
         final Map<String, String> jerseyParams1 = module1.getJerseyParams().build();
-        Assert.assertEquals(jerseyParams1.size(), 1);
+        Assert.assertEquals(jerseyParams1.size(), 2);
         Assert.assertEquals(jerseyParams1.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "HEADERS_ONLY");
+        Assert.assertEquals(jerseyParams1.get(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL), "INFO");
 
         final BaseServerModuleBuilder builder2 = new BaseServerModuleBuilder();
         builder2.addJerseyFilter("filter1").addJerseyFilter("filter2").addJerseyFilter("filter3");
         final JerseyBaseServerModule module2 = (JerseyBaseServerModule) builder2.build();
         final Map<String, String> jerseyParams2 = module2.getJerseyParams().build();
         Assert.assertEquals(jerseyParams2.size(), 3);
-        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_CONTAINER_REQUEST_FILTERS), "filter1;filter2;filter3");
-        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_CONTAINER_RESPONSE_FILTERS), "filter3;filter2;filter1");
+        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_PROVIDER_CLASSNAMES), "filter1;filter2;filter3");
         Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "HEADERS_ONLY");
+        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL), "INFO");
 
         final BaseServerModuleBuilder builder3 = new BaseServerModuleBuilder();
         builder3.addJerseyFilter("filter1").addJerseyFilter("filter2").addJerseyFilter("filter3");
-        builder3.addJerseyParam(JerseyBaseServerModule.JERSEY_CONTAINER_REQUEST_FILTERS, "bar").addJerseyParam("foo", "qux");
+        builder3.addJerseyParam(JerseyBaseServerModule.JERSEY_PROVIDER_CLASSNAMES, "bar").addJerseyParam("foo", "qux");
         final JerseyBaseServerModule module3 = (JerseyBaseServerModule) builder3.build();
         final Map<String, String> jerseyParams3 = module3.getJerseyParams().build();
         Assert.assertEquals(jerseyParams3.size(), 4);
-        Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_CONTAINER_REQUEST_FILTERS), "bar;filter1;filter2;filter3");
-        Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_CONTAINER_RESPONSE_FILTERS), "filter3;filter2;filter1");
+        Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_PROVIDER_CLASSNAMES), "bar;filter1;filter2;filter3");
         Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "HEADERS_ONLY");
+        Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL), "INFO");
         Assert.assertEquals(jerseyParams3.get("foo"), "qux");
 
         final BaseServerModuleBuilder builder4 = new BaseServerModuleBuilder();
-        builder4.addJerseyParam(JerseyBaseServerModule.JERSEY_CONTAINER_REQUEST_FILTERS, "bar")
-                .addJerseyParam(JerseyBaseServerModule.JERSEY_CONTAINER_RESPONSE_FILTERS, "bar2")
+        builder4.addJerseyParam(JerseyBaseServerModule.JERSEY_PROVIDER_CLASSNAMES, "bar")
                 .addJerseyParam(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY, "PAYLOAD_TEXT")
+                .addJerseyParam(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL, "FINE")
                 .addJerseyParam("foo", "qux");
         builder4.addJerseyFilter("filter1").addJerseyFilter("filter2").addJerseyFilter("filter3");
         final JerseyBaseServerModule module4 = (JerseyBaseServerModule) builder4.build();
         final Map<String, String> jerseyParams4 = module4.getJerseyParams().build();
         Assert.assertEquals(jerseyParams4.size(), 4);
-        Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_CONTAINER_REQUEST_FILTERS), "bar;filter1;filter2;filter3");
-        Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_CONTAINER_RESPONSE_FILTERS), "bar2;filter3;filter2;filter1");
+        Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_PROVIDER_CLASSNAMES), "bar;filter1;filter2;filter3");
         Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "PAYLOAD_TEXT");
+        Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL), "FINE");
         Assert.assertEquals(jerseyParams4.get("foo"), "qux");
     }
 }

From c944b85db0a6ede32d35ed84ac0345dcfa2c4e1a Mon Sep 17 00:00:00 2001
From: Pierre-Alexandre Meyer <pierre@mouraf.org>
Date: Wed, 11 Nov 2020 15:29:45 +0000
Subject: [PATCH 3/5] skeleton: simplify BaseServerModuleBuilder and
 JerseyBaseServerModule

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
---
 .../modules/BaseServerModuleBuilder.java      | 27 ++++++------
 .../modules/JerseyBaseServerModule.java       | 22 ++++------
 .../modules/TestJerseyBaseServerModule.java   | 41 ++++---------------
 3 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java
index b9bffe860..e1771a9a3 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/BaseServerModuleBuilder.java
@@ -28,7 +28,6 @@
 import javax.servlet.http.HttpServlet;
 
 import com.google.common.collect.Maps;
-import com.google.inject.Module;
 
 public class BaseServerModuleBuilder {
 
@@ -39,8 +38,6 @@ public enum JaxrsImplementation {
 
     // By default, proxy all requests to the Guice/Jax-RS servlet
     private String jaxrsUriPattern = "/.*";
-    private final List<String> jaxrsResources = new ArrayList<String>();
-    private final List<Module> modules = new ArrayList<Module>();
     private final Map<String, ArrayList<Map.Entry<Class<? extends Filter>, Map<String, String>>>> filters = new HashMap<String, ArrayList<Map.Entry<Class<? extends Filter>, Map<String, String>>>>();
     private final Map<String, ArrayList<Map.Entry<Class<? extends Filter>, Map<String, String>>>> filtersRegex = new HashMap<String, ArrayList<Map.Entry<Class<? extends Filter>, Map<String, String>>>>();
     private final Map<String, Class<? extends HttpServlet>> jaxrsServlets = new HashMap<String, Class<? extends HttpServlet>>();
@@ -48,8 +45,9 @@ public enum JaxrsImplementation {
     private final Map<String, Class<? extends HttpServlet>> servlets = new HashMap<String, Class<? extends HttpServlet>>();
     private final Map<String, Class<? extends HttpServlet>> servletsRegex = new HashMap<String, Class<? extends HttpServlet>>();
 
-    // Specific filters called by jersey
-    private final List<String> jerseyFilters = new ArrayList<String>();
+    // Jersey specific
+    private final List<String> jerseyResourcesAndProvidersPackages = new ArrayList<String>();
+    private final List<String> jerseyResourcesAndProvidersClasses = new ArrayList<String>();
     private final Map<String, String> jerseyParams = new HashMap<String, String>();
 
     private JaxrsImplementation jaxrsImplementation = JaxrsImplementation.JERSEY;
@@ -103,8 +101,14 @@ public BaseServerModuleBuilder addJaxrsServletRegex(final String urlPattern, fin
         return this;
     }
 
-    public BaseServerModuleBuilder addJerseyFilter(final String filterClassName) {
-        this.jerseyFilters.add(filterClassName);
+    /**
+     * Add a class for the Guice/Jersey servlet
+     *
+     * @param resource class to scan
+     * @return the current module builder
+     */
+    public BaseServerModuleBuilder addJerseyResourceClass(final String resource) {
+        this.jerseyResourcesAndProvidersClasses.add(resource);
         return this;
     }
 
@@ -118,7 +122,6 @@ public BaseServerModuleBuilder addJerseyParam(final String key, final String val
      *
      * @param jaxrsUriPattern Any Java-style regular expression
      * @return the current module builder
-     * @see BaseServerModuleBuilder#addJaxrsResource
      */
     public BaseServerModuleBuilder setJaxrsUriPattern(final String jaxrsUriPattern) {
         this.jaxrsUriPattern = jaxrsUriPattern;
@@ -131,8 +134,8 @@ public BaseServerModuleBuilder setJaxrsUriPattern(final String jaxrsUriPattern)
      * @param resource package to scan
      * @return the current module builder
      */
-    public BaseServerModuleBuilder addJaxrsResource(final String resource) {
-        this.jaxrsResources.add(resource);
+    public BaseServerModuleBuilder addJerseyResourcePackage(final String resource) {
+        this.jerseyResourcesAndProvidersPackages.add(resource);
         return this;
     }
 
@@ -159,8 +162,8 @@ public BaseServerModule build() {
                                                   jaxrsServlets,
                                                   jaxrsServletsRegex,
                                                   jaxrsUriPattern,
-                                                  jaxrsResources,
-                                                  jerseyFilters,
+                                                  jerseyResourcesAndProvidersPackages,
+                                                  jerseyResourcesAndProvidersClasses,
                                                   jerseyParams);
             default:
                 throw new IllegalArgumentException();
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java
index 91e9de5d2..5742a8f7e 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/JerseyBaseServerModule.java
@@ -27,6 +27,8 @@
 import javax.servlet.Filter;
 import javax.servlet.http.HttpServlet;
 
+import org.glassfish.jersey.server.ServerProperties;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
@@ -37,13 +39,12 @@ public class JerseyBaseServerModule extends BaseServerModule {
 
     private static final Joiner joiner = Joiner.on(";");
 
-    @VisibleForTesting
-    static final String JERSEY_PROVIDER_CLASSNAMES = "jersey.config.server.provider.classnames";
     @VisibleForTesting
     static final String JERSEY_LOGGING_VERBOSITY = "jersey.config.logging.verbosity";
     static final String JERSEY_LOGGING_LEVEL = "jersey.config.logging.logger.level";
 
     protected final Collection<String> jerseyResourcesAndProvidersPackages;
+    protected final Collection<String> jerseyResourcesAndProvidersClasses;
     // See org.glassfish.jersey.servlet.ServletProperties and org.glassfish.jersey.logging.LoggingFeature
     protected final ImmutableMap.Builder<String, String> jerseyParams;
 
@@ -55,23 +56,13 @@ public JerseyBaseServerModule(final Map<String, ArrayList<Entry<Class<? extends
                                   final Map<String, Class<? extends HttpServlet>> jaxrsServletsRegex,
                                   final String jaxrsUriPattern,
                                   final Collection<String> jerseyResourcesAndProvidersPackages,
-                                  final Collection<String> jerseyFilters,
+                                  final Collection<String> jerseyResourcesAndProvidersClasses,
                                   final Map<String, String> jerseyParams) {
         super(filters, filtersRegex, servlets, servletsRegex, jaxrsServlets, jaxrsServletsRegex, jaxrsUriPattern);
         this.jerseyResourcesAndProvidersPackages = jerseyResourcesAndProvidersPackages;
+        this.jerseyResourcesAndProvidersClasses = jerseyResourcesAndProvidersClasses;
         this.jerseyParams = new ImmutableMap.Builder<String, String>();
 
-        String jerseyResourcesAndProvidersClasses = Strings.nullToEmpty(jerseyParams.remove(JERSEY_PROVIDER_CLASSNAMES));
-        if (!jerseyFilters.isEmpty()) {
-            if (!jerseyResourcesAndProvidersClasses.isEmpty()) {
-                jerseyResourcesAndProvidersClasses += ";";
-            }
-        }
-        final String allJerseyResourcesAndProvidersClasses = jerseyResourcesAndProvidersClasses + joiner.join(jerseyFilters);
-        if (!allJerseyResourcesAndProvidersClasses.isEmpty()) {
-            this.jerseyParams.put(JERSEY_PROVIDER_CLASSNAMES, allJerseyResourcesAndProvidersClasses);
-        }
-
         // The LoggingFilter will log the body by default, which breaks StreamingOutput
         final String jerseyLoggingVerbosity = MoreObjects.firstNonNull(Strings.emptyToNull(jerseyParams.remove(JERSEY_LOGGING_VERBOSITY)), "HEADERS_ONLY");
         final String jerseyLoggingLevel = MoreObjects.firstNonNull(Strings.emptyToNull(jerseyParams.remove(JERSEY_LOGGING_LEVEL)), "INFO");
@@ -93,7 +84,8 @@ protected void configureResources() {
 
         // Catch-all resources
         if (!jerseyResourcesAndProvidersPackages.isEmpty()) {
-            jerseyParams.put("jersey.config.server.provider.packages", joiner.join(jerseyResourcesAndProvidersPackages));
+            jerseyParams.put(ServerProperties.PROVIDER_PACKAGES, joiner.join(jerseyResourcesAndProvidersPackages));
+            jerseyParams.put(ServerProperties.PROVIDER_CLASSNAMES, joiner.join(jerseyResourcesAndProvidersClasses));
             serveJaxrsResources();
         }
     }
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
index 6805b714f..03c0cbd10 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
@@ -41,9 +41,9 @@ public class TestJerseyBaseServerModule extends AbstractBaseServerModuleTest {
     @Test(groups = "slow")
     public void testJerseyIntegration() throws Exception {
         final BaseServerModuleBuilder builder = new BaseServerModuleBuilder();
-        builder.addJaxrsResource("org.killbill.commons.skeleton.modules");
-        builder.addJerseyFilter(HelloFilter.class.getName());
-        builder.addJerseyFilter(JacksonJsonProvider.class.getName());
+        builder.addJerseyResourcePackage("org.killbill.commons.skeleton.modules");
+        builder.addJerseyResourceClass(HelloFilter.class.getName());
+        builder.addJerseyResourceClass(JacksonJsonProvider.class.getName());
         final Server server = startServer(builder.build(), new AbstractModule() {
             @Override
             protected void configure() {
@@ -83,37 +83,14 @@ public void testJerseyParams() throws Exception {
         Assert.assertEquals(jerseyParams1.get(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL), "INFO");
 
         final BaseServerModuleBuilder builder2 = new BaseServerModuleBuilder();
-        builder2.addJerseyFilter("filter1").addJerseyFilter("filter2").addJerseyFilter("filter3");
+        builder2.addJerseyParam(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY, "PAYLOAD_TEXT")
+                .addJerseyParam(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL, "FINE")
+                .addJerseyParam("foo", "qux");
         final JerseyBaseServerModule module2 = (JerseyBaseServerModule) builder2.build();
         final Map<String, String> jerseyParams2 = module2.getJerseyParams().build();
         Assert.assertEquals(jerseyParams2.size(), 3);
-        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_PROVIDER_CLASSNAMES), "filter1;filter2;filter3");
-        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "HEADERS_ONLY");
-        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL), "INFO");
-
-        final BaseServerModuleBuilder builder3 = new BaseServerModuleBuilder();
-        builder3.addJerseyFilter("filter1").addJerseyFilter("filter2").addJerseyFilter("filter3");
-        builder3.addJerseyParam(JerseyBaseServerModule.JERSEY_PROVIDER_CLASSNAMES, "bar").addJerseyParam("foo", "qux");
-        final JerseyBaseServerModule module3 = (JerseyBaseServerModule) builder3.build();
-        final Map<String, String> jerseyParams3 = module3.getJerseyParams().build();
-        Assert.assertEquals(jerseyParams3.size(), 4);
-        Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_PROVIDER_CLASSNAMES), "bar;filter1;filter2;filter3");
-        Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "HEADERS_ONLY");
-        Assert.assertEquals(jerseyParams3.get(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL), "INFO");
-        Assert.assertEquals(jerseyParams3.get("foo"), "qux");
-
-        final BaseServerModuleBuilder builder4 = new BaseServerModuleBuilder();
-        builder4.addJerseyParam(JerseyBaseServerModule.JERSEY_PROVIDER_CLASSNAMES, "bar")
-                .addJerseyParam(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY, "PAYLOAD_TEXT")
-                .addJerseyParam(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL, "FINE")
-                .addJerseyParam("foo", "qux");
-        builder4.addJerseyFilter("filter1").addJerseyFilter("filter2").addJerseyFilter("filter3");
-        final JerseyBaseServerModule module4 = (JerseyBaseServerModule) builder4.build();
-        final Map<String, String> jerseyParams4 = module4.getJerseyParams().build();
-        Assert.assertEquals(jerseyParams4.size(), 4);
-        Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_PROVIDER_CLASSNAMES), "bar;filter1;filter2;filter3");
-        Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "PAYLOAD_TEXT");
-        Assert.assertEquals(jerseyParams4.get(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL), "FINE");
-        Assert.assertEquals(jerseyParams4.get("foo"), "qux");
+        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_LOGGING_VERBOSITY), "PAYLOAD_TEXT");
+        Assert.assertEquals(jerseyParams2.get(JerseyBaseServerModule.JERSEY_LOGGING_LEVEL), "FINE");
+        Assert.assertEquals(jerseyParams2.get("foo"), "qux");
     }
 }

From 02d1a02b6934627b7fc4059e87b7316fe169e2e1 Mon Sep 17 00:00:00 2001
From: Pierre-Alexandre Meyer <pierre@mouraf.org>
Date: Thu, 12 Nov 2020 11:35:29 +0000
Subject: [PATCH 4/5] skeleton: re-implementation of TimedResource handling on
 HK2

Resources are now constructed by HK2, so the AOP interceptor had
to be rewritten.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
---
 .../commons/metrics/TimedResource.java        |   1 -
 .../metrics/TimedResourceInterceptor.java     |  20 ++-
 .../metrics/TimedResourceListener.java        |  92 --------------
 .../modules/GuiceServletContainer.java        |  25 +++-
 .../commons/skeleton/modules/StatsModule.java |   7 --
 .../modules/TimedInterceptionService.java     | 119 ++++++++++++++++++
 .../metrics/TestTimedResourceInterceptor.java |  38 ++++--
 .../modules/AbstractBaseServerModuleTest.java |  21 ++++
 .../skeleton/modules/HelloResource.java       |   3 +
 .../modules/TestJerseyBaseServerModule.java   |  47 ++++---
 10 files changed, 239 insertions(+), 134 deletions(-)
 delete mode 100644 skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceListener.java
 create mode 100644 skeleton/src/main/java/org/killbill/commons/skeleton/modules/TimedInterceptionService.java

diff --git a/metrics/src/main/java/org/killbill/commons/metrics/TimedResource.java b/metrics/src/main/java/org/killbill/commons/metrics/TimedResource.java
index b22858f6f..790ae0388 100644
--- a/metrics/src/main/java/org/killbill/commons/metrics/TimedResource.java
+++ b/metrics/src/main/java/org/killbill/commons/metrics/TimedResource.java
@@ -47,7 +47,6 @@
  * MetricTag annotations in the method's parameters
  *
  * @see MetricTag
- * @see javax.ws.rs.Path
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceInterceptor.java b/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceInterceptor.java
index 643c72c79..aca24c729 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceInterceptor.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceInterceptor.java
@@ -27,17 +27,16 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Provider;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
 import org.glassfish.jersey.spi.ExceptionMappers;
 import org.killbill.commons.metrics.MetricTag;
 
 import com.codahale.metrics.MetricRegistry;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
 
 /**
  * A method interceptor which times the execution of the annotated resource method.
@@ -45,14 +44,14 @@
 public class TimedResourceInterceptor implements MethodInterceptor {
 
     private final Map<String, Map<String, Object>> metricTagsByMethod = new ConcurrentHashMap<String, Map<String, Object>>();
-    private final Provider<ExceptionMappers> exceptionMappers;
-    private final Provider<MetricRegistry> metricRegistry;
+    private final ExceptionMappers exceptionMappers;
+    private final MetricRegistry metricRegistry;
     private final String resourcePath;
     private final String metricName;
     private final String httpMethod;
 
-    public TimedResourceInterceptor(final Provider<ExceptionMappers> exceptionMappers,
-                                    final Provider<MetricRegistry> metricRegistry,
+    public TimedResourceInterceptor(final ExceptionMappers exceptionMappers,
+                                    final MetricRegistry metricRegistry,
                                     final String resourcePath,
                                     final String metricName,
                                     final String httpMethod) {
@@ -95,8 +94,7 @@ public Object invoke(final MethodInvocation invocation) throws Throwable {
     }
 
     private int mapException(final Throwable e) throws Exception {
-        final ExceptionMappers actualMappers = exceptionMappers.get();
-        final ExceptionMapper<Throwable> exceptionMapper = (actualMappers != null) ? actualMappers.findMapping(e) : null;
+        final ExceptionMapper<Throwable> exceptionMapper = (exceptionMappers != null) ? exceptionMappers.findMapping(e) : null;
 
         if (exceptionMapper != null) {
             return exceptionMapper.toResponse(e).getStatus();
@@ -108,7 +106,7 @@ private int mapException(final Throwable e) throws Exception {
     private ResourceTimer timer(final MethodInvocation invocation) {
         final Map<String, Object> metricTags = metricTags(invocation);
 
-        return new ResourceTimer(resourcePath, metricName, httpMethod, metricTags, metricRegistry.get());
+        return new ResourceTimer(resourcePath, metricName, httpMethod, metricTags, metricRegistry);
     }
 
     private Map<String, Object> metricTags(final MethodInvocation invocation) {
@@ -159,7 +157,7 @@ private static Object getProperty(final Object currentArgument, final String pro
         }
 
         try {
-            final String[] methodNames = {"get" + capitalize(property), "is" + capitalize(property), property };
+            final String[] methodNames = {"get" + capitalize(property), "is" + capitalize(property), property};
             Method propertyMethod = null;
             for (final String methodName : methodNames) {
                 try {
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceListener.java b/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceListener.java
deleted file mode 100644
index 4627d22a9..000000000
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/metrics/TimedResourceListener.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2010-2014 Ning, Inc.
- * Copyright 2014-2020 Groupon, Inc
- * Copyright 2020-2020 Equinix, Inc
- * Copyright 2014-2020 The Billing Project, LLC
- *
- * The Billing Project licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at:
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package org.killbill.commons.skeleton.metrics;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-
-import javax.inject.Provider;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.Path;
-
-import org.glassfish.jersey.spi.ExceptionMappers;
-import org.killbill.commons.metrics.TimedResource;
-
-import com.codahale.metrics.MetricRegistry;
-import com.google.inject.TypeLiteral;
-import com.google.inject.matcher.Matchers;
-import com.google.inject.spi.TypeEncounter;
-import com.google.inject.spi.TypeListener;
-
-/**
- * A listener which adds method interceptors to timed resource methods.
- */
-public class TimedResourceListener implements TypeListener {
-
-    private final Provider<ExceptionMappers> exceptionMappers;
-
-    private final Provider<MetricRegistry> metricRegistry;
-
-    public TimedResourceListener(final Provider<ExceptionMappers> exceptionMappers,
-                                 final Provider<MetricRegistry> metricRegistry) {
-        this.exceptionMappers = exceptionMappers;
-        this.metricRegistry = metricRegistry;
-    }
-
-    @Override
-    public <T> void hear(final TypeLiteral<T> literal,
-                         final TypeEncounter<T> encounter) {
-        final Path pathAnnotation = literal.getRawType().getAnnotation(Path.class);
-        if (pathAnnotation != null) {
-            final String resourcePath = pathAnnotation.value();
-
-            for (final Method method : literal.getRawType().getMethods()) {
-                final TimedResource annotation = method.getAnnotation(TimedResource.class);
-                if (annotation != null) {
-                    final HttpMethod httpMethod = resourceHttpMethod(method);
-                    if (httpMethod != null) {
-                        final String metricName;
-                        if (!annotation.name().trim().isEmpty()) {
-                            metricName = annotation.name();
-                        } else {
-                            metricName = method.getName();
-                        }
-                        final TimedResourceInterceptor timedResourceInterceptor = new TimedResourceInterceptor(exceptionMappers,
-                                                                                                               metricRegistry,
-                                                                                                               resourcePath,
-                                                                                                               metricName,
-                                                                                                               httpMethod.value());
-                        encounter.bindInterceptor(Matchers.only(method), timedResourceInterceptor);
-                    }
-                }
-            }
-        }
-    }
-
-    private HttpMethod resourceHttpMethod(final Method method) {
-        for (final Annotation annotation: method.getAnnotations()) {
-            final HttpMethod httpMethod = annotation.annotationType().getAnnotation(HttpMethod.class);
-            if (httpMethod != null) {
-                return httpMethod;
-            }
-        }
-        return null;
-    }
-}
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java
index 08d64af8e..b71a5517f 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/GuiceServletContainer.java
@@ -23,14 +23,22 @@
 import javax.ws.rs.ext.MessageBodyWriter;
 
 import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
 import org.glassfish.jersey.internal.inject.InjectionManager;
+import org.glassfish.jersey.server.ServerProperties;
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.glassfish.jersey.servlet.WebConfig;
+import org.glassfish.jersey.spi.ExceptionMappers;
 import org.jvnet.hk2.guice.bridge.api.GuiceBridge;
 import org.jvnet.hk2.guice.bridge.api.GuiceIntoHK2Bridge;
 
+import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableSet;
 import com.google.inject.Injector;
 import com.google.inject.TypeLiteral;
 
@@ -47,7 +55,8 @@ public GuiceServletContainer(final Injector injector) {
 
     @Override
     protected void init(final WebConfig webConfig) throws ServletException {
-        // This will instantiate a new instance of ResourceConfig (see WebComponent#createResourceConfig) initialized with the Jersey parameters we specified (see JerseyBaseServerModule)
+        // This will instantiate a new instance of ResourceConfig (see WebComponent#createResourceConfig) initialized
+        // with the Jersey parameters we specified (see JerseyBaseServerModule)
         super.init(webConfig);
 
         // HK2 will instantiate the Jersey resources, but will delegate injection of the bindings it doesn't know about to Guice
@@ -57,6 +66,20 @@ protected void init(final WebConfig webConfig) throws ServletException {
         final GuiceIntoHK2Bridge guiceBridge = serviceLocator.getService(GuiceIntoHK2Bridge.class);
         guiceBridge.bridgeGuiceInjector(injector);
 
+        // Metrics integration
+        final String scannedResourcePackagesString = webConfig.getInitParameter(ServerProperties.PROVIDER_PACKAGES);
+        if (Strings.emptyToNull(scannedResourcePackagesString) != null) {
+            final ImmutableSet<String> scannedResourcePackages = ImmutableSet.<String>copyOf(Splitter.on(CharMatcher.anyOf(" ,;\n"))
+                                                                                                     .split(scannedResourcePackagesString));
+            ServiceLocatorUtilities.addOneConstant(serviceLocator,
+                                                   new TimedInterceptionService(scannedResourcePackages,
+                                                                                // From HK2
+                                                                                injectionManager.<ExceptionMappers>getInstance(ExceptionMappers.class),
+                                                                                // From Guice
+                                                                                injector.getInstance(MetricRegistry.class)));
+        }
+
+        // Jackson integration
         final boolean hasObjectMapperBinding = !injector.findBindingsByType(TypeLiteral.get(ObjectMapper.class)).isEmpty();
         if (hasObjectMapperBinding) {
             // JacksonJsonProvider is constructed by HK2, but we need to inject the ObjectMapper we constructed via Guice
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/StatsModule.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/StatsModule.java
index 0ea12ac27..afb0c2d06 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/StatsModule.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/StatsModule.java
@@ -19,8 +19,6 @@
 
 package org.killbill.commons.skeleton.modules;
 
-import org.glassfish.jersey.spi.ExceptionMappers;
-import org.killbill.commons.skeleton.metrics.TimedResourceListener;
 import org.killbill.commons.skeleton.metrics.health.KillBillHealthCheckRegistry;
 
 import com.codahale.metrics.MetricRegistry;
@@ -28,7 +26,6 @@
 import com.codahale.metrics.health.HealthCheckRegistry;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.AbstractModule;
-import com.google.inject.matcher.Matchers;
 import com.google.inject.multibindings.Multibinder;
 import com.palominolabs.metrics.guice.MetricsInstrumentationModule;
 
@@ -79,10 +76,6 @@ protected void configure() {
         }
         install(new AdminServletModule(healthCheckUri, metricsUri, pingUri, threadsUri));
 
-        // Metrics/Jersey integration
-        final TimedResourceListener timedResourceTypeListener = new TimedResourceListener(getProvider(ExceptionMappers.class), getProvider(MetricRegistry.class));
-        bindListener(Matchers.any(), timedResourceTypeListener);
-
         bind(HealthCheckRegistry.class).toInstance(createHealthCheckRegistry());
     }
 
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/TimedInterceptionService.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/TimedInterceptionService.java
new file mode 100644
index 000000000..444ad93c2
--- /dev/null
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/TimedInterceptionService.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2020-2020 Equinix, Inc
+ * Copyright 2014-2020 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.killbill.commons.skeleton.modules;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Set;
+
+import javax.inject.Singleton;
+import javax.ws.rs.HttpMethod;
+import javax.ws.rs.Path;
+
+import org.aopalliance.intercept.ConstructorInterceptor;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.glassfish.hk2.api.Descriptor;
+import org.glassfish.hk2.api.Filter;
+import org.glassfish.hk2.api.InterceptionService;
+import org.glassfish.jersey.spi.ExceptionMappers;
+import org.killbill.commons.metrics.TimedResource;
+import org.killbill.commons.skeleton.metrics.TimedResourceInterceptor;
+
+import com.codahale.metrics.MetricRegistry;
+import com.google.common.collect.ImmutableList;
+
+@Singleton
+public class TimedInterceptionService implements InterceptionService {
+
+    private final Set<String> resourcePackages;
+    private final ExceptionMappers exceptionMappers;
+    private final MetricRegistry metricRegistry;
+
+    public TimedInterceptionService(final Set<String> resourcePackage,
+                                    final ExceptionMappers exceptionMappers,
+                                    final MetricRegistry metricRegistry) {
+        this.resourcePackages = resourcePackage;
+        this.exceptionMappers = exceptionMappers;
+        this.metricRegistry = metricRegistry;
+    }
+
+    @Override
+    public Filter getDescriptorFilter() {
+        return new Filter() {
+            @Override
+            public boolean matches(final Descriptor d) {
+                final String clazz = d.getImplementation();
+                for (final String resourcePackage : resourcePackages) {
+                    if (clazz.startsWith(resourcePackage)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        };
+    }
+
+    @Override
+    public List<MethodInterceptor> getMethodInterceptors(final Method method) {
+        final TimedResource annotation = method.getAnnotation(TimedResource.class);
+        if (annotation == null) {
+            return null;
+        }
+
+        final Path pathAnnotation = method.getDeclaringClass().getAnnotation(Path.class);
+        if (pathAnnotation == null) {
+            return null;
+        }
+        final String resourcePath = pathAnnotation.value();
+
+        final HttpMethod httpMethod = resourceHttpMethod(method);
+        if (httpMethod == null) {
+            return null;
+        }
+
+        final String metricName;
+        if (!annotation.name().trim().isEmpty()) {
+            metricName = annotation.name();
+        } else {
+            metricName = method.getName();
+        }
+        final MethodInterceptor timedResourceInterceptor = new TimedResourceInterceptor(exceptionMappers,
+                                                                                        metricRegistry,
+                                                                                        resourcePath,
+                                                                                        metricName,
+                                                                                        httpMethod.value());
+        return ImmutableList.<MethodInterceptor>of(timedResourceInterceptor);
+    }
+
+    private HttpMethod resourceHttpMethod(final Method method) {
+        for (final Annotation annotation : method.getAnnotations()) {
+            final HttpMethod httpMethod = annotation.annotationType().getAnnotation(HttpMethod.class);
+            if (httpMethod != null) {
+                return httpMethod;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public List<ConstructorInterceptor> getConstructorInterceptors(final Constructor<?> constructor) {
+        return null;
+    }
+}
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/metrics/TestTimedResourceInterceptor.java b/skeleton/src/test/java/org/killbill/commons/skeleton/metrics/TestTimedResourceInterceptor.java
index 0b3596239..238666435 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/metrics/TestTimedResourceInterceptor.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/metrics/TestTimedResourceInterceptor.java
@@ -19,7 +19,9 @@
 
 package org.killbill.commons.skeleton.metrics;
 
+import java.lang.reflect.Method;
 import java.net.URI;
+import java.util.List;
 
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -27,9 +29,12 @@
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 
+import org.aopalliance.intercept.MethodInterceptor;
+import org.glassfish.hk2.api.InterceptionService;
 import org.glassfish.jersey.spi.ExceptionMappers;
 import org.killbill.commons.metrics.MetricTag;
 import org.killbill.commons.metrics.TimedResource;
+import org.killbill.commons.skeleton.modules.TimedInterceptionService;
 import org.mockito.Mockito;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
@@ -37,10 +42,14 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import com.google.common.collect.ImmutableSet;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.google.inject.TypeLiteral;
 import com.google.inject.matcher.Matchers;
+import com.google.inject.spi.TypeEncounter;
+import com.google.inject.spi.TypeListener;
 
 @Test(groups = "fast")
 public class TestTimedResourceInterceptor {
@@ -57,7 +66,7 @@ public void setup() throws Exception {
 
     public void testResourceWithResponse() {
         final Response response = interceptedResource.createOk();
-        Assert.assertEquals(200,  response.getStatus());
+        Assert.assertEquals(200, response.getStatus());
 
         final Timer timer = registry.getTimers().get("kb_resource.path.createOk.POST.2xx.200");
         Assert.assertNotNull(timer);
@@ -121,7 +130,7 @@ public void testResourceWithWebApplicationException() {
         try {
             interceptedResource.createWebApplicationException();
             Assert.fail();
-        } catch(final WebApplicationException e) {
+        } catch (final WebApplicationException e) {
             final Timer timer = registry.getTimers().get("kb_resource.path.createWebApplicationException.POST.4xx.404");
             Assert.assertNotNull(timer);
             Assert.assertEquals(1, timer.getCount());
@@ -129,6 +138,7 @@ public void testResourceWithWebApplicationException() {
     }
 
     public static class Payment {
+
         private final String type;
 
         public Payment(final String type) {
@@ -179,15 +189,29 @@ public void createWebApplicationException() {
         }
     }
 
+    // In practice, this is done by HK2, not Guice, but for convenience, we use Guice here
     public static class TestResourceModule extends AbstractModule {
+
         @Override
         protected void configure() {
-            bind(ExceptionMappers.class).toInstance(Mockito.mock(ExceptionMappers.class));
             bind(TestResource.class).asEagerSingleton();
-            bind(MetricRegistry.class).asEagerSingleton();
-
-            final TimedResourceListener timedResourceTypeListener = new TimedResourceListener(getProvider(ExceptionMappers.class), getProvider(MetricRegistry.class));
-            bindListener(Matchers.any(), timedResourceTypeListener);
+            final MetricRegistry metricRegistry = new MetricRegistry();
+            bind(MetricRegistry.class).toInstance(metricRegistry);
+
+            final InterceptionService timedInterceptionService = new TimedInterceptionService(ImmutableSet.<String>of(this.getClass().getPackage().getName()),
+                                                                                              Mockito.mock(ExceptionMappers.class),
+                                                                                              metricRegistry);
+            bindListener(Matchers.any(), new TypeListener() {
+                @Override
+                public <I> void hear(final TypeLiteral<I> literal, final TypeEncounter<I> encounter) {
+                    for (final Method method : literal.getRawType().getMethods()) {
+                        final List<MethodInterceptor> methodInterceptors = timedInterceptionService.getMethodInterceptors(method);
+                        if (methodInterceptors != null) {
+                            encounter.bindInterceptor(Matchers.only(method), methodInterceptors.get(0));
+                        }
+                    }
+                }
+            });
         }
     }
 }
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/AbstractBaseServerModuleTest.java b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/AbstractBaseServerModuleTest.java
index a41b0f0ed..e24573249 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/AbstractBaseServerModuleTest.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/AbstractBaseServerModuleTest.java
@@ -22,11 +22,18 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 
+import javax.servlet.ServletContextEvent;
+
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.testng.Assert;
 
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.health.HealthCheckRegistry;
+import com.codahale.metrics.servlet.InstrumentedFilter;
+import com.codahale.metrics.servlets.HealthCheckServlet;
+import com.codahale.metrics.servlets.MetricsServlet;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
@@ -37,7 +44,10 @@ public abstract class AbstractBaseServerModuleTest {
 
     protected Server startServer(final Module... modules) throws Exception {
         final Injector injector = Guice.createInjector(modules);
+        return startServer(injector);
+    }
 
+    protected Server startServer(final Injector injector) throws Exception {
         final Server server = new Server(getPort());
         final ServletContextHandler servletContextHandler = new ServletContextHandler();
         servletContextHandler.addEventListener(new GuiceServletContextListener() {
@@ -45,6 +55,17 @@ protected Server startServer(final Module... modules) throws Exception {
             protected Injector getInjector() {
                 return injector;
             }
+
+            @Override
+            public void contextInitialized(final ServletContextEvent servletContextEvent) {
+                super.contextInitialized(servletContextEvent);
+
+                // For Kill Bill, this is done in KillbillPlatformGuiceListener
+                final MetricRegistry metricRegistry = injector.getInstance(MetricRegistry.class);
+                servletContextEvent.getServletContext().setAttribute(HealthCheckServlet.HEALTH_CHECK_REGISTRY, injector.getInstance(HealthCheckRegistry.class));
+                servletContextEvent.getServletContext().setAttribute(MetricsServlet.METRICS_REGISTRY, metricRegistry);
+                servletContextEvent.getServletContext().setAttribute(InstrumentedFilter.REGISTRY_ATTRIBUTE, metricRegistry);
+            }
         });
 
         servletContextHandler.addFilter(GuiceFilter.class, "/*", null);
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java
index 5ad49b4a4..a523a21cd 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/HelloResource.java
@@ -30,6 +30,7 @@
 import javax.ws.rs.Produces;
 
 import org.joda.time.LocalDate;
+import org.killbill.commons.metrics.TimedResource;
 import org.testng.Assert;
 
 import com.google.common.collect.ImmutableMap;
@@ -52,12 +53,14 @@ public HelloResource(final SomeGuiceyDependency someGuiceyDependency, final Inje
         Assert.assertEquals(someGuiceyDependency, guiceInjector.getInstance(SomeGuiceyDependency.class));
     }
 
+    @TimedResource
     @GET
     @Path("/{name}")
     public String hello(@PathParam("name") final String name) {
         return "Hello " + name;
     }
 
+    @TimedResource
     @POST
     @Produces("application/json")
     public Map<String, ?> hello() {
diff --git a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
index 03c0cbd10..6f70dc63d 100644
--- a/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
+++ b/skeleton/src/test/java/org/killbill/commons/skeleton/modules/TestJerseyBaseServerModule.java
@@ -30,11 +30,14 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.joda.JodaModule;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 
 public class TestJerseyBaseServerModule extends AbstractBaseServerModuleTest {
 
@@ -44,32 +47,46 @@ public void testJerseyIntegration() throws Exception {
         builder.addJerseyResourcePackage("org.killbill.commons.skeleton.modules");
         builder.addJerseyResourceClass(HelloFilter.class.getName());
         builder.addJerseyResourceClass(JacksonJsonProvider.class.getName());
-        final Server server = startServer(builder.build(), new AbstractModule() {
-            @Override
-            protected void configure() {
-                final ObjectMapper objectMapper = new ObjectMapper();
-                objectMapper.registerModule(new JodaModule());
-                objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-                binder().bind(ObjectMapper.class).toInstance(objectMapper);
-            }
-        });
+        builder.setJaxrsUriPattern("/hello|/hello/.*");
+
+        final Injector injector = Guice.createInjector(builder.build(),
+                                                       new StatsModule(),
+                                                       new AbstractModule() {
+                                                           @Override
+                                                           protected void configure() {
+                                                               final ObjectMapper objectMapper = new ObjectMapper();
+                                                               objectMapper.registerModule(new JodaModule());
+                                                               objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+                                                               binder().bind(ObjectMapper.class).toInstance(objectMapper);
+                                                           }
+                                                       });
+        final Server server = startServer(injector);
+
+        final AsyncHttpClient client = new DefaultAsyncHttpClient();
+        Future<Response> responseFuture = client.prepareGet("http://127.0.0.1:" + ((NetworkConnector) server.getConnectors()[0]).getPort() + "/1.0/ping").execute();
+        String body = responseFuture.get().getResponseBody();
+        Assert.assertEquals(body, "pong\n");
+
+        final MetricRegistry metricRegistry = injector.getInstance(MetricRegistry.class);
+        Assert.assertEquals(metricRegistry.getMetrics().size(), 0);
 
         Assert.assertEquals(HelloFilter.invocations, 0);
 
         // Do multiple passes to verify Singleton pattern
         for (int i = 0; i < 5; i++) {
-            final AsyncHttpClient client = new DefaultAsyncHttpClient();
-            final Future<Response> responseFuture = client.prepareGet("http://127.0.0.1:" + ((NetworkConnector) server.getConnectors()[0]).getPort() + "/hello/alhuile/").execute();
-            final String body = responseFuture.get().getResponseBody();
+            responseFuture = client.prepareGet("http://127.0.0.1:" + ((NetworkConnector) server.getConnectors()[0]).getPort() + "/hello/alhuile/").execute();
+            body = responseFuture.get().getResponseBody();
             Assert.assertEquals(body, "Hello alhuile");
             Assert.assertEquals(HelloFilter.invocations, i + 1);
         }
 
-        final AsyncHttpClient client = new DefaultAsyncHttpClient();
-        final Future<Response> responseFuture = client.preparePost("http://127.0.0.1:" + ((NetworkConnector) server.getConnectors()[0]).getPort() + "/hello").execute();
-        final String body = responseFuture.get().getResponseBody();
+        responseFuture = client.preparePost("http://127.0.0.1:" + ((NetworkConnector) server.getConnectors()[0]).getPort() + "/hello").execute();
+        body = responseFuture.get().getResponseBody();
         Assert.assertEquals(body, "{\"key\":\"hello\",\"date\":\"2010-01-01\"}");
 
+        Assert.assertEquals(metricRegistry.getMetrics().size(), 2);
+        Assert.assertNotNull(metricRegistry.getMetrics().get("kb_resource.hello.hello.POST.2xx.200"));
+        Assert.assertNotNull(metricRegistry.getMetrics().get("kb_resource.hello.hello.GET.2xx.200"));
         server.stop();
     }
 

From 3a2c20910095c6a1c77a95e2e8c226c62ed0f096 Mon Sep 17 00:00:00 2001
From: Pierre-Alexandre Meyer <pierre@mouraf.org>
Date: Thu, 12 Nov 2020 11:44:15 +0000
Subject: [PATCH 5/5] .github: disable CodeQL on PR

It isn't smart enough to understand how to pull SNAPSHOT dependencies.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
---
 .github/workflows/codeql-analysis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index bfb9cd181..cd4e93bd1 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -8,9 +8,6 @@ name: "CodeQL"
 on:
   push:
     branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
   schedule:
     - cron: '0 16 * * 6'