#349 Different instances of the same filter result in just one last instance of a filter configured

Author: Igor Polevoy

activeweb/src/main/java/org/javalite/activeweb/Configuration.java

@@ -60,7 +60,7 @@ enum Params {
 
     private static boolean filtersInjected = false;
 
-    private static Map<Class, FilterMetadata> filterMetadataMap = new HashMap<>();
+    private static Map<HttpSupport, FilterMetadata> filterMetadataMap = new HashMap<>();
 
     static{
         try {
@@ -314,10 +314,10 @@ protected static void injectFilters() {
     //no need to synchronize here, since FilterConfig objects will be created
     //by a single thread when the app is bootstrapped.
     static FilterMetadata getFilterMetadata(HttpSupportFilter filter){
-        FilterMetadata config = filterMetadataMap.get(filter.getClass());
+        FilterMetadata config = filterMetadataMap.get(filter);
         if(config == null){
             config = new FilterMetadata();
-            filterMetadataMap.put(filter.getClass(), config);
+            filterMetadataMap.put(filter, config);
         }
         return config;
     }

activeweb/src/main/java/org/javalite/activeweb/ControllerRunner.java

@@ -53,8 +53,8 @@ protected void run(Route route, boolean integrateViews) throws Exception {
 
                 String actionMethod = Inflector.camelize(route.getActionName().replace('-', '_'), false);
                 if (checkActionMethod(route.getController(), actionMethod)) {
-                    //Configuration.getTemplateManager().
                     injectController(route.getController());
+                    LOGGER.debug("Executing: " + route.getController() + "#" + actionMethod);
                     executeAction(route.getController(), actionMethod);
                 }
             }
@@ -207,11 +207,9 @@ private boolean checkActionMethod(AppController controller, String actionMethod)
     private boolean exceptionHandled(Exception e, Route route) throws Exception{
         for(HttpSupportFilter filter: Configuration.getFilters()){
             if(Configuration.getFilterMetadata(filter).matches(route)){
-                if (Configuration.logRequestParams()) {
-                    LOGGER.debug("Executing filter: " + filter.getClass().getName() + "#before");
-                }
+                LOGGER.debug("Executing filter: " + filter.getClass().getName() + "#exceptionHandled");
                 filter.onException(e);
-                if(RequestContext.getControllerResponse() != null){ // this filter sent a response, breaking the loop
+                if (RequestContext.getControllerResponse() != null){ // this filter sent a response, breaking the loop
                     break;
                 }
             }
@@ -227,16 +225,10 @@ private boolean exceptionHandled(Exception e, Route route) throws Exception{
      */
     private void filterBefore(Route route) {
         try {
-            List<HttpSupportFilter> filters = Configuration.getFilters();
 
             for(HttpSupportFilter filter: Configuration.getFilters()){
-                if (Configuration.logRequestParams()) {
-                    LOGGER.debug("Executing filter: " + filter.getClass().getName() + "#before");
-                }
                 if(Configuration.getFilterMetadata(filter).matches(route)){
-                    if (Configuration.logRequestParams()) {
-                        LOGGER.debug("Executing filter: " + filter.getClass().getName() + "#after");
-                    }
+                    LOGGER.debug("Executing filter: " + filter.getClass().getName() + "#before");
                     filter.before();
                 }
                 if (RequestContext.getControllerResponse() != null){
@@ -256,9 +248,7 @@ private void filterAfter(Route route) {
             for (int i = filters.size() - 1; i >= 0; i--) {
                 HttpSupportFilter filter = filters.get(i);
                 if(Configuration.getFilterMetadata(filter).matches(route)){
-                    if (Configuration.logRequestParams()) {
-                        LOGGER.debug("Executing filter: " + filter.getClass().getName() + "#after");
-                    }
+                    LOGGER.debug("Executing filter: " + filter.getClass().getName() + "#after");
                     filters.get(i).after();
                 }
             }

activeweb/src/test/java/org/javalite/activeweb/AbstractControllerConfigSpec.java

@@ -15,6 +15,7 @@
 */
 package org.javalite.activeweb;
 
+import org.javalite.activeweb.controller_filters.DBConnectionFilter;
 import org.javalite.activeweb.controller_filters.HttpSupportFilter;
 import org.javalite.activeweb.mock.*;
 import org.javalite.common.Util;
@@ -221,5 +222,21 @@ public void shouldTriggerFiltersInOrderOfDefinition() throws IOException, Servle
         the(getLine(7)).shouldBeEqual("GlobalFilter2 after");
         the(getLine(8)).shouldBeEqual("GlobalFilter1 after");
     }
+
+    @Test
+    public void shouldAllowMultipleInstancesOfFilterRegistered() {
+        config = new AbstractControllerConfig() {
+            public void init(AppContext context) {
+                add(new DBConnectionFilter());
+                add(new DBConnectionFilter("another")).to(LibraryController.class);
+            }
+        };
+        config.init(new AppContext());
+        config.completeInit();
+        List<HttpSupportFilter> filters = Configuration.getFilters();
+        FilterMetadata filter1Metadata = Configuration.getFilterMetadata(filters.get(0));
+        FilterMetadata filter2Metadata = Configuration.getFilterMetadata(filters.get(1));
+        the(filter1Metadata).shouldNotBeTheSameAs(filter2Metadata);
+    }
 }