Merge pull request #466 from commercetools/replace-cms-module

Replace CMS classes with CMS module

build.sbt

@@ -33,7 +33,7 @@ lazy val `commercetools-sunrise` = (project in file("."))
 
 lazy val common = project
   .enablePlugins(PlayJava).configs(IntegrationTest, PlayTest)
-  .settings(commonSettings ++ commonTestSettings ++ jvmSdkDependencies ++ templateDependencies ++ commonDependencies ++ disableDockerPublish: _*)
+  .settings(commonSettings ++ commonTestSettings ++ jvmSdkDependencies ++ templateDependencies ++ sunriseModuleDependencies ++ commonDependencies ++ disableDockerPublish: _*)
   .dependsOn(`move-to-sdk`)
 
 lazy val `product-catalog` = project
@@ -70,6 +70,12 @@ lazy val `move-to-sdk` = project
 
 javaUnidocSettings
 
+resolvers in ThisBuild ++= Seq (
+  Resolver.sonatypeRepo("releases"),
+  Resolver.sonatypeRepo("snapshots"),
+  Resolver.mavenLocal
+)
+
 lazy val commonSettings = Release.publishSettings ++ Seq (
   scalaVersion := "2.11.8",
   javacOptions ++= Seq("-source", "1.8", "-target", "1.8"),
@@ -82,12 +88,13 @@ lazy val commonSettings = Release.publishSettings ++ Seq (
   )
 )
 
