From 0c7cf89e55ca53ad790374ecf211633eda473037 Mon Sep 17 00:00:00 2001
From: Laura Luiz <laura.luiz@commercetools.de>
Date: Mon, 4 Dec 2017 16:08:26 +0100
Subject: [PATCH] Move actioncomposition config to application.conf due to #694

---
 common/conf/reference.conf | 5 +----
 conf/application.conf      | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/conf/reference.conf b/common/conf/reference.conf
index 966f16b37..713c70eab 100644
--- a/common/conf/reference.conf
+++ b/common/conf/reference.conf
@@ -403,10 +403,7 @@ httpAuth.basic = {
 # ~~~~~
 
 play = {
-  http = {
-    errorHandler = "com.commercetools.sunrise.play.http.SunriseDefaultHttpErrorHandler"
-    actionComposition.controllerAnnotationsFirst = true
-  }
+  http.errorHandler = "com.commercetools.sunrise.play.http.SunriseDefaultHttpErrorHandler"
 
   modules {
     enabled += "com.commercetools.sunrise.framework.injection.SunriseModule"
diff --git a/conf/application.conf b/conf/application.conf
index 857f09990..3c80547ab 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -345,6 +345,8 @@ play = {
   crypto.secret="changeme"
   crypto.secret=${?APPLICATION_SECRET}
 
+  http.actionComposition.controllerAnnotationsFirst = true
+
   application.loader = "com.commercetools.sunrise.play.configuration.SunriseGuiceApplicationLoader"
 }