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 2019/02/22 15:27:02 UTC
[isis] branch 2033-IoC updated (d198282 -> a8210a4)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git.
from d198282 ISIS-2033: refactoring ...
new 3fbea87 ISIS-2033: moves PersistenceSessionFactoryMetamodelRefiner to jdo-common
new ded1cec ISIS-2033: intermediate breaking commit
new 108d92c ISIS-2100: Reduce call-site complexity of 'BuilderScripts'
new a8210a4 merging 'v2' into 'IoC'
The 10353 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/isis/applib/AppManifest.java | 2 +-
.../fixturescripts/BuilderScriptAbstract.java | 38 +-
.../isis/applib/fixturescripts/FixtureScript.java | 33 +-
.../isis/applib/fixturescripts/FixtureScripts.java | 7 +-
.../fixturescripts/PersonaWithBuilderScript.java | 4 +-
.../isis/applib/fixturescripts/WithPrereqs.java | 10 +-
.../setup/PersonaEnumPersistAll.java | 6 +-
.../services/metamodel/MetaModelService.java | 19 +-
.../core/metamodel/IsisJdoMetamodelPlugin.java | 9 -
.../isis/core/metamodel/MetaModelContexts.java | 8 +-
.../isis/core/metamodel/MetamodelModule.java | 5 +
.../isis/core/metamodel/facetapi/BeanFacet.java | 10 +
.../isis/core/metamodel/facetapi/EntityFacet.java | 10 +
.../core/metamodel/facetapi/MetaModelRefiner.java | 25 +-
.../facetapi/MetaModelValidatorRefiner.java | 2 -
...ctionInvocationFacetForDomainEventAbstract.java | 2 +-
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 7 +-
.../DomainObjectAnnotationFacetFactory.java | 31 +-
...jectSpecIdFacetDerivedFromClassNameFactory.java | 13 +-
.../services/layout/LayoutServiceDefault.java | 16 +-
.../services/metamodel/MetaModelExportSupport.java | 13 +
.../services/metamodel/MetaModelExporter.java | 14 +-
.../metamodel/MetaModelServiceDefault.java | 42 +-
.../core/metamodel/spec/ManagedObjectType.java | 51 +-
.../core/metamodel/spec/ObjectSpecification.java | 53 +-
.../specimpl/ObjectSpecificationAbstract.java | 62 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 763 +++++++++++----------
.../ObjectSpecificationOnStandaloneList.java | 29 +-
.../testspec/ObjectSpecificationStub.java | 49 +-
...cIdFacetForJdoPersistenceCapableAnnotation.java | 0
.../org/apache/isis/jdo/IsisJdoRuntimePlugin.java | 10 +-
.../persistence/IsisLegacyJdoContextHandler.java | 8 +-
.../service/support/TimestampService.java | 2 +-
.../PersistenceSessionFactoryMetamodelRefiner.java | 8 +-
.../isis/jdo/persistence}/JdoMetamodelUtil.java | 6 +-
.../apache/isis/jdo/service/RegisterEntities.java | 2 +-
...JdoDatastoreIdentityAnnotationFacetFactory.java | 2 +-
.../JdoDatastoreIdentityFacet.java | 0
.../JdoDatastoreIdentityFacetAbstract.java | 0
.../JdoDatastoreIdentityFacetAnnotation.java | 0
.../JdoDatastoreIdentityFacetImpl.java | 0
.../object/datastoreidentity/package-info.java | 0
.../JdoDiscriminatorAnnotationFacetFactory.java | 2 +-
.../discriminator/JdoDiscriminatorFacet.java | 0
.../JdoDiscriminatorFacetDefault.java | 0
...nferredFromJdoDiscriminatorValueAnnotation.java | 0
.../facets/object/discriminator/package-info.java | 0
...doPersistenceCapableAnnotationFacetFactory.java | 4 +-
.../JdoPersistenceCapableFacet.java | 4 +-
.../JdoPersistenceCapableFacetAbstract.java | 0
.../JdoPersistenceCapableFacetAnnotation.java | 0
.../JdoPersistenceCapableFacetImpl.java | 0
.../object/persistencecapable/package-info.java | 0
.../facets/object/query/JdoNamedQuery.java | 10 +-
.../object/query/JdoQueriesFacetAnnotation.java | 0
.../query/JdoQueryAnnotationFacetFactory.java | 2 +-
.../facets/object/query/JdoQueryFacet.java | 0
.../facets/object/query/JdoQueryFacetAbstract.java | 0
.../object/query/JdoQueryFacetAnnotation.java | 0
.../object/query/VisitorForClauseAbstract.java | 0
.../facets/object/query/VisitorForFromClause.java | 0
.../object/query/VisitorForVariablesClause.java | 0
.../version/JdoVersionAnnotationFacetFactory.java | 2 +-
.../facets/object/version/JdoVersionFacet.java | 0
.../version/JdoVersionFacetFromAnnotation.java | 0
.../facets/object/version/package-info.java | 0
...DerivedFromJdoColumnAnnotationFacetFactory.java | 0
.../BigDecimalFacetDerivedFromJdoColumn.java | 0
.../prop/column/BigDecimalFacetFallback.java | 0
.../column/MandatoryFacetDerivedFromJdoColumn.java | 0
...ndatoryFacetInferredFromAbsenceOfJdoColumn.java | 0
...ndatoryFromJdoColumnAnnotationFacetFactory.java | 2 +-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../column/MaxLengthFacetDerivedFromJdoColumn.java | 0
.../JdoNotPersistentAnnotationFacetFactory.java | 2 +-
.../prop/notpersistent/JdoNotPersistentFacet.java | 0
.../JdoNotPersistentFacetAbstract.java | 0
.../JdoNotPersistentFacetAnnotation.java | 0
.../notpersistent/JdoNotPersistentFacetImpl.java | 0
...FacetDerivedFromJdoNotPersistentAnnotation.java | 0
...ledFacetDerivedFromJdoPrimaryKeyAnnotation.java | 0
.../JdoPrimaryKeyAnnotationFacetFactory.java | 2 +-
.../facets/prop/primarykey/JdoPrimaryKeyFacet.java | 0
.../primarykey/JdoPrimaryKeyFacetAbstract.java | 0
.../primarykey/JdoPrimaryKeyFacetAnnotation.java | 0
.../prop/primarykey/JdoPrimaryKeyFacetImpl.java | 0
...nalFacetDerivedFromJdoPrimaryKeyAnnotation.java | 0
.../facets/prop/primarykey/package-info.java | 0
.../validator/JdoMetaModelValidator.java | 0
.../util/JdoPrimaryKeyPropertyPredicate.java | 0
...AnnotationFacetFactoryTest_refineMetaModel.java | 0
.../handlers/DomainObjectInvocationHandler.java | 11 +-
.../core/runtime/headless/HeadlessAbstract.java | 7 +-
.../system/session/IsisSessionFactoryBuilder.java | 20 +-
.../viewer/wicket/model/models/EntityModel.java | 2 +-
.../simple/fixture/SimpleObjectBuilder.java | 2 +-
.../simple/fixture/SimpleObject_persona.java | 7 +-
migration-notes.adoc | 36 +
98 files changed, 759 insertions(+), 729 deletions(-)
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetamodelModule.java
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/BeanFacet.java
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/EntityFacet.java
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExportSupport.java
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java (100%)
rename core/{runtime/src/main/java/org/apache/isis/core/runtime/system/persistence => plugins/jdo-common/src/main/java/org/apache/isis/jdo/metamodel}/PersistenceSessionFactoryMetamodelRefiner.java (95%)
rename core/{metamodel/src/main/java/org/apache/isis/core/metamodel => plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence}/JdoMetamodelUtil.java (85%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java (97%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/package-info.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java (98%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/package-info.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java (97%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java (92%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/package-info.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoNamedQuery.java (92%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java (98%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryFacet.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/JdoQueryFacetAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForClauseAbstract.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForFromClause.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/query/VisitorForVariablesClause.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java (98%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionFacet.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/package-info.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/BigDecimalFacetFallback.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java (99%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java (99%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java (97%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java (97%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/package-info.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java (100%)
rename core/{metamodel => plugins/jdo-common}/src/main/java/org/apache/isis/objectstore/jdo/metamodel/util/JdoPrimaryKeyPropertyPredicate.java (100%)
rename core/{runtime => plugins/jdo-common}/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java (100%)