You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/05/20 00:45:06 UTC
[29/30] isis git commit: ISIS-1408: removing RuntimeContext,
ObjectSpecificationDependencies, ObjectMemberDependencies (WIP)
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
index e63a31e..c79e534 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
@@ -137,7 +137,7 @@ public class ActionParameterDefaultsFacetViaMethodFactory extends MethodPrefixBa
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- adapterManager = servicesInjector.lookupService(PersistenceSessionServiceInternal.class);
+ adapterManager = servicesInjector.getPersistenceSessionServiceInternal();
}
PersistenceSessionServiceInternal adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
index f2f939d..0242422 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
@@ -45,7 +45,6 @@ import org.apache.isis.core.metamodel.facets.param.parameter.mustsatisfy.MustSat
import org.apache.isis.core.metamodel.facets.param.parameter.mustsatisfy.MustSatisfySpecificationFacetForParameterAnnotation;
import org.apache.isis.core.metamodel.facets.param.parameter.regex.RegExFacetForParameterAnnotation;
import org.apache.isis.core.metamodel.facets.param.parameter.regex.RegExFacetFromRegExAnnotationOnParameter;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -207,8 +206,7 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = (IsisConfiguration) servicesInjector
- .lookupService(ConfigurationServiceInternal.class);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal();
maxLengthValidator.setConfiguration(configuration);
mustSatisfyValidator.setConfiguration(configuration);
regexValidator.setConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java
index ebc17c9..d7874bd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.param.renderedasdaybefore.annotation;
import java.lang.annotation.Annotation;
+
import org.apache.isis.applib.annotation.RenderedAsDayBefore;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -29,7 +30,6 @@ 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.objectvalue.renderedadjusted.RenderedAdjustedFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -71,8 +71,7 @@ public class RenderedAsDayBeforeFacetOnParameterAnnotationFactory extends FacetF
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = (IsisConfiguration) servicesInjector
- .lookupService(ConfigurationServiceInternal.class);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal();
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java
index 9ee85f0..9467fe8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java
@@ -30,7 +30,6 @@ 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.objectvalue.typicallen.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -73,8 +72,7 @@ public class TypicalLengthFacetOnParameterAnnotationFactory extends FacetFactory
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = (IsisConfiguration) servicesInjector
- .lookupService(ConfigurationServiceInternal.class);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal();
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
index 6dcbcfc..794678e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
@@ -30,7 +30,6 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.mask.MaskFacet;
import org.apache.isis.core.metamodel.facets.object.mask.TitleFacetBasedOnMask;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
@@ -95,8 +94,7 @@ public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = (IsisConfiguration) servicesInjector
- .lookupService(ConfigurationServiceInternal.class);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal();
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
index 64c0226..c987e78 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessorFactory.java
@@ -112,7 +112,7 @@ public class PropertyAccessorFacetViaAccessorFactory extends PropertyOrCollectio
@Override public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- adapterManager = servicesInjector.lookupService(PersistenceSessionServiceInternal.class);
+ adapterManager = servicesInjector.getPersistenceSessionServiceInternal();
}
PersistenceSessionServiceInternal adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
index 37f2242..cbc7e0a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethodFactory.java
@@ -74,7 +74,7 @@ public class PropertyAutoCompleteFacetMethodFactory extends MethodPrefixBasedFac
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- adapterManager = servicesInjector.lookupService(PersistenceSessionServiceInternal.class);
+ adapterManager = servicesInjector.getPersistenceSessionServiceInternal();
}
PersistenceSessionServiceInternal adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java
index de03f66..5e74421 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacetFactory.java
@@ -50,7 +50,7 @@ public class PropertyChoicesFacetDerivedFromChoicesFacetFactory extends FacetFac
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- adapterManager = servicesInjector.lookupService(PersistenceSessionServiceInternal.class);
+ adapterManager = servicesInjector.getPersistenceSessionServiceInternal();
}
PersistenceSessionServiceInternal adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
index aa8ae896..cbd17a1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethodFactory.java
@@ -71,7 +71,7 @@ public class PropertyChoicesFacetViaMethodFactory extends MethodPrefixBasedFacet
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- adapterManager = servicesInjector.lookupService(PersistenceSessionServiceInternal.class);
+ adapterManager = servicesInjector.getPersistenceSessionServiceInternal();
}
PersistenceSessionServiceInternal adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
index 75c9e0e..92bcd92 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/fromtype/PropertyDefaultFacetDerivedFromTypeFactory.java
@@ -70,7 +70,7 @@ public class PropertyDefaultFacetDerivedFromTypeFactory extends FacetFactoryAbst
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- adapterManager = servicesInjector.lookupService(PersistenceSessionServiceInternal.class);
+ adapterManager = servicesInjector.getPersistenceSessionServiceInternal();
}
PersistenceSessionServiceInternal adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
index 6c6d046..bd67bb3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/defaults/method/PropertyDefaultFacetViaMethodFactory.java
@@ -72,7 +72,7 @@ public class PropertyDefaultFacetViaMethodFactory extends MethodPrefixBasedFacet
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- adapterManager = servicesInjector.lookupService(PersistenceSessionServiceInternal.class);
+ adapterManager = servicesInjector.getPersistenceSessionServiceInternal();
}
PersistenceSessionServiceInternal adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java
index 8a404cd..bff62ff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java
@@ -33,7 +33,6 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -104,8 +103,7 @@ public class MandatoryFacetOnPropertyStaticMethodFactory extends MethodPrefixBas
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = (IsisConfiguration) servicesInjector
- .lookupService(ConfigurationServiceInternal.class);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal();
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java
index 1a4a5e7..773d970 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java
@@ -32,7 +32,6 @@ import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacetInferredFromMultiLineFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -97,8 +96,7 @@ public class MultiLineFacetOnPropertyFactory extends FacetFactoryAbstract implem
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = (IsisConfiguration) servicesInjector
- .lookupService(ConfigurationServiceInternal.class);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal();
multiLineValidator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index ba09aee..69c6cfd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -85,7 +85,6 @@ import org.apache.isis.core.metamodel.facets.properties.property.regex.RegExFace
import org.apache.isis.core.metamodel.facets.properties.publish.PublishedPropertyFacet;
import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacet;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -454,8 +453,7 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = (IsisConfiguration) servicesInjector
- .lookupService(ConfigurationServiceInternal.class);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal();
postsPropertyChangedEventValidator.setConfiguration(configuration);
propertyInteractionValidator.setConfiguration(configuration);
regexValidator.setConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java
index 24521eb..be97aac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java
@@ -28,7 +28,6 @@ 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.objectvalue.renderedadjusted.RenderedAdjustedFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -66,8 +65,7 @@ public class RenderedAsDayBeforeAnnotationOnPropertyFacetFactory extends FacetFa
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = (IsisConfiguration) servicesInjector
- .lookupService(ConfigurationServiceInternal.class);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal();
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java
index be6ccf4..7152051 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -89,8 +88,7 @@ public class TypicalLengthOnPropertyFacetFactory extends FacetFactoryAbstract im
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = (IsisConfiguration) servicesInjector
- .lookupService(ConfigurationServiceInternal.class);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal();
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
index 59f6d0f..04de951 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
@@ -30,7 +30,6 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.mask.MaskFacet;
import org.apache.isis.core.metamodel.facets.object.mask.TitleFacetBasedOnMask;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
@@ -111,8 +110,7 @@ public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract i
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = (IsisConfiguration) servicesInjector
- .lookupService(ConfigurationServiceInternal.class);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.getConfigurationServiceInternal();
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
deleted file mode 100644
index f6ab040..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
+++ /dev/null
@@ -1,56 +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.core.metamodel.runtimecontext;
-
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
-
-public class RuntimeContext implements ApplicationScopedComponent {
-
- //region > constructor, fields
-
- private final ServicesInjector servicesInjector;
- private final PersistenceSessionServiceInternal persistenceSessionServiceInternal;
-
- public RuntimeContext(
- final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
-
- this.persistenceSessionServiceInternal =
- servicesInjector.lookupService(PersistenceSessionServiceInternal.class);
-
- }
-
- //endregion
-
- @Programmatic
- public PersistenceSessionServiceInternal getPersistenceSessionService() {
- return persistenceSessionServiceInternal;
- }
-
- @Programmatic
- public ServicesInjector getServicesInjector() {
- return servicesInjector;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java
deleted file mode 100644
index 572ea2a..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAware.java
+++ /dev/null
@@ -1,26 +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.core.metamodel.runtimecontext;
-
-public interface RuntimeContextAware {
-
- public void setRuntimeContext(final RuntimeContext runtimeContext);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
index 13fe785..716bb02 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
@@ -49,9 +49,12 @@ import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.InjectorMethodEvaluator;
import org.apache.isis.core.metamodel.specloader.InjectorMethodEvaluatorDefault;
import org.apache.isis.core.metamodel.specloader.ServiceInitializer;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
/**
* The repository of services, also able to inject into any object.
@@ -509,6 +512,36 @@ public class ServicesInjector implements ApplicationScopedComponent {
};
}
+
+ //endregion
+
+ //region > convenience lookups
+
+ private SpecificationLoader specificationLoader;
+
+ @Programmatic
+ public SpecificationLoader getSpecificationLoader() {
+ return specificationLoader != null
+ ? specificationLoader
+ : (specificationLoader = lookupService(SpecificationLoader.class));
+ }
+
+ private PersistenceSessionServiceInternal persistenceSessionServiceInternal;
+ @Programmatic
+ public PersistenceSessionServiceInternal getPersistenceSessionServiceInternal() {
+ return persistenceSessionServiceInternal != null
+ ? persistenceSessionServiceInternal
+ : (persistenceSessionServiceInternal = lookupService(PersistenceSessionServiceInternal.class));
+ }
+
+ private ConfigurationServiceInternal configurationServiceInternal;
+ @Programmatic
+ public ConfigurationServiceInternal getConfigurationServiceInternal() {
+ return configurationServiceInternal != null
+ ? configurationServiceInternal
+ : (configurationServiceInternal = lookupService(ConfigurationServiceInternal.class));
+ }
+
//endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationDependencies.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationDependencies.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationDependencies.java
deleted file mode 100644
index bc2211f..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationDependencies.java
+++ /dev/null
@@ -1,58 +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.core.metamodel.spec;
-
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
-
-public class ObjectSpecificationDependencies {
-
- private final DeploymentCategory deploymentCategory;
- private final ServicesInjector servicesInjector;
- private final SpecificationLoader specificationLoader;
- private final FacetProcessor facetProcessor;
-
- public ObjectSpecificationDependencies(
- final DeploymentCategory deploymentCategory,
- final ServicesInjector servicesInjector,
- final SpecificationLoader specificationLoader,
- final FacetProcessor facetProcessor) {
- this.deploymentCategory = deploymentCategory;
- this.servicesInjector = servicesInjector;
- this.specificationLoader = specificationLoader;
- this.facetProcessor = facetProcessor;
- }
-
- public DeploymentCategory getDeploymentCategory() {
- return deploymentCategory;
- }
-
- public ServicesInjector getServicesInjector() {
- return servicesInjector;
- }
-
- public SpecificationLoader getSpecificationLoader() {
- return specificationLoader;
- }
-
- public FacetProcessor getFacetProcessor() {
- return facetProcessor;
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java
deleted file mode 100644
index 79e8e4f..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java
+++ /dev/null
@@ -1,51 +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.core.metamodel.spec.feature;
-
-import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-
-public class ObjectMemberDependencies {
-
- private final SpecificationLoader specificationLoader;
- private final ServicesInjector servicesInjector;
- private final PersistenceSessionServiceInternal persistenceSessionServiceInternal;
-
- public ObjectMemberDependencies(
- final SpecificationLoader specificationLoader,
- final ServicesInjector servicesInjector,
- final PersistenceSessionServiceInternal persistenceSessionServiceInternal) {
-
- this.specificationLoader = specificationLoader;
-
- this.servicesInjector = servicesInjector;
- this.persistenceSessionServiceInternal = persistenceSessionServiceInternal;
- }
-
- public SpecificationLoader getSpecificationLoader() {
- return specificationLoader;
- }
-
- public ServicesInjector getServicesInjector() {
- return servicesInjector;
- }
-
- public PersistenceSessionServiceInternal getPersistenceSessionService() {
- return persistenceSessionServiceInternal;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index b3b38d0..072dab8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -45,14 +45,10 @@ import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFac
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.FreeStandingList;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.ObjectSpecificationDependencies;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilderContext;
@@ -146,28 +142,19 @@ public class SpecificationLoader implements ApplicationScopedComponent {
//region > init
- private RuntimeContext runtimeContext;
-
private boolean initialized = false;
/**
* Initializes and wires up, and primes the cache based on any service
* classes (provided by the {@link ServicesInjector}).
- * @param runtimeContext
*/
@Programmatic
- public void init(final RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
+ public void init() {
if (LOG.isDebugEnabled()) {
LOG.debug("initialising {}", this);
}
- // default subcomponents
- if (runtimeContext == null) {
- this.runtimeContext = new RuntimeContext(servicesInjector);
- }
-
// wire subcomponents into each other
facetProcessor.setServicesInjector(servicesInjector);
for (final LayoutMetadataReader layoutMetadataReader : layoutMetadataReaders) {
@@ -182,6 +169,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
loadSpecificationsForServices();
loadSpecificationsForMixins();
cacheBySpecId();
+
initialized = true;
}
@@ -225,14 +213,6 @@ public class SpecificationLoader implements ApplicationScopedComponent {
}
- /**
- * Set using {@link #init(RuntimeContext)}.
- */
- @Programmatic
- public RuntimeContext getRuntimeContext() {
- return runtimeContext;
- }
-
//endregion
//region > shutdown
@@ -423,25 +403,16 @@ public class SpecificationLoader implements ApplicationScopedComponent {
*/
private ObjectSpecification createSpecification(final Class<?> cls) {
- final ServicesInjector servicesInjector = getRuntimeContext().getServicesInjector();
- final PersistenceSessionServiceInternal persistenceSessionServiceInternal =
- servicesInjector.lookupService(PersistenceSessionServiceInternal.class);
-
- final ObjectSpecificationDependencies specContext =
- new ObjectSpecificationDependencies(deploymentCategory, servicesInjector, this, facetProcessor);
-
- final ObjectMemberDependencies objectMemberDependencies =
- new ObjectMemberDependencies(this, servicesInjector, persistenceSessionServiceInternal);
-
// ... and create the specs
if (FreeStandingList.class.isAssignableFrom(cls)) {
- return new ObjectSpecificationOnStandaloneList(specContext, objectMemberDependencies);
+ return new ObjectSpecificationOnStandaloneList(servicesInjector,
+ facetProcessor);
} else {
final FacetedMethodsBuilderContext facetedMethodsBuilderContext =
new FacetedMethodsBuilderContext(
this, facetProcessor, layoutMetadataReaders);
- return new ObjectSpecificationDefault(cls, facetedMethodsBuilderContext, specContext,
- objectMemberDependencies);
+ return new ObjectSpecificationDefault(cls, facetedMethodsBuilderContext,
+ servicesInjector, facetProcessor);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index 03b06c9..7335948 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -36,10 +36,10 @@ import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
public class ObjectActionContributee extends ObjectActionDefault implements ContributeeMember2 {
@@ -67,8 +67,8 @@ public class ObjectActionContributee extends ObjectActionDefault implements Cont
final ObjectActionDefault serviceAction,
final int contributeeParam,
final ObjectSpecification contributeeType,
- final ObjectMemberDependencies objectMemberDependencies) {
- super(serviceAction.getFacetedMethod(), objectMemberDependencies);
+ final ServicesInjector servicesInjector) {
+ super(serviceAction.getFacetedMethod(), servicesInjector);
this.servicePojo = servicePojo;
this.serviceAction = serviceAction;
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 4af50f4..424e8c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -66,13 +66,13 @@ import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.DomainModelException;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
import org.apache.isis.schema.cmd.v1.CommandDto;
public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectAction {
@@ -100,8 +100,8 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
public ObjectActionDefault(
final FacetedMethod facetedMethod,
- final ObjectMemberDependencies objectMemberDependencies) {
- super(facetedMethod, FeatureType.ACTION, objectMemberDependencies);
+ final ServicesInjector servicesInjector) {
+ super(facetedMethod, FeatureType.ACTION, servicesInjector);
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index 11bf697..aa4bb1e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -37,10 +37,10 @@ import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
public class ObjectActionMixedIn extends ObjectActionDefault implements MixedInMember2 {
@@ -75,7 +75,7 @@ public class ObjectActionMixedIn extends ObjectActionDefault implements MixedInM
final Class<?> mixinType,
final ObjectActionDefault mixinAction,
final ObjectSpecification mixedInType,
- final ObjectMemberDependencies objectMemberDependencies) {
+ final ServicesInjector objectMemberDependencies) {
super(mixinAction.getFacetedMethod(), objectMemberDependencies);
this.mixinType = mixinType;
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
index 3884074..f457d86 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
@@ -27,9 +27,9 @@ 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.propcoll.notpersisted.NotPersistedFacet;
import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
public abstract class ObjectAssociationAbstract extends ObjectMemberAbstract implements ObjectAssociation {
@@ -39,8 +39,8 @@ public abstract class ObjectAssociationAbstract extends ObjectMemberAbstract imp
final FacetedMethod facetedMethod,
final FeatureType featureType,
final ObjectSpecification specification,
- final ObjectMemberDependencies dependencies) {
- super(facetedMethod, featureType, dependencies);
+ final ServicesInjector servicesInjector) {
+ super(facetedMethod, featureType, servicesInjector);
if (specification == null) {
throw new IllegalArgumentException("field type for '" + getId() + "' must exist");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index ef87934..fa3042c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -60,7 +60,6 @@ import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.utils.CommandDtoUtils;
@@ -85,7 +84,7 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
protected ObjectMemberAbstract(
final FacetedMethod facetedMethod,
final FeatureType featureType,
- final ObjectMemberDependencies objectMemberDependencies) {
+ final ServicesInjector servicesInjector) {
final String id = facetedMethod.getIdentifier().getMemberName();
if (id == null) {
throw new IllegalArgumentException("Id must always be set");
@@ -94,9 +93,10 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
this.featureType = featureType;
this.id = id;
- this.specificationLookup = objectMemberDependencies.getSpecificationLoader();
- this.servicesInjector = objectMemberDependencies.getServicesInjector();
- this.persistenceSessionServiceInternal = objectMemberDependencies.getPersistenceSessionService();
+ this.servicesInjector = servicesInjector;
+
+ this.specificationLookup = servicesInjector.getSpecificationLoader();
+ this.persistenceSessionServiceInternal = servicesInjector.getPersistenceSessionServiceInternal();
}
//region > Identifiers
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index de3114e..5b0de02 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -54,6 +54,7 @@ import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.consent.InteractionResult;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
@@ -87,18 +88,16 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.ObjectSpecificationDependencies;
import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
import org.apache.isis.core.metamodel.spec.Persistability;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
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.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implements ObjectSpecification {
@@ -126,8 +125,9 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//region > fields
+ protected final ServicesInjector servicesInjector;
+
private final DeploymentCategory deploymentCategory;
- private final ServicesInjector servicesInjector;
private final SpecificationLoader specificationLoader;
private final FacetProcessor facetProcessor;
@@ -136,8 +136,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
*/
protected Properties metadataProperties;
- protected final ObjectMemberDependencies objectMemberDependencies;
-
private final List<ObjectAssociation> associations = Lists.newArrayList();
private final List<ObjectAction> objectActions = Lists.newArrayList();
@@ -180,10 +178,10 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//region > Constructor
public ObjectSpecificationAbstract(
- final Class<?> introspectedClass,
+ final Class<?> introspectedClass,
final String shortName,
- final ObjectSpecificationDependencies objectSpecificationDependencies,
- final ObjectMemberDependencies objectMemberDependencies) {
+ final ServicesInjector servicesInjector,
+ final FacetProcessor facetProcessor) {
this.correspondingClass = introspectedClass;
this.fullName = introspectedClass.getName();
@@ -192,12 +190,11 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
this.isAbstract = ClassExtensions.isAbstract(introspectedClass);
this.identifier = Identifier.classIdentifier(introspectedClass);
- this.deploymentCategory = objectSpecificationDependencies.getDeploymentCategory();
- this.servicesInjector = objectSpecificationDependencies.getServicesInjector();
- this.specificationLoader = objectSpecificationDependencies.getSpecificationLoader();
- this.facetProcessor = objectSpecificationDependencies.getFacetProcessor();
+ this.servicesInjector = servicesInjector;
+ this.facetProcessor = facetProcessor;
- this.objectMemberDependencies = objectMemberDependencies;
+ this.deploymentCategory = servicesInjector.lookupService(DeploymentCategoryProvider.class).getDeploymentCategory();
+ this.specificationLoader = servicesInjector.getSpecificationLoader();
}
@@ -227,10 +224,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
/**
- * As provided explicitly within the
- * {@link #ObjectSpecificationAbstract(Class, String, ObjectSpecificationDependencies, ObjectMemberDependencies)}
- * constructor}.
- *
+ * As provided explicitly within the constructor.
+ *
* <p>
* Not API, but <tt>public</tt> so that {@link FacetedMethodsBuilder} can
* call it.
@@ -931,10 +926,10 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
final ObjectSpecification returnType) {
if (returnType.isNotCollection()) {
return new OneToOneAssociationContributee(servicePojo, input, contributeeType,
- objectMemberDependencies);
+ servicesInjector);
} else {
return new OneToManyAssociationContributee(servicePojo, input, contributeeType,
- objectMemberDependencies);
+ servicesInjector);
}
}
};
@@ -1023,10 +1018,10 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
final ObjectSpecification returnType = mixinAction.getReturnType();
if (returnType.isNotCollection()) {
return new OneToOneAssociationMixedIn(
- mixinAction, mixedInType, mixinType, objectMemberDependencies);
+ mixinAction, mixedInType, mixinType, servicesInjector);
} else {
return new OneToManyAssociationMixedIn(
- mixinAction, mixedInType, mixinType, objectMemberDependencies);
+ mixinAction, mixedInType, mixinType, servicesInjector);
}
}
};
@@ -1083,7 +1078,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
if (contributeeParam != -1) {
ObjectActionContributee contributeeAction =
new ObjectActionContributee(servicePojo, contributedAction, contributeeParam, this,
- objectMemberDependencies);
+ servicesInjector);
facetProcessor.processMemberOrder(metadataProperties, contributeeAction);
contributeeActions.add(contributeeAction);
}
@@ -1170,7 +1165,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
ObjectActionMixedIn mixedInAction =
- new ObjectActionMixedIn(mixinType, mixinAction, this, objectMemberDependencies);
+ new ObjectActionMixedIn(mixinType, mixinAction, this, servicesInjector);
facetProcessor.processMemberOrder(metadataProperties, mixedInAction);
actions.add(mixedInAction);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
index 633d354..e25d5b5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
@@ -36,10 +36,10 @@ import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedF
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public class OneToManyAssociationContributee extends OneToManyAssociationDefault implements ContributeeMember2 {
@@ -57,7 +57,7 @@ public class OneToManyAssociationContributee extends OneToManyAssociationDefault
private static ObjectSpecification typeOfSpec(
final ObjectActionDefault objectAction,
- final ObjectMemberDependencies objectMemberDependencies) {
+ final ServicesInjector objectMemberDependencies) {
final TypeOfFacet actionTypeOfFacet = objectAction.getFacet(TypeOfFacet.class);
final SpecificationLoader specificationLookup = objectMemberDependencies.getSpecificationLoader();
@@ -71,10 +71,10 @@ public class OneToManyAssociationContributee extends OneToManyAssociationDefault
final Object servicePojo,
final ObjectActionDefault serviceAction,
final ObjectSpecification contributeeType,
- final ObjectMemberDependencies objectMemberDependencies) {
+ final ServicesInjector servicesInjector) {
super(serviceAction.getFacetedMethod(),
- typeOfSpec(serviceAction, objectMemberDependencies),
- objectMemberDependencies);
+ typeOfSpec(serviceAction, servicesInjector),
+ servicesInjector);
this.servicePojo = servicePojo;
this.serviceAction = serviceAction;
@@ -83,8 +83,7 @@ public class OneToManyAssociationContributee extends OneToManyAssociationDefault
//
final NotPersistedFacet notPersistedFacet = new NotPersistedFacetAbstract(this) {};
final DisabledFacet disabledFacet = disabledFacet();
- final TypeOfFacet typeOfFacet = new TypeOfFacetAbstract(getSpecification().getCorrespondingClass(), this, objectMemberDependencies
- .getSpecificationLoader()) {};
+ final TypeOfFacet typeOfFacet = new TypeOfFacetAbstract(getSpecification().getCorrespondingClass(), this, servicesInjector.getSpecificationLoader()) {};
FacetUtil.addFacet(notPersistedFacet);
FacetUtil.addFacet(disabledFacet);
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
index 98c8e6b..f7cc6c4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationDefault.java
@@ -41,24 +41,25 @@ import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
public class OneToManyAssociationDefault extends ObjectAssociationAbstract implements OneToManyAssociation {
public OneToManyAssociationDefault(
final FacetedMethod facetedMethod,
- final ObjectMemberDependencies objectMemberDependencies) {
- this(facetedMethod, getSpecification(objectMemberDependencies.getSpecificationLoader(), facetedMethod.getType()),
- objectMemberDependencies);
+ final ServicesInjector servicesInjector) {
+ this(facetedMethod,
+ getSpecification(servicesInjector.getSpecificationLoader(), facetedMethod.getType()),
+ servicesInjector);
}
protected OneToManyAssociationDefault(
final FacetedMethod facetedMethod,
final ObjectSpecification objectSpec,
- final ObjectMemberDependencies objectMemberDependencies) {
- super(facetedMethod, FeatureType.COLLECTION, objectSpec, objectMemberDependencies);
+ final ServicesInjector servicesInjector) {
+ super(facetedMethod, FeatureType.COLLECTION, objectSpec, servicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
index 5d0ec7b..0e66c97 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
@@ -40,10 +40,10 @@ import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedF
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault implements MixedInMember2 {
@@ -73,7 +73,7 @@ public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault imp
private static ObjectSpecification typeOfSpec(
final ObjectActionDefault objectAction,
- final ObjectMemberDependencies objectMemberDependencies) {
+ final ServicesInjector objectMemberDependencies) {
final TypeOfFacet actionTypeOfFacet = objectAction.getFacet(TypeOfFacet.class);
final SpecificationLoader specificationLookup = objectMemberDependencies.getSpecificationLoader();
@@ -87,10 +87,10 @@ public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault imp
final ObjectActionDefault mixinAction,
final ObjectSpecification mixedInType,
final Class<?> mixinType,
- final ObjectMemberDependencies objectMemberDependencies) {
+ final ServicesInjector servicesInjector) {
super(mixinAction.getFacetedMethod(),
- typeOfSpec(mixinAction, objectMemberDependencies),
- objectMemberDependencies);
+ typeOfSpec(mixinAction, servicesInjector),
+ servicesInjector);
this.mixinType = mixinType;
this.mixinAction = mixinAction;
@@ -101,7 +101,7 @@ public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault imp
//
final NotPersistedFacet notPersistedFacet = new NotPersistedFacetAbstract(this) {};
final DisabledFacet disabledFacet = disabledFacet();
- final TypeOfFacet typeOfFacet = new TypeOfFacetAbstract(getSpecification().getCorrespondingClass(), this, objectMemberDependencies
+ final TypeOfFacet typeOfFacet = new TypeOfFacetAbstract(getSpecification().getCorrespondingClass(), this, servicesInjector
.getSpecificationLoader()) {};
FacetUtil.addFacet(notPersistedFacet);
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
index 1bfa110..99b0467 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationContributee.java
@@ -35,9 +35,9 @@ import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedF
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
public class OneToOneAssociationContributee extends OneToOneAssociationDefault implements ContributeeMember2 {
@@ -56,8 +56,8 @@ public class OneToOneAssociationContributee extends OneToOneAssociationDefault i
final Object servicePojo,
final ObjectActionDefault serviceAction,
final ObjectSpecification contributeeType,
- final ObjectMemberDependencies objectMemberDependencies) {
- super(serviceAction.getFacetedMethod(), serviceAction.getReturnType(), objectMemberDependencies);
+ final ServicesInjector servicesInjector) {
+ super(serviceAction.getFacetedMethod(), serviceAction.getReturnType(), servicesInjector);
this.servicePojo = servicePojo;
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
index a6f2d72..7de021f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
@@ -52,9 +52,9 @@ import org.apache.isis.core.metamodel.interactions.PropertyVisibilityContext;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.schema.cmd.v1.CommandDto;
@@ -62,16 +62,17 @@ public class OneToOneAssociationDefault extends ObjectAssociationAbstract implem
public OneToOneAssociationDefault(
final FacetedMethod facetedMethod,
- final ObjectMemberDependencies objectMemberDependencies) {
- this(facetedMethod, getSpecification(objectMemberDependencies.getSpecificationLoader(), facetedMethod.getType()),
- objectMemberDependencies);
+ final ServicesInjector servicesInjector) {
+ this(facetedMethod,
+ getSpecification(servicesInjector.getSpecificationLoader(), facetedMethod.getType()),
+ servicesInjector);
}
protected OneToOneAssociationDefault(
final FacetedMethod facetedMethod,
final ObjectSpecification objectSpec,
- final ObjectMemberDependencies objectMemberDependencies) {
- super(facetedMethod, FeatureType.PROPERTY, objectSpec, objectMemberDependencies);
+ final ServicesInjector servicesInjector) {
+ super(facetedMethod, FeatureType.PROPERTY, objectSpec, servicesInjector);
}
//region > visible, usable
http://git-wip-us.apache.org/repos/asf/isis/blob/03a1bd1c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
index 7e138cc..e48a44d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
@@ -38,9 +38,9 @@ import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedF
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
public class OneToOneAssociationMixedIn extends OneToOneAssociationDefault implements MixedInMember2 {
@@ -72,8 +72,8 @@ public class OneToOneAssociationMixedIn extends OneToOneAssociationDefault imple
final ObjectActionDefault mixinAction,
final ObjectSpecification mixedInType,
final Class<?> mixinType,
- final ObjectMemberDependencies objectMemberDependencies) {
- super(mixinAction.getFacetedMethod(), mixinAction.getReturnType(), objectMemberDependencies);
+ final ServicesInjector servicesInjector) {
+ super(mixinAction.getFacetedMethod(), mixinAction.getReturnType(), servicesInjector);
this.mixinType = mixinType;
this.mixinAction = mixinAction;