Merge pull request #514 from commercetools/update-play-2.5.6

Update to Play 2.5.6
commercetools · Aug 29, 2016 · b49fae0 · b49fae0
2 parents c075c6b + 0f4bc92
commit b49fae0
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 34 deletions.
diff --git a/app/Filters.java b/app/Filters.java
@@ -0,0 +1,13 @@
+import com.commercetools.sunrise.common.httpauth.HttpAuthenticationFilter;
+import play.filters.csrf.CSRFFilter;
+import play.http.DefaultHttpFilters;
+
+import javax.inject.Inject;
+
+public class Filters extends DefaultHttpFilters {
+
+    @Inject
+    public Filters(final HttpAuthenticationFilter httpAuthenticationFilter, final CSRFFilter csrfFilter) {
+        super(httpAuthenticationFilter, csrfFilter);
+    }
+}
diff --git a/...mon/httpauth/HttpAuthorizationFilter.java → ...on/httpauth/HttpAuthenticationFilter.java b/...mon/httpauth/HttpAuthorizationFilter.java → ...on/httpauth/HttpAuthenticationFilter.java
@@ -21,15 +21,15 @@
 /**
  * Request filter that enables HTTP Access Authentication.
  */
-public class HttpAuthorizationFilter extends Filter {
+public class HttpAuthenticationFilter extends Filter {
 
-    private static final Logger logger = LoggerFactory.getLogger(HttpAuthorizationFilter.class);
+    private static final Logger logger = LoggerFactory.getLogger(HttpAuthenticationFilter.class);
 
     @Inject
     private HttpAuthentication httpAuthentication;
 
     @Inject
-    public HttpAuthorizationFilter(final Materializer mat) {
+    public HttpAuthenticationFilter(final Materializer mat) {
         super(mat);
     }
 

diff --git a/common/app/com/commercetools/sunrise/play/http/SunriseHttpFilters.java b/common/app/com/commercetools/sunrise/play/http/SunriseHttpFilters.java
diff --git a/common/pt/com/commercetools/sunrise/common/httpauth/HttpAuthenticationFilterTest.java b/common/pt/com/commercetools/sunrise/common/httpauth/HttpAuthenticationFilterTest.java
@@ -61,7 +61,7 @@ protected void configure() {
     }
 
     private Configuration configurationWithBasicAuthFilterEnabled() {
-        final Map<String, Object> configMap = singletonMap("play.http.filters", "com.commercetools.sunrise.play.http.SunriseHttpFilters");
+        final Map<String, Object> configMap = singletonMap("play.http.filters", "com.commercetools.sunrise.common.httpauth.basic.BasicHttpAuthenticationFilter");
         return new Configuration(configMap).withFallback(testConfiguration());
     }
 

diff --git a/common/pt/com/commercetools/sunrise/common/httpauth/basic/BasicHttpAuthenticationFilter.java b/common/pt/com/commercetools/sunrise/common/httpauth/basic/BasicHttpAuthenticationFilter.java
@@ -0,0 +1,14 @@
+package com.commercetools.sunrise.common.httpauth.basic;
+
+import com.commercetools.sunrise.common.httpauth.HttpAuthenticationFilter;
+import play.http.DefaultHttpFilters;
+
+import javax.inject.Inject;
+
+public class BasicHttpAuthenticationFilter extends DefaultHttpFilters {
+
+    @Inject
+    public BasicHttpAuthenticationFilter(final HttpAuthenticationFilter httpAuthenticationFilter) {
+        super(httpAuthenticationFilter);
+    }
+}
diff --git a/...pt/com/commercetools/sunrise/common/httpauth/basic/BasicHttpAuthenticationFilterTest.java b/...pt/com/commercetools/sunrise/common/httpauth/basic/BasicHttpAuthenticationFilterTest.java
@@ -74,7 +74,7 @@ protected void configure() {
     }
 
     private Configuration configurationWithBasicAuthFilterEnabled() {
-        final Map<String, Object> configMap = singletonMap("play.http.filters", "com.commercetools.sunrise.play.http.SunriseHttpFilters");
+        final Map<String, Object> configMap = singletonMap("play.http.filters", "com.commercetools.sunrise.common.httpauth.basic.BasicHttpAuthenticationFilter");
         return new Configuration(configMap).withFallback(testConfiguration());
     }
 }
diff --git a/conf/application.conf b/conf/application.conf
@@ -315,7 +315,6 @@ play.crypto.secret=${?APPLICATION_SECRET}
 # INJECTION
 # ~~~~~
 play.application.loader = "com.commercetools.sunrise.play.inject.SunriseGuiceApplicationLoader"
-play.http.filters = "com.commercetools.sunrise.play.http.SunriseHttpFilters"
 play.http.errorHandler = "com.commercetools.sunrise.play.http.SunriseDefaultHttpErrorHandler"
 
 play.modules.enabled += "com.commercetools.sunrise.common.ctp.CtpModule"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/release
 
 resolvers += Resolver.sonatypeRepo("releases")
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.4")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.6")
 
 addSbtPlugin("io.sphere" % "git-publisher" % "0.2")