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 2019/01/27 11:20:46 UTC
[isis] branch v2 updated: ISIS-2094: fixes error message relating
to @Column#allowsNull
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 26d0b85 ISIS-2094: fixes error message relating to @Column#allowsNull
26d0b85 is described below
commit 26d0b8554c0f1d7de6d115a558ae2fec1c3cbe63
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 26 11:00:13 2019 +0000
ISIS-2094: fixes error message relating to @Column#allowsNull
---
.../src/main/java/org/apache/isis/applib/annotation/Property.java | 2 +-
.../prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
index 44999b3..51591a7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
@@ -211,7 +211,7 @@ public @interface Property {
* <p>
* For properties the default value, {@link org.apache.isis.applib.annotation.Optionality#DEFAULT}, usually
* means that the property is required unless it has been overridden by {@link javax.jdo.annotations.Column}
- * with its {@link javax.jdo.annotations.Column#allowsNull() allowNulls()} attribute set to true.
+ * with its {@link javax.jdo.annotations.Column#allowsNull() allowsNull()} attribute set to true.
* </p>
*/
Optionality optionality() default Optionality.NOT_SPECIFIED;
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
index 35dda83..015fcc6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
@@ -166,9 +166,9 @@ public class MandatoryFromJdoColumnAnnotationFacetFactory extends FacetFactoryAb
if(underlying.isInvertedSemantics()) {
// ie @Optional
- validationFailures.add("%s: incompatible usage of Isis' @Optional annotation and @javax.jdo.annotations.Column; use just @javax.jdo.annotations.Column(allowNulls=\"...\")", association.getIdentifier().toClassAndNameIdentityString());
+ validationFailures.add("%s: incompatible usage of Isis' @Optional annotation and @javax.jdo.annotations.Column; use just @javax.jdo.annotations.Column(allowsNull=\"...\")", association.getIdentifier().toClassAndNameIdentityString());
} else {
- validationFailures.add("%s: incompatible Isis' default of required/optional properties vs JDO; add @javax.jdo.annotations.Column(allowNulls=\"...\")", association.getIdentifier().toClassAndNameIdentityString());
+ validationFailures.add("%s: incompatible Isis' default of required/optional properties vs JDO; add @javax.jdo.annotations.Column(allowsNull=\"...\")", association.getIdentifier().toClassAndNameIdentityString());
}
}
@@ -184,7 +184,7 @@ public class MandatoryFromJdoColumnAnnotationFacetFactory extends FacetFactoryAb
}
if(underlying.isInvertedSemantics()) {
// ie @Optional
- validationFailures.add("%s: incompatible usage of Isis' @Optional annotation and @javax.jdo.annotations.Column; use just @javax.jdo.annotations.Column(allowNulls=\"...\")", association.getIdentifier().toClassAndNameIdentityString());
+ validationFailures.add("%s: incompatible usage of Isis' @Optional annotation and @javax.jdo.annotations.Column; use just @javax.jdo.annotations.Column(allowsNull=\"...\")", association.getIdentifier().toClassAndNameIdentityString());
} else {
validationFailures.add("%s: incompatible default handling of required/optional properties between Isis and JDO; add @javax.jdo.annotations.Column(allowsNull=\"...\")", association.getIdentifier().toClassAndNameIdentityString());
}