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/08/02 07:46:14 UTC
[isis-app-simpleapp] branch ISIS-2329 created (now 8d93cf9)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2329
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.
at 8d93cf9 ISIS-2329: fixes integ test compilation issue
This branch includes the following new commits:
new 6385b78 ISIS-2329: quick demo
new 8d93cf9 ISIS-2329: fixes integ test compilation issue
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.
[isis-app-simpleapp] 02/02: ISIS-2329: fixes integ test compilation
issue
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2329
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 8d93cf9c165bfba5a1f2d1af6774e4c1733ecab8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Aug 2 08:45:35 2021 +0100
ISIS-2329: fixes integ test compilation issue
---
.../webapp/integtests/WebAppIntegTestAbstract.java | 4 ++--
.../domainapp/webapp/integtests/smoke/Smoke_IntegTest.java | 13 ++++++-------
webapp/src/main/java/domainapp/webapp/AppManifest.java | 4 ++--
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
index 56c9bf4..dbd972b 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/WebAppIntegTestAbstract.java
@@ -11,7 +11,7 @@ import org.springframework.test.context.ActiveProfiles;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
-import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipselink;
+import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
@@ -40,7 +40,7 @@ public abstract class WebAppIntegTestAbstract extends IsisIntegrationTestAbstrac
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityBypass.class,
- IsisModuleJpaEclipselink.class,
+ IsisModulePersistenceJpaEclipselink.class,
IsisModuleTestingFixturesApplib.class,
SimpleModule.class
diff --git a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
index f8c5b56..504a9b4 100644
--- a/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
+++ b/webapp-tests/src/test/java/domainapp/webapp/integtests/smoke/Smoke_IntegTest.java
@@ -4,18 +4,17 @@ import java.util.List;
import javax.inject.Inject;
-import org.apache.isis.applib.services.wrapper.InvalidException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.springframework.transaction.annotation.Transactional;
+import org.apache.isis.applib.services.wrapper.InvalidException;
import org.apache.isis.applib.services.xactn.TransactionService;
+import org.springframework.transaction.annotation.Transactional;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import domainapp.webapp.integtests.WebAppIntegTestAbstract;
import domainapp.modules.simple.dom.so.SimpleObject;
import domainapp.modules.simple.dom.so.SimpleObjects;
+import domainapp.webapp.integtests.WebAppIntegTestAbstract;
+import static org.assertj.core.api.Assertions.assertThat;
@Transactional
class Smoke_IntegTest extends WebAppIntegTestAbstract {
@@ -54,7 +53,7 @@ class Smoke_IntegTest extends WebAppIntegTestAbstract {
// when
- wrap(fred).updateName("Freddy");
+ wrapMixin(SimpleObject.UpdateName.class, fred).act("Freddy");
transactionService.flushTransaction();
// then
@@ -71,7 +70,7 @@ class Smoke_IntegTest extends WebAppIntegTestAbstract {
// when
Assertions.assertThrows(InvalidException.class, () -> {
- wrap(fred).updateName("New name !!!");
+ wrapMixin(SimpleObject.UpdateName.class, fred).act("New name !!!");
transactionService.flushTransaction();
}, "Exclamation mark is not allowed");
diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java b/webapp/src/main/java/domainapp/webapp/AppManifest.java
index e02e4e7..9dca47c 100644
--- a/webapp/src/main/java/domainapp/webapp/AppManifest.java
+++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java
@@ -8,7 +8,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.extensions.flyway.impl.IsisModuleExtFlywayImpl;
-import org.apache.isis.persistence.jpa.eclipselink.IsisModuleJpaEclipselink;
+import org.apache.isis.persistence.jpa.eclipselink.IsisModulePersistenceJpaEclipselink;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.h2console.ui.IsisModuleTestingH2ConsoleUi;
@@ -24,7 +24,7 @@ import domainapp.webapp.quartz.QuartzModule;
@Import({
IsisModuleCoreRuntimeServices.class,
IsisModuleSecurityShiro.class,
- IsisModuleJpaEclipselink.class,
+ IsisModulePersistenceJpaEclipselink.class,
IsisModuleViewerRestfulObjectsJaxrsResteasy4.class,
IsisModuleViewerWicketViewer.class,
[isis-app-simpleapp] 01/02: ISIS-2329: quick demo
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2329
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 6385b78c297cb9ab7b3321c4621f2f5ff52ddb3d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jul 26 16:55:23 2021 +0100
ISIS-2329: quick demo
---
.../modules/simple/dom/so/SimpleObject.java | 34 +++++++++++++---------
.../modules/simple/dom/so/SimpleObjects.java | 8 ++++-
pom.xml | 4 +--
3 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
index 094b99b..c1ef563 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java
@@ -14,6 +14,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.events.domain.ActionDomainEvent;
import org.apache.isis.applib.jaxb.PersistentEntityAdapter;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
@@ -97,23 +98,28 @@ public class SimpleObject implements Comparable<SimpleObject> {
private String notes;
- @Action(semantics = IDEMPOTENT, commandPublishing = Publishing.ENABLED, executionPublishing = Publishing.ENABLED)
+
+ @Action(semantics = IDEMPOTENT, commandPublishing = Publishing.ENABLED, executionPublishing = Publishing.ENABLED, domainEvent = UpdateName.ActionEvent.class)
@ActionLayout(associateWith = "name", promptStyle = PromptStyle.INLINE)
- public SimpleObject updateName(
- @Name final String name) {
- setName(name);
- return this;
- }
- public String default0UpdateName() {
- return getName();
- }
- public String validate0UpdateName(String newName) {
- for (char prohibitedCharacter : "&%$!".toCharArray()) {
- if( newName.contains(""+prohibitedCharacter)) {
- return "Character '" + prohibitedCharacter + "' is not allowed.";
+ public class UpdateName {
+
+ public class ActionEvent extends ActionDomainEvent<UpdateName> {}
+ public SimpleObject act(
+ @Name final String name) {
+ setName(name);
+ return SimpleObject.this;
+ }
+ public String default0Act() {
+ return getName();
+ }
+ public String validate0Act(String newName) {
+ for (char prohibitedCharacter : "&%$!".toCharArray()) {
+ if( newName.contains(""+prohibitedCharacter)) {
+ return "Character '" + prohibitedCharacter + "' is not allowed.";
+ }
}
+ return null;
}
- return null;
}
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 e67d9bb..0e3eccb 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
@@ -18,11 +18,13 @@ import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.persistence.jpa.applib.services.JpaSupportService;
+import org.springframework.context.event.EventListener;
+
import domainapp.modules.simple.types.Name;
@DomainService(
nature = NatureOfService.VIEW,
- objectType = "simple.SimpleObjects"
+ logicalTypeName = "simple.SimpleObjects"
)
@javax.annotation.Priority(PriorityPrecedence.EARLY)
@lombok.RequiredArgsConstructor(onConstructor_ = {@Inject} )
@@ -88,5 +90,9 @@ public class SimpleObjects {
});
}
+ @EventListener(SimpleObject.UpdateName.ActionEvent.class)
+ public void on(SimpleObject.UpdateName.ActionEvent ev) {
+ System.out.println(ev.getIdentifier());
+ }
}
diff --git a/pom.xml b/pom.xml
index fdecb38..71fd836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
- <version>2.0.0-M5.20210724-1447-cdcc665b</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -19,7 +19,7 @@
<packaging>pom</packaging>
<properties>
- <isis.version>2.0.0-M5.20210724-1447-cdcc665b</isis.version>
+ <isis.version>2.0.0-SNAPSHOT</isis.version>
<java.version>11</java.version>
<maven-cucumber-reporting.version>5.3.0</maven-cucumber-reporting.version>
<archunit.version>0.14.1</archunit.version>