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 2022/04/14 15:42:49 UTC
[isis-app-simpleapp] branch jpa-SNAPSHOT updated: fixes up compile issues from latest changes in master
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jpa-SNAPSHOT by this push:
new b30bfe9 fixes up compile issues from latest changes in master
b30bfe9 is described below
commit b30bfe987656241b16a29b67e35b0e8cb018482e
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 16:42:39 2022 +0100
fixes up compile issues from latest changes in master
---
module-simple-tests/pom.xml | 2 +-
module-simple/pom.xml | 2 +-
.../java/domainapp/modules/simple/dom/so/SimpleObjects.java | 10 ++++++----
pom.xml | 4 ++--
webapp-tests/pom.xml | 2 +-
webapp/pom.xml | 2 +-
.../java/domainapp/webapp/custom/restapi/CustomController.java | 2 +-
.../src/main/java/domainapp/webapp/quartz/job/SampleJob.java | 3 ++-
8 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/module-simple-tests/pom.xml b/module-simple-tests/pom.xml
index 88e5831..7f7e844 100644
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jpa</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jpa-module-simple-tests</artifactId>
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index 457fbe9..76fbb98 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jpa</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jpa-module-simple</artifactId>
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
index 218d00b..6e076d3 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObjects.java
@@ -3,6 +3,7 @@ package domainapp.modules.simple.dom.so;
import java.util.List;
import javax.inject.Inject;
+import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
import org.apache.isis.applib.annotation.Action;
@@ -16,6 +17,7 @@ import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.commons.functional.Try;
import org.apache.isis.persistence.jpa.applib.services.JpaSupportService;
import domainapp.modules.simple.types.Name;
@@ -79,14 +81,14 @@ public class SimpleObjects {
@Programmatic
public void ping() {
jpaSupportService.getEntityManager(SimpleObject.class)
- .ifSuccess(entityManager -> {
+ .mapSuccess(entityManager -> {
final TypedQuery<SimpleObject> q = entityManager.createQuery(
"SELECT p FROM SimpleObject p ORDER BY p.name",
SimpleObject.class)
.setMaxResults(1);
- q.getResultList();
- });
+ return q.getResultList();
+ })
+ .ifFailureFail();
}
-
}
diff --git a/pom.xml b/pom.xml
index e09e519..a4c5193 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jpa</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>SimpleApp (JPA) - Parent</name>
diff --git a/webapp-tests/pom.xml b/webapp-tests/pom.xml
index 4bd5a8f..63b0487 100644
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jpa</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jpa-webapp-tests</artifactId>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 5c7f506..7bf3d96 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.isis.starters</groupId>
<artifactId>simpleapp-jpa</artifactId>
- <version>2.0.0-M7</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>simpleapp-jpa-webapp</artifactId>
diff --git a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
index 33c2ee5..2f0e7e8 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
@@ -41,7 +41,7 @@ class CustomController {
return interactionService.call(
InteractionContext.ofUserWithSystemDefaults(UserMemento.ofName(username)),
() -> transactionalProcessor.callWithinCurrentTransactionElseCreateNew(callable))
- .optionalElseFail(); // re-throws exception that has occurred, if any
+ .ifFailureFail().getValue();
}
}
diff --git a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
index d112ae9..6497693 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
+++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
@@ -50,6 +50,7 @@ public class SampleJob implements Job {
return interactionService.call(
InteractionContext.ofUserWithSystemDefaults(UserMemento.ofName(username)),
() -> transactionalProcessor.callWithinCurrentTransactionElseCreateNew(callable))
- .optionalElseFail(); // re-throws exception that has occurred, if any
+ .ifFailureFail()
+ .getValue();
}
}