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 2018/07/18 06:00:57 UTC

[isis] 08/09: ISIS-1632: moves @Column entirely to @Name for SimpleObject#name

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

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 9fbd6753628c1a9c233719ca6a06b87209f5f5e5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jul 18 07:59:34 2018 +0200

    ISIS-1632: moves @Column entirely to @Name for SimpleObject#name
---
 .../src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java   | 1 -
 .../src/main/java/domainapp/modules/simple/dom/types/Name.java          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index cf208b9..ed8963d 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -52,7 +52,6 @@ import lombok.AccessLevel;
 public class SimpleObject implements Comparable<SimpleObject> {
 
 
-    @javax.jdo.annotations.Column(allowsNull = "false")
     @lombok.Getter @lombok.Setter @lombok.NonNull
     @Title(prepend = "Object: ")
     @Name private String name;
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
index 254422d..e381dbe 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/types/Name.java
@@ -13,7 +13,7 @@ import org.apache.isis.applib.annotation.Property;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.spec.AbstractSpecification2;
 
-@Column(length = Name.MAX_LEN)
+@Column(length = Name.MAX_LEN, allowsNull = "false")
 @Property(mustSatisfy = Name.NoExclamationMarks.class, maxLength = Name.MAX_LEN)
 @Parameter(mustSatisfy = Name.NoExclamationMarks.class, maxLength = Name.MAX_LEN)
 @ParameterLayout(named = "Name")