You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/07/22 06:06:48 UTC
[isis] branch master updated: ISIS-3002: more post merge provisioning fixes for command replay
This is an automated email from the ASF dual-hosted git repository.
ahuber 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 c57b7f35d4 ISIS-3002: more post merge provisioning fixes for command replay
c57b7f35d4 is described below
commit c57b7f35d4e7dc5a95797d4653d8321d1a7f5652
Author: andi-huber <ah...@apache.org>
AuthorDate: Fri Jul 22 08:06:40 2022 +0200
ISIS-3002: more post merge provisioning fixes for command replay
---
.../applib/contributions/HasUsername_recentCommandsByUser.java | 4 ++--
.../commandlog/applib/dom/mixins/CommandLogEntry_childCommands.java | 4 ++--
.../applib/dom/mixins/CommandLogEntry_siblingCommands.java | 6 +++---
.../secondary/jobcallables/ReplicateAndRunCommands.java | 6 +++---
.../commandreplay/secondary/mixins/CommandLogEntry_replayQueue.java | 5 ++---
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasUsername_recentCommandsByUser.java b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasUsername_recentCommandsByUser.java
index 98039c225a..7bc8064de9 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasUsername_recentCommandsByUser.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/HasUsername_recentCommandsByUser.java
@@ -53,7 +53,7 @@ public class HasUsername_recentCommandsByUser {
this.hasUsername = hasUsername;
}
- public List<CommandLogEntry> coll() {
+ public List<? extends CommandLogEntry> coll() {
val username = hasUsername.getUsername();
return username != null
? commandLogEntryRepository.findRecentByUsername(username)
@@ -63,5 +63,5 @@ public class HasUsername_recentCommandsByUser {
return hasUsername.getUsername() == null;
}
- @Inject CommandLogEntryRepository<CommandLogEntry> commandLogEntryRepository;
+ @Inject CommandLogEntryRepository<? extends CommandLogEntry> commandLogEntryRepository;
}
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_childCommands.java b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_childCommands.java
index 1954181e68..981001dff1 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_childCommands.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_childCommands.java
@@ -46,11 +46,11 @@ public class CommandLogEntry_childCommands {
private final CommandLogEntry commandLogEntry;
@MemberSupport
- public List<CommandLogEntry> coll() {
+ public List<? extends CommandLogEntry> coll() {
return commandLogEntryRepository.findByParent(commandLogEntry);
}
@javax.inject.Inject
- private CommandLogEntryRepository<CommandLogEntry> commandLogEntryRepository;
+ private CommandLogEntryRepository<? extends CommandLogEntry> commandLogEntryRepository;
}
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_siblingCommands.java b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_siblingCommands.java
index 8a708c6ef9..fe8371e6ab 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_siblingCommands.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/mixins/CommandLogEntry_siblingCommands.java
@@ -46,18 +46,18 @@ public class CommandLogEntry_siblingCommands {
private final CommandLogEntry commandLogEntry;
@MemberSupport
- public List<CommandLogEntry> coll() {
+ public List<? extends CommandLogEntry> coll() {
final CommandLogEntry parentJdo = commandLogEntry.getParent();
if(parentJdo == null) {
return Collections.emptyList();
}
- final List<CommandLogEntry> siblingCommands = commandLogEntryRepository.findByParent(parentJdo);
+ final List<? extends CommandLogEntry> siblingCommands = commandLogEntryRepository.findByParent(parentJdo);
siblingCommands.remove(commandLogEntry);
return siblingCommands;
}
@javax.inject.Inject
- private CommandLogEntryRepository<CommandLogEntry> commandLogEntryRepository;
+ private CommandLogEntryRepository<? extends CommandLogEntry> commandLogEntryRepository;
}
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java
index 0dec69a4a9..29078020ea 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/jobcallables/ReplicateAndRunCommands.java
@@ -58,7 +58,7 @@ public class ReplicateAndRunCommands implements Callable<SecondaryStatus> {
@Inject CommandExecutorService commandExecutorService;
@Inject TransactionService transactionService;
@Inject CommandFetcher commandFetcher;
- @Inject CommandLogEntryRepository<CommandLogEntry> commandLogEntryRepository;
+ @Inject CommandLogEntryRepository<? extends CommandLogEntry> commandLogEntryRepository;
@Inject CommandReplayAnalysisService analysisService;
@Inject Optional<ReplayCommandExecutionController> controller;
@@ -79,7 +79,7 @@ public class ReplicateAndRunCommands implements Callable<SecondaryStatus> {
return;
}
- List<CommandLogEntry> commandsToReplay;
+ List<? extends CommandLogEntry> commandsToReplay;
while(isRunning()) {
@@ -131,7 +131,7 @@ public class ReplicateAndRunCommands implements Callable<SecondaryStatus> {
* @param commandsToReplay
* @apiNote could return, whether there was a command to process (and so continue)
*/
- private void replay(final List<CommandLogEntry> commandsToReplay) {
+ private void replay(final List<? extends CommandLogEntry> commandsToReplay) {
commandsToReplay.forEach(commandLog -> {
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/mixins/CommandLogEntry_replayQueue.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/mixins/CommandLogEntry_replayQueue.java
index 14dec3f17e..657c1e79cf 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/mixins/CommandLogEntry_replayQueue.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/mixins/CommandLogEntry_replayQueue.java
@@ -23,7 +23,6 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.isis.applib.annotation.Collection;
-import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.extensions.commandlog.applib.dom.CommandLogEntry;
import org.apache.isis.extensions.commandlog.applib.dom.CommandLogEntryRepository;
import org.apache.isis.extensions.commandreplay.secondary.IsisModuleExtCommandReplaySecondary;
@@ -45,7 +44,7 @@ public class CommandLogEntry_replayQueue {
final CommandLogEntry commandLogEntry;
- public List<CommandLogEntry> coll() {
+ public List<? extends CommandLogEntry> coll() {
return commandLogEntryRepository.findNotYetReplayed();
}
public boolean hideColl() {
@@ -53,6 +52,6 @@ public class CommandLogEntry_replayQueue {
}
@Inject SecondaryConfig secondaryConfig;
- @Inject CommandLogEntryRepository<CommandLogEntry> commandLogEntryRepository;
+ @Inject CommandLogEntryRepository<? extends CommandLogEntry> commandLogEntryRepository;
}