refactor: move CIDR filter to common mode

Author: pirhoo

datashare-app/src/main/java/org/icij/datashare/mode/CommonMode.java

@@ -45,6 +45,7 @@
 import org.icij.datashare.json.JsonObjectMapper;
 import org.icij.datashare.nlp.EmailPipeline;
 import org.icij.datashare.nlp.OptimaizeLanguageGuesser;
+import org.icij.datashare.session.StatusCidrFilter;
 import org.icij.datashare.session.UsersInDb;
 import org.icij.datashare.session.UsersWritable;
 import org.icij.datashare.tasks.DatashareTaskFactory;
@@ -192,6 +193,7 @@ public ExecutorService runWorkers() {
     @Override
     protected void configure() {
         bind(PropertiesProvider.class).toInstance(propertiesProvider);
+        bind(StatusCidrFilter.class).asEagerSingleton();
         install(new FactoryModuleBuilder().build(DatashareTaskFactory.class));
 
         QueueType batchQueueType = getQueueType(propertiesProvider, BATCH_QUEUE_TYPE_OPT, DEFAULT_BATCH_QUEUE_TYPE);
@@ -421,6 +423,7 @@ public ObjectMapper configureOrReplaceObjectMapper(ObjectMapper defaultObjectMap
                     }
                 });
         addExtensionsConfiguration(routes);
+        routes.filter(StatusCidrFilter.class);
         addModeConfiguration(routes);
         addPluginsConfiguration(routes);
         return routes;

datashare-app/src/main/java/org/icij/datashare/mode/LocalMode.java

@@ -3,7 +3,6 @@
 import net.codestory.http.routes.Routes;
 import org.icij.datashare.session.CsrfFilter;
 import org.icij.datashare.session.LocalUserFilter;
-import org.icij.datashare.session.StatusCidrFilter;
 import org.icij.datashare.web.*;
 
 import java.util.Map;
@@ -17,7 +16,6 @@ public class LocalMode extends CommonMode {
     protected void configure() {
         super.configure();
         bind(IndexWaiterFilter.class).asEagerSingleton();
-        bind(StatusCidrFilter.class).asEagerSingleton();
         bind(StatusResource.class).asEagerSingleton();
         bind(CsrfFilter.class).asEagerSingleton();
         bind(LocalUserFilter.class).asEagerSingleton();
@@ -42,7 +40,6 @@ protected Routes addModeConfiguration(Routes routes) {
                 add(NoteResource.class).
                 add(NerResource.class).
                 filter(IndexWaiterFilter.class).
-                filter(StatusCidrFilter.class).
                 filter(CsrfFilter.class).
                 filter(LocalUserFilter.class);
     }

datashare-app/src/main/java/org/icij/datashare/mode/ServerMode.java

@@ -62,7 +62,6 @@ protected void configure() {
             bind(YesCookieAuthFilter.class).toInstance(getYesCookieAuthFilter());
         }
         bind(CsrfFilter.class).asEagerSingleton();
-        bind(StatusCidrFilter.class).asEagerSingleton();
         bind(StatusResource.class).asEagerSingleton();
         configurePersistence();
     }
@@ -105,7 +104,6 @@ protected Routes addModeConfiguration(Routes routes) {
                 add(NerResource.class).
                 add(ApiKeyResource.class).
                 add(ProjectResource.class).
-                filter(StatusCidrFilter.class).
                 filter(CsrfFilter.class).
                 filter(ApiKeyFilter.class).
                 filter(Filter.class);