Improve web injection

2 files changed, 40 insertions, 14 deletions

diff --git a/src/main/java/org/traccar/web/WebModule.java b/src/main/java/org/traccar/web/WebModule.java
new file mode 100644
index 000000000..6c133ff74
--- /dev/null
+++ b/src/main/java/org/traccar/web/WebModule.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed 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.traccar.web;
+
+import com.google.inject.servlet.ServletModule;
+import org.traccar.api.AsyncSocketServlet;
+import org.traccar.api.MediaFilter;
+
+public class WebModule extends ServletModule {
+
+    @Override
+    protected void configureServlets() {
+        filter("/api/media/*").through(MediaFilter.class);
+        serve("/api/socket").with(AsyncSocketServlet.class);
+    }
+}
diff --git a/src/main/java/org/traccar/web/WebServer.java b/src/main/java/org/traccar/web/WebServer.java
index 36f3d7682..46e401779 100644
--- a/src/main/java/org/traccar/web/WebServer.java
+++ b/src/main/java/org/traccar/web/WebServer.java
@@ -15,6 +15,7 @@
  */
 package org.traccar.web;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Injector;
 import com.google.inject.servlet.GuiceFilter;
 import org.eclipse.jetty.http.HttpCookie;
@@ -40,13 +41,9 @@ import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerI
 import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.traccar.LifecycleObject;
-import org.traccar.api.AsyncSocketServlet;
 import org.traccar.api.CorsResponseFilter;
 import org.traccar.api.DateParameterConverterProvider;
-import org.traccar.api.MediaFilter;
 import org.traccar.api.ObjectMapperProvider;
 import org.traccar.api.ResourceErrorHandler;
 import org.traccar.api.resource.ServerResource;
@@ -88,6 +85,8 @@ public class WebServer implements LifecycleObject {
         }
 
         ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        JettyWebSocketServletContainerInitializer.configure(servletHandler, null);
+        servletHandler.addFilter(GuiceFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
 
         initApi(servletHandler);
         initSessionConfig(servletHandler);
@@ -140,7 +139,7 @@ public class WebServer implements LifecycleObject {
                     }
                 }
             };
-            ServletHolder servletHolder = new ServletHolder(new AsyncProxyServlet.Transparent());
+            ServletHolder servletHolder = new ServletHolder(AsyncProxyServlet.Transparent.class);
             servletHolder.setInitParameter("proxyTo", "http://localhost:" + port);
             servletHandler.addServlet(servletHolder, "/");
             handlers.addHandler(servletHandler);
@@ -164,11 +163,6 @@ public class WebServer implements LifecycleObject {
     }
 
     private void initApi(ServletContextHandler servletHandler) {
-        servletHandler.addFilter(GuiceFilter.class, "/api/*", EnumSet.allOf(DispatcherType.class));
-
-        servletHandler.addServlet(new ServletHolder(injector.getInstance(AsyncSocketServlet.class)), "/api/socket");
-        JettyWebSocketServletContainerInitializer.configure(servletHandler, null);
-
         String mediaPath = config.getString(Keys.MEDIA_PATH);
         if (mediaPath != null) {
             ServletHolder servletHolder = new ServletHolder(DefaultServlet.class);
@@ -176,15 +170,18 @@ public class WebServer implements LifecycleObject {
             servletHolder.setInitParameter("dirAllowed", "false");
             servletHolder.setInitParameter("pathInfoOnly", "true");
             servletHandler.addServlet(servletHolder, "/api/media/*");
-            servletHandler.addFilter(MediaFilter.class, "/api/media/*", EnumSet.allOf(DispatcherType.class));
         }
 
         ResourceConfig resourceConfig = new ResourceConfig();
+        resourceConfig.register(new GuiceBridgeInitializer(injector));
+        resourceConfig.register(new ObjectMapperProvider(injector.getInstance(ObjectMapper.class)));
         resourceConfig.registerClasses(
-                JacksonFeature.class, ObjectMapperProvider.class, ResourceErrorHandler.class,
-                SecurityRequestFilter.class, CorsResponseFilter.class, DateParameterConverterProvider.class);
+                JacksonFeature.class,
+                DateParameterConverterProvider.class,
+                SecurityRequestFilter.class,
+                CorsResponseFilter.class,
+                ResourceErrorHandler.class);
         resourceConfig.packages(ServerResource.class.getPackage().getName());
-        resourceConfig.register(new GuiceBridgeInitializer(injector));
         servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/api/*");
     }