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 2020/10/11 08:38:30 UTC
[isis] branch master updated: ISIS-2445: fixes instead by using
Bookmark directly in queries.
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 780cfe9 ISIS-2445: fixes instead by using Bookmark directly in queries.
780cfe9 is described below
commit 780cfe9b1c560eb45fff0bfe6a62631057052113
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Oct 11 09:30:32 2020 +0100
ISIS-2445: fixes instead by using Bookmark directly in queries.
Bookmark is persistable, see plugin.xml in isis-persistence-jdo
---
.../comguide/modules/ROOT/pages/cutting-a-release.adoc | 4 ----
.../isis/extensions/commandlog/impl/jdo/CommandJdo.java | 12 ++++++------
.../commandlog/impl/jdo/CommandJdoRepository.java | 13 ++++++-------
3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
index 1006131..9b34ff5 100644
--- a/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/cutting-a-release.adoc
@@ -233,10 +233,6 @@ We use `mvn versions:set` to manually bump the release version:
mvn versions:set -DnewVersion=$ISISREL
mvn install -o -DskipTests
-pushd ../starters
-mvn versions:set -DnewVersion=$ISISREL
-popd
-
git add ..
git commit -m "$ISISJIRA: bumps version to $ISISREL"
----
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
index baf7fb4..318f02f 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
@@ -108,14 +108,14 @@ import lombok.val;
name="findRecentByTarget",
value="SELECT "
+ "FROM org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo "
- + "WHERE targetStr == :targetStr "
+ + "WHERE target == :target "
+ "ORDER BY this.timestamp DESC, uniqueIdStr DESC "
+ "RANGE 0,30"),
@javax.jdo.annotations.Query(
name="findByTargetAndTimestampBetween",
value="SELECT "
+ "FROM org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo "
- + "WHERE targetStr == :targetStr "
+ + "WHERE target == :target "
+ "&& timestamp >= :from "
+ "&& timestamp <= :to "
+ "ORDER BY this.timestamp DESC"),
@@ -123,21 +123,21 @@ import lombok.val;
name="findByTargetAndTimestampAfter",
value="SELECT "
+ "FROM org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo "
- + "WHERE targetStr == :targetStr "
+ + "WHERE target == :target "
+ "&& timestamp >= :from "
+ "ORDER BY this.timestamp DESC"),
@javax.jdo.annotations.Query(
name="findByTargetAndTimestampBefore",
value="SELECT "
+ "FROM org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo "
- + "WHERE targetStr == :targetStr "
+ + "WHERE target == :target "
+ "&& timestamp <= :to "
+ "ORDER BY this.timestamp DESC"),
@javax.jdo.annotations.Query(
name="findByTarget",
value="SELECT "
+ "FROM org.apache.isis.extensions.commandlog.impl.jdo.CommandJdo "
- + "WHERE targetStr == :targetStr "
+ + "WHERE target == :target "
+ "ORDER BY this.timestamp DESC"),
@javax.jdo.annotations.Query(
name="findByTimestampBetween",
@@ -442,7 +442,7 @@ public class CommandJdo
public String getTargetStr() {
return Optional.ofNullable(getTarget()).map(Bookmark::toString).orElse(null);
}
-
+
@Override
public String getTargetMember() {
return getCommandDto().getMember().getLogicalMemberIdentifier();
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
index 93819a5..9407f20 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
@@ -134,7 +134,7 @@ public class CommandJdoRepository {
final Bookmark target
, final LocalDate from
, final LocalDate to) {
- final String targetStr = target.toString();
+
final Timestamp fromTs = toTimestampStartOfDayWithOffset(from, 0);
final Timestamp toTs = toTimestampStartOfDayWithOffset(to, 1);
@@ -143,25 +143,25 @@ public class CommandJdoRepository {
if(to != null) {
query = new QueryDefault<>(CommandJdo.class,
"findByTargetAndTimestampBetween",
- "targetStr", targetStr,
+ "target", target,
"from", fromTs,
"to", toTs);
} else {
query = new QueryDefault<>(CommandJdo.class,
"findByTargetAndTimestampAfter",
- "targetStr", targetStr,
+ "target", target,
"from", fromTs);
}
} else {
if(to != null) {
query = new QueryDefault<>(CommandJdo.class,
"findByTargetAndTimestampBefore",
- "targetStr", targetStr,
+ "target", target,
"to", toTs);
} else {
query = new QueryDefault<>(CommandJdo.class,
"findByTarget",
- "targetStr", targetStr);
+ "target", target);
}
}
return repositoryService.allMatches(query);
@@ -184,12 +184,11 @@ public class CommandJdoRepository {
public List<CommandJdo> findRecentByTarget(final Bookmark target) {
- final String targetStr = target.toString();
return repositoryService.allMatches(
new QueryDefault<>(
CommandJdo.class,
"findRecentByTarget",
- "targetStr", targetStr));
+ "target", target));
}