You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/09/15 08:03:55 UTC
[50/50] [abbrv] isis git commit: ISIS-1194: simplifying the provision
of DeploymentCategory...
ISIS-1194: simplifying the provision of DeploymentCategory...
... just inject the DeploymentCategory directly, rather than a DeploymentCategoryProvider.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/85e31c96
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/85e31c96
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/85e31c96
Branch: refs/heads/master
Commit: 85e31c962b7e1269da8a0816113dd2572f93b355
Parents: df8bd81
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Sep 15 07:01:44 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Sep 15 07:01:44 2015 +0100
----------------------------------------------------------------------
.../deployment/DeploymentCategoryAware.java | 29 +++++++++
.../DeploymentCategoryProviderAbstract.java | 6 +-
.../DeploymentCategoryProviderAware.java | 29 ---------
.../metamodel/facets/FacetFactoryAbstract.java | 17 ++----
.../runtimecontext/RuntimeContext.java | 26 +++++---
.../runtimecontext/RuntimeContextAbstract.java | 2 +
.../noruntime/RuntimeContextNoRuntime.java | 1 -
.../specloader/ObjectReflectorDefault.java | 3 -
.../metamodel/app/IsisMetaModelTest_init.java | 3 -
.../actions/ActionMethodsFacetFactoryTest.java | 40 ++++++-------
.../ActionAnnotationFacetFactoryTest.java | 3 +-
...tationFacetFactoryTest_actionInvocation.java | 8 ++-
.../PrototypeFacetAnnotationFactoryTest.java | 2 +-
.../ExplorationFacetAnnotationFactoryTest.java | 2 +-
.../CollectionFieldMethodsFacetFactoryTest.java | 52 ++++++++--------
...etFromBoundedMarkerInterfaceFactoryTest.java | 2 +-
...esFacetFromBoundedAnnotationFactoryTest.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 5 +-
.../TitleAnnotationFacetFactoryTest.java | 12 ++--
...tAnnotationElseConfigurationFactoryTest.java | 3 +-
...cetAnnotationOrConfigurationFactoryTest.java | 3 +-
.../ParameterAnnotationFacetFactoryTest.java | 11 ++--
.../PropertyMethodsFacetFactoryTest.java | 62 ++++++++++----------
.../PropertyAnnotationFacetFactoryTest.java | 3 +-
...inObjectContainerDefaultTest_allMatches.java | 8 +++
.../FormComponentPanelAbstract.java | 8 +--
.../viewer/wicket/ui/panels/FormAbstract.java | 8 +--
.../viewer/wicket/ui/panels/PanelAbstract.java | 8 +--
28 files changed, 187 insertions(+), 171 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryAware.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryAware.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryAware.java
new file mode 100644
index 0000000..6eb4f5b
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryAware.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.metamodel.deployment;
+
+import org.apache.isis.applib.annotation.Programmatic;
+
+public interface DeploymentCategoryAware {
+
+ @Programmatic
+ public void setDeploymentCategory(DeploymentCategory deploymentCategory);
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProviderAbstract.java
index 10539d4..635ece8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProviderAbstract.java
@@ -20,9 +20,9 @@ public abstract class DeploymentCategoryProviderAbstract implements DeploymentCa
@Override
public void injectInto(final Object candidate) {
- if (DeploymentCategoryProviderAware.class.isAssignableFrom(candidate.getClass())) {
- final DeploymentCategoryProviderAware cast = DeploymentCategoryProviderAware.class.cast(candidate);
- cast.setDeploymentCategoryProvider(this);
+ if (DeploymentCategoryAware.class.isAssignableFrom(candidate.getClass())) {
+ final DeploymentCategoryAware cast = DeploymentCategoryAware.class.cast(candidate);
+ cast.setDeploymentCategory(this.getDeploymentCategory());
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProviderAware.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProviderAware.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProviderAware.java
deleted file mode 100644
index 8285b69..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProviderAware.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.deployment;
-
-import org.apache.isis.applib.annotation.Programmatic;
-
-public interface DeploymentCategoryProviderAware {
-
- @Programmatic
- public void setDeploymentCategoryProvider(DeploymentCategoryProvider deploymentCategoryProvider);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
index cc5654e..2b1201a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
@@ -26,20 +26,19 @@ import com.google.common.collect.ImmutableList;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProviderAware;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
public abstract class FacetFactoryAbstract implements FacetFactory, SpecificationLoaderAware,
- AuthenticationSessionProviderAware, DeploymentCategoryProviderAware {
+ AuthenticationSessionProviderAware, DeploymentCategoryAware {
private final List<FeatureType> featureTypes;
private SpecificationLoader specificationLoader;
private AuthenticationSessionProvider authenticationSessionProvider;
- private DeploymentCategoryProvider deploymentCategoryProvider;
+ private DeploymentCategory deploymentCategory;
public FacetFactoryAbstract(final List<FeatureType> featureTypes) {
this.featureTypes = ImmutableList.copyOf(featureTypes);
@@ -88,16 +87,12 @@ public abstract class FacetFactoryAbstract implements FacetFactory, Specificatio
}
@Override
- public void setDeploymentCategoryProvider(final DeploymentCategoryProvider deploymentCategoryProvider) {
- this.deploymentCategoryProvider = deploymentCategoryProvider;
- }
-
- private DeploymentCategoryProvider getDeploymentCategoryProvider() {
- return deploymentCategoryProvider;
+ public void setDeploymentCategory(final DeploymentCategory deploymentCategory) {
+ this.deploymentCategory = deploymentCategory;
}
protected DeploymentCategory getDeploymentCategory() {
- return getDeploymentCategoryProvider().getDeploymentCategory();
+ return deploymentCategory;
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
index 38939fd..8cbac89 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContext.java
@@ -33,9 +33,21 @@ import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
*/
public interface RuntimeContext extends Injectable, ApplicationScopedComponent {
+ // //////////////////////////////////////
+ // application-scoped
+ // //////////////////////////////////////
+
public DeploymentCategoryProvider getDeploymentCategoryProvider();
- public TransactionStateProvider getTransactionStateProvider();
+ public ConfigurationService getConfigurationService();
+
+ public ServicesInjector getServicesInjector();
+
+ public SpecificationLoader getSpecificationLoader();
+
+ // //////////////////////////////////////
+ // session-scoped
+ // //////////////////////////////////////
/**
* A mechanism for returning the <tt>current</tt>
@@ -47,16 +59,16 @@ public interface RuntimeContext extends Injectable, ApplicationScopedComponent {
*/
public AuthenticationSessionProvider getAuthenticationSessionProvider();
- public MessageBrokerService getMessageBrokerService();
+ public LocalizationProvider getLocalizationProvider();
- public SpecificationLoader getSpecificationLoader();
+ public MessageBrokerService getMessageBrokerService();
- public ServicesInjector getServicesInjector();
+ // //////////////////////////////////////
+ // request-scoped
+ // //////////////////////////////////////
public PersistenceSessionService getPersistenceSessionService();
- public ConfigurationService getConfigurationService();
-
- public LocalizationProvider getLocalizationProvider();
+ public TransactionStateProvider getTransactionStateProvider();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
index 80dcb37..57ae0b3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/RuntimeContextAbstract.java
@@ -37,6 +37,7 @@ import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpiAware;
public abstract class RuntimeContextAbstract implements RuntimeContext, SpecificationLoaderSpiAware {
private final SpecificationLoaderDelegator specificationLookupDelegator = new SpecificationLoaderDelegator();
+
private final DeploymentCategory deploymentCategory;
private final IsisConfigurationDefault configuration;
private final ServicesInjector servicesInjector;
@@ -50,6 +51,7 @@ public abstract class RuntimeContextAbstract implements RuntimeContext, Specific
this.servicesInjector = servicesInjector;
}
+
@Override
public DeploymentCategoryProvider getDeploymentCategoryProvider() {
return new DeploymentCategoryProviderAbstract() {
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
index 70591c0..b2a2dcf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
@@ -29,7 +29,6 @@ import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider
import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAbstract;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
index ed13d49..6068f9e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
@@ -470,9 +470,6 @@ public final class ObjectReflectorDefault implements SpecificationLoaderSpi, App
}
private DeploymentCategory getDeploymentCategory() {
- if(runtimeContext == null) {
- throw new IllegalStateException("Runtime context has not been injected.");
- }
return runtimeContext.getDeploymentCategoryProvider().getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
index 190982d..ff17185 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/app/IsisMetaModelTest_init.java
@@ -91,9 +91,6 @@ public class IsisMetaModelTest_init {
allowing(mockRuntimeContext).getSpecificationLoader();
will(returnValue(mockSpecificationLoader));
- allowing(mockRuntimeContext).getAdapterManager();
- will(returnValue(mockAdapterManager));
-
allowing(mockRuntimeContext).getMessageBrokerService();
will(returnValue(mockMessageBrokerService));
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/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 eacf3af..7aefdc6 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
@@ -120,7 +120,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testProvidesDefaultNameForActionButIgnoresAnyNamedAnnotation() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -145,7 +145,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPicksUpDebugPrefixAndSetsNameAppropriatelyAlso() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -171,7 +171,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPicksUpExplorationPrefixAndSetsNameAppropriatelyAlso() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -197,7 +197,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testCannotHaveBothDebugAndThenExplorationPrefix() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -220,7 +220,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testCannotHaveBothExplorationAndThenDebugPrefix() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -244,7 +244,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionValidationFacetViaMethodFactory facetFactory = new ActionValidationFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -275,7 +275,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsValidateMethodSomeArgsFacetAndRemovesMethod() {
final ActionValidationFacetViaMethodFactory facetFactory = new ActionValidationFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
facetFactory.setServicesInjector(mockServicesInjector);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -307,7 +307,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterDefaultsMethodNoArgsFacetAndRemovesMethod() {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -338,7 +338,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterDefaultsMethodSomeArgsIsIgnored() {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -363,7 +363,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterChoicesMethodNoArgsFacetAndRemovesMethod() {
final ActionChoicesFacetViaMethodFactory facetFactory = new ActionChoicesFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
class Customer {
@@ -394,7 +394,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterChoicesMethodSomeArgsIsIgnored() {
final ActionChoicesFacetViaMethodFactory facetFactory = new ActionChoicesFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -459,7 +459,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -498,7 +498,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
facetFactory.setSpecificationLoader(programmableReflector);
@@ -533,7 +533,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -570,7 +570,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -610,7 +610,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterDefaultsMethodAndRemovesMethod() {
final ActionParameterDefaultsFacetViaMethodFactory facetFactory = new ActionParameterDefaultsFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -659,7 +659,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterChoicesMethodAndRemovesMethod() {
final ActionParameterChoicesFacetViaMethodFactory facetFactory = new ActionParameterChoicesFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -723,7 +723,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterAutoCompleteMethodAndRemovesMethod() {
final ActionParameterAutoCompleteFacetViaMethodFactory facetFactory = new ActionParameterAutoCompleteFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -762,7 +762,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionParameterChoicesFacetViaMethodFactory facetFactoryForParams = new ActionParameterChoicesFacetViaMethodFactory();
facetFactoryForParams.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -803,7 +803,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testBothDefaultMethodCausesException() {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/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 86b11ca..6486e73 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
@@ -52,6 +52,7 @@ import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.eventbus.ActionInteractionEvent;
import org.apache.isis.applib.services.eventbus.ActionInvokedEvent;
import org.apache.isis.applib.services.publish.EventPayload;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -128,7 +129,7 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
facetFactory.setConfiguration(mockConfiguration);
facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
actionMethod = findMethod(Customer.class, "someAction");
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/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 6526cda..df24c41 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
@@ -20,6 +20,8 @@
package org.apache.isis.core.metamodel.facets.actions.action;
import java.lang.reflect.Method;
+
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
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;
@@ -47,7 +49,7 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
facetFactory = new ActionAnnotationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
}
@@ -153,13 +155,13 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
final ActionParameterChoicesFacetViaMethodFactory facetFactoryForChoices = new ActionParameterChoicesFacetViaMethodFactory();
facetFactoryForChoices.setSpecificationLoader(programmableReflector);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
- facetFactoryForChoices.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactoryForChoices.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final DisableForContextFacetViaMethodFactory facetFactoryForDisable = new DisableForContextFacetViaMethodFactory();
facetFactoryForDisable.setSpecificationLoader(programmableReflector);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
facetFactoryForDisable.setServicesInjector(mockServicesInjector);
- facetFactoryForDisable.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactoryForDisable.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
index 95b1474..deee711 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
@@ -66,7 +66,7 @@ public class PrototypeFacetAnnotationFactoryTest extends AbstractFacetFactoryTes
facetFactory = new ActionAnnotationFacetFactory();
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
index 14a4048..88bd39c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
@@ -65,7 +65,7 @@ public class ExplorationFacetAnnotationFactoryTest extends AbstractFacetFactoryT
facetFactory = new ExplorationFacetAnnotationFactory();
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/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 d561a18..c637b8a 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
@@ -111,7 +111,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForJavaUtilCollectionAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
class Customer {
@@ -136,7 +136,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForJavaUtilListAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
class Customer {
@@ -161,7 +161,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForJavaUtilSetAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
class Customer {
@@ -186,7 +186,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForObjectArrayAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
class Customer {
@@ -211,7 +211,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForOrderArrayAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -239,7 +239,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testAddToFacetIsInstalledViaAccessorIfNoExplicitAddToMethodExists() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -265,7 +265,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCannotInferTypeOfFacetIfNoExplicitAddToOrRemoveFromMethods() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -287,7 +287,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testRemoveFromFacetIsInstalledViaAccessorIfNoExplicitRemoveFromMethodExists() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -313,7 +313,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testAddToFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -346,7 +346,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCanInferTypeOfFacetFromExplicitAddToMethod() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -376,7 +376,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testRemoveFromFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -409,7 +409,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCanInferTypeOfFacetFromExplicitRemoveFromMethod() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -439,7 +439,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testClearFacetIsInstalledAndMethodRemoved() {
final CollectionClearFacetFactory facetFactory = new CollectionClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings({ "hiding", "unused" })
@@ -472,7 +472,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testClearFacetIsInstalledViaAccessorIfNoExplicitClearMethod() {
final CollectionClearFacetFactory facetFactory = new CollectionClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings({ "hiding", "unused" })
@@ -499,7 +499,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -538,7 +538,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -576,7 +576,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testMethodFoundInSuperclass() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@SuppressWarnings("hiding")
@@ -606,7 +606,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testMethodFoundInSuperclassButHelpeMethodsFoundInSubclasses() {
final CollectionAccessorFacetViaAccessorFactory facetFactoryForAccessor = new CollectionAccessorFacetViaAccessorFactory();
facetFactoryForAccessor.setSpecificationLoader(programmableReflector);
- facetFactoryForAccessor.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactoryForAccessor.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactoryForAccessor.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
@@ -706,7 +706,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
@@ -726,7 +726,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
@@ -746,7 +746,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
@@ -764,7 +764,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
@@ -780,7 +780,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
@@ -800,7 +800,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
@@ -816,7 +816,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
@@ -836,7 +836,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDisabledForSessionFacetAndRemovesMethod() {
final DisableForSessionFacetViaMethodFactory facetFactory = new DisableForSessionFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bounded/ChoicesFacetFromBoundedMarkerInterfaceFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bounded/ChoicesFacetFromBoundedMarkerInterfaceFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bounded/ChoicesFacetFromBoundedMarkerInterfaceFactoryTest.java
index 2d24963..91d9875 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bounded/ChoicesFacetFromBoundedMarkerInterfaceFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bounded/ChoicesFacetFromBoundedMarkerInterfaceFactoryTest.java
@@ -61,7 +61,7 @@ public class ChoicesFacetFromBoundedMarkerInterfaceFactoryTest extends AbstractF
}});
facetFactory = new ChoicesFacetFromBoundedMarkerInterfaceFactory();
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
index 9ce7f1f..5fb7741 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
@@ -60,7 +60,7 @@ public class ChoicesFacetFromBoundedAnnotationFactoryTest extends AbstractFacetF
}});
facetFactory = new DomainObjectAnnotationFacetFactory();
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index 532666e..0a4e4f8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -20,11 +20,13 @@
package org.apache.isis.core.metamodel.facets.object.domainobject;
import java.util.UUID;
+
import org.jmock.Expectations;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+
import org.apache.isis.applib.annotation.Audited;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Immutable;
@@ -33,6 +35,7 @@ import org.apache.isis.applib.annotation.PublishingChangeKind;
import org.apache.isis.applib.annotation.PublishingPayloadFactoryForObject;
import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.publish.EventPayload;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
@@ -75,7 +78,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory = new DomainObjectAnnotationFacetFactory();
facetFactory.setConfiguration(mockConfiguration);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 85d3ae1..aaf6d85 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -32,8 +32,6 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.runtimecontext.LocalizationDefault;
-import org.apache.isis.core.metamodel.runtimecontext.LocalizationProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -43,15 +41,15 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation.TitleComponent;
+import org.apache.isis.core.metamodel.runtimecontext.LocalizationDefault;
+import org.apache.isis.core.metamodel.runtimecontext.LocalizationProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
- @ClassUnderTest
private TitleAnnotationFacetFactory facetFactory;
@Mock
@@ -64,14 +62,14 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
@Before
public void setUp() throws Exception {
-
+
context.allowing(mockSpecificationLoaderSpi);
- facetFactory = context.getClassUnderTest();
+ facetFactory = new TitleAnnotationFacetFactory();
facetFactory.setAdapterManager(mockAdapterManager);
facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
context.checking(new Expectations() {
{
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
index 83ace6b..0fb60dd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.parseable.annotcfg.ParseableFacetAnnotationElseConfigurationFactory;
-import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -67,7 +66,7 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
facetFactory.setConfiguration(isisConfigurationDefault);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index 839bcb9..3292cd5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -40,7 +40,6 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
-import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet;
import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotation;
@@ -79,7 +78,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
facetFactory.setConfiguration(isisConfigurationDefault);
facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/85e31c96/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
index 4ebd7b1..d5b9495 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactoryTest.java
@@ -21,25 +21,28 @@ package org.apache.isis.core.metamodel.facets.param.parameter;
import java.lang.reflect.Method;
import java.util.List;
import java.util.regex.Pattern;
+
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.spec.Specification;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfySpecificationFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.regex.RegExFacet;
import org.apache.isis.core.metamodel.facets.param.parameter.mandatory.MandatoryFacetForParameterAnnotation;
import org.apache.isis.core.metamodel.facets.param.parameter.maxlen.MaxLengthFacetForParameterAnnotation;
import org.apache.isis.core.metamodel.facets.param.parameter.mustsatisfy.MustSatisfySpecificationFacetForParameterAnnotation;
import org.apache.isis.core.metamodel.facets.param.parameter.regex.RegExFacetForParameterAnnotation;
-import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfySpecificationFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import static org.hamcrest.CoreMatchers.is;
@@ -77,7 +80,7 @@ public class ParameterAnnotationFacetFactoryTest extends AbstractFacetFactoryJUn
facetFactory = new ParameterAnnotationFacetFactory();
facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategoryProvider(mockDeploymentCategoryProvider);
+ facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
}