Provide Project via injection #672
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package com.commercetools.sunrise.ctp.client; | ||
|
|
||
| import com.commercetools.sunrise.framework.controllers.metrics.SimpleMetricsSphereClientProvider; | ||
| import com.google.inject.AbstractModule; | ||
| import io.sphere.sdk.client.SphereClient; | ||
| import io.sphere.sdk.client.SphereClientConfig; | ||
|
|
||
| import javax.inject.Singleton; | ||
|
|
||
| public final class SphereClientModule extends AbstractModule { | ||
|
|
||
| @Override | ||
| protected void configure() { | ||
| bind(SphereClientConfig.class) | ||
| .toProvider(SphereClientConfigProvider.class) | ||
| .in(Singleton.class); | ||
| bind(SphereClient.class) | ||
| .toProvider(SimpleMetricsSphereClientProvider.class) | ||
| .in(Singleton.class); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.commercetools.sunrise.ctp.project; | ||
|
|
||
| import com.google.inject.AbstractModule; | ||
| import io.sphere.sdk.projects.Project; | ||
|
|
||
| import javax.inject.Singleton; | ||
|
|
||
| public final class ProjectModule extends AbstractModule { | ||
|
There was a problem hiding this comment. The name clearly states that it provides a project, but as an user you have to look at the source code to see what this module provides. What do you think about adding some javadoc here? |
||
|
|
||
| @Override | ||
| protected void configure() { | ||
| bind(Project.class) | ||
| .toProvider(ProjectProvider.class) | ||
| .in(Singleton.class); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package com.commercetools.sunrise.ctp.project; | ||
|
|
||
| import io.sphere.sdk.client.SphereClient; | ||
| import io.sphere.sdk.client.SphereRequest; | ||
| import io.sphere.sdk.projects.Project; | ||
| import io.sphere.sdk.projects.queries.ProjectGet; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.inject.Provider; | ||
| import java.time.Duration; | ||
|
|
||
| import static io.sphere.sdk.client.SphereClientUtils.blockingWait; | ||
|
|
||
| public final class ProjectProvider implements Provider<Project> { | ||
|
There was a problem hiding this comment. We now could even remove the There was a problem hiding this comment. No, I would like to let developers to bind using this provider, in case they need to override some parts of an injection module and reuse others. |
||
|
|
||
| private final SphereClient sphereClient; | ||
|
|
||
| @Inject | ||
| ProjectProvider(final SphereClient sphereClient) { | ||
| this.sphereClient = sphereClient; | ||
| } | ||
|
|
||
| @Override | ||
| public Project get() { | ||
| final SphereRequest<Project> request = ProjectGet.of(); | ||
| return blockingWait(sphereClient.execute(request), Duration.ofSeconds(30)); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package com.commercetools.sunrise.framework.localization; | ||
|
|
||
| import com.commercetools.sunrise.framework.injection.RequestScoped; | ||
| import com.google.inject.AbstractModule; | ||
| import com.neovisionaries.i18n.CountryCode; | ||
|
|
||
| import javax.money.CurrencyUnit; | ||
| import java.util.Locale; | ||
|
|
||
| public final class LocalizationModule extends AbstractModule { | ||
|
There was a problem hiding this comment. As above: Would be nice to add some javadoc here. |
||
|
|
||
| @Override | ||
| protected void configure() { | ||
| bind(Locale.class) | ||
| .toProvider(LocaleFromUrlProvider.class) | ||
| .in(RequestScoped.class); | ||
| bind(CountryCode.class) | ||
| .toProvider(CountryFromSessionProvider.class) | ||
| .in(RequestScoped.class); | ||
| bind(CurrencyUnit.class) | ||
| .toProvider(CurrencyFromCountryProvider.class) | ||
| .in(RequestScoped.class); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package com.commercetools.sunrise.framework.template; | ||
|
|
||
| import com.commercetools.sunrise.cms.CmsService; | ||
| import com.commercetools.sunrise.framework.template.cms.FileBasedCmsServiceProvider; | ||
| import com.commercetools.sunrise.framework.template.engine.HandlebarsTemplateEngineProvider; | ||
| import com.commercetools.sunrise.framework.template.engine.TemplateEngine; | ||
| import com.commercetools.sunrise.framework.template.i18n.ConfigurableI18nResolverProvider; | ||
| import com.commercetools.sunrise.framework.template.i18n.I18nResolver; | ||
| import com.google.inject.AbstractModule; | ||
|
|
||
| import javax.inject.Singleton; | ||
|
|
||
| public final class TemplateModule extends AbstractModule { | ||
|
There was a problem hiding this comment. As above: Would be nice to add some javadoc here. |
||
|
|
||
| @Override | ||
| protected void configure() { | ||
| bind(CmsService.class) | ||
| .toProvider(FileBasedCmsServiceProvider.class) | ||
| .in(Singleton.class); | ||
| bind(TemplateEngine.class) | ||
| .toProvider(HandlebarsTemplateEngineProvider.class) | ||
| .in(Singleton.class); | ||
| bind(I18nResolver.class) | ||
| .toProvider(ConfigurableI18nResolverProvider.class) | ||
| .in(Singleton.class); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed from Module.java, because this file belongs to Starter Project and is therefore never updated with new releases, what makes migration more difficult. Now moved to LocalizationModule, which is enabled by default on reference.conf (default configuration), and can be disabled via configuration as explained in #671 in order to bind your own implementations.