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 2016/05/26 15:23:46 UTC
[2/2] isis git commit: reproduce problem of
metrics-service-xactn-scoping-issue
reproduce problem of metrics-service-xactn-scoping-issue
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d507600a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d507600a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d507600a
Branch: refs/heads/ISIS-1414
Commit: d507600a07dcfedeabd2dc679e32801cf80d2bc6
Parents: cdaaa74
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 24 22:14:43 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu May 26 16:22:49 2016 +0100
----------------------------------------------------------------------
.../main/java/domainapp/dom/simple/SimpleObjects.java | 3 +++
.../domainapp/fixture/dom/simple/SimpleObjectCreate.java | 5 +++--
.../fixture/scenarios/RecreateSimpleObjects.java | 11 ++++++++++-
3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d507600a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObjects.java b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObjects.java
index 98910da..af38897 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObjects.java
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObjects.java
@@ -27,6 +27,8 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.query.QueryDefault;
@@ -93,6 +95,7 @@ public class SimpleObjects {
)
@MemberOrder(sequence = "3")
public SimpleObject create(
+ @Parameter(optionality = Optionality.OPTIONAL)
@ParameterLayout(named="Name")
final String name) {
final SimpleObject obj = repositoryService.instantiate(SimpleObject.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/d507600a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/dom/simple/SimpleObjectCreate.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/dom/simple/SimpleObjectCreate.java b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/dom/simple/SimpleObjectCreate.java
index 8823dd9..c4c92fb 100644
--- a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/dom/simple/SimpleObjectCreate.java
+++ b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/dom/simple/SimpleObjectCreate.java
@@ -57,9 +57,10 @@ public class SimpleObjectCreate extends FixtureScript {
@Override
protected void execute(final ExecutionContext ec) {
- String name = checkParam("name", ec, String.class);
+ //String name = checkParam("name", ec, String.class);
- this.simpleObject = wrap(simpleObjects).create(name);
+// this.simpleObject = wrap(simpleObjects).create(name);
+ this.simpleObject = simpleObjects.create(name);
// also make available to UI
ec.addResult(this, simpleObject);
http://git-wip-us.apache.org/repos/asf/isis/blob/d507600a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
index 55b9045..666c884 100644
--- a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
+++ b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
@@ -23,9 +23,12 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import javax.inject.Inject;
+
import com.google.common.collect.Lists;
import org.apache.isis.applib.fixturescripts.FixtureScript;
+import org.apache.isis.applib.services.xactn.TransactionService;
import domainapp.dom.simple.SimpleObject;
import domainapp.fixture.dom.simple.SimpleObjectCreate;
@@ -34,7 +37,8 @@ import domainapp.fixture.dom.simple.SimpleObjectsTearDown;
public class RecreateSimpleObjects extends FixtureScript {
public final List<String> NAMES = Collections.unmodifiableList(Arrays.asList(
- "Foo", "Bar", "Baz", "Frodo", "Froyo", "Fizz", "Bip", "Bop", "Bang", "Boo"));
+ "Foo", null, "Baz", "Frodo", "Froyo", "Fizz", "Bip", "Bop", "Bang", "Boo"));
+// "Foo", "Bar", "Baz", "Frodo", "Froyo", "Fizz", "Bip", "Bop", "Bang", "Boo"));
public RecreateSimpleObjects() {
withDiscoverability(Discoverability.DISCOVERABLE);
@@ -86,7 +90,12 @@ public class RecreateSimpleObjects extends FixtureScript {
for (int i = 0; i < number; i++) {
final SimpleObjectCreate fs = new SimpleObjectCreate().setName(NAMES.get(i));
ec.executeChild(this, fs.getName(), fs);
+ transactionService.nextTransaction();
simpleObjects.add(fs.getSimpleObject());
}
}
+
+ @Inject
+ TransactionService transactionService;
+
}