ISIS-1422: refactoring (no functional change) - looking up components from ServicesInjector rather than pass them in.
for misc facets (ActionInvocationFacet, MaxLengthFacet, Encodable, RegEx, MultiLine) Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/935a5d94 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/935a5d94 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/935a5d94 Branch: refs/heads/master Commit: 935a5d947149544e3c15b44291676d0fa46eeed8 Parents: 28bd6dd Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Fri Jun 3 15:15:36 2016 +0100 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Fri Jun 3 16:42:43 2016 +0100 ---------------------------------------------------------------------- .../action/ActionAnnotationFacetFactory.java | 16 ++++------------ ...ctionInvocationFacetForDomainEventAbstract.java | 17 ++++++----------- ...ionFacetForDomainEventFromActionAnnotation.java | 11 +++-------- ...DomainEventFromActionInteractionAnnotation.java | 11 +++-------- ...onInvocationFacetForDomainEventFromDefault.java | 11 +++-------- ...nFacetForPostsActionInvokedEventAnnotation.java | 11 +++-------- .../MaxLengthFacetOnActionAnnotationFactory.java | 2 +- .../annotcfg/EncodableFacetAnnotation.java | 4 ++-- ...bleFacetAnnotationElseConfigurationFactory.java | 15 ++------------- .../annotcfg/EncodableFacetFromConfiguration.java | 4 ++-- .../RegExFacetOnTypeAnnotationFactory.java | 2 +- ...MultiLineFacetOnParameterAnnotationFactory.java | 2 +- 12 files changed, 31 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/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 f21de76..a60ff8a 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 @@ -208,9 +208,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract actionInvocationFacet = actionInteractionValidator.flagIfPresent( new ActionInvocationFacetForPostsActionInvokedEventAnnotation( actionInvokedEventType, actionMethod, typeSpec, returnSpec, holder, - getDeploymentCategory(), getConfiguration(), servicesInjector, - getAuthenticationSessionProvider(), adapterManager, - transactionStateProviderInternal + servicesInjector ), processMethodContext); } else // deprecated (but more recently) @@ -218,27 +216,21 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract actionInvocationFacet = actionInteractionValidator.flagIfPresent( new ActionInvocationFacetForDomainEventFromActionInteractionAnnotation( actionDomainEventType, actionMethod, typeSpec, returnSpec, holder, - getDeploymentCategory(), getConfiguration(), servicesInjector, - getAuthenticationSessionProvider(), adapterManager, - transactionStateProviderInternal + servicesInjector ), processMethodContext); } else // current if (action != null) { actionInvocationFacet = new ActionInvocationFacetForDomainEventFromActionAnnotation( actionDomainEventType, actionMethod, typeSpec, returnSpec, holder, - getDeploymentCategory(), getConfiguration(), - servicesInjector, getAuthenticationSessionProvider(), - adapterManager, transactionStateProviderInternal + servicesInjector ); } else // default { actionInvocationFacet = new ActionInvocationFacetForDomainEventFromDefault( actionDomainEventType, actionMethod, typeSpec, returnSpec, holder, - getDeploymentCategory(), getConfiguration(), - servicesInjector, getAuthenticationSessionProvider(), - adapterManager, transactionStateProviderInternal + servicesInjector ); } FacetUtil.addFacet(actionInvocationFacet); http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/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 10c1069..6a84f78 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 @@ -110,23 +110,18 @@ public abstract class ActionInvocationFacetForDomainEventAbstract final ObjectSpecification onType, final ObjectSpecification returnType, final FacetHolder holder, - final DeploymentCategory deploymentCategory, - final IsisConfiguration configuration, - final ServicesInjector servicesInjector, - final AuthenticationSessionProvider authenticationSessionProvider, - final AdapterManager adapterManager, - final TransactionStateProviderInternal transactionStateProviderInternal) { + final ServicesInjector servicesInjector) { super(holder); this.eventType = eventType; this.method = method; this.onType = onType; this.returnType = returnType; - this.deploymentCategory = deploymentCategory; - this.authenticationSessionProvider = authenticationSessionProvider; - this.adapterManager = adapterManager; + this.deploymentCategory = servicesInjector.getDeploymentCategoryProvider().getDeploymentCategory(); + this.authenticationSessionProvider = servicesInjector.getAuthenticationSessionProvider(); + this.adapterManager = servicesInjector.getPersistenceSessionServiceInternal(); this.servicesInjector = servicesInjector; - this.configuration = configuration; - this.transactionStateProviderInternal = transactionStateProviderInternal; + this.configuration = servicesInjector.getConfigurationServiceInternal(); + this.transactionStateProviderInternal = servicesInjector.lookupService(TransactionStateProviderInternal.class); this.domainEventHelper = new DomainEventHelper(this.servicesInjector); } http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/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 edf4e0b..a0e87fb 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 @@ -40,13 +40,8 @@ public class ActionInvocationFacetForDomainEventFromActionAnnotation final ObjectSpecification onType, final ObjectSpecification returnType, final FacetHolder holder, - final DeploymentCategory deploymentCategory, - final IsisConfiguration isisConfiguration, - final ServicesInjector servicesInjector, - final AuthenticationSessionProvider authenticationSessionProvider, - final AdapterManager adapterManager, - final TransactionStateProviderInternal transactionStateProviderInternal) { - super(eventType, method, onType, returnType, holder, deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager, - transactionStateProviderInternal); + final ServicesInjector servicesInjector) { + super(eventType, method, onType, returnType, holder, servicesInjector + ); } } http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/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 4ec448d..5d8461a 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 @@ -44,13 +44,8 @@ public class ActionInvocationFacetForDomainEventFromActionInteractionAnnotation final ObjectSpecification onType, final ObjectSpecification returnType, final FacetHolder holder, - final DeploymentCategory deploymentCategory, - final IsisConfiguration isisConfiguration, - final ServicesInjector servicesInjector, - final AuthenticationSessionProvider authenticationSessionProvider, - final AdapterManager adapterManager, - final TransactionStateProviderInternal transactionStateProviderInternal) { - super(eventType, method, onType, returnType, holder, deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager, - transactionStateProviderInternal); + final ServicesInjector servicesInjector) { + super(eventType, method, onType, returnType, holder, servicesInjector + ); } } http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/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 bccb50d..cf4f25b 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 @@ -40,14 +40,9 @@ public class ActionInvocationFacetForDomainEventFromDefault final ObjectSpecification onType, final ObjectSpecification returnType, final FacetHolder holder, - final DeploymentCategory deploymentCategory, - final IsisConfiguration isisConfiguration, - final ServicesInjector servicesInjector, - final AuthenticationSessionProvider authenticationSessionProvider, - final AdapterManager adapterManager, - final TransactionStateProviderInternal transactionStateProviderInternal) { + final ServicesInjector servicesInjector) { super(eventType, method, onType, returnType, holder, - deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager, - transactionStateProviderInternal); + servicesInjector + ); } } http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/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 59beec5..b9a0933 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 @@ -44,15 +44,10 @@ public class ActionInvocationFacetForPostsActionInvokedEventAnnotation final ObjectSpecification onType, final ObjectSpecification returnType, final FacetHolder holder, - final DeploymentCategory deploymentCategory, - final IsisConfiguration isisConfiguration, - final ServicesInjector servicesInjector, - final AuthenticationSessionProvider authenticationSessionProvider, - final AdapterManager adapterManager, - final TransactionStateProviderInternal transactionStateProviderInternal) { + final ServicesInjector servicesInjector) { super(eventType, method, onType, returnType, holder, - deploymentCategory, isisConfiguration, servicesInjector, authenticationSessionProvider, adapterManager, - transactionStateProviderInternal); + servicesInjector + ); } @Override http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java index 3983add..e14730f 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java @@ -68,7 +68,7 @@ public class MaxLengthFacetOnActionAnnotationFactory extends FacetFactoryAbstrac @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - validator.setConfiguration((IsisConfigurationDefault)servicesInjector.lookupService(ConfigurationServiceInternal.class)); + validator.setConfiguration(servicesInjector.lookupService(ConfigurationServiceInternal.class)); } http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotation.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotation.java index abe1cb0..2d4bcf4 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotation.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotation.java @@ -45,8 +45,8 @@ public class EncodableFacetAnnotation extends EncodableFacetAbstract { return annotation.encoderDecoderClass(); } - public EncodableFacetAnnotation(final Class<?> annotatedClass, final IsisConfiguration configuration, final FacetHolder holder, final AdapterManager adapterManager, final ServicesInjector dependencyInjector) { - this(encoderDecoderName(annotatedClass, configuration), encoderDecoderClass(annotatedClass), holder, adapterManager, dependencyInjector); + public EncodableFacetAnnotation(final Class<?> annotatedClass, final FacetHolder holder, final ServicesInjector servicesInjector) { + this(encoderDecoderName(annotatedClass, servicesInjector.getConfigurationServiceInternal()), encoderDecoderClass(annotatedClass), holder, servicesInjector.getPersistenceSessionServiceInternal(), servicesInjector); } private EncodableFacetAnnotation(final String candidateEncoderDecoderName, final Class<?> candidateEncoderDecoderClass, final FacetHolder holder, final AdapterManager adapterManager, final ServicesInjector dependencyInjector) { http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java index 95685a0..90d31d4 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java @@ -56,7 +56,7 @@ public class EncodableFacetAnnotationElseConfigurationFactory extends FacetFacto // create from annotation, if present final Encodable annotation = Annotations.getAnnotation(cls, Encodable.class); if (annotation != null) { - final EncodableFacetAnnotation facet = new EncodableFacetAnnotation(cls, getConfiguration(), holder, adapterManager, servicesInjector); + final EncodableFacetAnnotation facet = new EncodableFacetAnnotation(cls, holder, servicesInjector); if (facet.isValid()) { return facet; } @@ -65,7 +65,7 @@ public class EncodableFacetAnnotationElseConfigurationFactory extends FacetFacto // otherwise, try to create from configuration, if present final String encoderDecoderName = EncoderDecoderUtil.encoderDecoderNameFromConfiguration(cls, getConfiguration()); if (!Strings.isNullOrEmpty(encoderDecoderName)) { - final EncodableFacetFromConfiguration facet = new EncodableFacetFromConfiguration(encoderDecoderName, holder, adapterManager, servicesInjector); + final EncodableFacetFromConfiguration facet = new EncodableFacetFromConfiguration(encoderDecoderName, holder, servicesInjector); if (facet.isValid()) { return facet; } @@ -75,18 +75,7 @@ public class EncodableFacetAnnotationElseConfigurationFactory extends FacetFacto return null; } - // //////////////////////////////////////////////////////////////////// - // Injected - // //////////////////////////////////////////////////////////////////// - @Override - public void setServicesInjector(final ServicesInjector servicesInjector) { - super.setServicesInjector(servicesInjector); - adapterManager = servicesInjector.getPersistenceSessionServiceInternal(); - } - - PersistenceSessionServiceInternal adapterManager; - } http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetFromConfiguration.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetFromConfiguration.java index 9e2e2ff..806ea7e 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetFromConfiguration.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetFromConfiguration.java @@ -26,8 +26,8 @@ import org.apache.isis.core.metamodel.services.ServicesInjector; public class EncodableFacetFromConfiguration extends EncodableFacetAbstract { - public EncodableFacetFromConfiguration(final String candidateEncoderDecoderName, final FacetHolder holder, final AdapterManager adapterManager, final ServicesInjector dependencyInjector) { - super(candidateEncoderDecoderName, null, holder, adapterManager, dependencyInjector); + public EncodableFacetFromConfiguration(final String candidateEncoderDecoderName, final FacetHolder holder, final ServicesInjector servicesInjector) { + super(candidateEncoderDecoderName, null, holder, servicesInjector.getPersistenceSessionServiceInternal(), servicesInjector); } } http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/regex/annotation/RegExFacetOnTypeAnnotationFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/regex/annotation/RegExFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/regex/annotation/RegExFacetOnTypeAnnotationFactory.java index e264c14..c289aad 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/regex/annotation/RegExFacetOnTypeAnnotationFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/regex/annotation/RegExFacetOnTypeAnnotationFactory.java @@ -76,7 +76,7 @@ public class RegExFacetOnTypeAnnotationFactory extends FacetFactoryAbstract impl @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - validator.setConfiguration((IsisConfigurationDefault)servicesInjector.lookupService(ConfigurationServiceInternal.class)); + validator.setConfiguration(servicesInjector.getConfigurationServiceInternal()); } http://git-wip-us.apache.org/repos/asf/isis/blob/935a5d94/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/multiline/annotation/MultiLineFacetOnParameterAnnotationFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/multiline/annotation/MultiLineFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/multiline/annotation/MultiLineFacetOnParameterAnnotationFactory.java index 7d78cde..1707b2e 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/multiline/annotation/MultiLineFacetOnParameterAnnotationFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/multiline/annotation/MultiLineFacetOnParameterAnnotationFactory.java @@ -90,7 +90,7 @@ public class MultiLineFacetOnParameterAnnotationFactory extends FacetFactoryAbst @Override public void setServicesInjector(final ServicesInjector servicesInjector) { super.setServicesInjector(servicesInjector); - validator.setConfiguration((IsisConfigurationDefault)servicesInjector.lookupService(ConfigurationServiceInternal.class)); + validator.setConfiguration(servicesInjector.getConfigurationServiceInternal()); } }
