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 2015/09/03 16:23:10 UTC
[3/5] isis git commit: ISIS-1194: FacetFactorys no longer implement
RuntimeContextAware.
ISIS-1194: FacetFactorys no longer implement RuntimeContextAware.
... those that required this instead implement TransactionStateProviderAware.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dd162be9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dd162be9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dd162be9
Branch: refs/heads/master
Commit: dd162be98128c3762d273ffd9b71c6eb092f4b46
Parents: fe1f75d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 3 14:34:13 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 3 14:34:13 2015 +0100
----------------------------------------------------------------------
.../action/ActionAnnotationFacetFactory.java | 23 +++++---------------
...onInvocationFacetForDomainEventAbstract.java | 4 ----
...FacetForDomainEventFromActionAnnotation.java | 5 +----
...ainEventFromActionInteractionAnnotation.java | 5 +----
...nvocationFacetForDomainEventFromDefault.java | 4 +---
...cetForPostsActionInvokedEventAnnotation.java | 4 +---
...FacetAnnotationElseConfigurationFactory.java | 10 +--------
...ueFacetAnnotationOrConfigurationFactory.java | 19 +++++-----------
...ValueFacetUsingSemanticsProviderFactory.java | 11 +---------
...tAnnotationElseConfigurationFactoryTest.java | 1 -
...cetAnnotationOrConfigurationFactoryTest.java | 1 -
11 files changed, 17 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index 58bddba..8f9da41 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -24,6 +24,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionInteraction;
import org.apache.isis.applib.annotation.ActionSemantics;
@@ -88,8 +89,6 @@ import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFace
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -99,7 +98,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
import org.apache.isis.core.metamodel.transactions.TransactionStateProviderAware;
-public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implements ServicesInjectorAware, IsisConfigurationAware, AdapterManagerAware, RuntimeContextAware, MetaModelValidatorRefiner,
+public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implements ServicesInjectorAware, IsisConfigurationAware, AdapterManagerAware, MetaModelValidatorRefiner,
TransactionStateProviderAware {
private final MetaModelValidatorForDeprecatedAnnotation actionSemanticsValidator = new MetaModelValidatorForDeprecatedAnnotation(ActionSemantics.class);
@@ -119,7 +118,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
private ServicesInjector servicesInjector;
private IsisConfiguration configuration;
private AdapterManager adapterManager;
- private RuntimeContext runtimeContext;
private TransactionStateProvider transactionStateProvider;
private final CollectionTypeRegistry collectionTypeRegistry = new CollectionTypeRegistry();
@@ -215,7 +213,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
new ActionInvocationFacetForPostsActionInvokedEventAnnotation(
actionInvokedEventType, actionMethod, typeSpec, returnSpec, holder,
getDeploymentCategory(), configuration, getServicesInjector(),
- getAuthenticationSessionProvider(), getAdapterManager(), getRuntimeContext(),
+ getAuthenticationSessionProvider(), getAdapterManager(),
transactionStateProvider
), processMethodContext);
} else
@@ -225,7 +223,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
new ActionInvocationFacetForDomainEventFromActionInteractionAnnotation(
actionDomainEventType, actionMethod, typeSpec, returnSpec, holder,
getDeploymentCategory(), configuration, getServicesInjector(),
- getAuthenticationSessionProvider(), getAdapterManager(), getRuntimeContext(),
+ getAuthenticationSessionProvider(), getAdapterManager(),
transactionStateProvider
), processMethodContext);
} else
@@ -235,7 +233,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
actionDomainEventType, actionMethod, typeSpec, returnSpec, holder,
getDeploymentCategory(), configuration, getServicesInjector(),
getAuthenticationSessionProvider(),
- getAdapterManager(), getRuntimeContext(), transactionStateProvider
+ getAdapterManager(), transactionStateProvider
);
} else
// default
@@ -243,7 +241,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
actionInvocationFacet = new ActionInvocationFacetForDomainEventFromDefault(
actionDomainEventType, actionMethod, typeSpec, returnSpec, holder,
getDeploymentCategory(), configuration, getServicesInjector(), getAuthenticationSessionProvider(),
- getAdapterManager(), getRuntimeContext(), transactionStateProvider
+ getAdapterManager(), transactionStateProvider
);
}
FacetUtil.addFacet(actionInvocationFacet);
@@ -577,15 +575,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
return servicesInjector;
}
- private RuntimeContext getRuntimeContext() {
- return runtimeContext;
- }
-
- @Override
- public void setRuntimeContext(final RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
- }
-
@Override
public void setTransactionStateProvider(final TransactionStateProvider transactionStateProvider) {
this.transactionStateProvider = transactionStateProvider;
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index f78c720..acf8074 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -69,7 +69,6 @@ import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFace
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -90,7 +89,6 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
private final AdapterManager adapterManager;
private final DeploymentCategory deploymentCategory;
private final AuthenticationSessionProvider authenticationSessionProvider;
- private final RuntimeContext runtimeContext;
private final ServicesInjector servicesInjector;
private final IsisConfiguration configuration;
@@ -109,7 +107,6 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
final ServicesInjector servicesInjector,
final AuthenticationSessionProvider authenticationSessionProvider,
final AdapterManager adapterManager,
- final RuntimeContext runtimeContext,
final TransactionStateProvider transactionStateProvider) {
super(holder);
this.eventType = eventType;
@@ -118,7 +115,6 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
this.returnType = returnType;
this.deploymentCategory = deploymentCategory;
this.authenticationSessionProvider = authenticationSessionProvider;
- this.runtimeContext = runtimeContext;
this.adapterManager = adapterManager;
this.servicesInjector = servicesInjector;
this.configuration = configuration;
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java
index 7f6d614..a8685f5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionAnnotation.java
@@ -24,11 +24,9 @@ import java.lang.reflect.Method;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.config.IsisConfiguration;
-
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
@@ -47,9 +45,8 @@ public class ActionInvocationFacetForDomainEventFromActionAnnotation
final ServicesInjector servicesInjector,
final AuthenticationSessionProvider authenticationSessionProvider,
final AdapterManager adapterManager,
- final RuntimeContext runtimeContext,
final TransactionStateProvider transactionStateProvider) {
- super(eventType, method, onType, returnType, holder, deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager, runtimeContext,
+ super(eventType, method, onType, returnType, holder, deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager,
transactionStateProvider);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionInteractionAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionInteractionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionInteractionAnnotation.java
index 3bda165..7fcec42 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionInteractionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromActionInteractionAnnotation.java
@@ -24,11 +24,9 @@ import java.lang.reflect.Method;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.config.IsisConfiguration;
-
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
@@ -51,9 +49,8 @@ public class ActionInvocationFacetForDomainEventFromActionInteractionAnnotation
final ServicesInjector servicesInjector,
final AuthenticationSessionProvider authenticationSessionProvider,
final AdapterManager adapterManager,
- final RuntimeContext runtimeContext,
final TransactionStateProvider transactionStateProvider) {
- super(eventType, method, onType, returnType, holder, deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager, runtimeContext,
+ super(eventType, method, onType, returnType, holder, deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager,
transactionStateProvider);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java
index 395f2c7..5632337 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventFromDefault.java
@@ -27,7 +27,6 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
@@ -46,10 +45,9 @@ public class ActionInvocationFacetForDomainEventFromDefault
final ServicesInjector servicesInjector,
final AuthenticationSessionProvider authenticationSessionProvider,
final AdapterManager adapterManager,
- final RuntimeContext runtimeContext,
final TransactionStateProvider transactionStateProvider) {
super(eventType, method, onType, returnType, holder,
- deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager, runtimeContext,
+ deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager,
transactionStateProvider);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForPostsActionInvokedEventAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForPostsActionInvokedEventAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForPostsActionInvokedEventAnnotation.java
index 67ad6d0..a4143cc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForPostsActionInvokedEventAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForPostsActionInvokedEventAnnotation.java
@@ -27,7 +27,6 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
@@ -50,10 +49,9 @@ public class ActionInvocationFacetForPostsActionInvokedEventAnnotation
final ServicesInjector servicesInjector,
final AuthenticationSessionProvider authenticationSessionProvider,
final AdapterManager adapterManager,
- final RuntimeContext runtimeContext,
final TransactionStateProvider transactionStateProvider) {
super(eventType, method, onType, returnType, holder,
- deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager, runtimeContext,
+ deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager,
transactionStateProvider);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
index e826fde..bbb416c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
@@ -35,12 +35,10 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.parseable.ParserUtil;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterManagerAware, ServicesInjectorAware, RuntimeContextAware {
+public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterManagerAware, ServicesInjectorAware {
private IsisConfiguration configuration;
@@ -48,8 +46,6 @@ public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFacto
private AdapterManager adapterManager;
private ServicesInjector servicesInjector;
- private RuntimeContext runtimeContext;
-
public ParseableFacetAnnotationElseConfigurationFactory() {
super(FeatureType.OBJECTS_ONLY);
}
@@ -114,9 +110,5 @@ public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFacto
this.servicesInjector = dependencyInjector;
}
- @Override
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
index 153374e..8d3dfe4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
@@ -30,26 +30,23 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacet;
-import org.apache.isis.core.metamodel.facets.object.parented.ParentedFacet;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
+import org.apache.isis.core.metamodel.facets.object.parented.ParentedFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
+import org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
/**
* Processes the {@link Value} annotation.
@@ -77,10 +74,9 @@ import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProv
* <p>
* Note that {@link ParentedFacet} is <i>not</i> installed.
*/
-public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterManagerAware, ServicesInjectorAware, RuntimeContextAware {
+public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterManagerAware, ServicesInjectorAware {
private IsisConfiguration configuration;
- private RuntimeContext runtimeContext;
private AuthenticationSessionProvider authenticationSessionProvider;
private AdapterManager adapterManager;
private ServicesInjector servicesInjector;
@@ -165,9 +161,4 @@ public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbst
this.servicesInjector = dependencyInjector;
}
- @Override
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
index 049dc32..e5cefc1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
@@ -25,19 +25,15 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.core.metamodel.runtimecontext.RuntimeContextAware;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterManagerAware, ServicesInjectorAware, RuntimeContextAware {
+public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterManagerAware, ServicesInjectorAware {
private IsisConfiguration configuration;
- private RuntimeContext runtimeContext;
private AuthenticationSessionProvider authenticationSessionProvider;
private AdapterManager adapterManager;
private ServicesInjector servicesInjector;
@@ -92,9 +88,4 @@ public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFa
this.servicesInjector = dependencyInjector;
}
- @Override
- public void setRuntimeContext(RuntimeContext runtimeContext) {
- this.runtimeContext = runtimeContext;
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/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 a6d9e99..83ace6b 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
@@ -65,7 +65,6 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
facetFactory = new ParseableFacetAnnotationElseConfigurationFactory();
isisConfigurationDefault = new IsisConfigurationDefault();
facetFactory.setConfiguration(isisConfigurationDefault);
- facetFactory.setRuntimeContext(new RuntimeContextNoRuntime(DeploymentCategory.PRODUCTION));
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
http://git-wip-us.apache.org/repos/asf/isis/blob/dd162be9/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 d7cbfc7..839bcb9 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
@@ -77,7 +77,6 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
facetFactory = new ValueFacetAnnotationOrConfigurationFactory();
isisConfigurationDefault = new IsisConfigurationDefault();
facetFactory.setConfiguration(isisConfigurationDefault);
- facetFactory.setRuntimeContext(new RuntimeContextNoRuntime(DeploymentCategory.PRODUCTION));
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);