You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/11 11:15:32 UTC

[isis] 04/06: ISIS-2732: renames FixturesLifecycleService to InitialFixtureScriptsInstaller

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2732
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 7d9fe905d2c4a4f4ae0950d8856af3653f255a06
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 11 12:00:12 2021 +0100

    ISIS-2732: renames FixturesLifecycleService to InitialFixtureScriptsInstaller
    
    to reflect its actual responsibilities
---
 .../modules/fixtures/pages/fixture-scripts/mocking-the-clock.adoc | 2 +-
 .../testing/fixtures/applib/IsisModuleTestingFixturesApplib.java  | 4 ++--
 ...sLifecycleService.java => InitialFixtureScriptsInstaller.java} | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/mocking-the-clock.adoc b/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/mocking-the-clock.adoc
index 05d3187..fbfdc5f 100644
--- a/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/mocking-the-clock.adoc
+++ b/testing/fixtures/adoc/modules/fixtures/pages/fixture-scripts/mocking-the-clock.adoc
@@ -20,7 +20,7 @@ It is not recommended that your code use the `Clock` directly, but it's worth un
 This is a read-only clock that reads from the system time.
 The instance registers itself as the singleton and cannot be replaced.
 
-* If running in xref:refguide:config:about.adoc#deployment-types[prototype] mode, though, then the framework (using `FixturesLifecycleService`) will instead instantiate `FixtureClock`.
+* If running in xref:refguide:config:about.adoc#deployment-types[prototype] mode, though, then the framework (using `InitialFixtureScriptsInstaller`) will instead instantiate `FixtureClock`.
 This is a read-write clock that will behave as the system clock, unless it is explicitly set using eg, `FixtureClock#setDate(...)` or `FixtureClock#setTime(...)` etc.
 
 Moreover, the `FixtureClock` singleton can be replaced with another implementation.
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java
index 7e65b79..d6e128a 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTestingFixturesApplib.java
@@ -25,7 +25,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.testing.fixtures.applib.queryresultscache.QueryResultsCacheControlForFixtures;
 import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
 import org.apache.isis.subdomains.spring.applib.IsisModuleSubdomainsSpringApplib;
-import org.apache.isis.testing.fixtures.applib.services.FixturesLifecycleService;
+import org.apache.isis.testing.fixtures.applib.services.InitialFixtureScriptsInstaller;
 
 @Configuration
 @Import({
@@ -33,7 +33,7 @@ import org.apache.isis.testing.fixtures.applib.services.FixturesLifecycleService
         IsisModuleSubdomainsSpringApplib.class,
 
         // @Service's
-        FixturesLifecycleService.class,
+        InitialFixtureScriptsInstaller.class,
         ModuleWithFixturesService.class,
         QueryResultsCacheControlForFixtures.class,
 
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
similarity index 93%
rename from testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
index 94f9add..c090602 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/InitialFixtureScriptsInstaller.java
@@ -30,25 +30,23 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.core.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.events.MetamodelEvent;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 
-import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j2;
 
 /**
  * @since 2.0 {@index}
  */
 @Service
-@Named("isis.testing.fixtures.FixturesLifecycleService")
+@Named("isis.testing.fixtures.InitialFixtureScriptsInstaller")
 @Order(OrderPrecedence.MIDPOINT)
 @Primary
 @Qualifier("Default")
 @Log4j2
-public class FixturesLifecycleService {
+public class InitialFixtureScriptsInstaller {
 
     @SuppressWarnings("unused")
 
@@ -57,7 +55,7 @@ public class FixturesLifecycleService {
     private FixtureScript initialFixtureScript;
 
     @Inject
-    public FixturesLifecycleService(
+    public InitialFixtureScriptsInstaller(
             final IsisConfiguration isisConfiguration,
             final FixtureScripts fixtureScripts) {