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/03/01 13:07:33 UTC
[isis] branch master updated: ISIS-1841 refactor check for enhanced
classes into utility class
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 0b49491 ISIS-1841 refactor check for enhanced classes into utility class
0b49491 is described below
commit 0b49491b6eac12e015a453c85ab071e060c54d5d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 1 14:07:30 2018 +0100
ISIS-1841 refactor check for enhanced classes into utility class
---
.../java/org/apache/isis/core/commons/util/MetaInfo.java | 9 +++++++++
.../facets/jaxb/XmlJavaTypeAdapterFacetFactory.java | 9 ++++-----
.../services/metamodel/MetaModelServiceDefault.java | 13 ++++++-------
.../JdoDatastoreIdentityAnnotationFacetFactory.java | 3 ++-
.../JdoDiscriminatorAnnotationFacetFactory.java | 4 +++-
.../JdoPersistenceCapableAnnotationFacetFactory.java | 3 ++-
.../facets/object/query/JdoQueryAnnotationFacetFactory.java | 3 ++-
.../object/version/JdoVersionAnnotationFacetFactory.java | 3 ++-
.../MandatoryFromJdoColumnAnnotationFacetFactory.java | 3 ++-
...MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java | 7 ++++---
.../JdoNotPersistentAnnotationFacetFactory.java | 3 ++-
.../primarykey/JdoPrimaryKeyAnnotationFacetFactory.java | 3 ++-
12 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/util/MetaInfo.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/util/MetaInfo.java
new file mode 100644
index 0000000..fe1b6c3
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/util/MetaInfo.java
@@ -0,0 +1,9 @@
+package org.apache.isis.core.commons.util;
+
+public class MetaInfo {
+
+ public static boolean isPersistenceEnhanced(Class<?> cls) {
+ return org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls);
+ }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlJavaTypeAdapterFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlJavaTypeAdapterFacetFactory.java
index 8f102cc..dd4cd3a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlJavaTypeAdapterFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/jaxb/XmlJavaTypeAdapterFacetFactory.java
@@ -27,11 +27,8 @@ import java.util.List;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import com.google.common.collect.Lists;
-
-import org.datanucleus.enhancement.Persistable;
-
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -49,6 +46,8 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorCom
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVisiting;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
+import com.google.common.collect.Lists;
+
/**
* just adds a validator
*/
@@ -239,7 +238,7 @@ public class XmlJavaTypeAdapterFacetFactory extends FacetFactoryAbstract
final ObjectSpecification propertyTypeSpec = property.getSpecification();
final Class<?> propertyType = propertyTypeSpec.getCorrespondingClass();
- if (!Persistable.class.isAssignableFrom(propertyType)) {
+ if (!MetaInfo.isPersistenceEnhanced(propertyType)) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 9e5b34c..df93156 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -22,12 +22,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import com.google.common.collect.Lists;
-
-import org.datanucleus.enhancement.Persistable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.AppManifest2;
import org.apache.isis.applib.annotation.DomainService;
@@ -38,6 +32,7 @@ import org.apache.isis.applib.services.command.CommandDtoProcessor;
import org.apache.isis.applib.services.grid.GridService;
import org.apache.isis.applib.services.metamodel.DomainMember;
import org.apache.isis.applib.services.metamodel.MetaModelService;
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId;
@@ -52,6 +47,10 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Lists;
@DomainService(
nature = NatureOfService.DOMAIN,
@@ -195,7 +194,7 @@ public class MetaModelServiceDefault implements MetaModelService {
return Sort.COLLECTION;
}
final Class<?> correspondingClass = objectSpec.getCorrespondingClass();
- if(Persistable.class.isAssignableFrom(correspondingClass)) {
+ if(MetaInfo.isPersistenceEnhanced(correspondingClass)) {
return Sort.JDO_ENTITY;
}
if(mode == Mode.RELAXED) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
index 6dea94d..ffead7e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java
@@ -22,6 +22,7 @@ package org.apache.isis.objectstore.jdo.metamodel.facets.object.datastoreidentit
import javax.jdo.annotations.DatastoreIdentity;
import javax.jdo.annotations.IdGeneratorStrategy;
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
@@ -39,7 +40,7 @@ public class JdoDatastoreIdentityAnnotationFacetFactory extends FacetFactoryAbst
final Class<?> cls = processClassContext.getCls();
// only applies to JDO entities; ignore any view models
- if(!org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls)) {
+ if(!MetaInfo.isPersistenceEnhanced(cls)) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
index 303f24c..dac67af 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
@@ -21,6 +21,8 @@ package org.apache.isis.objectstore.jdo.metamodel.facets.object.discriminator;
import javax.jdo.annotations.Discriminator;
import com.google.common.base.Strings;
+
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -42,7 +44,7 @@ public class JdoDiscriminatorAnnotationFacetFactory extends FacetFactoryAbstract
// only applies to JDO entities; ignore any view models
final Class<?> cls = processClassContext.getCls();
- if(!org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls)) {
+ if(!MetaInfo.isPersistenceEnhanced(cls)) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
index 4ea41a2..b5eda93 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java
@@ -24,6 +24,7 @@ import javax.jdo.annotations.PersistenceCapable;
import com.google.common.base.Strings;
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
@@ -41,7 +42,7 @@ public class JdoPersistenceCapableAnnotationFacetFactory extends FacetFactoryAbs
final Class<?> cls = processClassContext.getCls();
// only applies to JDO entities; ignore any view models
- if(!org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls)) {
+ if(!MetaInfo.isPersistenceEnhanced(cls)) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
index fc4d045..000cc13 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
@@ -25,6 +25,7 @@ import javax.jdo.annotations.Queries;
import javax.jdo.annotations.Query;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -53,7 +54,7 @@ public class JdoQueryAnnotationFacetFactory extends FacetFactoryAbstract impleme
final Class<?> cls = processClassContext.getCls();
// only applies to JDO entities; ignore any view models
- if(!org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls)) {
+ if(!MetaInfo.isPersistenceEnhanced(cls)) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
index 438d900..0792afb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java
@@ -22,6 +22,7 @@ package org.apache.isis.objectstore.jdo.metamodel.facets.object.version;
import javax.jdo.annotations.Version;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
@@ -45,7 +46,7 @@ public class JdoVersionAnnotationFacetFactory extends FacetFactoryAbstract imple
final Class<?> cls = processClassContext.getCls();
// only applies to JDO entities; ignore any view models
- if(!org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls)) {
+ if(!MetaInfo.isPersistenceEnhanced(cls)) {
return;
}
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 54f9360..f52a9e6 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
@@ -26,6 +26,7 @@ import javax.jdo.annotations.IdentityType;
import com.google.common.base.Strings;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
@@ -58,7 +59,7 @@ public class MandatoryFromJdoColumnAnnotationFacetFactory extends FacetFactoryAb
// only applies to JDO entities; ignore any view models
final Class<?> cls = processMethodContext.getCls();
- if(!org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls)) {
+ if(!MetaInfo.isPersistenceEnhanced(cls)) {
return;
}
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 26b2cfa..d6da153 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
@@ -24,22 +24,23 @@ import javax.jdo.annotations.Column;
import javax.jdo.annotations.IdentityType;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.properties.property.maxlength.MaxLengthFacetForMaxLengthAnnotationOnProperty;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.properties.property.maxlength.MaxLengthFacetForMaxLengthAnnotationOnProperty;
import org.apache.isis.core.metamodel.facets.properties.property.maxlength.MaxLengthFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVisiting;
-import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
+import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
import org.apache.isis.objectstore.jdo.metamodel.facets.prop.notpersistent.JdoNotPersistentFacet;
@@ -55,7 +56,7 @@ public class MaxLengthDerivedFromJdoColumnAnnotationFacetFactory extends FacetFa
// only applies to JDO entities; ignore any view models
final Class<?> cls = processMethodContext.getCls();
- if(!org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls)) {
+ if(!MetaInfo.isPersistenceEnhanced(cls)) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
index 8938b38..9175ce8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java
@@ -20,6 +20,7 @@ package org.apache.isis.objectstore.jdo.metamodel.facets.prop.notpersistent;
import javax.jdo.annotations.NotPersistent;
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
@@ -38,7 +39,7 @@ public class JdoNotPersistentAnnotationFacetFactory extends FacetFactoryAbstract
// only applies to JDO entities; ignore any view models
final Class<?> cls = processMethodContext.getCls();
- if(!org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls)) {
+ if(!MetaInfo.isPersistenceEnhanced(cls)) {
return;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
index 980043a..77ab1bf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java
@@ -20,6 +20,7 @@ package org.apache.isis.objectstore.jdo.metamodel.facets.prop.primarykey;
import javax.jdo.annotations.PrimaryKey;
+import org.apache.isis.core.commons.util.MetaInfo;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
@@ -38,7 +39,7 @@ public class JdoPrimaryKeyAnnotationFacetFactory extends FacetFactoryAbstract {
// ignore any view models
final Class<?> cls = processMethodContext.getCls();
- if(!org.datanucleus.enhancement.Persistable.class.isAssignableFrom(cls)) {
+ if(!MetaInfo.isPersistenceEnhanced(cls)) {
return;
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.