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/06/12 08:27:52 UTC

[isis-app-simpleapp] 02/04: updates with 2732, 2727 and 2726 changes

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

commit 3d15a647ecdd31d5dee49f700744d804e2b7e6ef
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 11 14:40:40 2021 +0100

    updates with 2732, 2727 and 2726 changes
---
 module-simple-tests/pom.xml                        |  7 ++++
 .../integtests/tests/SimpleObject_IntegTest.java   |  4 +++
 .../modules/simple/dom/so/SimpleObject.java        |  4 ++-
 .../modules/simple/dom/so/SimpleObjects.java       |  2 +-
 .../simple/fixture/SimpleObjectBuilder.java        |  8 ++---
 .../simple/fixture/SimpleObject_persona.java       |  6 ++--
 pom.xml                                            |  3 ++
 webapp-tests/pom.xml                               |  1 +
 ...mainAppFixtureScriptsSpecificationProvider.java | 25 ---------------
 .../webapp/custom/restapi/CustomController.java    | 36 ++++++++++-----------
 .../domainapp/webapp/quartz/job/SampleJob.java     | 37 ++++++++--------------
 webapp/src/main/resources/application.yml          |  8 +++++
 .../main/resources/config/application.properties   |  2 +-
 webapp/src/main/resources/log4j2-spring.xml        |  4 +--
 webapp/src/main/resources/menubars.layout.xml      | 16 +++++-----
 15 files changed, 76 insertions(+), 87 deletions(-)

diff --git a/module-simple-tests/pom.xml b/module-simple-tests/pom.xml
index 93a3504..a919678 100644
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@ -64,6 +64,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.isis.mavendeps</groupId>
+            <artifactId>isis-mavendeps-jdk11</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
index 124f112..fdfdb8d 100644
--- a/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/module-simple-tests/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
@@ -1,5 +1,7 @@
 package domainapp.modules.simple.integtests.tests;
 
+import javax.inject.Inject;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.transaction.annotation.Transactional;
@@ -7,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import org.apache.isis.applib.services.sudo.SudoService;
 import org.apache.isis.applib.services.wrapper.DisabledException;
 import org.apache.isis.applib.services.wrapper.InvalidException;
 
@@ -18,6 +21,7 @@ import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
 public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
 
     SimpleObject simpleObject;
+    @Inject SudoService sudoService;
 
     @BeforeEach
     public void setUp() {
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 a428a4e..b3799ce 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
@@ -39,7 +39,7 @@ import domainapp.modules.simple.types.Notes;
 )
 @javax.persistence.NamedQueries({
         @javax.persistence.NamedQuery(
-                name = "SimpleObject.findByNameLike",
+                name = SimpleObject.NAMED_QUERY__FIND_BY_NAME_LIKE,
                 query = "SELECT so FROM SimpleObject so WHERE so.name LIKE :name"
         )
 })
