You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/09/13 06:12:01 UTC
[isis] branch ISIS-1985-mm-validation created (now 2fbcbf7)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch ISIS-1985-mm-validation
in repository https://gitbox.apache.org/repos/asf/isis.git.
at 2fbcbf7 ISIS-1985: fixes mm validation
This branch includes the following new commits:
new 2fbcbf7 ISIS-1985: fixes mm validation
The 1 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] 01/01: ISIS-1985: fixes mm validation
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch ISIS-1985-mm-validation
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2fbcbf7a24ac0c58038ec98405b0ab455110d5bf
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 13 08:11:06 2018 +0200
ISIS-1985: fixes mm validation
Task-Url: https://issues.apache.org/jira/browse/ISIS-1985
---
.../column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../core/runtime/services/changes/ChangedObjectsServiceInternal.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
index 3ac2c15..c4e54c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -129,7 +129,7 @@ public class BigDecimalDerivedFromJdoColumnAnnotationFacetFactory extends FacetF
// skip checks if annotated with JDO @NotPersistent
if(association.containsDoOpFacet(JdoNotPersistentFacet.class)) {
- return;
+ continue;
}
validateBigDecimalValueFacet(association, validationFailures);
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 aca097c..b9199cd 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
@@ -144,7 +144,7 @@ public class MandatoryFromJdoColumnAnnotationFacetFactory extends FacetFactoryAb
// skip checks if annotated with JDO @NotPersistent
if(association.containsDoOpFacet(JdoNotPersistentFacet.class)) {
- return;
+ continue;
}
validateMandatoryFacet(association, validationFailures);
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
index ddce1f0..5b23bbe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -112,7 +112,7 @@ public class MaxLengthDerivedFromJdoColumnAnnotationFacetFactory extends FacetFa
// skip checks if annotated with JDO @NotPersistent
if(association.containsDoOpFacet(JdoNotPersistentFacet.class)) {
- return;
+ continue;
}
MaxLengthFacet facet = association.getFacet(MaxLengthFacet.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
index e704874..17203a1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
@@ -103,7 +103,7 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
}
if(enlistedObjectProperties.containsKey(aap)) {
// already enlisted, so ignore
- return;
+ continue;
}
PreAndPostValues papv = PreAndPostValues.pre(IsisTransaction.Placeholder.NEW);
enlistedObjectProperties.put(aap, papv);
@@ -174,7 +174,7 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
}
if(enlistedObjectProperties.containsKey(aap)) {
// already enlisted, so ignore
- return;
+ continue;
}
PreAndPostValues papv = PreAndPostValues.pre(aap.getPropertyValue());
enlistedObjectProperties.put(aap, papv);