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 13:33:38 UTC
[03/51] [abbrv] isis git commit: ISIS-1405: removing
IsisConfigurationAware.
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 452438a..b3ba65e 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
@@ -22,7 +22,6 @@ package org.apache.isis.core.metamodel.facets.param.renderedasdaybefore.annotati
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.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -30,6 +29,8 @@ 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.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -37,7 +38,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class RenderedAsDayBeforeFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class RenderedAsDayBeforeFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(RenderedAsDayBefore.class);
@@ -68,8 +69,12 @@ public class RenderedAsDayBeforeFacetOnParameterAnnotationFactory extends FacetF
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 24b84b5..8888033 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
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.param.typicallen.annotation;
import java.lang.annotation.Annotation;
+
import org.apache.isis.applib.annotation.TypicalLength;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -30,6 +30,8 @@ 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.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -37,7 +39,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class TypicalLengthFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class TypicalLengthFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(TypicalLength.class);
@@ -69,8 +71,12 @@ public class TypicalLengthFacetOnParameterAnnotationFactory extends FacetFactory
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 19ba629..2f261be 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
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.param.validating.maskannot;
import org.apache.isis.applib.annotation.Mask;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -31,6 +30,8 @@ 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.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -39,7 +40,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Mask.class);
@@ -92,8 +93,12 @@ public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 4aa042a..72e3c82 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
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facets.properties.mandatory.staticmethod;
import java.lang.reflect.Method;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
@@ -33,6 +33,8 @@ 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.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -40,7 +42,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class MandatoryFacetOnPropertyStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MandatoryFacetOnPropertyStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
private static final String[] PREFIXES = { MethodPrefixConstants.OPTIONAL_PREFIX };
@@ -100,9 +102,13 @@ public class MandatoryFacetOnPropertyStaticMethodFactory extends MethodPrefixBas
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 985a32c..6638d5a 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
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.properties.multiline.annotation;
import java.util.Properties;
+
import org.apache.isis.applib.annotation.MultiLine;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -32,10 +32,12 @@ 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.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class MultiLineFacetOnPropertyFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MultiLineFacetOnPropertyFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation multiLineValidator = new MetaModelValidatorForDeprecatedAnnotation(MultiLine.class);
@@ -93,9 +95,13 @@ public class MultiLineFacetOnPropertyFactory extends FacetFactoryAbstract implem
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
multiLineValidator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 442b23b..531f1ae 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
@@ -36,7 +36,6 @@ import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.eventbus.PropertyChangedEvent;
import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -86,12 +85,13 @@ 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.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
import org.apache.isis.core.metamodel.util.EventUtil;
-public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation postsPropertyChangedEventValidator = new MetaModelValidatorForDeprecatedAnnotation(PostsPropertyChangedEvent.class);
private final MetaModelValidatorForDeprecatedAnnotation propertyInteractionValidator = new MetaModelValidatorForDeprecatedAnnotation(PropertyInteraction.class);
@@ -452,9 +452,12 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
// //////////////////////////////////////
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- this.configuration = configuration;
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
postsPropertyChangedEventValidator.setConfiguration(configuration);
propertyInteractionValidator.setConfiguration(configuration);
regexValidator.setConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 de90d85..5b5db86 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
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.properties.renderedasdaybefore.ann
import org.apache.isis.applib.annotation.RenderedAsDayBefore;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ 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.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class RenderedAsDayBeforeAnnotationOnPropertyFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class RenderedAsDayBeforeAnnotationOnPropertyFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(RenderedAsDayBefore.class);
@@ -63,8 +64,12 @@ public class RenderedAsDayBeforeAnnotationOnPropertyFacetFactory extends FacetFa
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 132a039..b6991ce 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
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.properties.typicallen.annotation;
import java.util.Properties;
+
import org.apache.isis.applib.annotation.TypicalLength;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -31,10 +31,12 @@ 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.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class TypicalLengthOnPropertyFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory , MetaModelValidatorRefiner, IsisConfigurationAware {
+public class TypicalLengthOnPropertyFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory , MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(TypicalLength.class);
@@ -85,8 +87,12 @@ public class TypicalLengthOnPropertyFacetFactory extends FacetFactoryAbstract im
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 a25e21e..af1ce53 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
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.properties.validating.maskannot;
import org.apache.isis.applib.annotation.Mask;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -31,11 +30,13 @@ 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.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Mask.class);
@@ -106,9 +107,14 @@ public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract i
metaModelValidator.add(validator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationService.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationService.java
deleted file mode 100644
index 1fa57b1..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationService.java
+++ /dev/null
@@ -1,45 +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 java.util.List;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-
-public interface ConfigurationService {
-
- void injectInto(final Object candidate);
-
- /**
- * Provided by {@link RuntimeContextAbstract} itself, cloned properties from
- * {@link IsisConfiguration}.
- *
- * <p>
- * Called by <tt>DomainObjectContainerDefault</tt>.
- */
- String getProperty(String name);
-
- /**
- * Provided by {@link RuntimeContextAbstract} itself, cloned properties from
- * {@link IsisConfiguration}.
- *
- * <p>
- * Called by <tt>DomainObjectContainerDefault</tt>.
- */
- List<String> getPropertyNames();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceAware.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceAware.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceAware.java
deleted file mode 100644
index c64b264..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceAware.java
+++ /dev/null
@@ -1,29 +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;
-
-public interface ConfigurationServiceAware {
-
- @Programmatic
- public void setConfigurationService(ConfigurationService configurationService);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceInternal.java
new file mode 100644
index 0000000..b5a3dc2
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceInternal.java
@@ -0,0 +1,45 @@
+/**
+ * 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 java.util.List;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+
+public interface ConfigurationServiceInternal {
+
+ void injectInto(final Object candidate);
+
+ /**
+ * Provided by {@link RuntimeContextAbstract} itself, cloned properties from
+ * {@link IsisConfiguration}.
+ *
+ * <p>
+ * Called by <tt>DomainObjectContainerDefault</tt>.
+ */
+ String getProperty(String name);
+
+ /**
+ * Provided by {@link RuntimeContextAbstract} itself, cloned properties from
+ * {@link IsisConfiguration}.
+ *
+ * <p>
+ * Called by <tt>DomainObjectContainerDefault</tt>.
+ */
+ List<String> getPropertyNames();
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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
index 9f20fc9..d7ab75b 100644
--- 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
@@ -35,8 +35,6 @@ public interface RuntimeContext extends ApplicationScopedComponent {
// application-scoped
// //////////////////////////////////////
- public ConfigurationService getConfigurationService();
-
public ServicesInjector getServicesInjector();
public SpecificationLoader getSpecificationLoader();
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
index babd24e..58443c6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
@@ -19,31 +19,22 @@
package org.apache.isis.core.metamodel.runtimecontext;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
public abstract class RuntimeContextAbstract implements RuntimeContext {
- private final IsisConfigurationDefault configuration;
private final ServicesInjector servicesInjector;
private final SpecificationLoaderSpi specificationLoader;
public RuntimeContextAbstract(
- final IsisConfigurationDefault configuration,
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- this.configuration = configuration;
this.servicesInjector = servicesInjector;
this.specificationLoader = specificationLoader;
}
@Override
- public ConfigurationService getConfigurationService() {
- return configuration;
- }
-
- @Override
public ServicesInjector getServicesInjector() {
return servicesInjector;
}
@@ -66,7 +57,6 @@ public abstract class RuntimeContextAbstract implements RuntimeContext {
protected void injectSubcomponentsInto(final Object candidate) {
getTransactionStateProvider().injectInto(candidate);
getServicesInjector().injectInto(candidate);
- getConfigurationService().injectInto(candidate);
getLocalizationProvider().injectInto(candidate);
getPersistenceSessionService().injectInto(candidate);
getMessageBrokerService().injectInto(candidate);
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
index 165266f..da18619 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
@@ -29,7 +29,6 @@ import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.runtimecontext.LocalizationDefault;
import org.apache.isis.core.metamodel.runtimecontext.LocalizationProvider;
import org.apache.isis.core.metamodel.runtimecontext.LocalizationProviderAbstract;
@@ -55,15 +54,14 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
public RuntimeContextNoRuntime(
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- this(DeploymentCategory.PRODUCTION, new IsisConfigurationDefault(null), servicesInjector, specificationLoader);
+ this(new IsisConfigurationDefault(null), servicesInjector, specificationLoader);
}
public RuntimeContextNoRuntime(
- final DeploymentCategory deploymentCategory,
final IsisConfigurationDefault isisConfiguration,
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- super(isisConfiguration, servicesInjector, specificationLoader);
+ super(servicesInjector, specificationLoader);
persistenceSessionService = new PersistenceSessionServiceAbstract() {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
index 24df9d0..7ae5213 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
@@ -25,8 +25,6 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkHolder;
import org.apache.isis.applib.services.bookmark.BookmarkService2;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationService;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceAware;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionServiceAware;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
@@ -42,7 +40,7 @@ import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
@DomainService(
nature = NatureOfService.DOMAIN
)
-public class BookmarkServiceDefault implements BookmarkService2, ConfigurationServiceAware,
+public class BookmarkServiceDefault implements BookmarkService2,
PersistenceSessionServiceAware {
private PersistenceSessionService persistenceSessionService;
@@ -132,21 +130,13 @@ public class BookmarkServiceDefault implements BookmarkService2, ConfigurationSe
// //////////////////////////////////////
- private ConfigurationService configurationService;
- @Programmatic
- @Override
- public void setConfigurationService(final ConfigurationService configurationService) {
- this.configurationService = configurationService;
- }
@Override
public void setPersistenceSessionService(final PersistenceSessionService persistenceSessionService) {
this.persistenceSessionService = persistenceSessionService;
}
- // //////////////////////////////////////
-
@javax.inject.Inject
private WrapperFactory wrapperFactory;
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
index 10c12e1..dbf59bb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
@@ -25,19 +25,19 @@ import java.util.Set;
import java.util.TreeSet;
import javax.annotation.PostConstruct;
+import javax.inject.Inject;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.config.ConfigurationProperty;
+import org.apache.isis.applib.services.config.ConfigurationService;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
@DomainService(
nature = NatureOfService.DOMAIN
)
-public class ConfigurationServiceDefault
- implements org.apache.isis.applib.services.config.ConfigurationService,
- org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceAware {
-
+public class ConfigurationServiceDefault implements ConfigurationService {
private Map<String, String> properties;
@@ -60,7 +60,7 @@ public class ConfigurationServiceDefault
@Programmatic
@Override
public String getProperty(final String name) {
- return getConfigurationService().getProperty(name);
+ return configurationServiceInternal.getProperty(name);
}
@Programmatic
@@ -73,21 +73,12 @@ public class ConfigurationServiceDefault
@Programmatic
@Override
public List<String> getPropertyNames() {
- return getConfigurationService().getPropertyNames();
+ return configurationServiceInternal.getPropertyNames();
}
- private org.apache.isis.core.metamodel.runtimecontext.ConfigurationService configurationService;
-
- protected org.apache.isis.core.metamodel.runtimecontext.ConfigurationService getConfigurationService() {
- return configurationService;
- }
-
- @Programmatic
- @Override
- public void setConfigurationService(final org.apache.isis.core.metamodel.runtimecontext.ConfigurationService configurationService) {
- this.configurationService = configurationService;
- }
+ @Inject
+ ConfigurationServiceInternal configurationServiceInternal;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
index 3c1e437..af0be4e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
@@ -37,6 +37,7 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ClassUtil;
@@ -46,6 +47,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
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.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
@@ -215,6 +217,7 @@ public final class ObjectReflectorDefault
// default subcomponents
if (this.runtimeContext == null) {
+ servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, new IsisConfigurationDefault(null));
this.runtimeContext = new RuntimeContextNoRuntime(servicesInjector, this);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
index cda3a8d..bea3c86 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
@@ -19,11 +19,10 @@
package org.apache.isis.core.metamodel.specloader.validator;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.FacetFactory;
-public abstract class MetaModelValidatorForDeprecatedAbstract extends MetaModelValidatorAbstract implements IsisConfigurationAware {
+public abstract class MetaModelValidatorForDeprecatedAbstract extends MetaModelValidatorAbstract {
public static final String ISIS_REFLECTOR_ALLOW_DEPRECATED_KEY = "isis.reflector.validator.allowDeprecated";
public static final boolean ISIS_REFLECTOR_ALLOW_DEPRECATED_DEFAULT = true;
@@ -75,7 +74,6 @@ public abstract class MetaModelValidatorForDeprecatedAbstract extends MetaModelV
validationFailures.addAll(failures);
}
- @Override
public void setConfiguration(final IsisConfiguration configuration) {
this.configuration = configuration;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableAnnotationInJdoApplibFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableAnnotationInJdoApplibFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableAnnotationInJdoApplibFacetFactory.java
index f6cc97d..462418c5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableAnnotationInJdoApplibFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableAnnotationInJdoApplibFacetFactory.java
@@ -20,12 +20,13 @@ package org.apache.isis.objectstore.jdo.metamodel.facets.object.auditable;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
import org.apache.isis.core.objectstore.jdo.applib.annotations.Auditable;
@@ -36,7 +37,7 @@ import org.apache.isis.core.objectstore.jdo.applib.annotations.Auditable;
*
*/
@Deprecated
-public class AuditableAnnotationInJdoApplibFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class AuditableAnnotationInJdoApplibFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Auditable.class);
@@ -53,7 +54,6 @@ public class AuditableAnnotationInJdoApplibFacetFactory extends FacetFactoryAbst
}
final AuditableFacetAnnotationInJdoApplib facet = new AuditableFacetAnnotationInJdoApplib(processClassContext.getFacetHolder());
FacetUtil.addFacet(validator.flagIfPresent(facet));
- return;
}
@@ -63,9 +63,13 @@ public class AuditableAnnotationInJdoApplibFacetFactory extends FacetFactoryAbst
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index a01e817..effc7ce 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -88,6 +88,7 @@ import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionPayl
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
@@ -128,7 +129,6 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
@Before
public void setUp() throws Exception {
facetFactory = new ActionAnnotationFacetFactory();
- facetFactory.setConfiguration(mockConfiguration);
facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
facetFactory.setServicesInjector(mockServicesInjector);
@@ -136,6 +136,9 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(mockConfiguration));
+
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 94adf4e..fe072fd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -27,6 +27,8 @@ import org.apache.isis.applib.RecreatableDomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -44,6 +46,9 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
@Mock
private IsisConfiguration mockConfiguration;
+ @Mock
+ private ServicesInjector mockServicesInjector;
+
private ViewModelSemanticCheckingFacetFactory facetFactory;
private ValidationFailures processThenRefine(final Class<?> cls) {
@@ -64,7 +69,11 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
will(returnValue(true));
}});
facetFactory = new ViewModelSemanticCheckingFacetFactory();
- facetFactory.setConfiguration(mockConfiguration);
+
+ context.checking(new Expectations() {{
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(mockConfiguration));
+ }});
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
index e9b3d7f..867a54e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
@@ -19,12 +19,16 @@
package org.apache.isis.core.metamodel.facets.object.defaults;
+import java.util.Collections;
+
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.defaults.annotcfg.DefaultedFacetAnnotationElseConfigurationFactory;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -36,8 +40,9 @@ public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
super.setUp();
facetFactory = new DefaultedFacetAnnotationElseConfigurationFactory();
- isisConfigurationDefault = new IsisConfigurationDefault();
- facetFactory.setConfiguration(isisConfigurationDefault);
+ ServicesInjectorDefault servicesInjector = new ServicesInjectorDefault(Collections.emptyList());
+ servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, isisConfigurationDefault = new IsisConfigurationDefault());
+ facetFactory.setServicesInjector(servicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 24a12bc..41c1583 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -63,6 +63,7 @@ import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObj
import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectPayloadFactoryDefault;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import static org.hamcrest.CoreMatchers.is;
@@ -77,7 +78,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
@Before
public void setUp() throws Exception {
facetFactory = new DomainObjectAnnotationFacetFactory();
- facetFactory.setConfiguration(mockConfiguration);
+
facetFactory.setServicesInjector(mockServicesInjector);
context.checking(new Expectations() {{
@@ -86,6 +87,9 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
+
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(mockConfiguration));
}});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
index d09a3dd..afb32f9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.object.encodable;
+import java.util.Collections;
+
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.annotation.Encodable;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
@@ -28,6 +30,8 @@ import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.object.encodeable.annotcfg.EncodableFacetAnnotationElseConfigurationFactory;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncoderDecoderUtil;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
public class EncodableFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -40,7 +44,11 @@ public class EncodableFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory = new EncodableFacetAnnotationElseConfigurationFactory();
isisConfigurationDefault = new IsisConfigurationDefault();
- facetFactory.setConfiguration(isisConfigurationDefault);
+
+ ServicesInjectorDefault servicesInjector = new ServicesInjectorDefault(Collections.emptyList());
+ servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, isisConfigurationDefault = new IsisConfigurationDefault());
+ facetFactory.setServicesInjector(servicesInjector);
+
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
index ce64eaa..4a58aae 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
@@ -32,6 +32,7 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.parseable.annotcfg.ParseableFacetAnnotationElseConfigurationFactory;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ParseableFacetAnnotationElseConfigurationFactoryTest extends AbstractFacetFactoryTest {
@@ -62,7 +63,6 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
facetFactory = new ParseableFacetAnnotationElseConfigurationFactory();
isisConfigurationDefault = new IsisConfigurationDefault();
- facetFactory.setConfiguration(isisConfigurationDefault);
facetFactory.setServicesInjector(mockServicesInjector);
context.checking(new Expectations(){{
@@ -71,6 +71,9 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
+
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(isisConfigurationDefault));
}});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index 3098e8d..6ecebf9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -43,6 +43,7 @@ import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengt
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet;
import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotation;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFacetFactoryTest {
@@ -75,7 +76,6 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
facetFactory = new ValueFacetAnnotationOrConfigurationFactory();
isisConfigurationDefault = new IsisConfigurationDefault();
- facetFactory.setConfiguration(isisConfigurationDefault);
facetFactory.setServicesInjector(mockServicesInjector);
context.checking(new Expectations(){{
@@ -84,6 +84,9 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
+
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(isisConfigurationDefault));
}});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTestAbstract.java
index 27a465e..429941a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTestAbstract.java
@@ -32,6 +32,7 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
@@ -42,6 +43,7 @@ import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson;
import org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
@@ -90,6 +92,10 @@ public abstract class ObjectReflectorDefaultTestAbstract {
new MetaModelValidatorDefault(),
Lists.<LayoutMetadataReader>newArrayList(
new LayoutMetadataReaderFromJson()), mockServicesInjector);
+ context.checking(new Expectations() {{
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(new IsisConfigurationDefault(null)));
+ }});
runtimeContext =
new RuntimeContextNoRuntime(
new ServicesInjectorDefault(Collections.emptyList()), reflector);
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index 215cac7..5accaa7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -29,6 +29,7 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -40,6 +41,7 @@ import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
@@ -72,8 +74,11 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
public ObjectSpecificationStub(final Class<?> type) {
this(type.getName());
+ ServicesInjectorDefault servicesInjector = new ServicesInjectorDefault(Collections.emptyList());
+ servicesInjector.addFallbackIfRequired(
+ ConfigurationServiceInternal.class, new IsisConfigurationDefault(null));
runtimeContext = new RuntimeContextNoRuntime(
- new ServicesInjectorDefault(Collections.emptyList()), null);
+ servicesInjector, null);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
index f067393..cfad852 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
@@ -70,7 +70,7 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
final IsisConfigurationDefault configuration,
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- super(configuration, servicesInjector, specificationLoader);
+ super(servicesInjector, specificationLoader);
this.persistenceSessionService = new PersistenceSessionServiceAbstract() {
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
index 26793cb..8e72ba1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
@@ -22,9 +22,8 @@ package org.apache.isis.core.runtime.services;
import java.util.List;
import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
-public interface ServicesInstaller extends Installer, IsisConfigurationAware {
+public interface ServicesInstaller extends Installer {
void init();
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
index 3eebf74..45a6e90 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
@@ -40,6 +40,7 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.lang.ListExtensions;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -149,6 +150,7 @@ public class IsisSystem implements ApplicationScopedComponent {
// services
ServicesInjectorDefault servicesInjector = isisComponentProvider.provideServiceInjector();
servicesInjector.addFallbackIfRequired(FixtureScripts.class, new FixtureScriptsDefault());
+ servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, configuration);
servicesInjector.validateServices();
// authentication, authorization
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 72310b0..a86e9fc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -89,8 +89,7 @@ import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingLifecycleE
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationService;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceAware;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerServiceAware;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
@@ -156,7 +155,7 @@ public class PersistenceSession implements
AdapterManager,
MessageBrokerService,
PersistenceSessionService,
- ConfigurationService,
+ ConfigurationServiceInternal,
IsisLifecycleListener2.PersistenceSessionLifecycleManagement,
IsisTransactionManager.PersistenceSessionTransactionManagement,
PersistenceQueryProcessorAbstract.PersistenceSessionQueryProcessorManagement {
@@ -410,10 +409,6 @@ public class PersistenceSession implements
final PersistenceSessionServiceAware cast = PersistenceSessionServiceAware.class.cast(candidate);
cast.setPersistenceSessionService(this);
}
- if (ConfigurationServiceAware.class.isAssignableFrom(candidate.getClass())) {
- final ConfigurationServiceAware cast = ConfigurationServiceAware.class.cast(candidate);
- cast.setConfigurationService(this);
- }
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
index 159e2ac..3b8671f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
@@ -121,7 +121,7 @@ public class IsisComponentProviderDefault2 extends IsisComponentProviderAbstract
@Override
protected void doPutConfigurationProperty(final String key, final String value) {
// bit hacky :-(
- IsisConfigurationDefault configurationDefault = (IsisConfigurationDefault) this.configuration;
+ IsisConfigurationDefault configurationDefault = this.configuration;
configurationDefault.put(key, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
index a743879..e340d72 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
@@ -30,7 +30,6 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;