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/19 08:41:48 UTC
[05/10] isis git commit: ISIS-1405: DeploymentCategoryProvider now
implemented by a domain service,
so can be looked up from ServicesInjector. Removed
DeploymentCategoryProviderAware.
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 fcce199..f039b70 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
@@ -35,6 +35,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.Annotations;
@@ -71,13 +72,15 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
facetFactory.setAdapterManager(mockAdapterManager);
facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
context.checking(new Expectations() {
{
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
+
allowing(mockLocalizationProvider).getLocalization();
will(returnValue(new LocalizationDefault()));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 03b27df..ce64eaa 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
@@ -57,7 +57,6 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
will(returnValue(DeploymentCategory.PRODUCTION));
allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
-
will(returnValue(mockAuthenticationSession));
}});
@@ -70,10 +69,10 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
}});
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
-
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 4a83554..3098e8d 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
@@ -69,11 +69,11 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
will(returnValue(DeploymentCategory.PRODUCTION));
allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
-
will(returnValue(mockAuthenticationSession));
}});
facetFactory = new ValueFacetAnnotationOrConfigurationFactory();
+
isisConfigurationDefault = new IsisConfigurationDefault();
facetFactory.setConfiguration(isisConfigurationDefault);
@@ -82,9 +82,9 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
}});
-
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 d5b9495..3e89fb4 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
@@ -33,6 +33,7 @@ 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.deployment.DeploymentCategoryProvider;
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;
@@ -80,7 +81,14 @@ public class ParameterAnnotationFacetFactoryTest extends AbstractFacetFactoryJUn
facetFactory = new ParameterAnnotationFacetFactory();
facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+
+ context.checking(new Expectations() {{
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
+
+ allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
+ will(returnValue(DeploymentCategory.PRODUCTION));
+ }});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
index 7a466eb..07f41cd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
@@ -32,6 +32,7 @@ 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.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.members.describedas.staticmethod.DescribedAsFacetStaticMethod;
@@ -120,16 +121,23 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}});
}
- public void testPropertyAccessorFacetIsInstalledAndMethodRemoved() {
- final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
+ private void injectServicesIntoAndAllowingServiceInjectorLookups(final FacetFactoryAbstract facetFactory) {
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
context.checking(new Expectations(){{
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
+
}});
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+ }
+
+ public void testPropertyAccessorFacetIsInstalledAndMethodRemoved() {
+ final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
+
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@SuppressWarnings("unused")
@@ -150,17 +158,10 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
assertTrue(methodRemover.getRemovedMethodMethodCalls().contains(propertyAccessorMethod));
}
- public void testSetterFacetIsInstalledForSetterMethodAndMethodRemoved() {
+ public void testSetterFacetIsInstalledForSetterMethodAndMethodRemoved() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@SuppressWarnings("unused")
@@ -188,15 +189,8 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInitializationFacetIsInstalledForSetterMethodAndMethodRemoved() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@SuppressWarnings("unused")
@@ -224,15 +218,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testSetterFacetIsInstalledMeansNoDisabledOrDerivedFacetsInstalled() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -255,19 +243,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testSetterFacetIsInstalledForModifyMethodAndMethodRemoved() {
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
- facetFactoryForModify.setSpecificationLoader(programmableReflector);
-
- facetFactoryForModify.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForModify);
- facetFactoryForModify.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final PropertySetAndClearFacetFactory facetFactoryForSetter = new PropertySetAndClearFacetFactory();
- facetFactoryForSetter.setSpecificationLoader(programmableReflector);
+
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForSetter);
class Customer {
@SuppressWarnings("unused")
@@ -299,25 +281,12 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
- facetFactoryForModify.setSpecificationLoader(programmableReflector);
- facetFactoryForModify.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
- facetFactoryForModify.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForModify);
final DisabledFacetOnPropertyInferredFactory disabledFacetOnPropertyInferredFactory = new DisabledFacetOnPropertyInferredFactory();
@@ -353,24 +322,14 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
- facetFactoryForModify.setSpecificationLoader(programmableReflector);
- facetFactoryForModify.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForModify);
- facetFactoryForModify.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -406,15 +365,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testClearFacet() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -442,15 +395,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testClearFacetViaSetterIfNoExplicitClearMethod() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -476,15 +423,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testChoicesFacetFoundAndMethodRemoved() {
final PropertyChoicesFacetViaMethodFactory facetFactory = new PropertyChoicesFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -515,13 +456,17 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertyAutoCompleteFacetMethodFactory facetFactory = new PropertyAutoCompleteFacetMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
+
context.checking(new Expectations(){{
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ final DeploymentCategory deploymentCategory = DeploymentCategory.PRODUCTION;
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
+
}});
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -550,15 +495,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDefaultFacetFoundAndMethodRemoved() {
final PropertyDefaultFacetViaMethodFactory facetFactory = new PropertyDefaultFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -587,16 +526,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testValidateFacetFoundAndMethodRemoved() {
final PropertyValidateFacetViaMethodFactory facetFactory = new PropertyValidateFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -625,16 +557,8 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDisableFacetFoundAndMethodRemoved() {
final DisableForContextFacetViaMethodFactory facetFactory = new DisableForContextFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@SuppressWarnings("unused")
@@ -663,16 +587,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDisableFacetNoArgsFoundAndMethodRemoved() {
final DisableForContextFacetViaMethodFactory facetFactory = new DisableForContextFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -701,15 +618,8 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testHiddenFacetFoundAndMethodRemoved() {
final HideForContextFacetViaMethodFactory facetFactory = new HideForContextFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
-
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@SuppressWarnings("unused")
@@ -738,15 +648,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testHiddenFacetWithNoArgFoundAndMethodRemoved() {
final HideForContextFacetViaMethodFactory facetFactory = new HideForContextFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@SuppressWarnings("unused")
@@ -775,15 +679,8 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPropertyFoundOnSuperclass() {
final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@SuppressWarnings("unused")
@@ -808,40 +705,17 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPropertyFoundOnSuperclassButHelperMethodFoundOnSubclass() {
final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
-
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
-
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final HideForContextFacetViaMethodFactory facetFactoryForHide = new HideForContextFacetViaMethodFactory();
- facetFactoryForHide.setSpecificationLoader(programmableReflector);
- facetFactoryForHide.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
-
- facetFactoryForHide.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForHide);
final DisableForContextFacetViaMethodFactory facetFactoryForDisable = new DisableForContextFacetViaMethodFactory();
- facetFactoryForDisable.setSpecificationLoader(programmableReflector);
- facetFactoryForDisable.setServicesInjector(mockServicesInjector);
- facetFactoryForDisable.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForDisable);
- facetFactoryForDisable.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -937,15 +811,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method nameMethod = findMethod(CustomerStatic.class, "nameFirstName");
@@ -963,15 +831,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionFirstName");
@@ -989,15 +851,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method propertyAlwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideFirstName");
@@ -1012,15 +868,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getLastName");
final Method propertyAlwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideLastName");
@@ -1034,15 +884,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method propertyProtectMethod = findMethod(CustomerStatic.class, "protectFirstName");
@@ -1058,15 +902,8 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
-
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getLastName");
final Method propertyProtectMethod = findMethod(CustomerStatic.class, "protectLastName");
@@ -1081,15 +918,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method hideMethod = findMethod(CustomerStatic.class, "hideFirstName", new Class[] { UserMemento.class });
@@ -1108,15 +939,9 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDisabledForSessionFacetAndRemovesMethod() {
final DisableForSessionFacetViaMethodFactory facetFactory = new DisableForSessionFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method disableMethod = findMethod(CustomerStatic.class, "disableFirstName", new Class[] { UserMemento.class });
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index 347c273..767be67 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -21,12 +21,14 @@ package org.apache.isis.core.metamodel.facets.properties.property;
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.Identifier;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.PostsPropertyChangedEvent;
@@ -40,7 +42,6 @@ import org.apache.isis.applib.services.eventbus.PropertyInteractionEvent;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -48,6 +49,9 @@ import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
+import org.apache.isis.core.metamodel.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.propcoll.accessor.PropertyOrCollectionAccessorFacetAbstract;
import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
@@ -74,9 +78,6 @@ import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyCle
import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacetAbstract;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetAbstract;
-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 org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -116,7 +117,6 @@ public class PropertyAnnotationFacetFactoryTest extends AbstractFacetFactoryJUni
facetFactory = new PropertyAnnotationFacetFactory();
facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
}
@After
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
index 058333a..f067393 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
@@ -26,7 +26,6 @@ import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService2;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -46,7 +45,6 @@ import org.apache.isis.core.metamodel.transactions.TransactionState;
import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
import org.apache.isis.core.metamodel.transactions.TransactionStateProviderAbstract;
import org.apache.isis.core.runtime.persistence.container.DomainObjectContainerResolve;
-import org.apache.isis.core.runtime.services.authsess.AuthenticationSessionProviderDefault;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
@@ -72,7 +70,7 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
final IsisConfigurationDefault configuration,
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- super(deploymentCategory, configuration, servicesInjector, specificationLoader);
+ super(configuration, servicesInjector, specificationLoader);
this.persistenceSessionService = new PersistenceSessionServiceAbstract() {
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
new file mode 100644
index 0000000..e57610d
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
@@ -0,0 +1,34 @@
+/**
+ * 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.runtime.services.deplcat;
+
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
+import org.apache.isis.core.runtime.system.context.IsisContext;
+
+@DomainService(nature = NatureOfService.DOMAIN)
+public class DeploymentCategoryProviderDefault implements DeploymentCategoryProvider {
+
+ @Programmatic
+ @Override
+ public DeploymentCategory getDeploymentCategory() {
+ return IsisContext.getDeploymentType().getDeploymentCategory();
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DeploymentType.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DeploymentType.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DeploymentType.java
index 09eaf50..253ee14 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DeploymentType.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DeploymentType.java
@@ -24,14 +24,13 @@ import java.util.List;
import com.google.common.collect.Lists;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProviderAbstract;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
/**
* Whether running on client or server side etc.
*/
-public class DeploymentType extends DeploymentCategoryProviderAbstract {
+public class DeploymentType {
private static List<DeploymentType> deploymentTypes = Lists.newArrayList();
@@ -77,7 +76,6 @@ public class DeploymentType extends DeploymentCategoryProviderAbstract {
return (this == SERVER) && isProduction();
}
- @Override
public DeploymentCategory getDeploymentCategory() {
return deploymentCategory;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 52ec15a..9781237 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -70,7 +70,6 @@ import org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassCla
import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.runner.IsisInjectModule;
@@ -139,8 +138,7 @@ import net.ftlines.wicketsource.WicketSource;
*/
public class IsisWicketApplication
extends AuthenticatedWebApplication
- implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
- DeploymentCategoryProvider {
+ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
private static final long serialVersionUID = 1L;
@@ -811,15 +809,6 @@ public class IsisWicketApplication
}
- // /////////////////////////////////////////////////
- // *Provider impl.
- // /////////////////////////////////////////////////
-
- @Override
- public void injectInto(final Object candidate) {
- }
-
- @Override
public DeploymentCategory getDeploymentCategory() {
return deploymentType.getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
index 53204ec..a743879 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
@@ -47,7 +46,7 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
* panel using other {@link ComponentType}s.
*/
public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T>
- implements PersistenceSessionProvider, DeploymentCategoryProvider {
+ implements PersistenceSessionProvider {
private static final long serialVersionUID = 1L;
@@ -139,7 +138,6 @@ public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T
return IsisContext.getAuthenticationSession();
}
- @Override
public DeploymentCategory getDeploymentCategory() {
return IsisContext.getDeploymentType().getDeploymentCategory();
}
@@ -158,16 +156,4 @@ public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T
}
- // /////////////////////////////////////////////////
- // *Provider impl.
- // /////////////////////////////////////////////////
-
- @Override
- public void injectInto(final Object candidate) {
- 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/0c794397/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 9294df0..6f2b7aa 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -27,8 +27,6 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
@@ -39,7 +37,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
public abstract class FormAbstract<T> extends Form<T>
implements IHeaderContributor, ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
- DeploymentCategoryProvider, PersistenceSessionProvider {
+ PersistenceSessionProvider {
private static final long serialVersionUID = 1L;
@@ -112,22 +110,9 @@ public abstract class FormAbstract<T> extends Form<T>
return IsisContext.getAuthenticationSession();
}
- @Override
public DeploymentCategory getDeploymentCategory() {
return IsisContext.getDeploymentType().getDeploymentCategory();
}
- // /////////////////////////////////////////////////
- // *Provider impl.
- // /////////////////////////////////////////////////
-
- @Override
- public void injectInto(final Object candidate) {
- 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/0c794397/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index 8578592..f2e5b2f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -27,10 +27,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -50,8 +47,8 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.Confi
* Convenience adapter for {@link Panel}s built up using {@link ComponentType}s.
*/
// TODO mgrigorov: extend GenericPanel and make T the type of the model object, not the model
-public abstract class PanelAbstract<T extends IModel<?>> extends Panel implements IHeaderContributor, PersistenceSessionProvider,
- DeploymentCategoryProvider {
+public abstract class PanelAbstract<T extends IModel<?>> extends Panel
+ implements IHeaderContributor, PersistenceSessionProvider {
private static final long serialVersionUID = 1L;
@@ -139,7 +136,6 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
return IsisContext.getAuthenticationSession();
}
- @Override
public DeploymentCategory getDeploymentCategory() {
return IsisContext.getDeploymentType().getDeploymentCategory();
}
@@ -171,14 +167,6 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
// *Provider impl.
// /////////////////////////////////////////////////
- @Override
- public void injectInto(final Object candidate) {
- if (DeploymentCategoryAware.class.isAssignableFrom(candidate.getClass())) {
- final DeploymentCategoryAware cast = DeploymentCategoryAware.class.cast(candidate);
- cast.setDeploymentCategory(this.getDeploymentCategory());
- }
- }
-
/**
* Helper method that looks up a domain service by type
*