You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/05/20 00:44:50 UTC
[13/30] isis git commit: ISIS-1407: removed SpecificationLoaderAware.
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index 0ca7200..de3114e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -83,7 +83,7 @@ import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.core.metamodel.layout.DeweyOrderSet;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java
index 42349d9..407e666 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidator.java
@@ -20,13 +20,14 @@
package org.apache.isis.core.metamodel.specloader.validator;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoaderAware;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-public interface MetaModelValidator extends SpecificationLoaderAware, ApplicationScopedComponent {
+public interface MetaModelValidator extends ApplicationScopedComponent {
- public void init();
- public void shutdown();
+ void init(final SpecificationLoader specificationLoader);
+ void shutdown();
+
+ void validate(ValidationFailures validationFailures);
- public void validate(ValidationFailures validationFailures);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java
index 1f194db..bde6490 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java
@@ -19,40 +19,20 @@
package org.apache.isis.core.metamodel.specloader.validator;
-import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public abstract class MetaModelValidatorAbstract implements MetaModelValidator {
- private SpecificationLoader specificationLoaderSpi;
-
- // ////////////////////////////////////////////////////////////////////
- // init, shutdown
- // ////////////////////////////////////////////////////////////////////
+ protected SpecificationLoader specificationLoader;
- public void init() {
- ensureThatState(specificationLoaderSpi, is(notNullValue()));
+ @Override
+ public void init(final SpecificationLoader specificationLoader) {
+ this.specificationLoader = specificationLoader;
}
+ @Override
public void shutdown() {
}
- // ////////////////////////////////////////////////////////////////////
- // Dependencies (due to *Aware)
- // ////////////////////////////////////////////////////////////////////
-
- public SpecificationLoader getSpecificationLoader() {
- return specificationLoaderSpi;
- }
-
- @Override
- public void setSpecificationLoader(final SpecificationLoader specificationLoader) {
- this.specificationLoaderSpi = specificationLoader;
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java
index 99ee00c..cced609 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorComposite.java
@@ -29,12 +29,6 @@ public class MetaModelValidatorComposite extends MetaModelValidatorAbstract {
private final List<MetaModelValidator> validators = Lists.newArrayList();
- @Override
- public void validate(final ValidationFailures validationFailures) {
- for (final MetaModelValidator validator : validators) {
- validator.validate(validationFailures);
- }
- }
public MetaModelValidatorComposite add(final MetaModelValidator validator) {
validators.add(validator);
@@ -50,14 +44,24 @@ public class MetaModelValidatorComposite extends MetaModelValidatorAbstract {
return this;
}
+
+ @Override
+ public void init(final SpecificationLoader specificationLoader) {
+ super.init(specificationLoader);
+ for (final MetaModelValidator validator : validators) {
+ validator.init(specificationLoader);
+ }
+ }
+
+
@Override
- public void setSpecificationLoader(final SpecificationLoader specificationLoader) {
- super.setSpecificationLoader(specificationLoader);
+ public void validate(final ValidationFailures validationFailures) {
for (final MetaModelValidator validator : validators) {
- validator.setSpecificationLoader(specificationLoader);
+ validator.validate(validationFailures);
}
}
+
public static MetaModelValidatorComposite asComposite(final MetaModelValidator baseMetaModelValidator) {
final MetaModelValidatorComposite metaModelValidatorComposite = new MetaModelValidatorComposite();
metaModelValidatorComposite.add(baseMetaModelValidator);
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
index c493f33..edbce71 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorVisiting.java
@@ -25,14 +25,14 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public final class MetaModelValidatorVisiting extends MetaModelValidatorAbstract {
- public static interface Visitor {
+ public interface Visitor {
/**
* @return <tt>true</tt> continue visiting specs.
*/
- public boolean visit(ObjectSpecification objectSpec, ValidationFailures validationFailures);
+ boolean visit(ObjectSpecification objectSpec, ValidationFailures validationFailures);
}
- public static interface SummarizingVisitor extends Visitor {
- public void summarize(ValidationFailures validationFailures);
+ public interface SummarizingVisitor extends Visitor {
+ void summarize(ValidationFailures validationFailures);
}
private final Visitor visitor;
@@ -42,7 +42,7 @@ public final class MetaModelValidatorVisiting extends MetaModelValidatorAbstract
@Override
public final void validate(ValidationFailures validationFailures) {
- final Collection<ObjectSpecification> objectSpecs = getSpecificationLoader().allSpecifications();
+ final Collection<ObjectSpecification> objectSpecs = specificationLoader.allSpecifications();
for (final ObjectSpecification objSpec : objectSpecs) {
if(!visitor.visit(objSpec, validationFailures)) {
break;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
index 5c9b067..11de514 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
@@ -19,30 +19,44 @@
package org.apache.isis.core.runtime.authentication;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+/**
+ * Implementing class is added to {@link ServicesInjector} as an (internal) domain service; all public methods
+ * must be annotated using {@link Programmatic}.
+ */
public interface AuthenticationManager extends ApplicationScopedComponent {
- public void init();
- public void shutdown();
+ @Programmatic
+ void init();
+
+ @Programmatic
+ void shutdown();
/**
* Caches and returns an authentication {@link AuthenticationSession} if the
* {@link AuthenticationRequest request} is valid; otherwise returns
* <tt>null</tt>.
*/
+ @Programmatic
AuthenticationSession authenticate(AuthenticationRequest request);
+ @Programmatic
boolean supportsRegistration(Class<? extends RegistrationDetails> registrationDetailsClass);
+ @Programmatic
boolean register(RegistrationDetails registrationDetails);
/**
* Whether the provided {@link AuthenticationSession} is still valid.
*/
+ @Programmatic
boolean isSessionValid(AuthenticationSession authenticationSession);
+ @Programmatic
void closeSession(AuthenticationSession authenticationSession);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
index f682261..3ed3adf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
@@ -28,6 +28,7 @@ import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -155,6 +156,7 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
* Use either this or alternatively {@link #setAuthenticators(List) inject}
* the full list of {@link Authenticator}s.
*/
+ @Programmatic
public final void addAuthenticator(final Authenticator authenticator) {
authenticators.add(authenticator);
}
@@ -173,10 +175,12 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
* Use either this or programmatically
* {@link #addAuthenticator(Authenticator)}.
*/
+ @Programmatic
public void setAuthenticators(final List<Authenticator> authenticators) {
this.authenticators = authenticators;
}
+ @Programmatic
public List<Authenticator> getAuthenticators() {
return Collections.unmodifiableList(authenticators);
}
@@ -205,6 +209,7 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
return false;
}
+ @Programmatic
public List<Registrar> getRegistrars() {
return asAuthenticators(getAuthenticators());
}
@@ -218,17 +223,12 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
// RandomCodeGenerator
// //////////////////////////////////////////////////////////
- /**
- * The {@link RandomCodeGenerator} in use.
- */
- public RandomCodeGenerator getRandomCodeGenerator() {
- return randomCodeGenerator;
- }
/**
* For injection; will {@link #defaultRandomCodeGeneratorIfNecessary()
* default} otherwise.
*/
+ @Programmatic
public void setRandomCodeGenerator(final RandomCodeGenerator randomCodeGenerator) {
ensureThatArg(randomCodeGenerator, is(notNullValue()), "randomCodeGenerator cannot be null");
this.randomCodeGenerator = randomCodeGenerator;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java
index 3679985..e43aba6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java
@@ -20,17 +20,25 @@
package org.apache.isis.core.runtime.authorization;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
/**
* Authorises the user in the current session view and use members of an object.
+ *
+ * Implementing class is added to {@link ServicesInjector} as an (internal) domain service; all public methods
+ * must be annotated using {@link Programmatic}.
*/
public interface AuthorizationManager extends ApplicationScopedComponent {
- public void init();
- public void shutdown();
+ @Programmatic
+ void init();
+
+ @Programmatic
+ void shutdown();
/**
* Returns true when the user represented by the specified session is
@@ -38,6 +46,7 @@ public interface AuthorizationManager extends ApplicationScopedComponent {
* member identifier. Normally the view of the specified field, or the
* display of the action will be suppress if this returns false.
*/
+ @Programmatic
boolean isVisible(AuthenticationSession session, ObjectAdapter target, Identifier identifier);
/**
@@ -46,5 +55,6 @@ public interface AuthorizationManager extends ApplicationScopedComponent {
* Normally the specified field will be not appear editable if this returns
* false.
*/
+ @Programmatic
boolean isUsable(AuthenticationSession session, ObjectAdapter target, Identifier identifier);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java
index 0deee45..bc94643 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java
@@ -19,6 +19,7 @@
package org.apache.isis.core.runtime.authorization;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
@@ -34,6 +35,7 @@ public abstract class AuthorizationManagerAbstract implements AuthorizationManag
this.configuration = configuration;
}
+ @Programmatic
public IsisConfiguration getConfiguration() {
return configuration;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
index 61b0948..ee3a055 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.runtime.authorization.standard;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/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 462418c5..be088af 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
@@ -26,7 +26,7 @@ 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.services.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;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
index fefcecb..274aa94 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
@@ -49,7 +49,7 @@ public final class JavaReflectorHelper {
final Collection<MetaModelRefiner> metaModelRefiners,
final List<LayoutMetadataReader> layoutMetadataReaders,
final MetaModelValidator mmv,
- final ServicesInjectorSpi servicesInjector) {
+ final ServicesInjector servicesInjector) {
MetaModelValidatorComposite metaModelValidator = MetaModelValidatorComposite.asComposite(mmv);
for (MetaModelRefiner metaModelRefiner : metaModelRefiners) {
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
index 60c9093..942c299 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
@@ -37,10 +37,10 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoaderInstaller;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoaderInstaller;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
public class JavaReflectorInstaller extends InstallerAbstract implements SpecificationLoaderInstaller {
@@ -71,7 +71,7 @@ public class JavaReflectorInstaller extends InstallerAbstract implements Specifi
public SpecificationLoader createReflector(
final DeploymentCategory deploymentCategory,
final Collection<MetaModelRefiner> metaModelRefiners,
- final ServicesInjectorSpi servicesInjector) {
+ final ServicesInjector servicesInjector) {
final ProgrammingModel programmingModel = createProgrammingModel(getConfiguration());
final MetaModelValidator mmv = createMetaModelValidator(getConfiguration());
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index dd73306..c9b1e92 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.metamodel.facets.object.domainobject.autocomplete.AutoCompleteFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -122,6 +122,10 @@ public abstract class AbstractFacetFactoryJUnit4TestCase {
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+
+ allowing(mockServicesInjector).lookupService(SpecificationLoader.class);
+ will(returnValue(mockSpecificationLoader));
+
}});
facetHolder = new AbstractFacetFactoryTest.IdentifiedHolderImpl(Identifier.propertyOrCollectionIdentifier(Customer.class, "firstName"));
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index a1514ef..6e8805a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -122,6 +122,9 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(SpecificationLoader.class);
+ will(returnValue(mockSpecificationLoader));
+
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index cfa7c57..c965186 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -39,7 +39,6 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
@@ -80,8 +79,9 @@ import org.apache.isis.core.metamodel.facets.param.defaults.ActionParameterDefau
import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetViaMethod;
import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetViaMethodFactory;
import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -129,22 +129,23 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
+ allowing(mockServicesInjector).lookupService(SpecificationLoader.class);
+ will(returnValue(mockSpecificationLoader));
+
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
- }});
- }
+ allowing(mockServicesInjector).lookupService(SpecificationLoader.class);
+ will(returnValue(mockSpecificationLoader));
- private void injectServicesIntoAndAllowingServiceInjectorLookups(final FacetFactoryAbstract facetFactory) {
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
- facetFactory.setServicesInjector(mockServicesInjector);
- }
+ }});
+ }
public void testProvidesDefaultNameForActionButIgnoresAnyNamedAnnotation() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -170,7 +171,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPicksUpDebugPrefixAndSetsNameAppropriatelyAlso() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -197,7 +198,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPicksUpExplorationPrefixAndSetsNameAppropriatelyAlso() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -224,7 +225,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testCannotHaveBothDebugAndThenExplorationPrefix() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -248,7 +249,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testCannotHaveBothExplorationAndThenDebugPrefix() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -272,7 +273,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsValidateMethodNoArgsFacetAndRemovesMethod() {
final ActionValidationFacetViaMethodFactory facetFactory = new ActionValidationFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -304,7 +305,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsValidateMethodSomeArgsFacetAndRemovesMethod() {
final ActionValidationFacetViaMethodFactory facetFactory = new ActionValidationFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -336,7 +337,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterDefaultsMethodNoArgsFacetAndRemovesMethod() {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -368,7 +369,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterDefaultsMethodSomeArgsIsIgnored() {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -394,7 +395,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterChoicesMethodNoArgsFacetAndRemovesMethod() {
final ActionChoicesFacetViaMethodFactory facetFactory = new ActionChoicesFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -425,7 +426,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterChoicesMethodSomeArgsIsIgnored() {
final ActionChoicesFacetViaMethodFactory facetFactory = new ActionChoicesFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -491,7 +492,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -512,7 +513,6 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -534,7 +534,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideSomeAction", new Class[] {});
@@ -552,7 +552,6 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -570,7 +569,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -591,7 +590,6 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -610,7 +608,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -631,7 +629,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDisabledForSessionFacetAndRemovesMethod() {
final DisableForSessionFacetViaMethodFactory facetFactory = new DisableForSessionFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
+
facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
@@ -654,7 +652,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterDefaultsMethodAndRemovesMethod() {
final ActionParameterDefaultsFacetViaMethodFactory facetFactory = new ActionParameterDefaultsFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -704,7 +702,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterChoicesMethodAndRemovesMethod() {
final ActionParameterChoicesFacetViaMethodFactory facetFactory = new ActionParameterChoicesFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -769,7 +767,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterAutoCompleteMethodAndRemovesMethod() {
final ActionParameterAutoCompleteFacetViaMethodFactory facetFactory = new ActionParameterAutoCompleteFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
@@ -804,16 +802,16 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testBothChoicesMethodCausesException() {
final ActionChoicesFacetViaMethodFactory facetFactory = new ActionChoicesFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
-// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
+ // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
final ActionParameterChoicesFacetViaMethodFactory facetFactoryForParams = new ActionParameterChoicesFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForParams);
+ facetFactoryForParams.setServicesInjector(mockServicesInjector);
-// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
+ // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@SuppressWarnings("unused")
@@ -852,14 +850,14 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testBothDefaultMethodCausesException() {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
final ActionParameterDefaultsFacetViaMethodFactory facetFactoryForParams = new ActionParameterDefaultsFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForParams);
+ facetFactoryForParams.setServicesInjector(mockServicesInjector);
// mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/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 02b2317..ef2bf37 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
@@ -146,7 +146,6 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
actionMethod = findMethod(Customer.class, "someAction");
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
facetFactory.setServicesInjector(mockServicesInjector);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_actionInvocation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_actionInvocation.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_actionInvocation.java
index 2c3a616..b72a0e7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_actionInvocation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_actionInvocation.java
@@ -29,7 +29,6 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventAbstract;
@@ -40,6 +39,7 @@ import org.apache.isis.core.metamodel.facets.param.choices.ActionParameterChoice
import org.apache.isis.core.metamodel.facets.param.choices.methodnum.ActionParameterChoicesFacetViaMethod;
import org.apache.isis.core.metamodel.facets.param.choices.methodnum.ActionParameterChoicesFacetViaMethodFactory;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub;
public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractFacetFactoryTest {
@@ -53,30 +53,31 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
super.setUp();
this.facetFactory = new ActionAnnotationFacetFactory();;
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- }
-
- private void injectServicesIntoAndAllowingServiceInjectorLookups(final FacetFactoryAbstract facetFactory) {
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
- facetFactory.setServicesInjector(mockServicesInjector);
-
context.checking(new Expectations() {{
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(SpecificationLoader.class);
+ will(returnValue(mockSpecificationLoader));
+
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
+
+ allowing(mockServicesInjector).lookupService(SpecificationLoader.class);
+ will(returnValue(mockSpecificationLoader));
+
}});
+ facetFactory.setServicesInjector(mockServicesInjector);
+
}
public void testActionInvocationFacetIsInstalledAndMethodRemoved() {
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(voidSpec);
class Customer {
@@ -99,7 +100,6 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
public void testActionReturnTypeWhenVoid() {
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(voidSpec);
class Customer {
@@ -117,9 +117,8 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
}
public void testActionReturnTypeWhenNotVoid() {
- // mockSpecificationLoader.setLoadSpecificationStringReturn(stringSpec);
- allowing_specificationLoader_loadSpecification_any_willReturn(stringSpec);
+ allowing_specificationLoader_loadSpecification_any_willReturn(stringSpec);
class Customer {
@SuppressWarnings("unused")
@@ -137,7 +136,7 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
}
public void testActionOnType() {
- // mockSpecificationLoader.setLoadSpecificationStringReturn(customerSpec);
+
allowing_specificationLoader_loadSpecification_any_willReturn(customerSpec);
class Customer {
@@ -157,7 +156,6 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
public void testActionsPickedUpFromSuperclass() {
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(voidSpec);
class Customer {
@@ -180,20 +178,17 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
}
public void testActionsPickedUpFromSuperclassButHelpersFromSubClass() {
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
+
allowing_specificationLoader_loadSpecification_any_willReturn(voidSpec);
final ActionParameterChoicesFacetViaMethodFactory facetFactoryForChoices = new ActionParameterChoicesFacetViaMethodFactory();
- facetFactoryForChoices.setSpecificationLoader(mockSpecificationLoader);
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
+ facetFactoryForChoices.setServicesInjector(mockServicesInjector);
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForChoices);
+ facetFactoryForChoices.setServicesInjector(mockServicesInjector);
- final DisableForContextFacetViaMethodFactory facetFactoryForDisable = new DisableForContextFacetViaMethodFactory();
- facetFactoryForDisable.setSpecificationLoader(mockSpecificationLoader);
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
+ final DisableForContextFacetViaMethodFactory facetFactoryForDisable = new DisableForContextFacetViaMethodFactory();
facetFactoryForDisable.setServicesInjector(mockServicesInjector);
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
index 2623a5d..d7860a2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
@@ -49,7 +49,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
@Before
public void setUp() throws Exception {
facetFactory = new ActionLayoutFacetFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
+ facetFactory.setServicesInjector(mockServicesInjector);
}
public static class Contributing extends ActionLayoutAnnotationFacetFactoryJunit4Test {
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
index c39fea7..aa6a34e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutXmlLayoutAnnotationFacetFactoryTest.java
@@ -48,7 +48,7 @@ public class ActionLayoutXmlLayoutAnnotationFacetFactoryTest extends AbstractFac
@Before
public void setUp() throws Exception {
facetFactory = new ActionLayoutFacetFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
+ facetFactory.setServicesInjector(mockServicesInjector);
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
index a121bd6..8a7bd45 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -44,7 +44,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends
@Before
public void setUp() throws Exception {
facetFactory = new NotContributedFacetDerivedFromDomainServiceFacetFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
+ facetFactory.setServicesInjector(mockServicesInjector);
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
index c4001cd..0036429 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -44,7 +44,7 @@ public class NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest exten
@Before
public void setUp() throws Exception {
facetFactory = new NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
+ facetFactory.setServicesInjector(mockServicesInjector);
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
index 5e0ae47..9666789 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
@@ -23,7 +23,9 @@ import java.lang.reflect.Method;
import java.util.Collection;
import java.util.List;
import java.util.Set;
+
import org.jmock.Expectations;
+
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.applib.services.i18n.TranslationService;
@@ -34,7 +36,6 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
@@ -73,7 +74,8 @@ import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFac
import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -117,22 +119,18 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
will(returnValue(stubConfiguration));
- }});
-
- }
+ allowing(mockServicesInjector).lookupService(SpecificationLoader.class);
+ will(returnValue(mockSpecificationLoader));
- private void injectServicesIntoAndAllowingServiceInjectorLookups(final FacetFactoryAbstract ffa) {
-
- ffa.setSpecificationLoader(mockSpecificationLoader);
- ffa.setServicesInjector(mockServicesInjector);
+ }});
}
public void testPropertyAccessorFacetIsInstalledForJavaUtilCollectionAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -156,7 +154,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForJavaUtilListAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -180,7 +178,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForJavaUtilSetAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -204,8 +202,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForObjectArrayAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
-
+ facetFactory.setServicesInjector(mockServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -229,8 +226,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForOrderArrayAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
-
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -257,7 +253,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testAddToFacetIsInstalledViaAccessorIfNoExplicitAddToMethodExists() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -282,7 +278,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCannotInferTypeOfFacetIfNoExplicitAddToOrRemoveFromMethods() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -303,7 +299,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testRemoveFromFacetIsInstalledViaAccessorIfNoExplicitRemoveFromMethodExists() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -328,7 +324,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testAddToFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -360,7 +356,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCanInferTypeOfFacetFromExplicitAddToMethod() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -389,7 +385,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testRemoveFromFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -421,7 +417,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCanInferTypeOfFacetFromExplicitRemoveFromMethod() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -450,7 +446,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testClearFacetIsInstalledAndMethodRemoved() {
final CollectionClearFacetFactory facetFactory = new CollectionClearFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings({ "hiding", "unused" })
class Order {
@@ -482,7 +478,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testClearFacetIsInstalledViaAccessorIfNoExplicitClearMethod() {
final CollectionClearFacetFactory facetFactory = new CollectionClearFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings({ "hiding", "unused" })
class Order {
@@ -507,7 +503,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testValidateAddToFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -544,7 +540,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testValidateRemoveFromFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -581,7 +577,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testMethodFoundInSuperclass() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -610,11 +606,11 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testMethodFoundInSuperclassButHelpeMethodsFoundInSubclasses() {
final CollectionAccessorFacetViaAccessorFactory facetFactoryForAccessor = new CollectionAccessorFacetViaAccessorFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForAccessor);
+ facetFactoryForAccessor.setServicesInjector(mockServicesInjector);
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactoryForHelpers = new CollectionAddToRemoveFromAndValidateFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForHelpers);
+ facetFactoryForHelpers.setServicesInjector(mockServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -708,7 +704,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method nameMethod = findMethod(CustomerStatic.class, "nameOrders");
@@ -727,7 +723,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionOrders");
@@ -746,7 +742,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOrders");
@@ -763,7 +759,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOtherOrders");
@@ -778,7 +774,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method protectMethod = findMethod(CustomerStatic.class, "protectOrders");
@@ -797,7 +793,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
final Method protectMethod = findMethod(CustomerStatic.class, "protectOtherOrders");
@@ -812,7 +808,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method hideMethod = findMethod(CustomerStatic.class, "hideOrders", new Class[] { UserMemento.class });
@@ -831,7 +827,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDisabledForSessionFacetAndRemovesMethod() {
final DisableForSessionFacetViaMethodFactory facetFactory = new DisableForSessionFacetViaMethodFactory();
- injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ facetFactory.setServicesInjector(mockServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method disableMethod = findMethod(CustomerStatic.class, "disableOrders", new Class[] { UserMemento.class });
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index b26fe09..2512efb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -109,7 +109,7 @@ public class CollectionAnnotationFacetFactoryTest extends AbstractFacetFactoryJU
@Before
public void setUp() throws Exception {
facetFactory = new CollectionAnnotationFacetFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
+ facetFactory.setServicesInjector(mockServicesInjector);
}
@After
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
index 565ecfc..8cf1358 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
@@ -40,6 +40,7 @@ public class CollectionAnnotationFacetFactoryTest_typeOf extends AbstractFacetFa
protected void setUp() throws Exception {
super.setUp();
facetFactory = new CollectionAnnotationFacetFactory();
+ facetFactory.setServicesInjector(mockServicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
index 8b496fb..ed1453a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassAnnotationOnMemberFacetFactoryTest.java
@@ -35,7 +35,6 @@ public class CssClassAnnotationOnMemberFacetFactoryTest extends AbstractFacetFac
public void testCssClassAnnotationPickedUpOnProperty() {
final CssClassFacetOnMemberFactory facetFactory = new CssClassFacetOnMemberFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
index 4fa0310..db0931a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/naming/named/NamedAnnotationFacetFactoryTest.java
@@ -46,7 +46,6 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
public void testNamedAnnotationPickedUpOnClass() {
final NamedFacetOnTypeAnnotationFactory facetFactory = new NamedFacetOnTypeAnnotationFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
@Named("some name")
class Customer {
@@ -67,7 +66,6 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
public void testNamedAnnotationPickedUpOnProperty() {
final NamedFacetOnMemberFactory facetFactory = new NamedFacetOnMemberFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
@@ -91,7 +89,6 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
public void testNamedAnnotationPickedUpOnCollection() {
final NamedFacetOnMemberFactory facetFactory = new NamedFacetOnMemberFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
@@ -115,7 +112,6 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
public void testNamedAnnotationPickedUpOnAction() {
final NamedFacetOnMemberFactory facetFactory = new NamedFacetOnMemberFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
@@ -139,7 +135,6 @@ public class NamedAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
public void testNamedAnnotationPickedUpOnActionParameter() {
final NamedFacetOnParameterAnnotationFactory facetFactory = new NamedFacetOnParameterAnnotationFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
class Customer {
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/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 3a686c0..5898a53 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
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
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.services.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;
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclass/CssClassFacetOnTypeAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclass/CssClassFacetOnTypeAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclass/CssClassFacetOnTypeAnnotationFactoryTest.java
index 3e2dd1c..4c8febb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclass/CssClassFacetOnTypeAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/cssclass/CssClassFacetOnTypeAnnotationFactoryTest.java
@@ -41,7 +41,6 @@ public class CssClassFacetOnTypeAnnotationFactoryTest extends AbstractFacetFacto
public void testCssClassAnnotationPickedUpOnClass() {
final CssClassFacetOnTypeAnnotationFactory facetFactory = new CssClassFacetOnTypeAnnotationFactory();
- facetFactory.setSpecificationLoader(mockSpecificationLoader);
@CssClass("testClass")
class Customer {
http://git-wip-us.apache.org/repos/asf/isis/blob/6e3495f4/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 867a54e..418ff8a 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
@@ -28,7 +28,7 @@ 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;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -40,7 +40,7 @@ public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
super.setUp();
facetFactory = new DefaultedFacetAnnotationElseConfigurationFactory();
- ServicesInjectorDefault servicesInjector = new ServicesInjectorDefault(Collections.emptyList());
+ ServicesInjector servicesInjector = new ServicesInjector(Collections.emptyList());
servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, isisConfigurationDefault = new IsisConfigurationDefault());
facetFactory.setServicesInjector(servicesInjector);
}