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/04/13 19:44:02 UTC
[isis-app-simpleapp] 02/03: Merge branch 'jdo' into jpa
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit aeb490c220ee0ba3a80f4ee496c3485a14f2edaf
Merge: 9fe1003 c93c384
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 19:27:59 2021 +0100
Merge branch 'jdo' into jpa
.../domainapp/modules/simple/SimpleModule.java | 33 ----------------------
.../modules/simple/dom/so/SimpleObject.java | 8 ++++++
.../java/domainapp/modules/simple/types/Name.java | 25 ++--------------
webapp/src/main/resources/application.yml | 8 ------
4 files changed, 10 insertions(+), 64 deletions(-)
diff --cc module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 89c9d01,978c617..fd47969
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@@ -17,11 -16,6 +16,8 @@@ import domainapp.modules.simple.dom.so.
@Configuration
@ComponentScan
- @EnableConfigurationProperties({
- SimpleModule.Configuration.class,
- })
+@EnableJpaRepositories
+@EntityScan(basePackageClasses = {SimpleModule.class})
public class SimpleModule implements ModuleWithFixtures {
@Override
diff --cc module-simple/src/main/java/domainapp/modules/simple/types/Name.java
index a04b05c,4e1e8d2..2412d3d
--- a/module-simple/src/main/java/domainapp/modules/simple/types/Name.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/types/Name.java
@@@ -17,8 -18,9 +17,8 @@@ import lombok.val
import domainapp.modules.simple.SimpleModule;
- @Property(mustSatisfy = Name.Specification.class, maxLength = Name.MAX_LEN)
- @Parameter(mustSatisfy = Name.Specification.class, maxLength = Name.MAX_LEN)
-@Column(length = Name.MAX_LEN, allowsNull = "false")
+ @Property(maxLength = Name.MAX_LEN)
+ @Parameter(maxLength = Name.MAX_LEN)
@ParameterLayout(named = "Name")
@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
diff --cc webapp/src/main/resources/application.yml
index 986d6cf,0e6436d..394dc2b
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@@ -101,16 -103,3 +101,8 @@@ management
health:
enabled: true
- app:
- simple-module:
- types:
- name:
- validation:
- message: "'{character}' is invalid."
- prohibited-characters: "&%$!"
-
+# workaround for https://issues.apache.org/jira/browse/ISIS-2583: not used, but needed to prevent NPE
+datanucleus:
+ cache:
+ level2:
+ type: soft