@@ -51,6 +51,8 @@ import domainapp.modules.simple.types.Notes;
 @ToString(onlyExplicitlyIncluded = true)
 public class SimpleObject implements Comparable<SimpleObject> {
 
+    static final String NAMED_QUERY__FIND_BY_NAME_LIKE = "SimpleObject.findByNameLike";
+
     @javax.persistence.Id
     @javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
     @javax.persistence.Column(name = "id", nullable = false)
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 8d75062..329b107 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
@@ -44,7 +44,7 @@ public class SimpleObjects {
     public List<SimpleObject> findByNameLike(
             @Name final String name) {
         return repositoryService.allMatches(
-                Query.named(SimpleObject.class, "SimpleObject.findByNameLike")
+                Query.named(SimpleObject.class, SimpleObject.NAMED_QUERY__FIND_BY_NAME_LIKE)
                      .withParameter("name", "%" + name + "%"));
     }
 
diff --git a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
index c517334..80223be 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObjectBuilder.java
@@ -2,7 +2,7 @@ package domainapp.modules.simple.fixture;
 
 import javax.inject.Inject;
 
-import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptWithResult;
+import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptWithResult;
 
 import domainapp.modules.simple.dom.so.SimpleObject;
 import domainapp.modules.simple.dom.so.SimpleObjects;
@@ -18,12 +18,12 @@ public class SimpleObjectBuilder extends BuilderScriptWithResult<SimpleObject> {
 
     @Override
     protected SimpleObject buildResult(final ExecutionContext ec) {
-        
+
         checkParam("name", ec, String.class);
-        
+
         return wrap(simpleObjects).create(name);
     }
-    
+
     // -- DEPENDENCIES
 
     @Inject SimpleObjects simpleObjects;
diff --git a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
index 36e0c71..41a5aec 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleObject_persona.java
@@ -1,8 +1,8 @@
 package domainapp.modules.simple.fixture;
 
 import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
-import org.apache.isis.testing.fixtures.applib.api.PersonaWithFinder;
+import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.personas.PersonaWithFinder;
 import org.apache.isis.testing.fixtures.applib.setup.PersonaEnumPersistAll;
 
 import domainapp.modules.simple.dom.so.SimpleObject;
@@ -10,7 +10,7 @@ import domainapp.modules.simple.dom.so.SimpleObjects;
 import lombok.AllArgsConstructor;
 
 @AllArgsConstructor
-public enum SimpleObject_persona 
+public enum SimpleObject_persona
 implements PersonaWithBuilderScript<SimpleObjectBuilder>, PersonaWithFinder<SimpleObject> {
 
     FOO("Foo"),
diff --git a/pom.xml b/pom.xml
index 47009c8..c64d4ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,10 @@
     <parent>
         <groupId>org.apache.isis.app</groupId>
         <artifactId>isis-app-starter-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+<!--
         <version>2.0.0-M5.20210601-0553-daa4d8e1</version>
+-->
         <relativePath/>
     </parent>
 
diff --git a/webapp-tests/pom.xml b/webapp-tests/pom.xml
index 6110fb2..8ab3a09 100644
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@ -49,6 +49,7 @@
             <scope>test</scope>
         </dependency>
 
+
     </dependencies>
 
 </project>
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java b/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
deleted file mode 100644
index 44a100c..0000000
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package domainapp.webapp.application.fixture;
-
-import org.springframework.stereotype.Service;
-
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecification;
-import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecificationProvider;
-
-import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
-
-/**
- * Specifies where to find fixtures, and other settings.
- */
-@Service
-public class DomainAppFixtureScriptsSpecificationProvider implements FixtureScriptsSpecificationProvider {
-    @Override
-    public FixtureScriptsSpecification getSpecification() {
-        return FixtureScriptsSpecification
-                .builder(DomainAppFixtureScriptsSpecificationProvider.class)
-                .with(FixtureScripts.MultipleExecutionStrategy.EXECUTE)
-                .withRunScriptDefault(DomainAppDemo.class)
-                .withRecreate(DomainAppDemo.class)
-                .build();
-    }
-}
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 abd4e01..33c2ee5 100644
--- a/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
+++ b/webapp/src/main/java/domainapp/webapp/custom/restapi/CustomController.java
@@ -2,17 +2,18 @@ package domainapp.webapp.custom.restapi;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.Callable;
 
+import javax.inject.Inject;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionService;
 import org.apache.isis.applib.services.user.UserMemento;
 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;
-import org.apache.isis.core.security.authentication.standard.SimpleAuthentication;
 
 import lombok.RequiredArgsConstructor;
 
@@ -20,30 +21,27 @@ import domainapp.modules.simple.dom.so.SimpleObject;
 import domainapp.modules.simple.dom.so.SimpleObjects;
 
 @RestController
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = {@Inject})
 class CustomController {
 
-    private final InteractionFactory interactionFactory;
+    private final InteractionService interactionService;
     private final TransactionalProcessor transactionalProcessor;
     private final SimpleObjects simpleObjects;
 
     @GetMapping("/custom/simpleObjects")
     List<SimpleObject> all() {
-        return callAuthenticated(newAuthentication(), () -> simpleObjects.listAll())
-                .optionalElseFail() // re-throws exception that has occurred, if any
-                .orElse(Collections.emptyList()); // handles null case, if required
-    }
-
-    private SimpleAuthentication newAuthentication() {
-        return SimpleAuthentication.validOf(UserMemento.ofName("sven"));
+        return call("sven", simpleObjects::listAll)
+                .orElse(Collections.<SimpleObject>emptyList());
     }
 
-    private <T> Result<T> callAuthenticated(
-            final Authentication authentication,
-            final Callable<T> task) {
+    private <T> Optional<T> call(
+            final String username,
+            final Callable<T> callable) {
 
-        return interactionFactory.callAuthenticated(
-                authentication,
-                () -> transactionalProcessor.callWithinCurrentTransactionElseCreateNew(task));
+        return interactionService.call(
+                InteractionContext.ofUserWithSystemDefaults(UserMemento.ofName(username)),
+                () -> transactionalProcessor.callWithinCurrentTransactionElseCreateNew(callable))
+                .optionalElseFail(); // re-throws exception that has occurred, if any
     }
+
 }
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 41b62e0..d112ae9 100644
--- a/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
+++ b/webapp/src/main/java/domainapp/webapp/quartz/job/SampleJob.java
@@ -2,6 +2,7 @@ package domainapp.webapp.quartz.job;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.Callable;
 
 import javax.inject.Inject;
@@ -9,31 +10,25 @@ import javax.inject.Inject;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import org.apache.isis.applib.services.iactnlayer.InteractionContext;
+import org.apache.isis.applib.services.iactnlayer.InteractionService;
 import org.apache.isis.applib.services.user.UserMemento;
 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;
-import org.apache.isis.core.security.authentication.standard.SimpleAuthentication;
 
 import lombok.RequiredArgsConstructor;
-
 import lombok.extern.log4j.Log4j2;
 
-import lombok.extern.slf4j.Slf4j;
-
 import domainapp.modules.simple.dom.so.SimpleObject;
 import domainapp.modules.simple.dom.so.SimpleObjects;
 
 @Component
 @RequiredArgsConstructor(onConstructor_ = {@Inject})
-@Slf4j
+@Log4j2
 public class SampleJob implements Job {
 
-    private final InteractionFactory interactionFactory;
+    private final InteractionService interactionService;
     private final TransactionalProcessor transactionalProcessor;
     private final SimpleObjects simpleObjects;
 
@@ -44,21 +39,17 @@ public class SampleJob implements Job {
     }
 
     List<SimpleObject> all() {
-        return callAuthenticated(newAuthentication(), () -> simpleObjects.listAll())
-                .optionalElseFail() // re-throws exception that has occurred, if any
-                .orElse(Collections.emptyList()); // handles null case, if required
-    }
-
-    private SimpleAuthentication newAuthentication() {
-        return SimpleAuthentication.validOf(UserMemento.ofName("sven"));
+        return call("sven", simpleObjects::listAll)
+                .orElse(Collections.<SimpleObject>emptyList());
     }
 
-    private <T> Result<T> callAuthenticated(
-            final Authentication authentication,
-            final Callable<T> task) {
+    private <T> Optional<T> call(
+            final String username,
+            final Callable<T> callable) {
 
-        return interactionFactory.callAuthenticated(
-                authentication,
-                () -> transactionalProcessor.callWithinCurrentTransactionElseCreateNew(task));
+        return interactionService.call(
+                InteractionContext.ofUserWithSystemDefaults(UserMemento.ofName(username)),
+                () -> transactionalProcessor.callWithinCurrentTransactionElseCreateNew(callable))
+                .optionalElseFail(); // re-throws exception that has occurred, if any
     }
 }
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 125c1f9..8032779 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -66,6 +66,14 @@ isis:
         show-chooser: true
         show-drop-down-on-footer: true
 
+  testing:
+    fixtures:
+      fixture-scripts-specification:
+        context-class: domainapp.webapp.application.fixture.scenarios.DomainAppDemo
+        run-script-default: domainapp.webapp.application.fixture.scenarios.DomainAppDemo
+        recreate: domainapp.webapp.application.fixture.scenarios.DomainAppDemo
+        non-persisted-objects-strategy: persist
+        multiple-execution-strategy: execute
 
   persistence:
     schema:
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index aed22f6..19442f0 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -10,7 +10,7 @@
 
 spring.flyway.enabled=false
 
-spring.datasource.platform=h2
+spring.sql.init.platform=h2
 spring.datasource.url=jdbc:h2:mem:simple
 spring.datasource.driver-class-name=org.h2.Driver
 
diff --git a/webapp/src/main/resources/log4j2-spring.xml b/webapp/src/main/resources/log4j2-spring.xml
index 6ac00e5..ffa0765 100644
--- a/webapp/src/main/resources/log4j2-spring.xml
+++ b/webapp/src/main/resources/log4j2-spring.xml
@@ -41,13 +41,13 @@
         <!-- request scoped -->
         <logger name="org.apache.isis.viewer.restfulobjects.rendering.service.acceptheader.AcceptHeaderServiceForRest" level="debug"/>
         <logger name="org.apache.isis.applib.services.command.CommandContext" level="debug"/>
-        <logger name="org.apache.isis.applib.services.iactn.InteractionContext" level="debug"/>
+        <logger name="org.apache.isis.applib.services.iactn.InteractionProvider" level="debug"/>
         <logger name="org.apache.isis.applib.services.scratchpad.Scratchpad" level="debug"/>
         <logger name="org.apache.isis.core.runtimeservices.publish.PublisherDispatchServiceDefault" level="debug"/>
 
         <!-- transaction scoped -->
         <logger name="org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault" level="debug"/>
-        <logger name="org.apache.isis.core.runtimeservices.queryresultscache.QueryResultsCacheDefault" level="debug"/>
+        <logger name="org.apache.isis.applib.services.queryresultscache.QueryResultsCache" level="debug"/>
         <logger name="org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService" level="debug"/>
 
         <Root level="info">
diff --git a/webapp/src/main/resources/menubars.layout.xml b/webapp/src/main/resources/menubars.layout.xml
index 12d446c..d8d0d55 100644
--- a/webapp/src/main/resources/menubars.layout.xml
+++ b/webapp/src/main/resources/menubars.layout.xml
@@ -19,14 +19,8 @@
             <mb3:named>Prototyping</mb3:named>
             <mb3:section>
                 <mb3:named>Fixtures</mb3:named>
-                <mb3:serviceAction objectType="isis.ext.fixtures.FixtureScripts" id="runFixtureScript"/>
-                <mb3:serviceAction objectType="isis.ext.fixtures.FixtureScripts" id="recreateObjectsAndReturnFirst"/>
-            </mb3:section>
-            <mb3:section>
-                <mb3:named>Impersonate</mb3:named>
-                <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="impersonate"/>
-                <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="impersonateWithRoles"/>
-                <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="stopImpersonating"/>
+                <mb3:serviceAction objectType="isis.testing.fixtures.FixtureScripts" id="runFixtureScript"/>
+                <mb3:serviceAction objectType="isis.testing.fixtures.FixtureScripts" id="recreateObjectsAndReturnFirst"/>
             </mb3:section>
             <mb3:section>
                 <mb3:named>Layouts</mb3:named>
@@ -71,6 +65,12 @@
                 <mb3:serviceAction objectType="isis.conf.ConfigurationMenu" id="configuration"/>
             </mb3:section>
             <mb3:section>
+                <mb3:named>Impersonate</mb3:named>
+                <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="impersonate"/>
+                <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="impersonateWithRoles"/>
+                <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="stopImpersonating"/>
+            </mb3:section>
+            <mb3:section>
                 <mb3:serviceAction objectType="isis.security.LogoutMenu" id="logout"/>
             </mb3:section>
         </mb3:menu>