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 2021/02/19 12:36:23 UTC

[isis] branch master updated: ISIS-2535: moving JdoBeanTypeClassifier to metamodel module

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 76d2228  ISIS-2535: moving JdoBeanTypeClassifier to metamodel module
76d2228 is described below

commit 76d22280c45253ccf00135571921b54ec4ffbeed
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Feb 19 13:36:08 2021 +0100

    ISIS-2535: moving JdoBeanTypeClassifier to metamodel module
    
    adds support for object type naming from @Table(schema=...) annotation
    also fixes logic to handle presence of table name in @Table or
    @PersistneceCapable (JPA+JDO)
---
 .../config/beans/IsisBeanTypeClassifierImpl.java   | 29 +++++++
 ...e.isis.core.config.beans.IsisBeanTypeClassifier |  1 -
 .../metamodel/beans}/JdoBeanTypeClassifier.java    | 14 +++-
 ...cIdFacetForJdoPersistenceCapableAnnotation.java |  3 +-
 .../JdoPersistenceCapableFacetAnnotation.java      | 44 ++++++++++-
 ...e.isis.core.config.beans.IsisBeanTypeClassifier |  1 +
 .../jpa/metamodel/JpaProgrammingModel.java         | 90 ++--------------------
 .../ObjectSpecIdFacetForTableAnnotation.java}      | 21 ++---
 .../table/JpaTableAnnotationFacetFactory.java      | 77 ++++++++++++++++++
 .../object/table/JpaTableFacetAnnotation.java}     | 31 +++++---
 .../object/table/JpaTableFacetAnnotationImpl.java} | 39 +++-------
 11 files changed, 207 insertions(+), 143 deletions(-)

diff --git a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierImpl.java b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierImpl.java
index f0572ab..148a737 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierImpl.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeClassifierImpl.java
@@ -20,9 +20,11 @@ package org.apache.isis.core.config.beans;
 
 import java.io.Serializable;
 import java.util.Collection;
+import java.util.Locale;
 
 import javax.enterprise.inject.Vetoed;
 import javax.persistence.Entity;
+import javax.persistence.Table;
 
 import org.springframework.stereotype.Component;
 
