Make user/project context implementations extendable to reuse logic (#…

…702)
commercetools · Apr 12, 2018 · 1ee0a24 · 1ee0a24
1 parent 5b47fcb
commit 1ee0a24
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...e/common/contexts/ProjectContextImpl.java → ...ommon/contexts/DefaultProjectContext.java b/...e/common/contexts/ProjectContextImpl.java → ...ommon/contexts/DefaultProjectContext.java
@@ -32,7 +32,7 @@
  */
 
 @Singleton
-final class ProjectContextImpl extends Base implements ProjectContext {
+public class DefaultProjectContext extends Base implements ProjectContext {
 
     private static final Logger logger = LoggerFactory.getLogger(ProjectContext.class);
     private static final String CONFIG_LANGUAGES = "application.i18n.languages";
@@ -44,7 +44,7 @@ final class ProjectContextImpl extends Base implements ProjectContext {
     private final List<CurrencyUnit> currencies;
 
     @Inject
-    private ProjectContextImpl(final Configuration configuration, @Named("global") final SphereClient client) {
+    protected DefaultProjectContext(final Configuration configuration, @Named("global") final SphereClient client) {
         try {
             final SphereRequest<Project> request = ProjectGet.of();
             final Project project = blockingWait(client.execute(request), Duration.ofMinutes(1));

diff --git a/...rise/common/contexts/UserContextImpl.java → ...e/common/contexts/DefaultUserContext.java b/...rise/common/contexts/UserContextImpl.java → ...e/common/contexts/DefaultUserContext.java
@@ -32,7 +32,7 @@
  */
 
 @RequestScoped
-final class UserContextImpl extends Base implements UserContext {
+public class DefaultUserContext extends Base implements UserContext {
 
     private static final Logger logger = LoggerFactory.getLogger(UserContext.class);
     private final List<Locale> locales;
@@ -44,7 +44,7 @@ final class UserContextImpl extends Base implements UserContext {
     private final Reference<Channel> channel;
 
     @Inject
-    private UserContextImpl(final Http.Context context, final ProjectContext projectContext) {
+    protected DefaultUserContext(final Http.Context context, final ProjectContext projectContext) {
         this.locales = acceptedLocales(context, projectContext);
         this.country = userCountry(context, projectContext);
         this.currency = userCurrency(context, projectContext, country);

diff --git a/common/app/com/commercetools/sunrise/common/contexts/ProjectContext.java b/common/app/com/commercetools/sunrise/common/contexts/ProjectContext.java
@@ -10,7 +10,7 @@
 /**
  * A container for all information related to the project, such as supported countries, languages or currencies.
  */
-@ImplementedBy(ProjectContextImpl.class)
+@ImplementedBy(DefaultProjectContext.class)
 public interface ProjectContext {
 
     /**

diff --git a/common/app/com/commercetools/sunrise/common/contexts/UserContext.java b/common/app/com/commercetools/sunrise/common/contexts/UserContext.java
@@ -14,7 +14,7 @@
 /**
  * A container for all information related to the current user, such as selected country, language or customer group.
  */
-@ImplementedBy(UserContextImpl.class)
+@ImplementedBy(DefaultUserContext.class)
 public interface UserContext {