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 2014/10/08 00:37:15 UTC
[3/3] git commit: ISIS-864: persist commands if objects dirtied (even
if action semantics are query-only and ignoreQueryOnly flag is set).
ISIS-864: persist commands if objects dirtied (even if action semantics are query-only and ignoreQueryOnly flag is set).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b0e31f6f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b0e31f6f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b0e31f6f
Branch: refs/heads/master
Commit: b0e31f6f595466a4f624c7df6bbda9bb8bbd0b0d
Parents: dec49d6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Oct 7 23:36:57 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Oct 7 23:36:57 2014 +0100
----------------------------------------------------------------------
.../isis/applib/services/command/Command.java | 25 --------------------
.../isis/applib/services/command/Command2.java | 15 ++++++++----
.../system/transaction/IsisTransaction.java | 22 +++++++++++++----
3 files changed, 28 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b0e31f6f/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
index fb92128..f791ba9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
@@ -29,7 +29,6 @@ import org.apache.isis.applib.services.background.BackgroundCommandService;
import org.apache.isis.applib.services.background.BackgroundService;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.applib.services.eventbus.ActionInteractionEvent;
public interface Command extends HasTransactionId {
@@ -208,30 +207,6 @@ public interface Command extends HasTransactionId {
// //////////////////////////////////////
- // actionInteractionEvent (property)
- // //////////////////////////////////////
-
- /**
- * The corresponding {@link org.apache.isis.applib.services.eventbus.ActionInteractionEvent}.
- *
- * <p>
- * Note that the {@link org.apache.isis.applib.services.eventbus.ActionInteractionEvent} itself is mutable,
- * as its {@link org.apache.isis.applib.services.eventbus.ActionInteractionEvent#getPhase() phase} changes from
- * {@link org.apache.isis.applib.services.eventbus.AbstractInteractionEvent.Phase#EXECUTING executing} to
- * {@link org.apache.isis.applib.services.eventbus.AbstractInteractionEvent.Phase#EXECUTED executed}. The
- * event returned from this method will always be in one or other of these phases.
- * </p>
- * @return
- */
- ActionInteractionEvent<?> getActionInteractionEvent();
-
- /**
- * <b>NOT API</b>: intended to be called only by the framework.
- */
- void setActionInteractionEvent(ActionInteractionEvent<?> event);
-
-
- // //////////////////////////////////////
// executor (property)
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/b0e31f6f/core/applib/src/main/java/org/apache/isis/applib/services/command/Command2.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command2.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command2.java
index 2734c7e..0664ba1 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command2.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command2.java
@@ -24,12 +24,17 @@ import org.apache.isis.applib.services.eventbus.ActionInteractionEvent;
*/
public interface Command2 extends Command {
- // //////////////////////////////////////
- // actionInteractionEvent (property)
- // //////////////////////////////////////
-
/**
* The corresponding {@link org.apache.isis.applib.services.eventbus.ActionInteractionEvent}.
+ *
+ * <p>
+ * Note that the {@link org.apache.isis.applib.services.eventbus.ActionInteractionEvent} itself is mutable,
+ * as its {@link org.apache.isis.applib.services.eventbus.ActionInteractionEvent#getPhase() phase} changes from
+ * {@link org.apache.isis.applib.services.eventbus.AbstractInteractionEvent.Phase#EXECUTING executing} to
+ * {@link org.apache.isis.applib.services.eventbus.AbstractInteractionEvent.Phase#EXECUTED executed}. The
+ * event returned from this method will always be in one or other of these phases.
+ * </p>
+ * @return
*/
ActionInteractionEvent<?> getActionInteractionEvent();
@@ -39,4 +44,6 @@ public interface Command2 extends Command {
void setActionInteractionEvent(ActionInteractionEvent<?> event);
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b0e31f6f/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index 9060315..9f52c24 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -724,7 +724,7 @@ public class IsisTransaction implements TransactionScopedComponent {
try {
final Set<Entry<AdapterAndProperty, PreAndPostValues>> changedObjectProperties = getChangedObjectProperties();
- ensureAnySafeSemanticsHonoured(changedObjectProperties);
+ ensureCommandsPersistedIfDirtyXactnAndAnySafeSemanticsHonoured(changedObjectProperties);
preCommitServices(changedObjectProperties);
} catch (final RuntimeException ex) {
setAbortCause(new IsisTransactionManagerException(ex));
@@ -733,14 +733,27 @@ public class IsisTransaction implements TransactionScopedComponent {
}
}
- private void ensureAnySafeSemanticsHonoured(final Set<Entry<AdapterAndProperty, PreAndPostValues>> changedObjectProperties) {
- final CommandContext commandContext = getServiceOrNull(CommandContext.class);
+ private void ensureCommandsPersistedIfDirtyXactnAndAnySafeSemanticsHonoured(final Set<Entry<AdapterAndProperty, PreAndPostValues>> changedObjectProperties) {
- // playing it safe, but the following guards are almost certainly not necessary.
+ final CommandContext commandContext = getServiceOrNull(CommandContext.class);
if (commandContext == null) {
return;
}
final Command command = commandContext.getCommand();
+ if(command == null) {
+ return;
+ }
+
+ // ensure that any changed objects means that the command should be persisted
+ final Set<ObjectAdapter> changedAdapters = findChangedAdapters(changedObjectProperties);
+ if(!changedAdapters.isEmpty()) {
+ command.setPersistHint(true);
+ }
+
+ ensureSafeSemanticsHonoured(command, changedAdapters);
+ }
+
+ private void ensureSafeSemanticsHonoured(Command command, Set<ObjectAdapter> changedAdapters) {
if (!(command instanceof Command2)) {
return;
}
@@ -758,7 +771,6 @@ public class IsisTransaction implements TransactionScopedComponent {
return;
}
- final Set<ObjectAdapter> changedAdapters = findChangedAdapters(changedObjectProperties);
if(!changedAdapters.isEmpty()) {
final String msg = "Action '" + event.getIdentifier().toFullIdentityString() + "'" +
" (with safe semantics)" +