@@ -75,6 +77,33 @@ implements IsisBeanTypeClassifier {
 
         val entityAnnotation = findNearestAnnotation(type, Entity.class).orElse(null);
         if(entityAnnotation!=null) {
+            
+            String objectType = null; 
+            
+            val aDomainObject = findNearestAnnotation(type, DomainObject.class).orElse(null);
+            if(aDomainObject!=null) {
+                objectType = aDomainObject.objectType();
+            }
+            
+            // don't trample over the @DomainObject(objectType=..) if present
+            if(_Strings.isEmpty(objectType)) {
+                val aTable = findNearestAnnotation(type, Table.class).orElse(null);
+                if(aTable!=null) {
+                    val schema = aTable.schema();      
+                    if(_Strings.isNotEmpty(schema)) {
+                        val table = aTable.name();
+                        objectType = String.format("%s.%s", schema.toLowerCase(Locale.ROOT), 
+                                _Strings.isNotEmpty(table)
+                                    ? table
+                                    : type.getSimpleName());
+                    }    
+                }
+            }
+      
+            if(_Strings.isNotEmpty(objectType)) {
+                BeanClassification.selfManaged(
+                        BeanSort.ENTITY, objectType);
+            }
             return BeanClassification.selfManaged(BeanSort.ENTITY);
         }
         
diff --git a/persistence/jdo/datanucleus/src/main/resources/META-INF/services/org.apache.isis.core.config.beans.IsisBeanTypeClassifier b/persistence/jdo/datanucleus/src/main/resources/META-INF/services/org.apache.isis.core.config.beans.IsisBeanTypeClassifier
deleted file mode 100644
index 0c56ca3..0000000
--- a/persistence/jdo/datanucleus/src/main/resources/META-INF/services/org.apache.isis.core.config.beans.IsisBeanTypeClassifier
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.isis.persistence.jdo.datanucleus.config.JdoBeanTypeClassifier
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/JdoBeanTypeClassifier.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
similarity index 86%
rename from persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/JdoBeanTypeClassifier.java
rename to persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
index df91775..b46f1ca 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/config/JdoBeanTypeClassifier.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/beans/JdoBeanTypeClassifier.java
@@ -16,7 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.datanucleus.config;
+package org.apache.isis.persistence.jdo.metamodel.beans;
+
+import java.util.Locale;
 
 import javax.jdo.annotations.EmbeddedOnly;
 
@@ -58,11 +60,17 @@ public class JdoBeanTypeClassifier implements IsisBeanTypeClassifier {
                 objectType = aDomainObject.objectType();
             }
             
-            // don't tremble over the @DomainObject(objectType=..) if present
+            // don't trample over the @DomainObject(objectType=..) if present
             if(_Strings.isEmpty(objectType)) {
                 val schema = persistenceCapableAnnot.get().schema();      
                 if(_Strings.isNotEmpty(schema)) {
-                    objectType = String.format("%s.%s", schema, type.getSimpleName());
+                    
+                    val table = persistenceCapableAnnot.get().table();
+                    
+                    objectType = String.format("%s.%s", schema.toLowerCase(Locale.ROOT), 
+                            _Strings.isNotEmpty(table)
+                                ? table
+                                : type.getSimpleName());
                 }
             }
             
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
index 1fbe2e8..91b8020 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
@@ -27,7 +27,8 @@ import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFac
 import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacetAbstract;
 import org.apache.isis.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
 
-public class ObjectSpecIdFacetForJdoPersistenceCapableAnnotation extends ObjectSpecIdFacetAbstract {
+public class ObjectSpecIdFacetForJdoPersistenceCapableAnnotation 
+extends ObjectSpecIdFacetAbstract {
 
     public static ObjectSpecIdFacet create(
             final JdoPersistenceCapableFacet persistenceCapableFacet,
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
index a3fb740..a430292 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
@@ -18,18 +18,58 @@
  */
 package org.apache.isis.persistence.jdo.metamodel.facets.object.persistencecapable;
 
+import java.util.Map;
+
 import javax.jdo.annotations.IdentityType;
 
+import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
+import org.apache.isis.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
+
+public class JdoPersistenceCapableFacetAnnotation 
+extends FacetAbstract 
+implements JdoPersistenceCapableFacet {
 
-public class JdoPersistenceCapableFacetAnnotation extends JdoPersistenceCapableFacetAbstract {
+    private final String schema;
+    private final String table;
+    private final IdentityType identityType;
 
     public JdoPersistenceCapableFacetAnnotation(
             final String schemaName,
             final String tableOrTypeName,
             final IdentityType identityType,
             final FacetHolder holder) {
-        super(schemaName, tableOrTypeName, identityType, holder);
+        
+        super(JdoPersistenceCapableFacet.class, holder, Derivation.NOT_DERIVED);
+        super.setFacetAliasType(EntityFacet.class);
+        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 appendAttributesTo(final Map<String, Object> attributeMap) {
+        super.appendAttributesTo(attributeMap);
+        attributeMap.put("schema", schema);
+        attributeMap.put("table", table);
+        attributeMap.put("identityType", identityType);
+    }
+
+
 }
diff --git a/persistence/jdo/metamodel/src/main/resources/META-INF/services/org.apache.isis.core.config.beans.IsisBeanTypeClassifier b/persistence/jdo/metamodel/src/main/resources/META-INF/services/org.apache.isis.core.config.beans.IsisBeanTypeClassifier
new file mode 100644
index 0000000..ea39b0a
--- /dev/null
+++ b/persistence/jdo/metamodel/src/main/resources/META-INF/services/org.apache.isis.core.config.beans.IsisBeanTypeClassifier
@@ -0,0 +1 @@
+org.apache.isis.persistence.jdo.metamodel.beans.JdoBeanTypeClassifier
\ No newline at end of file
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/JpaProgrammingModel.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/JpaProgrammingModel.java
index f1c8970..864b4bd 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/JpaProgrammingModel.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/JpaProgrammingModel.java
@@ -25,6 +25,7 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
 import org.apache.isis.core.metamodel.progmodel.ProgrammingModel.Marker;
 import org.apache.isis.persistence.jpa.metamodel.facets.prop.column.MandatoryFromJpaColumnAnnotationFacetFactory;
 import org.apache.isis.persistence.jpa.metamodel.facets.prop.transients.JpaTransientAnnotationFacetFactory;
+import org.apache.isis.persistence.jpa.metamodel.object.table.JpaTableAnnotationFacetFactory;
 
 import lombok.val;
 
@@ -36,93 +37,12 @@ public class JpaProgrammingModel implements MetaModelRefiner {
     @Override
     public void refineProgrammingModel(ProgrammingModel pm) {
 
-//        val step1 = ProgrammingModel.FacetProcessingOrder.C2_AFTER_METHOD_REMOVING;
-//
-//        // come what may, we have to ignore the PersistenceCapable supertype.
-//        pm.addFactory(step1, RemoveJdoEnhancementTypesFacetFactory.class, Marker.JDO);
-//        // so we may as well also just ignore any 'jdo' prefixed methods here also.
-//        pm.addFactory(step1, RemoveJdoPrefixedMethodsFacetFactory.class, Marker.JDO);
-//        // Datanucleus
-//        pm.addFactory(step1, RemoveDatanucleusPersistableTypesFacetFactory.class, Marker.JDO);
-//        pm.addFactory(step1, RemoveDnPrefixedMethodsFacetFactory.class, Marker.JDO);
+        val step = ProgrammingModel.FacetProcessingOrder.A2_AFTER_FALLBACK_DEFAULTS;
 
-
-        val step2 = ProgrammingModel.FacetProcessingOrder.A2_AFTER_FALLBACK_DEFAULTS;
-
-        pm.addFactory(step2, JpaTransientAnnotationFacetFactory.class, Marker.JPA);
-//        pm.addFactory(step2, JdoDatastoreIdentityAnnotationFacetFactory.class, Marker.JDO);
-//
-//        pm.addFactory(step2, JdoPrimaryKeyAnnotationFacetFactory.class, Marker.JDO);
-//        pm.addFactory(step2, JdoNotPersistentAnnotationFacetFactory.class, Marker.JDO);
-//        pm.addFactory(step2, JdoDiscriminatorAnnotationFacetFactory.class, Marker.JDO);
-//        pm.addFactory(step2, JdoVersionAnnotationFacetFactory.class, Marker.JDO);
-//
-//        pm.addFactory(step2, JdoQueryAnnotationFacetFactory.class, Marker.JDO);
-//
-//        pm.addFactory(step2, BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.class, Marker.JDO);
-//        pm.addFactory(step2, MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.class, Marker.JDO);
-//        // must appear after JdoPrimaryKeyAnnotationFacetFactory (above)
-//        // and also MandatoryFacetOnPropertyMandatoryAnnotationFactory
-//        // and also PropertyAnnotationFactory
-        pm.addFactory(step2, MandatoryFromJpaColumnAnnotationFacetFactory.class, Marker.JPA);
-//
-//
-//        // -- validators
-//
-//        addValidatorToEnsureIdentityType(pm);
-//        addValidatorToCheckForUnsupportedAnnotations(pm);
+        pm.addFactory(step, JpaTableAnnotationFacetFactory.class, Marker.JPA);
+        pm.addFactory(step, JpaTransientAnnotationFacetFactory.class, Marker.JPA);
+        pm.addFactory(step, MandatoryFromJpaColumnAnnotationFacetFactory.class, Marker.JPA);
 
     }
-    
-    // -- HELPER
 
-//    private void addValidatorToEnsureIdentityType(ProgrammingModel pm) {
-//
-//        pm.addValidator((objSpec, validation) -> {
-//
-//            final JdoPersistenceCapableFacet jpcf = objSpec.getFacet(JdoPersistenceCapableFacet.class);
-//            if(jpcf == null) {
-//                return true;
-//            }
-//            final IdentityType identityType = jpcf.getIdentityType();
-//            if(identityType == IdentityType.APPLICATION) {
-//                // ok
-//
-//            } else if(identityType == IdentityType.NONDURABLE) {
-//                // ok; for use with DN view objects (http://www.datanucleus.org/products/accessplatform_3_2/datastores/rdbms_views.html)
-//
-//            } else if(identityType == IdentityType.DATASTORE || identityType == IdentityType.UNSPECIFIED) {
-//
-//                // TODO: ensure that DATASTORE has recognised @DatastoreIdentity attribute
-//
-//            } else {
-//                // in fact, at the time of writing there are no others, so this is theoretical in case there is
-//                // a future change to the JDO spec
-//                validation.onFailure(
-//                        objSpec,
-//                        objSpec.getIdentifier(),
-//                        "%s: is annotated with @PersistenceCapable but with an unrecognized identityType (%s)",
-//                        objSpec.getFullIdentifier(),
-//                        identityType);
-//            }
-//
-//            return true;
-//        }, Marker.JDO);
-//
-//    }
-//
-//    private void addValidatorToCheckForUnsupportedAnnotations(ProgrammingModel pm) {
-//
-//        pm.addValidator((objSpec, validation) -> {
-//            if (objSpec.containsNonFallbackFacet(ParentedCollectionFacet.class) && !objSpec.containsNonFallbackFacet(CollectionFacet.class)) {
-//                validation.onFailure(
-//                        objSpec,
-//                        objSpec.getIdentifier(),
-//                        "%s: JDO/DataNucleus object store currently does not supported Aggregated or EmbeddedOnly annotations",
-//                        objSpec.getFullIdentifier());
-//            }
-//            return true;
-//        }, Marker.JDO);
-//
-//    }
 }
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/domainobject/objectspecid/ObjectSpecIdFacetForTableAnnotation.java
similarity index 67%
copy from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
copy to persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/domainobject/objectspecid/ObjectSpecIdFacetForTableAnnotation.java
index 1fbe2e8..0cf1732 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/domainobject/objectspecid/ObjectSpecIdFacetForTableAnnotation.java
@@ -16,8 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-
-package org.apache.isis.persistence.jdo.metamodel.facets.object.domainobject.objectspecid;
+package org.apache.isis.persistence.jpa.metamodel.object.domainobject.objectspecid;
 
 import java.util.Locale;
 
@@ -25,26 +24,28 @@ import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
 import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacetAbstract;
-import org.apache.isis.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
+import org.apache.isis.persistence.jpa.metamodel.object.table.JpaTableFacetAnnotation;
 
-public class ObjectSpecIdFacetForJdoPersistenceCapableAnnotation extends ObjectSpecIdFacetAbstract {
+public class ObjectSpecIdFacetForTableAnnotation 
+extends ObjectSpecIdFacetAbstract {
 
     public static ObjectSpecIdFacet create(
-            final JdoPersistenceCapableFacet persistenceCapableFacet,
+            final JpaTableFacetAnnotation tableFacet,
             final FacetHolder holder) {
 
-        if(persistenceCapableFacet.isFallback()) {
+        if(tableFacet.isFallback()) {
             return null;
         }
-        final String schema = persistenceCapableFacet.getSchema();
+        final String schema = tableFacet.getSchema();
         if(_Strings.isNullOrEmpty(schema)) {
             return null;
         }
-        final String objectType = schema.toLowerCase(Locale.ROOT) + "." + persistenceCapableFacet.getTable();
-        return new ObjectSpecIdFacetForJdoPersistenceCapableAnnotation(objectType, holder);
+        final String objectType = schema.toLowerCase(Locale.ROOT) + "." + tableFacet.getTable();
+        return new ObjectSpecIdFacetForTableAnnotation(objectType, holder);
     }
 
-    private ObjectSpecIdFacetForJdoPersistenceCapableAnnotation(final String value,
+    private ObjectSpecIdFacetForTableAnnotation(
+            final String value,
             final FacetHolder holder) {
         super(value, holder);
     }
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/table/JpaTableAnnotationFacetFactory.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/table/JpaTableAnnotationFacetFactory.java
new file mode 100644
index 0000000..8809fc9
--- /dev/null
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/table/JpaTableAnnotationFacetFactory.java
@@ -0,0 +1,77 @@
+/*
+ *  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.jpa.metamodel.object.table;
+
+
+import javax.persistence.Table;
+
+import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory;
+import org.apache.isis.core.metamodel.facets.object.domainobject.DomainObjectAnnotationFacetFactory;
+import org.apache.isis.persistence.jpa.metamodel.object.domainobject.objectspecid.ObjectSpecIdFacetForTableAnnotation;
+
+import lombok.val;
+
+/**
+ * Implements {@link ObjectSpecIdFacetFactory} only because is a prereq of {@link DomainObjectAnnotationFacetFactory}.
+ */
+public class JpaTableAnnotationFacetFactory
+extends FacetFactoryAbstract
+implements ObjectSpecIdFacetFactory {
+
+    public JpaTableAnnotationFacetFactory() {
+        super(FeatureType.OBJECTS_ONLY);
+    }
+
+    @Override
+    public void process(ObjectSpecIdFacetFactory.ProcessObjectSpecIdContext processClassContext) {
+        final Class<?> cls = processClassContext.getCls();
+
+        final Table annotation = Annotations.getAnnotation(cls, Table.class);
+        if (annotation == null) {
+            return;
+        }
+        String annotationSchemaAttribute = annotation.schema();
+        if(_Strings.isNullOrEmpty(annotationSchemaAttribute)) {
+            annotationSchemaAttribute = null;
+        }
+        String annotationTableAttribute = annotation.name();
+        if (_Strings.isNullOrEmpty(annotationTableAttribute)) {
+            annotationTableAttribute = cls.getSimpleName();
+        }
+
+        val facetHolder = processClassContext.getFacetHolder();
+
+
+        val jdoPersistenceCapableFacet = new JpaTableFacetAnnotationImpl(
+                annotationSchemaAttribute,
+                annotationTableAttribute, 
+                facetHolder);
+        FacetUtil.addFacet(jdoPersistenceCapableFacet);
+        FacetUtil.addFacet(ObjectSpecIdFacetForTableAnnotation.create(jdoPersistenceCapableFacet, facetHolder));
+
+        return;
+    }
+
+
+}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/table/JpaTableFacetAnnotation.java
similarity index 58%
copy from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
copy to persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/table/JpaTableFacetAnnotation.java
index a3fb740..ac406cd 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/table/JpaTableFacetAnnotation.java
@@ -16,20 +16,27 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.metamodel.facets.object.persistencecapable;
+package org.apache.isis.persistence.jpa.metamodel.object.table;
 
-import javax.jdo.annotations.IdentityType;
+import javax.persistence.Table;
 
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.Facet;
 
-public class JdoPersistenceCapableFacetAnnotation extends JdoPersistenceCapableFacetAbstract {
+/**
+ * Corresponds to annotating the class with the {@link Table} annotation.
+ */
+public interface JpaTableFacetAnnotation extends Facet {
 
-    public JdoPersistenceCapableFacetAnnotation(
-            final String schemaName,
-            final String tableOrTypeName,
-            final IdentityType identityType,
-            final FacetHolder holder) {
-        super(schemaName, tableOrTypeName, identityType, holder);
-    }
+    /**
+     * Corresponds to {@link Table#schema()}, or null if not specified.
+     */
+    String getSchema();
+    
+    
+    /**
+     * Corresponds to {@link Table#name()}, or to the
+     * class' {@link Class#getSimpleName() simple name} if no table specified.
+     */
+    String getTable();
 
-}
+}
\ No newline at end of file
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/table/JpaTableFacetAnnotationImpl.java
similarity index 56%
rename from persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
rename to persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/table/JpaTableFacetAnnotationImpl.java
index 260c86c..bc9f157 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/object/table/JpaTableFacetAnnotationImpl.java
@@ -16,46 +16,28 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.persistence.jdo.metamodel.facets.object.persistencecapable;
+package org.apache.isis.persistence.jpa.metamodel.object.table;
 
 import java.util.Map;
 
-import javax.jdo.annotations.IdentityType;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
-import org.apache.isis.persistence.jdo.provider.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
 
-public abstract class JdoPersistenceCapableFacetAbstract 
+public class JpaTableFacetAnnotationImpl 
 extends FacetAbstract 
-implements JdoPersistenceCapableFacet {
-
-    public static Class<? extends Facet> type() {
-        return JdoPersistenceCapableFacet.class;
-    }
+implements JpaTableFacetAnnotation {
 
     private final String schema;
-    private final String table;
-    private final IdentityType identityType;
+    private final String tableOrTypeName;
 
-    public JdoPersistenceCapableFacetAbstract(
+    public JpaTableFacetAnnotationImpl(
             final String schemaName,
             final String tableOrTypeName,
-            final IdentityType identityType,
             final FacetHolder holder) {
         
-        super(JdoPersistenceCapableFacetAbstract.type(), holder, Derivation.NOT_DERIVED);
-        super.setFacetAliasType(EntityFacet.class);
+        super(JpaTableFacetAnnotation.class, holder, Derivation.NOT_DERIVED);
         this.schema = schemaName;
-        this.table = tableOrTypeName;
-        this.identityType = identityType;
-    }
-
-    @Override
-    public IdentityType getIdentityType() {
-        return identityType;
+        this.tableOrTypeName = tableOrTypeName;
     }
 
     @Override
@@ -65,16 +47,15 @@ implements JdoPersistenceCapableFacet {
     
     @Override
     public String getTable() {
-        return table;
+        return tableOrTypeName;
     }
 
     @Override 
     public void appendAttributesTo(final Map<String, Object> attributeMap) {
         super.appendAttributesTo(attributeMap);
         attributeMap.put("schema", schema);
-        attributeMap.put("table", table);
-        attributeMap.put("identityType", identityType);
+        attributeMap.put("table", tableOrTypeName);
     }
 
-    
+
 }