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/12/02 12:30:48 UTC
[isis] branch master updated: ISIS-1784: renames toBuilderScript()
to simply builder()
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new ff172b5 ISIS-1784: renames toBuilderScript() to simply builder()
ff172b5 is described below
commit ff172b530479a1ac66b580279ab613a3dd64639a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Dec 2 12:28:44 2017 +0000
ISIS-1784: renames toBuilderScript() to simply builder()
---
.../applib/fixturescripts/BuilderScriptAbstract.java | 16 ++++++++++++----
.../applib/fixturescripts/PersonaWithBuilderScript.java | 2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java
index 5ad0fab..ecefd09 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java
@@ -73,16 +73,23 @@ public abstract class BuilderScriptAbstract<T,F extends BuilderScriptAbstract<T,
public abstract T getObject();
- public <E extends PersonaWithBuilderScript<T, F>, T, F extends BuilderScriptAbstract<T,F>> T objectFor(
- final E datum,
+ public <P extends PersonaWithBuilderScript<T, F>, T, F extends BuilderScriptAbstract<T,F>> T objectFor(
+ final P persona,
final FixtureScript.ExecutionContext ec) {
- if(datum == null) {
+ if(persona == null) {
return null;
}
- final F fixtureScript = datum.toBuilderScript();
+ final F fixtureScript = persona.builder();
return ec.executeChildT(this, fixtureScript).getObject();
}
+ public <P extends PersonaWithFinder<T>, T> T findUsing(final P persona) {
+ if(persona == null) {
+ return null;
+ }
+ return persona.findUsing(serviceRegistry);
+ }
+
private final List<WithPrereqs.Block<T,F>> prereqs = Lists.newArrayList();
@Override
@@ -91,5 +98,6 @@ public abstract class BuilderScriptAbstract<T,F extends BuilderScriptAbstract<T,
return (F)this;
}
+
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/PersonaWithBuilderScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/PersonaWithBuilderScript.java
index f0f8184..da202bd 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/PersonaWithBuilderScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/PersonaWithBuilderScript.java
@@ -2,7 +2,7 @@ package org.apache.isis.applib.fixturescripts;
public interface PersonaWithBuilderScript<T, F extends BuilderScriptAbstract<T,F>> {
- F toBuilderScript();
+ F builder();
}
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].