Fix regression after configuration refactoring (#51)

Configuration parameters in both web.xml and
Spring configuration are used now
Fix #46

src/main/java/com/hazelcast/web/WebFilterConfig.java

@@ -251,7 +251,7 @@ private static URL getConfigUrl(final ServletContext ctx, final String configLoc
     }
 
     private static String getValue(FilterConfig filterConfig, Properties properties, String paramName) {
-        if (properties != null) {
+        if (properties != null && properties.containsKey(paramName)) {
             return properties.getProperty(paramName);
         } else {
             return filterConfig.getInitParameter(paramName);

src/test/java/com/hazelcast/wm/test/WebFilterConfigTest.java

@@ -2,7 +2,8 @@
 
 import com.hazelcast.config.InvalidConfigurationException;
 import com.hazelcast.web.WebFilterConfig;
-import com.hazelcast.wm.test.spring.FilterConfigStub;
+import com.hazelcast.wm.test.spring.MapBasedFilterConfig;
+import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -17,7 +18,7 @@ public class WebFilterConfigTest {
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 
-    private FilterConfig emptyFilterConfig = new FilterConfigStub();
+    private final FilterConfig emptyFilterConfig = new MapBasedFilterConfig();
 
     @Test
     public void testInstanceName_withConfigLocation() throws Exception {
@@ -62,4 +63,29 @@ public void testUseClient_withConfigLocation() throws Exception {
 
         WebFilterConfig.create(emptyFilterConfig, properties);
     }
+
+    @Test
+    public void bothServletFilterConfigAndPropertiesAreUsed() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty("cookie-name", "customcookiename");
+
+        MapBasedFilterConfig servletFilterConfig = new MapBasedFilterConfig();
+        servletFilterConfig.setParameter("use-client", "true");
+
+        WebFilterConfig webFilterConfig = WebFilterConfig.create(servletFilterConfig, properties);
+        Assert.assertEquals(true, webFilterConfig.isUseClient());
+        Assert.assertEquals("customcookiename", webFilterConfig.getCookieName());
+    }
+
+    @Test
+    public void propertiesOverrideServletFilterConfiguration() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty("cookie-name", "cookie1");
+
+        MapBasedFilterConfig servletFilterConfig = new MapBasedFilterConfig();
+        servletFilterConfig.setParameter("cookie-name", "cookie2");
+
+        WebFilterConfig webFilterConfig = WebFilterConfig.create(servletFilterConfig, properties);
+        Assert.assertEquals("cookie1", webFilterConfig.getCookieName());
+    }
 }

src/test/java/com/hazelcast/wm/test/spring/MapBasedFilterConfig.java

@@ -0,0 +1,50 @@
+package com.hazelcast.wm.test.spring;
+
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+public class MapBasedFilterConfig implements FilterConfig {
+    private final ServletContext emptyServletContext = new ServletContextStub();
+    private final Map<String, String> parameters = new HashMap<String, String>();
+
+    @Override
+    public String getFilterName() {
+        return "filter-1";
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        return emptyServletContext;
+    }
+
+    @Override
+    public String getInitParameter(String name) {
+        return parameters.get(name);
+    }
+
+    @Override
+    public Enumeration<String> getInitParameterNames() {
+        return new Enumeration<String>() {
+
+            private Iterator<String> iterator = parameters.keySet().iterator();
+
+            @Override
+            public boolean hasMoreElements() {
+                return iterator.hasNext();
+            }
+
+            @Override
+            public String nextElement() {
+                return iterator.next();
+            }
+        };
+    }
+
+    public void setParameter(String paramName, String paramValue) {
+        parameters.put(paramName, paramValue);
+    }
+}