This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch ISIS-1976-rethink-object-adapters in repository https://gitbox.apache.org/repos/asf/isis.git
commit 83f6173a4bd695ace685d3ed26dc7e049e8f8787 Author: Andi Huber <ahu...@apache.org> AuthorDate: Mon Sep 3 15:13:15 2018 +0200 ISIS-1976: remove unused spec-loader from some facet constructors Task-Url: https://issues.apache.org/jira/browse/ISIS-1976 --- .../object/domainobject/DomainObjectAnnotationFacetFactory.java | 1 - .../RecreatableObjectFacetForDomainObjectAnnotation.java | 9 ++------- .../RecreatableObjectFacetDeclarativeInitializingAbstract.java | 4 ---- .../facets/object/recreatable/RecreatableObjectFacetFactory.java | 2 +- .../RecreatableObjectFacetForRecreatableObjectAnnotation.java | 8 +++----- .../RecreatableObjectFacetForViewModelAnnotation.java | 4 +--- 6 files changed, 7 insertions(+), 21 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java index 5cf7e73..781dc8a 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java @@ -291,7 +291,6 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache { final PostConstructMethodCache postConstructMethodCache = this; final ViewModelFacet recreatableObjectFacet = RecreatableObjectFacetForDomainObjectAnnotation.create( domainObjects, - getSpecificationLoader(), persistenceSessionServiceInternal, servicesInjector, facetHolder, diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java index ca9c234..b9bcfd6 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/recreatable/RecreatableObjectFacetForDomainObjectAnnotation.java @@ -24,20 +24,17 @@ import java.util.Objects; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider; -import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.PostConstructMethodCache; import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacetDeclarativeInitializingAbstract; import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet; import org.apache.isis.core.metamodel.services.ServicesInjector; -import org.apache.isis.core.metamodel.specloader.SpecificationLoader; public class RecreatableObjectFacetForDomainObjectAnnotation extends RecreatableObjectFacetDeclarativeInitializingAbstract { public static ViewModelFacet create( final List<DomainObject> domainObjects, - final SpecificationLoader specificationLoader, final ObjectAdapterProvider adapterProvider, final ServicesInjector servicesInjector, final FacetHolder holder, @@ -61,8 +58,7 @@ RecreatableObjectFacetDeclarativeInitializingAbstract { return null; } return new RecreatableObjectFacetForDomainObjectAnnotation( - holder, - specificationLoader, adapterProvider, servicesInjector, postConstructMethodCache); + holder, adapterProvider, servicesInjector, postConstructMethodCache); } // shouldn't happen, the above switch should match all cases. throw new IllegalArgumentException("nature of '" + nature + "' not recognized"); @@ -74,11 +70,10 @@ RecreatableObjectFacetDeclarativeInitializingAbstract { private RecreatableObjectFacetForDomainObjectAnnotation( final FacetHolder holder, - final SpecificationLoader specificationLoader, final ObjectAdapterProvider adapterProvider, final ServicesInjector servicesInjector, final PostConstructMethodCache postConstructMethodCache) { - super(holder, RecreationMechanism.INITIALIZES, specificationLoader, adapterProvider, servicesInjector, + super(holder, RecreationMechanism.INITIALIZES, adapterProvider, servicesInjector, postConstructMethodCache); } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java index 3042d6f..7bd3528 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeInitializingAbstract.java @@ -38,23 +38,19 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId; 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.OneToOneAssociation; -import org.apache.isis.core.metamodel.specloader.SpecificationLoader; public abstract class RecreatableObjectFacetDeclarativeInitializingAbstract extends RecreatableObjectFacetAbstract { - private final SpecificationLoader specificationLoader; //FIXME[ISIS-1976] remove private final ObjectAdapterProvider adapterProvider; public RecreatableObjectFacetDeclarativeInitializingAbstract( final FacetHolder holder, final RecreationMechanism recreationMechanism, - final SpecificationLoader specificationLoader, final ObjectAdapterProvider adapterProvider, final ServicesInjector servicesInjector, final PostConstructMethodCache postConstructMethodCache) { super(holder, recreationMechanism, postConstructMethodCache, servicesInjector); - this.specificationLoader = specificationLoader; this.adapterProvider = adapterProvider; } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java index 70089bd..fb93bef 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java @@ -89,7 +89,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache { private ViewModelFacet create(final org.apache.isis.applib.annotation.ViewModel annotation, final FacetHolder holder) { final PostConstructMethodCache postConstructMethodCache = this; - return annotation != null ? new RecreatableObjectFacetForViewModelAnnotation(holder, getSpecificationLoader(), adapterProvider, servicesInjector, postConstructMethodCache) : null; + return annotation != null ? new RecreatableObjectFacetForViewModelAnnotation(holder, adapterProvider, servicesInjector, postConstructMethodCache) : null; } private ViewModelFacet create(final XmlRootElement annotation, final FacetHolder holder) { diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectAnnotation.java index 8153dbf..cbb29a8 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForRecreatableObjectAnnotation.java @@ -19,23 +19,21 @@ package org.apache.isis.core.metamodel.facets.object.recreatable; -import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager; +import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.PostConstructMethodCache; import org.apache.isis.core.metamodel.services.ServicesInjector; -import org.apache.isis.core.metamodel.specloader.SpecificationLoader; public class RecreatableObjectFacetForRecreatableObjectAnnotation extends RecreatableObjectFacetDeclarativeInitializingAbstract { public RecreatableObjectFacetForRecreatableObjectAnnotation( final FacetHolder holder, - final SpecificationLoader specificationLoader, - final AdapterManager adapterManager, + final ObjectAdapterProvider adapterProvider, final ServicesInjector servicesInjector, final PostConstructMethodCache postConstructMethodCache) { super(holder, RecreationMechanism.INITIALIZES, - specificationLoader, adapterManager, servicesInjector, postConstructMethodCache); + adapterProvider, servicesInjector, postConstructMethodCache); } } diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java index d76770c..e912d75 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetForViewModelAnnotation.java @@ -23,19 +23,17 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.PostConstructMethodCache; import org.apache.isis.core.metamodel.services.ServicesInjector; -import org.apache.isis.core.metamodel.specloader.SpecificationLoader; public class RecreatableObjectFacetForViewModelAnnotation extends RecreatableObjectFacetDeclarativeInitializingAbstract { public RecreatableObjectFacetForViewModelAnnotation( final FacetHolder holder, - final SpecificationLoader specificationLoader, final ObjectAdapterProvider adapterProvider, final ServicesInjector servicesInjector, final PostConstructMethodCache postConstructMethodCache) { super(holder, RecreationMechanism.INITIALIZES, - specificationLoader, adapterProvider, servicesInjector, postConstructMethodCache); + adapterProvider, servicesInjector, postConstructMethodCache); } }