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/09/22 06:30:15 UTC
[isis] branch ISIS-2735-command-log updated: ISIS-2835: moves
mixins from jdo to applib (for commandlog)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2735-command-log
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2735-command-log by this push:
new f18672f ISIS-2835: moves mixins from jdo to applib (for commandlog)
f18672f is described below
commit f18672f4ff6670da594cb694a0c4e9edd67e2d07
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 22 07:30:04 2021 +0100
ISIS-2835: moves mixins from jdo to applib (for commandlog)
---
.../applib/contributions}/HasInteractionId_command.java | 16 +++++++++-------
.../contributions}/HasUsername_recentCommandsByUser.java | 12 +++++++-----
.../applib/contributions}/Object_recentCommands.java | 10 +++++-----
.../commandlog/applib/contributions}/T_recent.java | 13 +++++++------
4 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/HasInteractionId_command.java b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasInteractionId_command.java
similarity index 84%
rename from extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/HasInteractionId_command.java
rename to extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasInteractionId_command.java
index da0213f..a6d260a 100644
--- a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/HasInteractionId_command.java
+++ b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasInteractionId_command.java
@@ -24,12 +24,14 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.mixins.system.HasInteractionId;
import org.apache.isis.applib.services.command.Command;
+import org.apache.isis.extensions.commandlog.applib.dom.PublishedCommand;
+import org.apache.isis.extensions.commandlog.applib.dom.PublishedCommandRepository;
import org.apache.isis.extensions.commandlog.jdo.IsisModuleExtCommandLogJdo;
import org.apache.isis.extensions.commandlog.jdo.entities.PublishedCommandForJdo;
-import org.apache.isis.extensions.commandlog.jdo.entities.PublishedCommandForJdoRepository;
import lombok.RequiredArgsConstructor;
@@ -54,26 +56,26 @@ public class HasInteractionId_command {
private final HasInteractionId hasInteractionId;
- public PublishedCommandForJdo act() {
+ public PublishedCommand act() {
return findCommand();
}
/**
* Hide if the contributee is a {@link Command}, because {@link Command}s already have a
* {@link Command#getParent() parent} property.
*/
- public boolean hideAct() {
+ @MemberSupport public boolean hideAct() {
return (hasInteractionId instanceof PublishedCommandForJdo);
}
- public String disableAct() {
+ @MemberSupport public String disableAct() {
return findCommand() == null ? "No command found for unique Id": null;
}
- private PublishedCommandForJdo findCommand() {
+ private PublishedCommand findCommand() {
final UUID transactionId = hasInteractionId.getInteractionId();
- return commandServiceRepository
+ return publishedCommandRepository
.findByInteractionId(transactionId)
.orElse(null);
}
- @Inject PublishedCommandForJdoRepository commandServiceRepository;
+ @Inject PublishedCommandRepository publishedCommandRepository;
}
diff --git a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/HasUsername_recentCommandsByUser.java b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasUsername_recentCommandsByUser.java
similarity index 82%
rename from extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/HasUsername_recentCommandsByUser.java
rename to extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasUsername_recentCommandsByUser.java
index 2de12bf..212a2fe 100644
--- a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/HasUsername_recentCommandsByUser.java
+++ b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasUsername_recentCommandsByUser.java
@@ -25,10 +25,12 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.CollectionLayout;
+import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.mixins.security.HasUsername;
+import org.apache.isis.extensions.commandlog.applib.dom.PublishedCommand;
+import org.apache.isis.extensions.commandlog.applib.dom.PublishedCommandRepository;
import org.apache.isis.extensions.commandlog.jdo.IsisModuleExtCommandLogJdo;
import org.apache.isis.extensions.commandlog.jdo.entities.PublishedCommandForJdo;
-import org.apache.isis.extensions.commandlog.jdo.entities.PublishedCommandForJdoRepository;
/**
@@ -51,15 +53,15 @@ public class HasUsername_recentCommandsByUser {
this.hasUsername = hasUsername;
}
- public List<PublishedCommandForJdo> coll() {
+ public List<PublishedCommand> coll() {
final String username = hasUsername.getUsername();
return username != null
- ? commandServiceRepository.findRecentByUsername(username)
+ ? publishedCommandRepository.findRecentByUsername(username)
: Collections.emptyList();
}
- public boolean hideColl() {
+ @MemberSupport public boolean hideColl() {
return hasUsername.getUsername() == null;
}
- @Inject PublishedCommandForJdoRepository commandServiceRepository;
+ @Inject PublishedCommandRepository publishedCommandRepository;
}
diff --git a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/Object_recentCommands.java b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
similarity index 88%
rename from extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/Object_recentCommands.java
rename to extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
index 16ad916..38da938 100644
--- a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/Object_recentCommands.java
+++ b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
@@ -32,9 +32,9 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.mixins.layout.LayoutMixinConstants;
import org.apache.isis.applib.mixins.system.HasInteractionId;
import org.apache.isis.applib.services.bookmark.BookmarkService;
+import org.apache.isis.extensions.commandlog.applib.dom.PublishedCommand;
+import org.apache.isis.extensions.commandlog.applib.dom.PublishedCommandRepository;
import org.apache.isis.extensions.commandlog.jdo.IsisModuleExtCommandLogJdo;
-import org.apache.isis.extensions.commandlog.jdo.entities.PublishedCommandForJdo;
-import org.apache.isis.extensions.commandlog.jdo.entities.PublishedCommandForJdoRepository;
import lombok.RequiredArgsConstructor;
@@ -65,9 +65,9 @@ public class Object_recentCommands {
private final Object domainObject; // mixee
- @MemberSupport public List<PublishedCommandForJdo> act() {
+ @MemberSupport public List<PublishedCommand> act() {
return bookmarkService.bookmarkFor(domainObject)
- .map(commandServiceRepository::findRecentByTarget)
+ .map(publishedCommandRepository::findRecentByTarget)
.orElse(Collections.emptyList());
}
@@ -79,7 +79,7 @@ public class Object_recentCommands {
return (domainObject instanceof HasInteractionId);
}
- @Inject PublishedCommandForJdoRepository commandServiceRepository;
+ @Inject PublishedCommandRepository publishedCommandRepository;
@Inject BookmarkService bookmarkService;
}
diff --git a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/T_recent.java b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/T_recent.java
similarity index 83%
rename from extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/T_recent.java
rename to extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/T_recent.java
index 128e914..95f1c41 100644
--- a/extensions/core/command-log/jdo/src/main/java/org/apache/isis/extensions/commandlog/jdo/mixins/T_recent.java
+++ b/extensions/core/command-log/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/T_recent.java
@@ -27,9 +27,10 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
+import org.apache.isis.extensions.commandlog.applib.dom.PublishedCommand;
+import org.apache.isis.extensions.commandlog.applib.dom.PublishedCommandRepository;
import org.apache.isis.extensions.commandlog.jdo.IsisModuleExtCommandLogJdo;
import org.apache.isis.extensions.commandlog.jdo.entities.PublishedCommandForJdo;
-import org.apache.isis.extensions.commandlog.jdo.entities.PublishedCommandForJdoRepository;
@Collection(
domainEvent = T_recent.CollectionDomainEvent.class
@@ -47,21 +48,21 @@ public abstract class T_recent<T> {
this.domainObject = domainObject;
}
- public List<PublishedCommandForJdo> coll() {
+ public List<PublishedCommand> coll() {
return findRecent();
}
- private List<PublishedCommandForJdo> findRecent() {
+ private List<PublishedCommand> findRecent() {
return bookmarkService.bookmarkFor(domainObject)
.map(bookmark->queryResultsCache.execute(
- () -> commandJdoRepository.findRecentByTarget(bookmark)
+ () -> publishedCommandRepository.findRecentByTarget(bookmark)
, T_recent.class
- , "findRecentByTarget"
+ , "findRecent"
, domainObject))
.orElse(Collections.emptyList());
}
- @Inject PublishedCommandForJdoRepository commandJdoRepository;
+ @Inject PublishedCommandRepository publishedCommandRepository;
@Inject BookmarkService bookmarkService;
@Inject QueryResultsCache queryResultsCache;