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 2017/10/16 13:37:08 UTC
[isis] 02/08: ISIS-1742: deletes unused constructors within
FixtureScripts
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 00ff36d3eef694ec83dae54863cc627c153123de
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 16 14:02:48 2017 +0100
ISIS-1742: deletes unused constructors within FixtureScripts
---
.../isis/applib/fixturescripts/FixtureScripts.java | 71 ----------------------
.../fixturespec/FixtureScriptsDefault.java | 3 +-
todo-deprecation-list.txt | 9 +--
3 files changed, 3 insertions(+), 80 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
index 31d0da1..3a5abd0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
@@ -154,79 +154,9 @@ public abstract class FixtureScripts extends AbstractService {
//endregion
-
//region > constructors
/**
- * Defaults to {@link FixtureScripts.NonPersistedObjectsStrategy#PERSIST persist}
- * strategy (if non-persisted objects are {@link FixtureScripts#newFixtureResult(FixtureScript, String, Object, boolean) added} to a {@link FixtureResultList}),
- * defaults {@link #getMultipleExecutionStrategy()} to {@link FixtureScripts.MultipleExecutionStrategy#EXECUTE_ONCE_BY_CLASS}
- * if multiple instances of the same fixture script class are encountered.
- *
- * @param packagePrefix - to search for fixture script implementations, eg "com.mycompany". Note that this is ignored if an {@link org.apache.isis.applib.AppManifest} is in use.
- *
- * @deprecated - use {@link #FixtureScripts(FixtureScriptsSpecification)} instead.
- */
- @Deprecated
- public FixtureScripts(final String packagePrefix) {
- this(FixtureScriptsSpecification.builder(packagePrefix)
- .build());
- }
-
- /**
- * Defaults to {@link FixtureScripts.NonPersistedObjectsStrategy#PERSIST persist}
- * strategy (if non-persisted objects are {@link FixtureScripts#newFixtureResult(FixtureScript, String, Object, boolean) added} to a {@link FixtureResultList}).
- *
- * @param packagePrefix - to search for fixture script implementations, eg "com.mycompany". Note that this is ignored if an {@link org.apache.isis.applib.AppManifest} is in use.
- * @param multipleExecutionStrategy - whether more than one instance of the same fixture script class can be run multiple times. See {@link MultipleExecutionStrategy} for more details.
- *
- * @deprecated - use {@link #FixtureScripts(FixtureScriptsSpecification)} instead.
- */
- @Deprecated
- public FixtureScripts(
- final String packagePrefix,
- final MultipleExecutionStrategy multipleExecutionStrategy) {
- this(FixtureScriptsSpecification.builder(packagePrefix)
- .with(multipleExecutionStrategy)
- .build());
- }
-
- /**
- * Defaults {@link #getMultipleExecutionStrategy()} to {@link FixtureScripts.MultipleExecutionStrategy#IGNORE ignore}
- * if multiple instances of the same fixture script class are encountered.
- *
- * @param packagePrefix - to search for fixture script implementations, eg "com.mycompany". Note that this is ignored if an {@link org.apache.isis.applib.AppManifest} is in use.
- * @param nonPersistedObjectsStrategy - how to handle any non-persisted objects that are {@link #newFixtureResult(FixtureScript, String, Object, boolean) added} to a {@link org.apache.isis.applib.fixturescripts.FixtureResultList}.
- *
- * @deprecated - use {@link #FixtureScripts(FixtureScriptsSpecification)} instead.
- */
- @Deprecated
- public FixtureScripts(
- final String packagePrefix, final NonPersistedObjectsStrategy nonPersistedObjectsStrategy) {
- this(FixtureScriptsSpecification.builder(packagePrefix)
- .with(nonPersistedObjectsStrategy)
- .build());
- }
-
- /**
- * @param packagePrefix - to search for fixture script implementations, eg "com.mycompany". Note that this is ignored if an {@link org.apache.isis.applib.AppManifest} is in use.
- * @param nonPersistedObjectsStrategy - how to handle any non-persisted objects that are {@link #newFixtureResult(FixtureScript, String, Object, boolean) added} to a {@link org.apache.isis.applib.fixturescripts.FixtureResultList}.
- * @param multipleExecutionStrategy - whether more than one instance of the same fixture script class can be run multiple times
- *
- * @deprecated - use {@link #FixtureScripts(FixtureScriptsSpecification)} instead.
- */
- @Deprecated
- public FixtureScripts(
- final String packagePrefix,
- final NonPersistedObjectsStrategy nonPersistedObjectsStrategy,
- final MultipleExecutionStrategy multipleExecutionStrategy) {
- this(FixtureScriptsSpecification.builder(packagePrefix)
- .with(nonPersistedObjectsStrategy)
- .with(multipleExecutionStrategy)
- .build());
- }
-
- /**
* @param specification - specifies how the service will find instances and execute them.
*/
public FixtureScripts(final FixtureScriptsSpecification specification) {
@@ -235,7 +165,6 @@ public abstract class FixtureScripts extends AbstractService {
//endregion
-
//region > packagePrefix, nonPersistedObjectsStrategy, multipleExecutionStrategy
private FixtureScriptsSpecification specification;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
index b2cb8b3..4d37ebc 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
@@ -74,7 +74,8 @@ public class FixtureScriptsDefault extends FixtureScripts {
public static final String PACKAGE_PREFIX = FixtureScriptsDefault.class.getPackage().getName();
public FixtureScriptsDefault() {
- super(PACKAGE_PREFIX);
+ super(FixtureScriptsSpecification.builder(PACKAGE_PREFIX)
+ .build());
}
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index 17544ca..66a7764 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -19,14 +19,6 @@ org.apache.isis.applib.clock
-
-org.apache.isis.applib.fixturescripts
-
- FixtureScripts.java - remove deprecated methods;
- framework provides an implementation of this service, and use FixtureScriptsSpecificatoinProvider to configure instead.
-
-
-
org.apache.isis.applib.services.actinvoc
ActionInvocationContext.java -remove unused constructors
@@ -432,6 +424,7 @@ org.apache.isis.applib.fixturescripts
lookup(String, Class<T>) - use ExecutionContext#lookup(...) instead
run(String) - no longer publically available (internal API for FixtureScripts to call).
+ FixtureScripts.java - remove deprecated constructors;
FixtureScripts.MultipleExecutionStrategy#IGNORE removed, replaced by EXECUTE_ONCE_BY_CLASS
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.