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/03/09 06:28:51 UTC
[isis-app-simpleapp] branch jdo updated (b391bd9 -> 15b2310)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.
from b391bd9 api changes with approvaltests
new 07fc201 updates approvals for metamodel
new 15b2310 uses TransactionalProcessor service rather than TransactionService
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../webapp/custom/restapi/CustomController.java | 8 ++++----
.../domainapp.modules.simple.dom.impl.SimpleObject.xml | 18 ++++++++++--------
.../domainapp.modules.simple.dom.so.SimpleObject.xml | 18 ++++++++++--------
...application.services.homepage.HomePageViewModel.xml | 18 ++++++++++--------
4 files changed, 34 insertions(+), 28 deletions(-)
[isis-app-simpleapp] 02/02: uses TransactionalProcessor service
rather than TransactionService
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 15b23103fa6256e38bb3058e5bdfdf72fd2a2756
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Mar 9 06:27:58 2021 +0000
uses TransactionalProcessor service rather than TransactionService
---
.../java/domainapp/webapp/custom/restapi/CustomController.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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 1e5e7a8..39972d8 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.apache.isis.applib.services.user.UserMemento;
-import org.apache.isis.applib.services.xactn.TransactionService;
+import org.apache.isis.applib.services.xactn.TransactionalProcessor;
import org.apache.isis.commons.functional.Result;
import org.apache.isis.core.interaction.session.InteractionFactory;
import org.apache.isis.core.security.authentication.Authentication;
@@ -24,7 +24,7 @@ import domainapp.modules.simple.dom.so.SimpleObjects;
class CustomController {
private final InteractionFactory interactionFactory;
- private final TransactionService transactionService;
+ private final TransactionalProcessor transactionalProcessor;
private final SimpleObjects repository;
@GetMapping("/custom/simpleObjects")
@@ -41,9 +41,9 @@ class CustomController {
private <T> Result<T> callAuthenticated(
final Authentication authentication,
final Callable<T> task) {
-
+
return interactionFactory.callAuthenticated(
authentication,
- () -> transactionService.callWithinCurrentTransactionElseCreateNew(task));
+ () -> transactionalProcessor.callWithinCurrentTransactionElseCreateNew(task));
}
}
[isis-app-simpleapp] 01/02: updates approvals for metamodel
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 07fc20174c82b26fa97a1adc0d251eda57f6069d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Mar 9 06:25:29 2021 +0000
updates approvals for metamodel
---
.../domainapp.modules.simple.dom.impl.SimpleObject.xml | 18 ++++++++++--------
.../domainapp.modules.simple.dom.so.SimpleObject.xml | 18 ++++++++++--------
...application.services.homepage.HomePageViewModel.xml | 18 ++++++++++--------
3 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
index ae2b0e7..11bcb10 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
@@ -1053,13 +1053,14 @@
<mml:attr name="disabling">true</mml:attr>
<mml:attr name="hiding">true</mml:attr>
<mml:attr name="validating">true</mml:attr>
- <mml:attr name="value">org.apache.isis.applib.mixins.layout.Object_openRestApi.ActionDomainEvent</mml:attr>
+ <mml:attr name="value">org.apache.isis.applib.mixins.rest.Object_openRestApi.ActionDomainEvent</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation">
- <mml:attr name="eventType">org.apache.isis.applib.mixins.layout.Object_openRestApi.ActionDomainEvent</mml:attr>
+ <mml:attr name="eventType">org.apache.isis.applib.mixins.rest.Object_openRestApi.ActionDomainEvent</mml:attr>
<mml:attr name="intent.act">EXECUTE</mml:attr>
- <mml:attr name="methods">public org.apache.isis.applib.value.LocalResourcePath org.apache.isis.applib.mixins.layout.Object_openRestApi.act()</mml:attr>
- <mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_openRestApi</mml:attr>
+ <mml:attr name="methods">public org.apache.isis.applib.value.LocalResourcePath
+ org.apache.isis.applib.mixins.rest.Object_openRestApi.act()</mml:attr>
+ <mml:attr name="onType">org.apache.isis.applib.mixins.rest.Object_openRestApi</mml:attr>
<mml:attr name="returnType">org.apache.isis.applib.value.LocalResourcePath</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
@@ -1124,13 +1125,14 @@
<mml:attr name="disabling">true</mml:attr>
<mml:attr name="hiding">true</mml:attr>
<mml:attr name="validating">true</mml:attr>
- <mml:attr name="value">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
+ <mml:attr name="value">org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation">
- <mml:attr name="eventType">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
+ <mml:attr name="eventType">org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
<mml:attr name="intent.act">EXECUTE</mml:attr>
- <mml:attr name="methods">public java.lang.Object org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel.act()</mml:attr>
- <mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel</mml:attr>
+ <mml:attr name="methods">public java.lang.Object
+ org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel.act()</mml:attr>
+ <mml:attr name="onType">org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel</mml:attr>
<mml:attr name="returnType">java.lang.Object</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.command.CommandFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.command.CommandFacetFromConfiguration">
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.so.SimpleObject.xml b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.so.SimpleObject.xml
index f7fadad..1a4f4cb 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.so.SimpleObject.xml
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.so.SimpleObject.xml
@@ -1024,13 +1024,14 @@
<mml:attr name="disabling">true</mml:attr>
<mml:attr name="hiding">true</mml:attr>
<mml:attr name="validating">true</mml:attr>
- <mml:attr name="value">org.apache.isis.applib.mixins.layout.Object_openRestApi.ActionDomainEvent</mml:attr>
+ <mml:attr name="value">org.apache.isis.applib.mixins.rest.Object_openRestApi.ActionDomainEvent</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation">
- <mml:attr name="eventType">org.apache.isis.applib.mixins.layout.Object_openRestApi.ActionDomainEvent</mml:attr>
+ <mml:attr name="eventType">org.apache.isis.applib.mixins.rest.Object_openRestApi.ActionDomainEvent</mml:attr>
<mml:attr name="intent.act">EXECUTE</mml:attr>
- <mml:attr name="methods">public org.apache.isis.applib.value.LocalResourcePath org.apache.isis.applib.mixins.layout.Object_openRestApi.act()</mml:attr>
- <mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_openRestApi</mml:attr>
+ <mml:attr name="methods">public org.apache.isis.applib.value.LocalResourcePath
+ org.apache.isis.applib.mixins.rest.Object_openRestApi.act()</mml:attr>
+ <mml:attr name="onType">org.apache.isis.applib.mixins.rest.Object_openRestApi</mml:attr>
<mml:attr name="returnType">org.apache.isis.applib.value.LocalResourcePath</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet">
@@ -1088,13 +1089,14 @@
<mml:attr name="disabling">true</mml:attr>
<mml:attr name="hiding">true</mml:attr>
<mml:attr name="validating">true</mml:attr>
- <mml:attr name="value">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
+ <mml:attr name="value">org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation">
- <mml:attr name="eventType">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
+ <mml:attr name="eventType">org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
<mml:attr name="intent.act">EXECUTE</mml:attr>
- <mml:attr name="methods">public java.lang.Object org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel.act()</mml:attr>
- <mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel</mml:attr>
+ <mml:attr name="methods">public java.lang.Object
+ org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel.act()</mml:attr>
+ <mml:attr name="onType">org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel</mml:attr>
<mml:attr name="returnType">java.lang.Object</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet">
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.homepage.HomePageViewModel.xml b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.homepage.HomePageViewModel.xml
index 9738c7d..fe17dd6 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.homepage.HomePageViewModel.xml
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.webapp.application.services.homepage.HomePageViewModel.xml
@@ -565,13 +565,14 @@
<mml:attr name="disabling">true</mml:attr>
<mml:attr name="hiding">true</mml:attr>
<mml:attr name="validating">true</mml:attr>
- <mml:attr name="value">org.apache.isis.applib.mixins.layout.Object_openRestApi.ActionDomainEvent</mml:attr>
+ <mml:attr name="value">org.apache.isis.applib.mixins.rest.Object_openRestApi.ActionDomainEvent</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation">
- <mml:attr name="eventType">org.apache.isis.applib.mixins.layout.Object_openRestApi.ActionDomainEvent</mml:attr>
+ <mml:attr name="eventType">org.apache.isis.applib.mixins.rest.Object_openRestApi.ActionDomainEvent</mml:attr>
<mml:attr name="intent.act">EXECUTE</mml:attr>
- <mml:attr name="methods">public org.apache.isis.applib.value.LocalResourcePath org.apache.isis.applib.mixins.layout.Object_openRestApi.act()</mml:attr>
- <mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_openRestApi</mml:attr>
+ <mml:attr name="methods">public org.apache.isis.applib.value.LocalResourcePath
+ org.apache.isis.applib.mixins.rest.Object_openRestApi.act()</mml:attr>
+ <mml:attr name="onType">org.apache.isis.applib.mixins.rest.Object_openRestApi</mml:attr>
<mml:attr name="returnType">org.apache.isis.applib.value.LocalResourcePath</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet">
@@ -629,13 +630,14 @@
<mml:attr name="disabling">true</mml:attr>
<mml:attr name="hiding">true</mml:attr>
<mml:attr name="validating">true</mml:attr>
- <mml:attr name="value">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
+ <mml:attr name="value">org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation">
- <mml:attr name="eventType">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
+ <mml:attr name="eventType">org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel.ActionDomainEvent</mml:attr>
<mml:attr name="intent.act">EXECUTE</mml:attr>
- <mml:attr name="methods">public java.lang.Object org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel.act()</mml:attr>
- <mml:attr name="onType">org.apache.isis.applib.mixins.layout.Object_rebuildMetamodel</mml:attr>
+ <mml:attr name="methods">public java.lang.Object
+ org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel.act()</mml:attr>
+ <mml:attr name="onType">org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel</mml:attr>
<mml:attr name="returnType">java.lang.Object</mml:attr>
</mml:facet>
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet">