This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 111b345cf9 ISIS-3010: [JDO] adds support for JPA Column annot.
111b345cf9 is described below
commit 111b345cf9262e5891f43679a6d0bdf4af18410c
Author: andi-huber <[email protected]>
AuthorDate: Fri Apr 15 12:06:37 2022 +0200
ISIS-3010: [JDO] adds support for JPA Column annot.
---
.../jdo/metamodel/JdoProgrammingModel.java | 8 +-
...alTypeFacetFromJdoPersistenceCapableFacet.java} | 6 +-
.../JdoPersistenceCapableFacetFactory.java | 12 +--
.../JdoPersistenceCapableFacetFromAnnotation.java | 36 ++++++-
...oPersistenceCapableFacetFromJpaAnnotations.java | 112 ---------------------
...igDecimalFromColumnAnnotationFacetFactory.java} | 35 ++++---
...ndatoryFacetFromAbsenceOfColumnAnnotation.java} | 4 +-
...ava => MandatoryFacetFromColumnAnnotation.java} | 4 +-
...MandatoryFromColumnAnnotationFacetFactory.java} | 60 +++--------
.../MaxFractionalDigitsFacetFromJdoColumn.java | 33 ++++--
.../MaxLengthFacetFromJdoColumnAnnotation.java | 12 ++-
...xLengthFromJdoColumnAnnotationFacetFactory.java | 17 +++-
...MaxTotalDigitsFacetFromJdoColumnAnnotation.java | 22 ++--
.../metamodel/facets/prop/column/_ColumnUtil.java | 74 ++++++++++++++
.../JdoNotPersistentAnnotationFacetFactory.java | 2 +-
.../JdoNotPersistentFacetFromJpaAnnotation.java | 30 ------
...malFromJdoColumnAnnotationFacetFactoryTest.java | 4 +-
...oryFromJdoColumnAnnotationFacetFactoryTest.java | 20 ++--
18 files changed, 238 insertions(+), 253 deletions(-)
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java
index 7a8835c313..df922c4e01 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/JdoProgrammingModel.java
@@ -36,8 +36,8 @@ import
org.apache.isis.persistence.jdo.metamodel.facets.object.datastoreidentity
import
org.apache.isis.persistence.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetFactory;
import
org.apache.isis.persistence.jdo.metamodel.facets.object.query.JdoQueryAnnotationFacetFactory;
import
org.apache.isis.persistence.jdo.metamodel.facets.object.version.JdoVersionAnnotationFacetFactory;
-import
org.apache.isis.persistence.jdo.metamodel.facets.prop.column.BigDecimalFromJdoColumnAnnotationFacetFactory;
-import
org.apache.isis.persistence.jdo.metamodel.facets.prop.column.MandatoryFromJdoColumnAnnotationFacetFactory;
+import
org.apache.isis.persistence.jdo.metamodel.facets.prop.column.BigDecimalFromColumnAnnotationFacetFactory;
+import
org.apache.isis.persistence.jdo.metamodel.facets.prop.column.MandatoryFromColumnAnnotationFacetFactory;
import
org.apache.isis.persistence.jdo.metamodel.facets.prop.column.MaxLengthFromJdoColumnAnnotationFacetFactory;
import
org.apache.isis.persistence.jdo.metamodel.facets.prop.notpersistent.JdoNotPersistentAnnotationFacetFactory;
import
org.apache.isis.persistence.jdo.metamodel.facets.prop.primarykey.JdoPrimaryKeyAnnotationFacetFactory;
@@ -82,12 +82,12 @@ public class JdoProgrammingModel implements
MetaModelRefiner {
pm.addFactory(step2, new JdoQueryAnnotationFacetFactory(mmc,
jdoFacetContext), Marker.JDO);
- pm.addFactory(step2, new
BigDecimalFromJdoColumnAnnotationFacetFactory(mmc), Marker.JDO);
+ pm.addFactory(step2, new
BigDecimalFromColumnAnnotationFacetFactory(mmc), Marker.JDO);
pm.addFactory(step2, new
MaxLengthFromJdoColumnAnnotationFacetFactory(mmc), Marker.JDO);
// must appear after JdoPrimaryKeyAnnotationFacetFactory (above)
// and also MandatoryFacetOnPropertyMandatoryAnnotationFactory
// and also PropertyAnnotationFactory
- pm.addFactory(step2, new
MandatoryFromJdoColumnAnnotationFacetFactory(mmc, jdoFacetContext), Marker.JDO);
+ pm.addFactory(step2, new
MandatoryFromColumnAnnotationFacetFactory(mmc, jdoFacetContext), Marker.JDO);
// -- validators
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetFromJdoPersistenceCapableAnnotation.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetFromJdoPersistenceCapableFacet.java
similarity index 94%
rename from
persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetFromJdoPersistenceCapableAnnotation.java
rename to
persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetFromJdoPersistenceCapableFacet.java
index 5fa71153d3..9348df7713 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetFromJdoPersistenceCapableAnnotation.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/LogicalTypeFacetFromJdoPersistenceCapableFacet.java
@@ -28,7 +28,7 @@ import
org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacet
import
org.apache.isis.core.metamodel.facets.object.logicaltype.LogicalTypeFacetAbstract;
import
org.apache.isis.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
-public class LogicalTypeFacetFromJdoPersistenceCapableAnnotation
+public class LogicalTypeFacetFromJdoPersistenceCapableFacet
extends LogicalTypeFacetAbstract {
public static Optional<LogicalTypeFacet> create(
@@ -45,12 +45,12 @@ extends LogicalTypeFacetAbstract {
}
final String logicalTypeName =
schema.toLowerCase(Locale.ROOT) + "." +
persistenceCapableFacet.getTable();
- return Optional.of(new
LogicalTypeFacetFromJdoPersistenceCapableAnnotation(
+ return Optional.of(new LogicalTypeFacetFromJdoPersistenceCapableFacet(
LogicalType.eager(correspondingClass, logicalTypeName),
holder));
}
- private LogicalTypeFacetFromJdoPersistenceCapableAnnotation(
+ private LogicalTypeFacetFromJdoPersistenceCapableFacet(
final LogicalType logicalType,
final FacetHolder holder) {
super(logicalType, holder, Precedence.INFERRED);
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java
index 06834611a9..727721124d 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFactory.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.ObjectTypeFacetFactory;
import
org.apache.isis.core.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory;
-import
org.apache.isis.persistence.jdo.metamodel.facets.object.domainobject.objectspecid.LogicalTypeFacetFromJdoPersistenceCapableAnnotation;
+import
org.apache.isis.persistence.jdo.metamodel.facets.object.domainobject.objectspecid.LogicalTypeFacetFromJdoPersistenceCapableFacet;
import org.apache.isis.persistence.jdo.provider.entities.JdoFacetContext;
import lombok.val;
@@ -80,11 +80,11 @@ implements ObjectTypeFacetFactory {
return FacetUtil.addFacetIfPresent(
JdoPersistenceCapableFacetFromAnnotation
- .create(persistenceCapableIfAny, embeddedOnlyIfAny, cls,
facetHolder))
+ .createUsingJdo(persistenceCapableIfAny, embeddedOnlyIfAny,
cls, facetHolder))
.map(jdoPersistenceCapableFacet->{
FacetUtil.addFacetIfPresent(
- LogicalTypeFacetFromJdoPersistenceCapableAnnotation
+ LogicalTypeFacetFromJdoPersistenceCapableFacet
.create(jdoPersistenceCapableFacet, cls, facetHolder));
FacetUtil.addFacet(
@@ -108,12 +108,12 @@ implements ObjectTypeFacetFactory {
val tableIfAny = processClassContext.synthesizeOnType(Table.class);
FacetUtil.addFacetIfPresent(
- JdoPersistenceCapableFacetFromJpaAnnotations
- .create(entityIfAny, tableIfAny, cls, facetHolder))
+ JdoPersistenceCapableFacetFromAnnotation
+ .createUsingJpa(entityIfAny, tableIfAny, cls, facetHolder))
.ifPresent(jdoPersistenceCapableFacet->{
FacetUtil.addFacetIfPresent(
- LogicalTypeFacetFromJdoPersistenceCapableAnnotation
+ LogicalTypeFacetFromJdoPersistenceCapableFacet
.create(jdoPersistenceCapableFacet, cls, facetHolder));
FacetUtil.addFacet(
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromAnnotation.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromAnnotation.java
index c2ee1590df..614514f2cd 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromAnnotation.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromAnnotation.java
@@ -24,6 +24,8 @@ import java.util.function.BiConsumer;
import javax.jdo.annotations.EmbeddedOnly;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.PersistenceCapable;
+import javax.persistence.Entity;
+import javax.persistence.Table;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
@@ -40,7 +42,7 @@ implements JdoPersistenceCapableFacet {
private final String table;
private final IdentityType identityType;
- public static Optional<JdoPersistenceCapableFacet> create(
+ public static Optional<JdoPersistenceCapableFacet> createUsingJdo(
final Optional<PersistenceCapable> persistenceCapableIfAny,
final Optional<EmbeddedOnly> embeddedOnlyIfAny,
final Class<?> cls,
@@ -77,6 +79,38 @@ implements JdoPersistenceCapableFacet {
}
+ public static Optional<JdoPersistenceCapableFacet> createUsingJpa(
+ final Optional<Entity> entityIfAny,
+ final Optional<Table> tableIfAny,
+ final Class<?> cls,
+ final FacetHolder facetHolder) {
+
+ if(!entityIfAny.isPresent()) {
+ return Optional.empty();
+ }
+
+ //val entity = entityIfAny.get(); // optionally has a name, we don't
use yet
+
+ val table = tableIfAny
+ .map(tableAnnot->tableAnnot.name())
+ .map(_Strings::emptyToNull)
+ .orElseGet(cls::getSimpleName);
+
+ val schema = tableIfAny
+ .map(tableAnnot->tableAnnot.schema())
+ .map(_Strings::emptyToNull)
+ .orElseGet(cls::getSimpleName);
+
+
+ val identityType = IdentityType.UNSPECIFIED;
+
+ return Optional.of(new JdoPersistenceCapableFacetFromAnnotation(
+ schema,
+ table,
+ identityType,
+ facetHolder));
+ }
+
private JdoPersistenceCapableFacetFromAnnotation(
final String schemaName,
final String tableOrTypeName,
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromJpaAnnotations.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromJpaAnnotations.java
deleted file mode 100644
index 9cc96f11e3..0000000000
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetFromJpaAnnotations.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package
org.apache.isis.persistence.jdo.metamodel.facets.object.persistencecapable;
-
-import java.util.Optional;
-import java.util.function.BiConsumer;
-
-import javax.jdo.annotations.IdentityType;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import
org.apache.isis.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
-
-import lombok.val;
-
-public class JdoPersistenceCapableFacetFromJpaAnnotations
-extends FacetAbstract
-implements JdoPersistenceCapableFacet {
-
- private final String schema;
- private final String table;
- private final IdentityType identityType;
-
- public static Optional<JdoPersistenceCapableFacet> create(
- final Optional<Entity> entityIfAny,
- final Optional<Table> tableIfAny,
- final Class<?> cls,
- final FacetHolder facetHolder) {
-
- if(!entityIfAny.isPresent()) {
- return Optional.empty();
- }
-
- //val entity = entityIfAny.get(); // optionally has a name, we don't
use yet
-
- val table = tableIfAny
- .map(tableAnnot->tableAnnot.name())
- .map(_Strings::emptyToNull)
- .orElseGet(cls::getSimpleName);
-
- val schema = tableIfAny
- .map(tableAnnot->tableAnnot.schema())
- .map(_Strings::emptyToNull)
- .orElseGet(cls::getSimpleName);
-
-
- val identityType = IdentityType.UNSPECIFIED;
-
- return Optional.of(new JdoPersistenceCapableFacetFromJpaAnnotations(
- schema,
- table,
- identityType,
- facetHolder));
-
- }
-
- private JdoPersistenceCapableFacetFromJpaAnnotations(
- final String schemaName,
- final String tableOrTypeName,
- final IdentityType identityType,
- final FacetHolder holder) {
-
- super(JdoPersistenceCapableFacet.class, holder);
- this.schema = schemaName;
- this.table = tableOrTypeName;
- this.identityType = identityType;
- }
-
- @Override
- public IdentityType getIdentityType() {
- return identityType;
- }
-
- @Override
- public String getSchema() {
- return schema;
- }
-
- @Override
- public String getTable() {
- return table;
- }
-
- @Override
- public void visitAttributes(final BiConsumer<String, Object> visitor) {
- super.visitAttributes(visitor);
- visitor.accept("schema", schema);
- visitor.accept("table", table);
- visitor.accept("identityType", identityType);
- }
-
-
-}
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactory.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java
similarity index 82%
rename from
persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactory.java
rename to
persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java
index ebb601238e..60117d6836 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactory.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromColumnAnnotationFacetFactory.java
@@ -21,7 +21,6 @@ package
org.apache.isis.persistence.jdo.metamodel.facets.prop.column;
import java.math.BigDecimal;
import javax.inject.Inject;
-import javax.jdo.annotations.Column;
import javax.jdo.annotations.IdentityType;
import org.apache.isis.core.metamodel.context.MetaModelContext;
@@ -38,14 +37,12 @@ import
org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
import
org.apache.isis.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
import
org.apache.isis.persistence.jdo.provider.metamodel.facets.prop.notpersistent.JdoNotPersistentFacet;
-import lombok.val;
-
-public class BigDecimalFromJdoColumnAnnotationFacetFactory
+public class BigDecimalFromColumnAnnotationFacetFactory
extends FacetFactoryAbstract
implements MetaModelRefiner {
@Inject
- public BigDecimalFromJdoColumnAnnotationFacetFactory(final
MetaModelContext mmc) {
+ public BigDecimalFromColumnAnnotationFacetFactory(final MetaModelContext
mmc) {
super(mmc, FeatureType.PROPERTIES_ONLY);
}
@@ -58,15 +55,25 @@ implements MetaModelRefiner {
final FacetedMethod holder = processMethodContext.getFacetHolder();
- val jdoColumnIfAny =
processMethodContext.synthesizeOnMethod(Column.class);
-
- addFacetIfPresent(
- MaxTotalDigitsFacetFromJdoColumnAnnotation
- .create(jdoColumnIfAny, holder));
-
- addFacetIfPresent(
- MaxFractionalDigitsFacetFromJdoColumn
- .create(jdoColumnIfAny, holder));
+ _ColumnUtil.processColumnAnnotations(processMethodContext,
+ jdoColumnIfAny->{
+ addFacetIfPresent(
+ MaxTotalDigitsFacetFromJdoColumnAnnotation
+ .createJdo(jdoColumnIfAny, holder));
+
+ addFacetIfPresent(
+ MaxFractionalDigitsFacetFromJdoColumn
+ .createJdo(jdoColumnIfAny, holder));
+ },
+ jpaColumnIfAny->{
+ addFacetIfPresent(
+ MaxTotalDigitsFacetFromJdoColumnAnnotation
+ .createJpa(jpaColumnIfAny, holder));
+
+ addFacetIfPresent(
+ MaxFractionalDigitsFacetFromJdoColumn
+ .createJpa(jpaColumnIfAny, holder));
+ });
}
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfJdoColumnAnnotation.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java
similarity index 91%
rename from
persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfJdoColumnAnnotation.java
rename to
persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java
index 9a2c6d9fc4..68fb2e08ec 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfJdoColumnAnnotation.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromAbsenceOfColumnAnnotation.java
@@ -24,10 +24,10 @@ import
org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFace
/**
* Inferred from absence of an <tt>@Column</tt> method.
*/
-public class MandatoryFacetFromAbsenceOfJdoColumnAnnotation
+public class MandatoryFacetFromAbsenceOfColumnAnnotation
extends MandatoryFacetAbstract {
- public MandatoryFacetFromAbsenceOfJdoColumnAnnotation(
+ public MandatoryFacetFromAbsenceOfColumnAnnotation(
final FacetHolder holder, final Semantics semantics, Precedence
precedence) {
super(holder, semantics, precedence);
}
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromJdoColumnAnnotation.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromColumnAnnotation.java
similarity index 92%
rename from
persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromJdoColumnAnnotation.java
rename to
persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromColumnAnnotation.java
index d657436460..181ff812d5 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromJdoColumnAnnotation.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFacetFromColumnAnnotation.java
@@ -24,10 +24,10 @@ import
org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFace
/**
* Inferred from presence of an <tt>@Column</tt> method.
*/
-public class MandatoryFacetFromJdoColumnAnnotation
+public class MandatoryFacetFromColumnAnnotation
extends MandatoryFacetAbstract {
- public MandatoryFacetFromJdoColumnAnnotation(
+ public MandatoryFacetFromColumnAnnotation(
final FacetHolder holder, final Semantics semantics) {
super(holder, semantics);
}
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java
similarity index 75%
rename from
persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
rename to
persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java
index 12bc8ad624..d71359e2ca 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromColumnAnnotationFacetFactory.java
@@ -18,14 +18,11 @@
*/
package org.apache.isis.persistence.jdo.metamodel.facets.prop.column;
-import java.util.Optional;
import java.util.stream.Stream;
import javax.inject.Inject;
-import javax.jdo.annotations.Column;
import javax.jdo.annotations.IdentityType;
-import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.Facet.Precedence;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -34,7 +31,6 @@ import
org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import
org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
-import
org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet.Semantics;
import
org.apache.isis.core.metamodel.facets.properties.property.mandatory.MandatoryFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
@@ -45,17 +41,15 @@ import
org.apache.isis.persistence.jdo.provider.entities.JdoFacetContext;
import
org.apache.isis.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
import
org.apache.isis.persistence.jdo.provider.metamodel.facets.prop.notpersistent.JdoNotPersistentFacet;
-import lombok.val;
-
-public class MandatoryFromJdoColumnAnnotationFacetFactory
+public class MandatoryFromColumnAnnotationFacetFactory
extends FacetFactoryAbstract
implements MetaModelRefiner {
private final JdoFacetContext jdoFacetContext;
@Inject
- public MandatoryFromJdoColumnAnnotationFacetFactory(
+ public MandatoryFromColumnAnnotationFacetFactory(
final MetaModelContext mmc,
final JdoFacetContext jdoFacetContext) {
super(mmc, FeatureType.PROPERTIES_ONLY);
@@ -88,42 +82,20 @@ implements MetaModelRefiner {
}
}
- val columnIfAny =
processMethodContext.synthesizeOnMethod(Column.class);
-
- val semantics = inferSemantics(processMethodContext, columnIfAny);
-
- FacetUtil.addFacet(
- columnIfAny.isPresent()
- ? new MandatoryFacetFromJdoColumnAnnotation(holder,
semantics)
- : new MandatoryFacetFromAbsenceOfJdoColumnAnnotation(
- holder,
- semantics,
- semantics.isRequired()
- ? Precedence.DEFAULT
- : Precedence.INFERRED)
- );
-
- }
-
- private static Semantics inferSemantics(
- final ProcessMethodContext processMethodContext,
- final Optional<Column> columnIfAny) {
-
- final String allowsNull = columnIfAny.isPresent()
- ? columnIfAny.get().allowsNull()
- : null;
-
- if(_Strings.isNotEmpty(allowsNull)) {
- // if miss-spelled, then DN assumes is not-nullable
- return Semantics.of(!"true".equalsIgnoreCase(allowsNull.trim()));
- }
-
- final Class<?> returnType =
processMethodContext.getMethod().getReturnType();
- // per JDO spec
- return returnType != null
- && returnType.isPrimitive()
- ? Semantics.REQUIRED
- : Semantics.OPTIONAL;
+ _ColumnUtil.inferSemantics(processMethodContext,
+ semanticsWhileColumnPresent->{
+ FacetUtil.addFacet(
+ new MandatoryFacetFromColumnAnnotation(holder,
semanticsWhileColumnPresent));
+ },
+ semanticsWhileColumnAbsent->{
+ FacetUtil.addFacet(
+ new MandatoryFacetFromAbsenceOfColumnAnnotation(
+ holder,
+ semanticsWhileColumnAbsent,
+ semanticsWhileColumnAbsent.isRequired()
+ ? Precedence.DEFAULT
+ : Precedence.INFERRED));
+ });
}
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxFractionalDigitsFacetFromJdoColumn.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxFractionalDigitsFacetFromJdoColumn.java
index f87f7843d4..c5a04eb0c3 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxFractionalDigitsFacetFromJdoColumn.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxFractionalDigitsFacetFromJdoColumn.java
@@ -29,16 +29,28 @@ import
org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDig
public class MaxFractionalDigitsFacetFromJdoColumn
extends MaxFractionalDigitsFacetAbstract {
- public static Optional<MaxFractionalDigitsFacet> create(
- final Optional<Column> jdoColumnIfAny,
- final FacetHolder holder) {
-
- return jdoColumnIfAny
- .filter(jdoColumn->jdoColumn.scale()>=0)
- .map(jdoColumn->{
- return new MaxFractionalDigitsFacetFromJdoColumn(
- jdoColumn.scale(), holder);
- });
+ public static Optional<MaxFractionalDigitsFacet> createJdo(
+ final Optional<Column> jdoColumnIfAny,
+ final FacetHolder holder) {
+
+ return jdoColumnIfAny
+ .filter(jdoColumn->jdoColumn.scale()>=0)
+ .map(jdoColumn->{
+ return new MaxFractionalDigitsFacetFromJdoColumn(
+ jdoColumn.scale(), holder);
+ });
+ }
+
+ public static Optional<MaxFractionalDigitsFacet> createJpa(
+ final Optional<javax.persistence.Column> jdoColumnIfAny,
+ final FacetHolder holder) {
+
+ return jdoColumnIfAny
+ .filter(jdoColumn->jdoColumn.scale()>=0)
+ .map(jdoColumn->{
+ return new MaxFractionalDigitsFacetFromJdoColumn(
+ jdoColumn.scale(), holder);
+ });
}
private MaxFractionalDigitsFacetFromJdoColumn(
@@ -46,4 +58,5 @@ extends MaxFractionalDigitsFacetAbstract {
super(maxFractionalDigits, holder);
}
+
}
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFacetFromJdoColumnAnnotation.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFacetFromJdoColumnAnnotation.java
index 7371dbc05b..0b29256466 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFacetFromJdoColumnAnnotation.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFacetFromJdoColumnAnnotation.java
@@ -29,7 +29,7 @@ import
org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacetAb
public class MaxLengthFacetFromJdoColumnAnnotation
extends MaxLengthFacetAbstract {
- public static Optional<MaxLengthFacet> create(
+ public static Optional<MaxLengthFacet> createJdo(
final Optional<Column> jdoColumnIfAny,
final FacetHolder holder) {
@@ -39,6 +39,16 @@ extends MaxLengthFacetAbstract {
jdoColumn.length(), holder));
}
+ public static Optional<MaxLengthFacet> createJpa(
+ final Optional<javax.persistence.Column> jpaColumnIfAny,
+ final FacetHolder holder) {
+
+ return jpaColumnIfAny
+ .map(jdoColumn->
+ new MaxLengthFacetFromJdoColumnAnnotation(
+ jdoColumn.length(), holder));
+ }
+
private MaxLengthFacetFromJdoColumnAnnotation(
final int maxLength, final FacetHolder holder) {
super(maxLength, holder);
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java
index 6824fb6fb5..b3d329923d 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthFromJdoColumnAnnotationFacetFactory.java
@@ -21,7 +21,6 @@ package
org.apache.isis.persistence.jdo.metamodel.facets.prop.column;
import java.util.stream.Stream;
import javax.inject.Inject;
-import javax.jdo.annotations.Column;
import javax.jdo.annotations.IdentityType;
import org.apache.isis.core.metamodel.context.MetaModelContext;
@@ -62,13 +61,21 @@ implements MetaModelRefiner {
if(String.class != processMethodContext.getMethod().getReturnType()) {
return;
}
- val jdoColumnIfAny =
processMethodContext.synthesizeOnMethod(Column.class);
val facetHolder = processMethodContext.getFacetHolder();
- FacetUtil.addFacetIfPresent(
- MaxTotalDigitsFacetFromJdoColumnAnnotation
- .create(jdoColumnIfAny, facetHolder));
+ _ColumnUtil.processColumnAnnotations(processMethodContext,
+ jdoColumnIfAny->{
+ FacetUtil.addFacetIfPresent(
+ MaxTotalDigitsFacetFromJdoColumnAnnotation
+ .createJdo(jdoColumnIfAny, facetHolder));
+ },
+ jpaColumnIfAny->{
+ FacetUtil.addFacetIfPresent(
+ MaxTotalDigitsFacetFromJdoColumnAnnotation
+ .createJpa(jpaColumnIfAny, facetHolder));
+ });
+
}
@Override
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxTotalDigitsFacetFromJdoColumnAnnotation.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxTotalDigitsFacetFromJdoColumnAnnotation.java
index 7490be517c..52c5cd1186 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxTotalDigitsFacetFromJdoColumnAnnotation.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxTotalDigitsFacetFromJdoColumnAnnotation.java
@@ -29,15 +29,26 @@ import
org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFa
public class MaxTotalDigitsFacetFromJdoColumnAnnotation
extends MaxTotalDigitsFacetAbstract {
- public static Optional<MaxTotalDigitsFacet> create(
+ public static Optional<MaxTotalDigitsFacet> createJdo(
final Optional<Column> jdoColumnIfAny,
final FacetHolder holder) {
return jdoColumnIfAny
- .filter(jdoColumn->jdoColumn.length()>=0)
- .map(jdoColumn->
- new MaxTotalDigitsFacetFromJdoColumnAnnotation(
- jdoColumn.length(), holder));
+ .filter(jdoColumn->jdoColumn.length()>=0)
+ .map(jdoColumn->
+ new MaxTotalDigitsFacetFromJdoColumnAnnotation(
+ jdoColumn.length(), holder));
+ }
+
+ public static Optional<MaxTotalDigitsFacet> createJpa(
+ final Optional<javax.persistence.Column> jpaColumnIfAny,
+ final FacetHolder holder) {
+
+ return jpaColumnIfAny
+ .filter(jpaColumn->jpaColumn.length()>=0)
+ .map(jpaColumn->
+ new MaxTotalDigitsFacetFromJdoColumnAnnotation(
+ jpaColumn.length(), holder));
}
private MaxTotalDigitsFacetFromJdoColumnAnnotation(
@@ -45,5 +56,4 @@ extends MaxTotalDigitsFacetAbstract {
super(maxTotalDigits, holder);
}
-
}
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/_ColumnUtil.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/_ColumnUtil.java
new file mode 100644
index 0000000000..7a8dafbb62
--- /dev/null
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/_ColumnUtil.java
@@ -0,0 +1,74 @@
+package org.apache.isis.persistence.jdo.metamodel.facets.prop.column;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import javax.jdo.annotations.Column;
+
+import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
+import
org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet.Semantics;
+
+import lombok.val;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+class _ColumnUtil {
+
+ void processColumnAnnotations(final ProcessMethodContext
processMethodContext,
+ final Consumer<Optional<javax.jdo.annotations.Column>> onJdoColumn,
+ final Consumer<Optional<javax.persistence.Column>> onJpaColumn) {
+
+ val jdoColumnIfAny =
processMethodContext.synthesizeOnMethod(javax.jdo.annotations.Column.class);
+ if(jdoColumnIfAny.isPresent()) {
+ onJdoColumn.accept(jdoColumnIfAny);
+ } else {
+ val jpaColumnIfAny =
processMethodContext.synthesizeOnMethod(javax.persistence.Column.class);
+ if(jpaColumnIfAny.isPresent()) {
+ onJpaColumn.accept(jpaColumnIfAny);
+ }
+ }
+
+ }
+
+ void inferSemantics(final ProcessMethodContext processMethodContext,
+ final Consumer<Semantics> onColumnPresent,
+ final Consumer<Semantics> onColumnNotPresent) {
+ val jdoColumnIfAny =
processMethodContext.synthesizeOnMethod(javax.jdo.annotations.Column.class);
+ if(jdoColumnIfAny.isPresent()) {
+ onColumnPresent.accept(inferSemantics(processMethodContext,
jdoColumnIfAny));
+ return;
+ }
+ val jpaColumnIfAny =
processMethodContext.synthesizeOnMethod(javax.persistence.Column.class);
+ if(jpaColumnIfAny.isPresent()) {
+
onColumnPresent.accept(Semantics.of(!jpaColumnIfAny.get().nullable()));
+ return;
+ }
+ onColumnNotPresent.accept(inferSemantics(processMethodContext,
Optional.empty()));
+ }
+
+ // -- HELPER
+
+ private Semantics inferSemantics(
+ final ProcessMethodContext processMethodContext,
+ final Optional<Column> columnIfAny) {
+
+ final String allowsNull = columnIfAny.isPresent()
+ ? columnIfAny.get().allowsNull()
+ : null;
+
+ if(_Strings.isNotEmpty(allowsNull)) {
+ // if miss-spelled, then DN assumes is not-nullable
+ return Semantics.of(!"true".equalsIgnoreCase(allowsNull.trim()));
+ }
+
+ final Class<?> returnType =
processMethodContext.getMethod().getReturnType();
+ // per JDO spec
+ return returnType != null
+ && returnType.isPrimitive()
+ ? Semantics.REQUIRED
+ : Semantics.OPTIONAL;
+
+ }
+
+}
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
index c6d7ab21cd..8c0a4eb783 100644
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
+++
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
@@ -85,7 +85,7 @@ extends FacetFactoryAbstract {
}
val facetHolder = processMethodContext.getFacetHolder();
- FacetUtil.addFacet(new
JdoNotPersistentFacetFromJpaAnnotation(facetHolder));
+ FacetUtil.addFacet(new
JdoNotPersistentFacetFromAnnotation(facetHolder));
}
diff --git
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetFromJpaAnnotation.java
b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetFromJpaAnnotation.java
deleted file mode 100644
index 2cae95b3b6..0000000000
---
a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetFromJpaAnnotation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.persistence.jdo.metamodel.facets.prop.notpersistent;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
-
-public class JdoNotPersistentFacetFromJpaAnnotation extends
JdoNotPersistentFacetAbstract {
-
- public JdoNotPersistentFacetFromJpaAnnotation(final FacetHolder holder) {
- super(holder);
- }
-
-}
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
index 4b27ef77af..07e894ca85 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalFromJdoColumnAnnotationFacetFactoryTest.java
@@ -36,14 +36,14 @@ import lombok.val;
public class BigDecimalFromJdoColumnAnnotationFacetFactoryTest
extends AbstractFacetFactoryTest {
- private BigDecimalFromJdoColumnAnnotationFacetFactory facetFactory;
+ private BigDecimalFromColumnAnnotationFacetFactory facetFactory;
@Override
protected void setUp() throws Exception {
super.setUp();
val mmc = MetaModelContext_forTesting.buildDefault();
- facetFactory = new BigDecimalFromJdoColumnAnnotationFacetFactory(mmc);
+ facetFactory = new BigDecimalFromColumnAnnotationFacetFactory(mmc);
}
@Override
diff --git
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
index dd4d23a8c7..dcddb5f90d 100644
---
a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
+++
b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactoryTest.java
@@ -33,14 +33,14 @@ import lombok.val;
public class MandatoryFromJdoColumnAnnotationFacetFactoryTest
extends AbstractFacetFactoryTest {
- private MandatoryFromJdoColumnAnnotationFacetFactory facetFactory;
+ private MandatoryFromColumnAnnotationFacetFactory facetFactory;
private Class<?> cls;
@Override
protected void setUp() throws Exception {
super.setUp();
- facetFactory = new
MandatoryFromJdoColumnAnnotationFacetFactory(metaModelContext, jdoFacetContext);
+ facetFactory = new
MandatoryFromColumnAnnotationFacetFactory(metaModelContext, jdoFacetContext);
cls = SimpleObjectWithColumnAllowsNullAnnotations.class;
}
@@ -66,7 +66,7 @@ extends AbstractFacetFactoryTest {
final MandatoryFacet facet =
facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof
MandatoryFacetFromAbsenceOfJdoColumnAnnotation);
+ assertTrue(facet instanceof
MandatoryFacetFromAbsenceOfColumnAnnotation);
assertThat(facet.getSemantics().isOptional(), is(false));
}
@@ -77,7 +77,7 @@ extends AbstractFacetFactoryTest {
final MandatoryFacet facet =
facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof MandatoryFacetFromJdoColumnAnnotation);
+ assertTrue(facet instanceof MandatoryFacetFromColumnAnnotation);
assertThat(facet.getSemantics().isOptional(), is(false));
}
@@ -88,7 +88,7 @@ extends AbstractFacetFactoryTest {
final MandatoryFacet facet =
facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof MandatoryFacetFromJdoColumnAnnotation);
+ assertTrue(facet instanceof MandatoryFacetFromColumnAnnotation);
assertThat(facet.getSemantics().isOptional(), is(false));
}
@@ -99,7 +99,7 @@ extends AbstractFacetFactoryTest {
final MandatoryFacet facet =
facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof MandatoryFacetFromJdoColumnAnnotation);
+ assertTrue(facet instanceof MandatoryFacetFromColumnAnnotation);
assertThat(facet.getSemantics().isOptional(), is(true));
}
@@ -110,7 +110,7 @@ extends AbstractFacetFactoryTest {
final MandatoryFacet facet =
facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof
MandatoryFacetFromAbsenceOfJdoColumnAnnotation);
+ assertTrue(facet instanceof
MandatoryFacetFromAbsenceOfColumnAnnotation);
assertThat(facet.getSemantics().isOptional(), is(true));
}
@@ -121,7 +121,7 @@ extends AbstractFacetFactoryTest {
final MandatoryFacet facet =
facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof MandatoryFacetFromJdoColumnAnnotation);
+ assertTrue(facet instanceof MandatoryFacetFromColumnAnnotation);
assertThat(facet.getSemantics().isOptional(), is(true));
}
@@ -132,7 +132,7 @@ extends AbstractFacetFactoryTest {
final MandatoryFacet facet =
facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof MandatoryFacetFromJdoColumnAnnotation);
+ assertTrue(facet instanceof MandatoryFacetFromColumnAnnotation);
assertThat(facet.getSemantics().isOptional(), is(false));
}
@@ -143,7 +143,7 @@ extends AbstractFacetFactoryTest {
final MandatoryFacet facet =
facetedMethod.getFacet(MandatoryFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof MandatoryFacetFromJdoColumnAnnotation);
+ assertTrue(facet instanceof MandatoryFacetFromColumnAnnotation);
assertThat(facet.getSemantics().isOptional(), is(true));
}