+lazy val sunriseModuleDependencies = Seq (
+  libraryDependencies ++= Seq (
+    "com.commercetools.sunrise.cms" % "cms-api" % "0.1.0"
+  )
+)
+
 lazy val jvmSdkDependencies = Seq (
-  resolvers in ThisBuild ++= Seq (
-    Resolver.sonatypeRepo("releases"),
-    Resolver.sonatypeRepo("snapshots"),
-    Resolver.mavenLocal
-  ),
   libraryDependencies ++= Seq (
     "com.commercetools.sdk.jvm.core" % "commercetools-models" % jvmSdkVersion,
     "com.commercetools.sdk.jvm.core" % "commercetools-java-client" % jvmSdkVersion,

common/app/com/commercetools/sunrise/common/controllers/SunriseFrameworkController.java

@@ -1,10 +1,10 @@
 package com.commercetools.sunrise.common.controllers;
 
+import com.commercetools.sunrise.cms.CmsPage;
 import com.commercetools.sunrise.common.contexts.UserContext;
 import com.commercetools.sunrise.common.ctp.MetricAction;
 import com.commercetools.sunrise.common.pages.*;
 import com.commercetools.sunrise.common.reverserouter.HomeReverseRouter;
-import com.commercetools.sunrise.common.template.cms.CmsPage;
 import com.commercetools.sunrise.common.template.engine.TemplateContext;
 import com.commercetools.sunrise.common.template.engine.TemplateEngine;
 import com.commercetools.sunrise.common.template.i18n.I18nIdentifier;

common/app/com/commercetools/sunrise/common/controllers/WithCmsPage.java

@@ -1,8 +1,8 @@
 package com.commercetools.sunrise.common.controllers;
 
+import com.commercetools.sunrise.cms.CmsPage;
+import com.commercetools.sunrise.cms.CmsService;
 import com.commercetools.sunrise.common.contexts.UserContext;
-import com.commercetools.sunrise.common.template.cms.CmsPage;
-import com.commercetools.sunrise.common.template.cms.CmsService;
 
 import java.util.Optional;
 import java.util.concurrent.CompletionStage;

common/app/com/commercetools/sunrise/common/template/TemplateModule.java

@@ -1,6 +1,6 @@
 package com.commercetools.sunrise.common.template;
 
-import com.commercetools.sunrise.common.template.cms.CmsService;
+import com.commercetools.sunrise.cms.CmsService;
 import com.commercetools.sunrise.common.template.cms.filebased.CmsI18nResolverProvider;
 import com.commercetools.sunrise.common.template.cms.filebased.FileBasedCmsService;
 import com.commercetools.sunrise.common.template.engine.TemplateEngine;

common/app/com/commercetools/sunrise/common/template/cms/filebased/FileBasedCmsPage.java

@@ -1,6 +1,6 @@
 package com.commercetools.sunrise.common.template.cms.filebased;
 
-import com.commercetools.sunrise.common.template.cms.CmsPage;
+import com.commercetools.sunrise.cms.CmsPage;
 import com.commercetools.sunrise.common.template.i18n.I18nIdentifier;
 import com.commercetools.sunrise.common.template.i18n.I18nResolver;
 

common/app/com/commercetools/sunrise/common/template/cms/filebased/FileBasedCmsService.java

@@ -1,7 +1,7 @@
 package com.commercetools.sunrise.common.template.cms.filebased;
 
-import com.commercetools.sunrise.common.template.cms.CmsPage;
-import com.commercetools.sunrise.common.template.cms.CmsService;
+import com.commercetools.sunrise.cms.CmsPage;
+import com.commercetools.sunrise.cms.CmsService;
 import com.commercetools.sunrise.common.template.i18n.I18nResolver;
 
 import javax.inject.Inject;

common/app/com/commercetools/sunrise/common/template/engine/TemplateContext.java

@@ -1,7 +1,7 @@
 package com.commercetools.sunrise.common.template.engine;
 
+import com.commercetools.sunrise.cms.CmsPage;
 import com.commercetools.sunrise.common.pages.PageData;
-import com.commercetools.sunrise.common.template.cms.CmsPage;
 
 import javax.annotation.Nullable;
 import java.util.List;

common/app/com/commercetools/sunrise/common/template/engine/handlebars/HandlebarsCmsHelper.java

@@ -1,6 +1,6 @@
 package com.commercetools.sunrise.common.template.engine.handlebars;
 
-import com.commercetools.sunrise.common.template.cms.CmsPage;
+import com.commercetools.sunrise.cms.CmsPage;
 import com.github.jknack.handlebars.Helper;
 import com.github.jknack.handlebars.Options;
 import io.sphere.sdk.models.Base;

common/app/com/commercetools/sunrise/common/template/engine/handlebars/HelperUtils.java

@@ -1,6 +1,6 @@
 package com.commercetools.sunrise.common.template.engine.handlebars;
 
-import com.commercetools.sunrise.common.template.cms.CmsPage;
+import com.commercetools.sunrise.cms.CmsPage;
 import com.github.jknack.handlebars.Context;
 import io.sphere.sdk.models.Base;
 

common/pt/com/commercetools/sunrise/common/DefaultTestModule.java

@@ -1,11 +1,11 @@
 package com.commercetools.sunrise.common;
 
+import com.commercetools.sunrise.cms.CmsService;
 import com.commercetools.sunrise.common.basicauth.BasicAuth;
 import com.commercetools.sunrise.common.contexts.UserContext;
 import com.commercetools.sunrise.common.controllers.TestableSphereClient;
 import com.commercetools.sunrise.common.pages.PageMeta;
 import com.commercetools.sunrise.common.pages.PageMetaFactory;
-import com.commercetools.sunrise.common.template.cms.CmsService;
 import com.commercetools.sunrise.common.template.engine.TemplateEngine;
 import com.commercetools.sunrise.common.template.i18n.I18nResolver;
 import com.commercetools.sunrise.framework.MultiControllerComponentResolver;

common/test/com/commercetools/sunrise/common/template/cms/filebased/FileBasedCmsPageTest.java

@@ -1,6 +1,6 @@
 package com.commercetools.sunrise.common.template.cms.filebased;
 
-import com.commercetools.sunrise.common.template.cms.CmsPage;
+import com.commercetools.sunrise.cms.CmsPage;
 import com.commercetools.sunrise.common.template.i18n.I18nResolver;
 import com.commercetools.sunrise.common.template.i18n.yaml.YamlI18nResolver;
 import com.google.inject.AbstractModule;

common/test/com/commercetools/sunrise/common/template/engine/handlebars/HandlebarsCmsHelperTest.java

@@ -1,7 +1,7 @@
 package com.commercetools.sunrise.common.template.engine.handlebars;
 
+import com.commercetools.sunrise.cms.CmsPage;
 import com.commercetools.sunrise.common.pages.PageData;
-import com.commercetools.sunrise.common.template.cms.CmsPage;
 import com.commercetools.sunrise.common.template.engine.TemplateContext;
 import com.commercetools.sunrise.common.template.engine.TemplateEngine;
 import com.commercetools.sunrise.common.template.engine.TestablePageData;

product-catalog/app/com/commercetools/sunrise/productcatalog/home/SunriseHomeController.java

@@ -1,21 +1,19 @@
 package com.commercetools.sunrise.productcatalog.home;
 
+import com.commercetools.sunrise.cms.CmsService;
 import com.commercetools.sunrise.common.contexts.RequestScoped;
 import com.commercetools.sunrise.common.controllers.SunriseFrameworkController;
 import com.commercetools.sunrise.common.controllers.WithCmsPage;
 import com.commercetools.sunrise.common.controllers.WithOverwriteableTemplateName;
 import com.commercetools.sunrise.common.pages.PageContent;
 import com.commercetools.sunrise.common.reverserouter.HomeReverseRouter;
-import com.commercetools.sunrise.common.template.cms.CmsPage;
-import com.commercetools.sunrise.common.template.cms.CmsService;
 import com.commercetools.sunrise.hooks.PageDataHook;
 import com.commercetools.sunrise.hooks.RequestHook;
 import com.commercetools.sunrise.productcatalog.productsuggestions.ProductSuggestionsControllerComponent;
 import play.mvc.Result;
 
 import javax.inject.Inject;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletionStage;
 
@@ -59,12 +57,6 @@ public CmsService cmsService() {
         return injector().getInstance(CmsService.class);
     }
 
-    @Override
-    public CompletionStage<Optional<CmsPage>> cmsPage() {
-        final CmsService cmsService = injector().getInstance(CmsService.class);
-        return cmsService.page("home", userContext().locales());
-    }
-
     @Override
     public Set<String> getFrameworkTags() {
         return new HashSet<>(asList("home", "product-catalog"));