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/03/28 12:29:04 UTC

[isis-app-simpleapp] tag 2.0.0-M3 created (now ccec642)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to tag 2.0.0-M3
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.


      at ccec642  (commit)
This tag includes the following new commits:

     new acb3640  more use of lombok; fixes a bug in Name.MustSatisfySpecification; less layout boilerplate; adds archunit tests.
     new 87be3bc  minor tidy-up
     new ccec642  fixes for archunit tests

The 3 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/03: minor tidy-up

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to tag 2.0.0-M3
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git

commit 87be3bcba2648446a9fc81baf645f8ec03066fb1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 28 11:52:18 2020 +0000

    minor tidy-up
---
 .../simple/integtests/tests/SimpleObject_IntegTest.java    |  2 +-
 .../webapp/bdd/stepdefs/domain/SimpleObjectsStepDef.java   | 10 ----------
 .../webapp/bdd/stepdefs/fixtures/DomainAppDemoStepDef.java | 14 --------------
 .../bdd/stepdefs/infrastructure/TransactionalStepDef.java  |  8 --------
 .../domainapp.modules.simple.dom.so.SimpleObjects.xml      |  9 ++++++---
 5 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
index dd54846..a64ac81 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
@@ -95,7 +95,7 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
         }
 
         @Test
-        public void failsValidation() {
+        public void fails_validation() {
 
             // expect
             InvalidException cause = assertThrows(InvalidException.class, ()->{
diff --git a/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsStepDef.java b/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsStepDef.java
index bdb5b56..5ea7b77 100644
--- a/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsStepDef.java
+++ b/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/domain/SimpleObjectsStepDef.java
@@ -2,15 +2,8 @@ package domainapp.webapp.bdd.stepdefs.domain;
 
 import domainapp.modules.simple.dom.so.SimpleObject;
 import domainapp.modules.simple.dom.so.SimpleObjects;
-import domainapp.modules.simple.fixture.SimpleObject_persona;
-import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
-import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
-import io.cucumber.java.After;
-import io.cucumber.java.Before;
 import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
-import lombok.val;
 
 import java.util.List;
 import java.util.UUID;
@@ -18,9 +11,6 @@ import java.util.UUID;
 import javax.inject.Inject;
 
 import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.support.TransactionTemplate;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
diff --git a/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/fixtures/DomainAppDemoStepDef.java b/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/fixtures/DomainAppDemoStepDef.java
index a4ee5ae..3e6b19c 100644
--- a/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/fixtures/DomainAppDemoStepDef.java
+++ b/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/fixtures/DomainAppDemoStepDef.java
@@ -1,29 +1,15 @@
 package domainapp.webapp.bdd.stepdefs.fixtures;
 
-import java.util.List;
-import java.util.UUID;
-
 import javax.inject.Inject;
 
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.support.TransactionTemplate;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.applib.annotation.OrderPrecedence;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 
-import lombok.val;
-
-import domainapp.modules.simple.dom.so.SimpleObject;
-import domainapp.modules.simple.dom.so.SimpleObjects;
 import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
-import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
-import io.cucumber.java.After;
 import io.cucumber.java.Before;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.When;
 
 public class DomainAppDemoStepDef {
 
diff --git a/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/TransactionalStepDef.java b/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/TransactionalStepDef.java
index b3860e7..94c92f4 100644
--- a/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/TransactionalStepDef.java
+++ b/webapp/src/test/java/domainapp/webapp/bdd/stepdefs/infrastructure/TransactionalStepDef.java
@@ -1,8 +1,5 @@
 package domainapp.webapp.bdd.stepdefs.infrastructure;
 
-import java.util.List;
-import java.util.UUID;
-
 import javax.inject.Inject;
 
 import org.springframework.transaction.PlatformTransactionManager;
@@ -18,13 +15,8 @@ import org.apache.isis.core.runtime.session.init.InitialisationSession;
 
 import lombok.val;
 
-import domainapp.modules.simple.dom.so.SimpleObject;
-import domainapp.modules.simple.dom.so.SimpleObjects;
-import domainapp.webapp.integtests.ApplicationIntegTestAbstract;
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.When;
 
 /**
  * equivalent to the Spring @Transactional attribute
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.so.SimpleObjects.xml b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.so.SimpleObjects.xml
index f069370..f013e4d 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.so.SimpleObjects.xml
+++ b/webapp/src/test/java/domainapp/webapp/integtests/metamodel/lockdown/approved/domainapp.modules.simple.dom.so.SimpleObjects.xml
@@ -62,7 +62,8 @@
                 <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">domainapp.modules.simple.dom.so.SimpleObjects.CreateActionDomainEvent</mml:attr>
                     <mml:attr name="intent.create">EXECUTE</mml:attr>
-                    <mml:attr name="methods">public domainapp.modules.simple.dom.so.SimpleObject domainapp.modules.simple.dom.so.SimpleObjects.create(java.lang.String)</mml:attr>
+                    <mml:attr name="methods">public domainapp.modules.simple.dom.so.SimpleObject
+                        domainapp.modules.simple.dom.so.SimpleObjects.create(java.lang.String)</mml:attr>
                     <mml:attr name="onType">domainapp.modules.simple.dom.so.SimpleObjects</mml:attr>
                     <mml:attr name="returnType">domainapp.modules.simple.dom.so.SimpleObject</mml:attr>
                 </mml:facet>
@@ -165,7 +166,8 @@
                 <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">domainapp.modules.simple.dom.so.SimpleObjects.FindByNameActionDomainEvent</mml:attr>
                     <mml:attr name="intent.findByName">EXECUTE</mml:attr>
-                    <mml:attr name="methods">public java.util.List&lt;domainapp.modules.simple.dom.so.SimpleObject&gt; domainapp.modules.simple.dom.so.SimpleObjects.findByName(java.lang.String)</mml:attr>
+                    <mml:attr name="methods">public java.util.List&lt;domainapp.modules.simple.dom.so.SimpleObject&gt;
+                        domainapp.modules.simple.dom.so.SimpleObjects.findByName(java.lang.String)</mml:attr>
                     <mml:attr name="onType">domainapp.modules.simple.dom.so.SimpleObjects</mml:attr>
                     <mml:attr name="returnType">java.util.List</mml:attr>
                 </mml:facet>
@@ -268,7 +270,8 @@
                 <mml:facet id="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromDefault">
                     <mml:attr name="eventType">org.apache.isis.applib.events.domain.ActionDomainEvent.Default</mml:attr>
                     <mml:attr name="intent.listAll">EXECUTE</mml:attr>
-                    <mml:attr name="methods">public java.util.List&lt;domainapp.modules.simple.dom.so.SimpleObject&gt; domainapp.modules.simple.dom.so.SimpleObjects.listAll()</mml:attr>
+                    <mml:attr name="methods">public java.util.List&lt;domainapp.modules.simple.dom.so.SimpleObject&gt;
+                        domainapp.modules.simple.dom.so.SimpleObjects.listAll()</mml:attr>
                     <mml:attr name="onType">domainapp.modules.simple.dom.so.SimpleObjects</mml:attr>
                     <mml:attr name="returnType">java.util.List</mml:attr>
                 </mml:facet>


[isis-app-simpleapp] 01/03: more use of lombok; fixes a bug in Name.MustSatisfySpecification; less layout boilerplate; adds archunit tests.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to tag 2.0.0-M3
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git

commit acb3640bec9e64a22dda481acd34593db3f4a136
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Mar 24 16:18:10 2020 +0000

    more use of lombok; fixes a bug in Name.MustSatisfySpecification; less layout boilerplate; adds archunit tests.
---
 .../modules/simple/dom/so/SimpleObject.java        | 16 +++-----
 .../modules/simple/dom/so/SimpleObject.layout.xml  |  2 +-
 .../modules/simple/dom/so/SimpleObjects.java       |  7 +---
 .../java/domainapp/modules/simple/types/Name.java  |  2 +-
 .../java/domainapp/modules/simple/types/Notes.java |  5 ++-
 .../integtests/tests/SimpleObject_IntegTest.java   | 14 +++----
 webapp/pom.xml                                     | 14 +++++++
 webapp/src/main/resources/application.yml          | 14 ++++---
 .../unittests/archunit/ArchitectureTests.java      | 47 ++++++++++++++++++++++
 9 files changed, 87 insertions(+), 34 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 948ad9d..7d5f7d5 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
@@ -27,6 +27,7 @@ import domainapp.modules.simple.types.Notes;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 import lombok.val;
 
 @javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE, schema = "simple")
@@ -36,6 +37,7 @@ import lombok.val;
 @DomainObject()
 @DomainObjectLayout()
 @XmlJavaTypeAdapter(PersistentEntityAdapter.class)
+@ToString(onlyExplicitlyIncluded = true)
 public class SimpleObject implements Comparable<SimpleObject> {
 
     public static SimpleObject withName(String name) {
@@ -57,12 +59,12 @@ public class SimpleObject implements Comparable<SimpleObject> {
         return "Object: " + getName();
     }
 
-    @Getter @Setter
     @Name
+    @Getter @Setter @ToString.Include
     private String name;
 
-    @Getter @Setter
     @Notes
+    @Getter @Setter
     private String notes;
 
 
@@ -75,6 +77,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
         setName(name);
         return this;
     }
+
     public String default0UpdateName() {
         return getName();
     }
@@ -87,12 +90,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
         repositoryService.removeAndFlush(this);
     }
 
-    @Override
-    public String toString() {
-        return getName();
-    }
-
-    private final static Comparator<SimpleObject> comparator = 
+    private final static Comparator<SimpleObject> comparator =
             Comparator.comparing(SimpleObject::getName);
 
     @Override
@@ -100,6 +98,4 @@ public class SimpleObject implements Comparable<SimpleObject> {
         return comparator.compare(this, other);
     }
 
-
-
 }
\ No newline at end of file
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
index b3e841f..a970956 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.layout.xml
@@ -19,7 +19,7 @@
                                 <c:property id="name" namedEscaped="true">
                                     <c:action id="updateName" promptStyle="INLINE"/>
                                 </c:property>
-                                <c:property id="notes" namedEscaped="true" multiLine="10" hidden="ALL_TABLES"/>
+                                <c:property id="notes"/>
                             </c:fieldSet>
                         </bs3:col>
                     </bs3:row>
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 711f3af..b7dffc1 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
@@ -16,17 +16,12 @@ import domainapp.modules.simple.types.Name;
         nature = NatureOfService.VIEW,
         objectType = "simple.SimpleObjects"
         )
+@lombok.RequiredArgsConstructor(onConstructor_ = {@Inject} )
 public class SimpleObjects {
 
     private final RepositoryService repositoryService;
     private final IsisJdoSupport_v3_2 isisJdoSupport;
 
-    @Inject
-    public SimpleObjects(RepositoryService repositoryService, IsisJdoSupport_v3_2 isisJdoSupport) {
-        this.repositoryService = repositoryService;
-        this.isisJdoSupport = isisJdoSupport;
-    }
-
     public static class ActionDomainEvent extends SimpleModule.ActionDomainEvent<SimpleObjects> {}
 
     public static class CreateActionDomainEvent extends ActionDomainEvent {}
diff --git a/module-simple/src/main/java/domainapp/modules/simple/types/Name.java b/module-simple/src/main/java/domainapp/modules/simple/types/Name.java
index 2826ec6..02fab8c 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/types/Name.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/types/Name.java
@@ -40,7 +40,7 @@ public @interface Name {
             }
             val prohibitedCharacters = configuration.getTypes().getName().getValidation().getProhibitedCharacters();
             for (char prohibitedCharacter : prohibitedCharacters) {
-                if( name.contains("!")) {
+                if( name.contains(""+prohibitedCharacter)) {
                     String message = configuration.getTypes().getName().getValidation().getMessage();
                     return TranslatableString.tr(message, "character", ""+prohibitedCharacter);
                 }
diff --git a/module-simple/src/main/java/domainapp/modules/simple/types/Notes.java b/module-simple/src/main/java/domainapp/modules/simple/types/Notes.java
index 1845679..afd987e 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/types/Notes.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/types/Notes.java
@@ -11,11 +11,14 @@ import org.apache.isis.applib.annotation.Editing;
 import org.apache.isis.applib.annotation.Parameter;
 import org.apache.isis.applib.annotation.ParameterLayout;
 import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
 
 @Column(length = Notes.MAX_LEN, allowsNull = "true")
 @Property(editing = Editing.ENABLED, maxLength = Notes.MAX_LEN)
+@PropertyLayout(named = "Notes", multiLine = 10, hidden = Where.ALL_TABLES)
 @Parameter(maxLength = Notes.MAX_LEN)
-@ParameterLayout(named = "Notes")
+@ParameterLayout(named = "Notes", multiLine = 10)
 @Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Notes {
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
index 14631b2..dd54846 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObject_IntegTest.java
@@ -1,29 +1,25 @@
 package domainapp.modules.simple.integtests.tests;
 
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.event.EventListener;
 import org.springframework.transaction.annotation.Transactional;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.services.title.TitleService;
-import org.apache.isis.applib.services.wrapper.DisabledException;
-import org.apache.isis.applib.services.wrapper.InvalidException;
-import org.apache.isis.persistence.jdo.datanucleus5.jdosupport.mixins.Persistable_datanucleusIdLong;
-import org.apache.isis.persistence.jdo.datanucleus5.jdosupport.mixins.Persistable_datanucleusVersionTimestamp;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.services.wrapper.DisabledException;
+import org.apache.isis.applib.services.wrapper.InvalidException;
+import org.apache.isis.persistence.jdo.datanucleus5.jdosupport.mixins.Persistable_datanucleusIdLong;
+
 import lombok.Getter;
 
 import domainapp.modules.simple.dom.so.SimpleObject;
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 2f2c437..e09192a 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -17,6 +17,7 @@
 
     <properties>
         <maven-cucumber-reporting.version>4.11.2</maven-cucumber-reporting.version>
+        <archunit.version>0.12.0</archunit.version>
         <skipBDD>${skipTests}</skipBDD>
     </properties>
 
@@ -169,6 +170,19 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.tngtech.archunit</groupId>
+            <artifactId>archunit-junit5-api</artifactId>
+            <version>${archunit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.tngtech.archunit</groupId>
+            <artifactId>archunit-junit5-engine</artifactId>
+            <version>${archunit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <profiles>
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 44da480..e0adc5f 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -94,9 +94,11 @@ spring:
   banner:
     location: banner.txt
 
-#app:
-#  simple-module:
-#    types:
-#      name:
-#        validation-message: '{character}' is invalid.
-#
+app:
+  simple-module:
+    types:
+      name:
+        validation:
+          message: "'{character}' is invalid."
+          prohibited-characters: "&%$"
+
diff --git a/webapp/src/test/java/domainapp/webapp/unittests/archunit/ArchitectureTests.java b/webapp/src/test/java/domainapp/webapp/unittests/archunit/ArchitectureTests.java
new file mode 100644
index 0000000..426ccc1
--- /dev/null
+++ b/webapp/src/test/java/domainapp/webapp/unittests/archunit/ArchitectureTests.java
@@ -0,0 +1,47 @@
+package domainapp.webapp.unittests.archunit;
+
+import javax.jdo.annotations.PersistenceCapable;
+
+import com.tngtech.archunit.core.importer.ImportOption;
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.lang.ArchRule;
+
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
+import static com.tngtech.archunit.library.Architectures.layeredArchitecture;
+
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+
+@AnalyzeClasses(
+        packages = "domainapp.modules.simple",
+        importOptions = {
+                ImportOption.DoNotIncludeTests.class,
+                ImportOption.DoNotIncludeJars.class
+        })
+public class ArchitectureTests {
+
+    @ArchTest
+    static ArchRule package_dependencies =
+            layeredArchitecture()
+                    .layer("dom").definedBy("..dom..")
+                    .layer("fixture").definedBy("..fixture..")
+                    .layer("types").definedBy("..types..")
+
+            .whereLayer("types").mayOnlyBeAccessedByLayers("dom")
+            .whereLayer("dom").mayOnlyBeAccessedByLayers("fixture")
+            .whereLayer("fixture").mayNotBeAccessedByAnyLayer();
+
+    @ArchTest
+    static ArchRule classes_annotated_with_PersistenceCapable_are_also_annotated_with_DomainObject =
+            classes()
+                   .that().areAnnotatedWith(PersistenceCapable.class)
+            .should().beAnnotatedWith(DomainObject.class);
+
+    @ArchTest
+    static ArchRule classes_annotated_with_DomainObject_are_also_annotated_with_DomainObjectLayout =
+            classes()
+                   .that().areAnnotatedWith(DomainObject.class)
+            .should().beAnnotatedWith(DomainObjectLayout.class);
+
+}
\ No newline at end of file


[isis-app-simpleapp] 03/03: fixes for archunit tests

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to tag 2.0.0-M3
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git

commit ccec642eabcddbb6bbcf1ab03a2275b4613ca9fa
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 28 12:28:16 2020 +0000

    fixes for archunit tests
---
 .../services/homepage/HomePageViewModel.java       |  2 ++
 webapp/src/main/resources/application.yml          |  2 +-
 .../unittests/archunit/ArchitectureTests.java      | 33 +++++++++++++++-------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
index 570d3dd..9b87197 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.inject.Inject;
 
 import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.annotation.HomePage;
 import org.apache.isis.applib.annotation.Nature;
 import org.apache.isis.applib.services.i18n.TranslatableString;
@@ -17,6 +18,7 @@ import domainapp.modules.simple.dom.so.SimpleObjects;
         objectType = "domainapp.HomePageViewModel"
         )
 @HomePage
+@DomainObjectLayout()
 public class HomePageViewModel {
 
     public TranslatableString title() {
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index e0adc5f..b6d6f80 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -100,5 +100,5 @@ app:
       name:
         validation:
           message: "'{character}' is invalid."
-          prohibited-characters: "&%$"
+          prohibited-characters: "&%$!"
 
diff --git a/webapp/src/test/java/domainapp/webapp/unittests/archunit/ArchitectureTests.java b/webapp/src/test/java/domainapp/webapp/unittests/archunit/ArchitectureTests.java
index 426ccc1..22925df 100644
--- a/webapp/src/test/java/domainapp/webapp/unittests/archunit/ArchitectureTests.java
+++ b/webapp/src/test/java/domainapp/webapp/unittests/archunit/ArchitectureTests.java
@@ -1,6 +1,7 @@
 package domainapp.webapp.unittests.archunit;
 
 import javax.jdo.annotations.PersistenceCapable;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import com.tngtech.archunit.core.importer.ImportOption;
 import com.tngtech.archunit.junit.AnalyzeClasses;
@@ -12,25 +13,25 @@ import static com.tngtech.archunit.library.Architectures.layeredArchitecture;
 
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.ViewModel;
+import org.apache.isis.applib.annotation.ViewModelLayout;
+
+import domainapp.modules.simple.SimpleModule;
+import domainapp.webapp.SimpleApp;
 
 @AnalyzeClasses(
-        packages = "domainapp.modules.simple",
+        packagesOf = {SimpleModule.class, SimpleApp.class},
         importOptions = {
-                ImportOption.DoNotIncludeTests.class,
-                ImportOption.DoNotIncludeJars.class
+                ImportOption.DoNotIncludeTests.class
         })
 public class ArchitectureTests {
 
     @ArchTest
     static ArchRule package_dependencies =
             layeredArchitecture()
-                    .layer("dom").definedBy("..dom..")
-                    .layer("fixture").definedBy("..fixture..")
-                    .layer("types").definedBy("..types..")
-
-            .whereLayer("types").mayOnlyBeAccessedByLayers("dom")
-            .whereLayer("dom").mayOnlyBeAccessedByLayers("fixture")
-            .whereLayer("fixture").mayNotBeAccessedByAnyLayer();
+                    .layer("simple module").definedBy("domainapp.modules.simple..")
+                    .layer("webapp").definedBy("domainapp.webapp..")
+            .whereLayer("simple module").mayOnlyBeAccessedByLayers("webapp");
 
     @ArchTest
     static ArchRule classes_annotated_with_PersistenceCapable_are_also_annotated_with_DomainObject =
@@ -39,9 +40,21 @@ public class ArchitectureTests {
             .should().beAnnotatedWith(DomainObject.class);
 
     @ArchTest
+    static ArchRule classes_annotated_with_PersistenceCapable_are_also_annotated_with_XmlJavaTypeAdapter =
+            classes()
+                   .that().areAnnotatedWith(PersistenceCapable.class)
+            .should().beAnnotatedWith(XmlJavaTypeAdapter.class);
+
+    @ArchTest
     static ArchRule classes_annotated_with_DomainObject_are_also_annotated_with_DomainObjectLayout =
             classes()
                    .that().areAnnotatedWith(DomainObject.class)
             .should().beAnnotatedWith(DomainObjectLayout.class);
 
+    @ArchTest
+    static ArchRule classes_annotated_with_ViewModel_are_also_annotated_with_ViewModelLayout =
+            classes()
+                   .that().areAnnotatedWith(ViewModel.class)
+            .should().beAnnotatedWith(ViewModelLayout.class);
+
 }
\ No newline at end of file