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:44 UTC
[01/10] isis git commit: ISIS-1404: AuthenticationSessionProvider is
now a domain service;
removed the AuthenticationSessionProviderAbstract and Aware interfaces.
Repository: isis
Updated Branches:
refs/heads/ISIS-1406 [created] dcaab8ead
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
deleted file mode 100644
index ae682f5..0000000
--- a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ /dev/null
@@ -1,389 +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.progmodel.wrapper;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import org.apache.isis.applib.services.wrapper.DisabledException;
-import org.apache.isis.applib.services.wrapper.HiddenException;
-import org.apache.isis.applib.services.wrapper.InvalidException;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
-import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred;
-import org.apache.isis.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod;
-import org.apache.isis.core.metamodel.facets.members.hidden.method.HideForContextFacetViaMethod;
-import org.apache.isis.core.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
-import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacetViaClearMethod;
-import org.apache.isis.core.metamodel.facets.properties.update.init.PropertyInitializationFacetViaSetterMethod;
-import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetViaModifyMethod;
-import org.apache.isis.core.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethod;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
-import org.apache.isis.core.metamodel.specloader.specimpl.OneToOneAssociationDefault;
-import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.core.wrapper.WrapperFactoryDefault;
-import org.apache.isis.progmodel.wrapper.dom.employees.Employee;
-import org.apache.isis.progmodel.wrapper.dom.employees.EmployeeRepository;
-import org.apache.isis.progmodel.wrapper.dom.employees.EmployeeRepositoryImpl;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
-public class WrapperFactoryDefaultTest_wrappedObject {
-
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
- @Mock
- private AdapterManager mockAdapterManager;
- @Mock
- private AuthenticationSessionProvider mockAuthenticationSessionProvider;
- @Mock
- private PersistenceSessionService mockPersistenceSessionService;
- @Mock
- private MessageBrokerService mockMessageBrokerService;
- @Mock
- private ServicesInjector mockServicesInjector;
- @Mock
- private SpecificationLoader mockSpecificationLoader;
- @Mock
- private DeploymentCategoryProvider mockDeploymentCategoryProvider;
- @Mock
- private IsisConfiguration mockConfiguration;
-
- private ObjectMemberDependencies objectMemberDependencies;
-
- @Mock
- private ObjectSpecificationDefault mockEmployeeSpec;
- private ObjectMember employeeNameMember;
-
- @Mock
- private ObjectSpecificationDefault mockStringSpec;
-
- @Mock
- private ObjectAdapter mockEmployeeAdapter;
-
- @Mock
- private ObjectAdapter mockAdapterForStringSmith;
- @Mock
- private ObjectAdapter mockAdapterForStringJones;
-
-
- private final SimpleSession session = new SimpleSession("tester", Collections.<String>emptyList());
-
- private EmployeeRepository employeeRepository;
-
- private Employee employeeDO;
- private Employee employeeWO;
-
- private WrapperFactoryDefault wrapperFactory;
-
- @Before
- public void setUp() {
-
- objectMemberDependencies = new ObjectMemberDependencies(
- mockSpecificationLoader, mockServicesInjector,
- mockPersistenceSessionService);
-
- employeeRepository = new EmployeeRepositoryImpl();
-
- employeeDO = new Employee();
- employeeDO.setName("Smith");
- employeeDO.setEmployeeRepository(employeeRepository);
-
- wrapperFactory = createWrapperFactory();
- wrapperFactory.setAdapterManager(mockAdapterManager);
- wrapperFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- wrapperFactory.setPersistenceSessionService(mockPersistenceSessionService);
- wrapperFactory.setSpecificationLoader(mockSpecificationLoader);
-
- context.checking(new Expectations() {
- {
- allowing(mockSpecificationLoader).loadSpecification(String.class);
- will(returnValue(mockStringSpec));
-
- allowing(mockStringSpec).getShortIdentifier();
- will(returnValue(String.class.getName()));
- }
- });
-
-
- final Method employeeGetNameMethod = methodOf(Employee.class, "getName");
- final Method employeeSetNameMethod = methodOf(Employee.class, "setName", String.class);
- final Method employeeModifyNameMethod = methodOf(Employee.class, "modifyName", String.class);
- final Method employeeHideNameMethod = methodOf(Employee.class, "hideName");
- final Method employeeDisableNameMethod = methodOf(Employee.class, "disableName");
- final Method employeeValidateNameMethod = methodOf(Employee.class, "validateName", String.class);
- final Method employeeClearNameMethod = methodOf(Employee.class, "clearName");
- employeeNameMember = new OneToOneAssociationDefault(
- facetedMethodForProperty(
- employeeSetNameMethod, employeeGetNameMethod, employeeModifyNameMethod, employeeClearNameMethod, employeeHideNameMethod, employeeDisableNameMethod, employeeValidateNameMethod),
- objectMemberDependencies);
-
- context.checking(new Expectations() {
- {
- allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
- will(returnValue(DeploymentCategory.PRODUCTION));
-
- allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
- will(returnValue(session));
-
- allowing(mockAdapterManager).getAdapterFor(employeeDO);
- will(returnValue(mockEmployeeAdapter));
-
- allowing(mockEmployeeAdapter).getSpecification();
- will(returnValue(mockEmployeeSpec));
-
- allowing(mockSpecificationLoader).loadSpecification(Employee.class);
- will(returnValue(mockEmployeeSpec));
-
- allowing(mockEmployeeSpec).getMember(methodOf(Employee.class, "getEmployeeRepository"));
- will(returnValue(null));
-
- allowing(mockEmployeeSpec).getMember(employeeGetNameMethod);
- will(returnValue(employeeNameMember));
-
- allowing(mockEmployeeSpec).getMember(employeeSetNameMethod);
- will(returnValue(employeeNameMember));
-
- allowing(mockEmployeeSpec).getMember(employeeModifyNameMethod);
- will(returnValue(employeeNameMember));
-
- allowing(mockEmployeeSpec).getMember(employeeClearNameMethod);
- will(returnValue(employeeNameMember));
-
- allowing(mockEmployeeAdapter).getObject();
- will(returnValue(employeeDO));
-
- allowing(mockEmployeeAdapter).representsPersistent();
- will(returnValue(true));
- }
- });
-
-
- employeeWO = wrapperFactory.wrap(employeeDO);
- }
-
- protected WrapperFactoryDefault createWrapperFactory() {
- return new WrapperFactoryDefault();
- }
-
- @Test
- public void shouldWrapDomainObject() {
- // then
- assertThat(employeeWO, is(notNullValue()));
- }
-
- @Test
- public void shouldBeAbleToInjectIntoDomainObjects() {
- assertThat(employeeDO.getEmployeeRepository(), is(notNullValue()));
- }
-
- @Test
- public void cannotAccessMethodNotCorrespondingToMember() {
-
- expectedException.expectMessage(
- "Method 'getEmployeeRepository' being invoked does not correspond to any of the object's fields or actions.");
-
- // then
- assertThat(employeeWO.getEmployeeRepository(), is(notNullValue()));
- }
-
- @Test
- public void shouldBeAbleToReadVisibleProperty() {
-
- allowingEmployeeHasSmithAdapter();
-
-
- // then
- assertThat(employeeWO.getName(), is(employeeDO.getName()));
- }
-
- @Test
- public void shouldNotBeAbleToViewHiddenProperty() {
-
- expectedException.expect(HiddenException.class);
-
- allowingEmployeeHasSmithAdapter();
-
- // given
- employeeDO.whetherHideName = true;
- // when
- employeeWO.getName();
- // then should throw exception
- }
-
- @Test
- public void shouldBeAbleToModifyEnabledPropertyUsingSetter() {
-
- allowingJonesStringValueAdapter();
-
- context.checking(new Expectations() {
- {
-
- oneOf(mockAdapterManager).adapterFor("Jones");
- will(returnValue(mockAdapterForStringJones));
- }
- });
-
- // when
- employeeWO.setName("Jones");
- // then
- assertThat(employeeDO.getName(), is("Jones"));
- assertThat(employeeWO.getName(), is(employeeDO.getName()));
- }
-
- @Test
- public void shouldNotBeAbleToModifyDisabledProperty() {
-
- expectedException.expect(DisabledException.class);
-
- // given
- employeeDO.reasonDisableName = "sorry, no change allowed";
- // when
- employeeWO.setName("Jones");
- // then should throw exception
- }
-
- @Test
- public void shouldNotBeAbleToModifyPropertyUsingModify() {
-
- allowingJonesStringValueAdapter();
-
- expectedException.expect(UnsupportedOperationException.class);
-
- // when
- employeeWO.modifyName("Jones");
- // then should throw exception
- }
-
- @Test
- public void shouldNotBeAbleToModifyPropertyUsingClear() {
-
- expectedException.expect(UnsupportedOperationException.class);
-
- // when
- employeeWO.clearName();
- // then should throw exception
- }
-
- @Test
- public void shouldNotBeAbleToModifyPropertyIfInvalid() {
-
- allowingJonesStringValueAdapter();
-
- expectedException.expect(InvalidException.class);
-
- // given
- employeeDO.reasonValidateName = "sorry, invalid data";
- // when
- employeeWO.setName("Jones");
- // then should throw exception
- }
-
-
- // //////////////////////////////////////
-
- private FacetedMethod facetedMethodForProperty(
- Method init, Method accessor, Method modify, Method clear, Method hide, Method disable, Method validate) {
- FacetedMethod facetedMethod = FacetedMethod.createForProperty(accessor.getDeclaringClass(), accessor);
- FacetUtil.addFacet(new PropertyAccessorFacetViaAccessor(accessor, facetedMethod, mockDeploymentCategoryProvider.getDeploymentCategory(),
- mockConfiguration, mockSpecificationLoader,
- mockAuthenticationSessionProvider, mockAdapterManager
- ));
- FacetUtil.addFacet(new PropertyInitializationFacetViaSetterMethod(init, facetedMethod));
- FacetUtil.addFacet(new PropertySetterFacetViaModifyMethod(modify, facetedMethod));
- FacetUtil.addFacet(new PropertyClearFacetViaClearMethod(clear, facetedMethod));
- FacetUtil.addFacet(new HideForContextFacetViaMethod(hide, facetedMethod));
- FacetUtil.addFacet(new DisableForContextFacetViaMethod(disable, null, null, facetedMethod));
- FacetUtil.addFacet(new PropertyValidateFacetViaMethod(validate, null, null, facetedMethod));
- FacetUtil.addFacet(new NamedFacetInferred(accessor.getName(), facetedMethod));
- return facetedMethod;
- }
-
- private static Method methodOf(Class<?> cls, String methodName) {
- return methodOf(cls, methodName, new Class<?>[]{});
- }
-
- private static Method methodOf(Class<?> cls, String methodName, Class<?>... args) {
- try {
- return cls.getMethod(methodName, args);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- // //////////////////////////////////////
-
- private void allowingEmployeeHasSmithAdapter() {
- context.checking(new Expectations() {
- {
- allowing(mockAdapterManager).adapterFor("Smith");
- will(returnValue(mockAdapterForStringSmith));
-
- allowing(mockAdapterForStringSmith).getObject();
- will(returnValue("Smith"));
- }
- });
- }
-
- private void allowingJonesStringValueAdapter() {
- context.checking(new Expectations() {
- {
- allowing(mockAdapterManager).adapterFor("Jones");
- will(returnValue(mockAdapterForStringJones));
-
- allowing(mockAdapterForStringJones).getObject();
- will(returnValue("Jones"));
-
- allowing(mockAdapterForStringJones).isTransient();
- will(returnValue(false));
- }
- });
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
deleted file mode 100644
index 4d91efa..0000000
--- a/core/wrapper/src/test/java/org/apache/isis/progmodel/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ /dev/null
@@ -1,276 +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.progmodel.wrapper;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.PropertyModifyEvent;
-import org.apache.isis.applib.events.PropertyUsabilityEvent;
-import org.apache.isis.applib.events.PropertyVisibilityEvent;
-import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.applib.services.wrapper.DisabledException;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.consent.Allow;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.consent.InteractionResult;
-import org.apache.isis.core.metamodel.consent.Veto;
-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.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractAlwaysEverywhere;
-import org.apache.isis.core.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
-import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetViaSetterMethod;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.core.wrapper.WrapperFactoryDefault;
-import org.apache.isis.progmodel.wrapper.dom.employees.Employee;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * Contract test.
- */
-public class WrapperFactoryDefaultTest_wrappedObject_transient {
-
- @Rule
- public final JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
-
- @Mock
- private AdapterManager mockAdapterManager;
- @Mock
- private AuthenticationSessionProvider mockAuthenticationSessionProvider;
- @Mock
- private DeploymentCategoryProvider mockDeploymentCategoryProvider;
- @Mock
- private IsisConfiguration mockConfiguration;
- @Mock
- private PersistenceSessionService mockPersistenceSessionService;
- @Mock
- private SpecificationLoader mockSpecificationLoader;
-
- private Employee employeeDO;
- @Mock
- private ObjectAdapter mockEmployeeAdapter;
- @Mock
- private ObjectSpecificationDefault mockEmployeeSpec;
- @Mock
- private OneToOneAssociation mockPasswordMember;
- @Mock
- private Identifier mockPasswordIdentifier;
-
-
- @Mock
- protected ObjectAdapter mockPasswordAdapter;
-
- private final String passwordValue = "12345678";
-
- private final SimpleSession session = new SimpleSession("tester", Collections.<String>emptyList());
-
- private List<Facet> facets;
- private Method getPasswordMethod;
- private Method setPasswordMethod;
-
- private WrapperFactoryDefault wrapperFactory;
- private Employee employeeWO;
-
- @Before
- public void setUp() throws Exception {
-
- employeeDO = new Employee();
- employeeDO.setName("Smith");
-
- getPasswordMethod = Employee.class.getMethod("getPassword");
- setPasswordMethod = Employee.class.getMethod("setPassword", String.class);
-
- wrapperFactory = createWrapperFactory();
- wrapperFactory.setAdapterManager(mockAdapterManager);
- wrapperFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
- wrapperFactory.setPersistenceSessionService(mockPersistenceSessionService);
- wrapperFactory.setSpecificationLoader(mockSpecificationLoader);
-
- context.checking(new Expectations() {
- {
- allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
- will(returnValue(DeploymentCategory.PRODUCTION));
-
- allowing(mockAdapterManager).getAdapterFor(employeeDO);
- will(returnValue(mockEmployeeAdapter));
-
- allowing(mockAdapterManager).adapterFor(passwordValue);
- will(returnValue(mockPasswordAdapter));
-
- allowing(mockEmployeeAdapter).getSpecification();
- will(returnValue(mockEmployeeSpec));
-
- allowing(mockEmployeeAdapter).getObject();
- will(returnValue(employeeDO));
-
- allowing(mockPasswordAdapter).getObject();
- will(returnValue(passwordValue));
-
- allowing(mockPasswordMember).getIdentifier();
- will(returnValue(mockPasswordIdentifier));
-
- allowing(mockSpecificationLoader).loadSpecification(Employee.class);
- will(returnValue(mockEmployeeSpec));
-
- allowing(mockEmployeeSpec).getMember(with(setPasswordMethod));
- will(returnValue(mockPasswordMember));
-
- allowing(mockEmployeeSpec).getMember(with(getPasswordMethod));
- will(returnValue(mockPasswordMember));
-
- allowing(mockPasswordMember).getName();
- will(returnValue("password"));
-
- allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
- will(returnValue(session));
-
- allowing(mockPasswordMember).isOneToOneAssociation();
- will(returnValue(true));
-
- allowing(mockPasswordMember).isOneToManyAssociation();
- will(returnValue(false));
- }
- });
-
- employeeWO = wrapperFactory.wrap(employeeDO);
- }
-
- /**
- * Mandatory hook.
- */
- protected WrapperFactoryDefault createWrapperFactory() {
- return new WrapperFactoryDefault();
- }
-
- @Test(expected = DisabledException.class)
- public void shouldNotBeAbleToModifyProperty() {
-
- // given
- final DisabledFacet disabledFacet = new DisabledFacetAbstractAlwaysEverywhere(mockPasswordMember){};
- facets = Arrays.asList(disabledFacet, new PropertySetterFacetViaSetterMethod(setPasswordMethod, mockPasswordMember));
-
- final Consent visibilityConsent = new Allow(new InteractionResult(new PropertyVisibilityEvent(employeeDO, null)));
-
- final InteractionResult usabilityInteractionResult = new InteractionResult(new PropertyUsabilityEvent(employeeDO, null));
- usabilityInteractionResult.advise("disabled", disabledFacet);
- final Consent usabilityConsent = new Veto(usabilityInteractionResult);
-
- context.checking(new Expectations() {
- {
- allowing(mockPasswordMember).getFacets(with(any(Filter.class)));
- will(returnValue(facets));
-
- allowing(mockPasswordMember).isVisible(mockEmployeeAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE);
- will(returnValue(visibilityConsent));
-
- allowing(mockPasswordMember).isUsable(mockEmployeeAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE
- );
- will(returnValue(usabilityConsent));
- }
- });
-
- // when
- employeeWO.setPassword(passwordValue);
-
- // then should throw exception
- }
-
- @Ignore("TODO - reinstate or replace with integration tests")
- @Test
- public void canModifyProperty() {
- // given
-
- final Consent visibilityConsent = new Allow(new InteractionResult(new PropertyVisibilityEvent(employeeDO, mockPasswordIdentifier)));
- final Consent usabilityConsent = new Allow(new InteractionResult(new PropertyUsabilityEvent(employeeDO, mockPasswordIdentifier)));
- final Consent validityConsent = new Allow(new InteractionResult(new PropertyModifyEvent(employeeDO, mockPasswordIdentifier, passwordValue)));
-
- context.checking(new Expectations() {
- {
- allowing(mockPasswordMember).isVisible(mockEmployeeAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE);
- will(returnValue(visibilityConsent));
-
- allowing(mockPasswordMember).isUsable(mockEmployeeAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE
- );
- will(returnValue(usabilityConsent));
-
- allowing(mockPasswordMember).isAssociationValid(mockEmployeeAdapter, mockPasswordAdapter,
- InteractionInitiatedBy.USER);
- will(returnValue(validityConsent));
- }
- });
-
- facets = Arrays.asList((Facet)new PropertySetterFacetViaSetterMethod(setPasswordMethod, mockPasswordMember));
- context.checking(new Expectations() {
- {
- allowing(mockPasswordMember).getFacets(with(any(Filter.class)));
- will(returnValue(facets));
-
- oneOf(mockPasswordMember).set(mockEmployeeAdapter, mockPasswordAdapter, InteractionInitiatedBy.USER);
- }
- });
-
- // when
- employeeWO.setPassword(passwordValue);
-
-
- // and given
- facets = Arrays.asList((Facet)new PropertyAccessorFacetViaAccessor(getPasswordMethod, mockPasswordMember,
- mockDeploymentCategoryProvider.getDeploymentCategory(), mockConfiguration, mockSpecificationLoader,
- mockAuthenticationSessionProvider, mockAdapterManager
- ));
- context.checking(new Expectations() {
- {
- allowing(mockPasswordMember).getFacets(with(any(Filter.class)));
- will(returnValue(facets));
-
- oneOf(mockPasswordMember).get(mockEmployeeAdapter, InteractionInitiatedBy.USER);
- will(returnValue(mockPasswordAdapter));
- }
- });
-
- // then be allowed
- assertThat(employeeWO.getPassword(), is(passwordValue));
- }
-}
[09/10] isis git commit: ISIS-1405: removing IsisConfigurationAware.
Posted by da...@apache.org.
ISIS-1405: removing IsisConfigurationAware.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/62f5ad7d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/62f5ad7d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/62f5ad7d
Branch: refs/heads/ISIS-1406
Commit: 62f5ad7d7d468535bd8851b5d484797227bb23aa
Parents: 0c79439
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed May 18 17:34:23 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed May 18 17:40:39 2016 +0100
----------------------------------------------------------------------
.../integtestsupport/IsisSystemForTest.java | 4 +-
.../core/commons/config/InstallerAbstract.java | 4 +-
.../commons/config/IsisConfigurationAware.java | 32 --------------
.../config/IsisConfigurationDefault.java | 13 +-----
...llectionIdentifyingFacetFactoryAbstract.java | 11 +++--
.../action/ActionAnnotationFacetFactory.java | 14 ++++--
...MaxLengthFacetOnActionAnnotationFactory.java | 12 ++++--
.../paged/PagedFacetOnActionFactory.java | 12 ++++--
.../annotation/DebugFacetAnnotationFactory.java | 10 +++--
.../ExplorationFacetAnnotationFactory.java | 10 +++--
...ActionNamedDebugExplorationFacetFactory.java | 12 ++++--
.../NotContributedFacetAnnotationFactory.java | 11 +++--
.../NotInServiceMenuFacetAnnotationFactory.java | 11 +++--
.../NotInServiceMenuFacetViaMethodFactory.java | 12 ++++--
.../CollectionAnnotationFacetFactory.java | 11 ++---
.../paged/PagedFacetOnCollectionFactory.java | 13 ++++--
.../SortedByFacetAnnotationFactory.java | 12 ++++--
.../facets/fallback/FallbackFacetFactory.java | 22 +++++++---
...FacetOnActionFromConfiguredRegexFactory.java | 11 +++--
.../annotprop/CssClassFacetOnMemberFactory.java | 14 ++++--
.../CssClassFaFacetOnMemberFactory.java | 22 ++++++----
.../DescribedAsFacetOnMemberFactory.java | 13 ++++--
.../DescribedAsFacetStaticMethodFactory.java | 13 ++++--
.../DisabledFacetStaticMethodFacetFactory.java | 11 +++--
.../HiddenFacetStaticMethodFactory.java | 11 +++--
.../annotprop/NamedFacetOnMemberFactory.java | 21 ++++++---
.../NamedFacetStaticMethodFactory.java | 12 ++++--
.../annotprop/RenderFacetOrResolveFactory.java | 13 ++++--
.../ViewModelSemanticCheckingFacetFactory.java | 13 ++++--
.../ActionOrderFacetAnnotationFactory.java | 11 +++--
...cyFacetViaBookmarkableAnnotationFactory.java | 10 +++--
.../CssClassFacetOnTypeAnnotationFactory.java | 11 +++--
...FacetAnnotationElseConfigurationFactory.java | 14 +++---
...DescribedAsFacetOnTypeAnnotationFactory.java | 11 +++--
.../DomainObjectAnnotationFacetFactory.java | 12 ++++--
.../DomainObjectLayoutFacetFactory.java | 13 +++---
...FacetAnnotationElseConfigurationFactory.java | 11 +++--
.../FieldOrderFacetAnnotationFactory.java | 10 +++--
.../HiddenFacetOnTypeAnnotationFactory.java | 10 +++--
.../MaskFacetOnTypeAnnotationFactory.java | 11 +++--
.../MaxLengthFacetOnTypeAnnotationFactory.java | 11 +++--
.../MultiLineFacetOnTypeAnnotationFactory.java | 11 +++--
.../NamedFacetOnTypeAnnotationFactory.java | 12 ++++--
.../NamedFacetStaticMethodFactory.java | 12 ++++--
.../PagedFacetOnTypeAnnotationFactory.java | 17 ++++----
...FacetAnnotationElseConfigurationFactory.java | 13 +++---
.../PluralAnnotationFacetFactory.java | 11 +++--
.../PluralFacetStaticMethodFactory.java | 12 ++++--
.../RegExFacetOnTypeAnnotationFactory.java | 13 ++++--
...picalLengthFacetOnTypeAnnotationFactory.java | 12 ++++--
...MustSatisfyAnnotationOnTypeFacetFactory.java | 10 +++--
...ueFacetAnnotationOrConfigurationFactory.java | 12 ++++--
...ValueFacetUsingSemanticsProviderFactory.java | 11 +++--
...tiLineFacetOnParameterAnnotationFactory.java | 12 ++++--
.../NamedFacetOnParameterAnnotationFactory.java | 14 ++++--
.../ParameterAnnotationFacetFactory.java | 17 +++++---
...BeforeFacetOnParameterAnnotationFactory.java | 11 +++--
...LengthFacetOnParameterAnnotationFactory.java | 12 ++++--
.../MaskFacetOnParameterAnnotationFactory.java | 11 +++--
...atoryFacetOnPropertyStaticMethodFactory.java | 12 ++++--
.../MultiLineFacetOnPropertyFactory.java | 12 ++++--
.../PropertyAnnotationFacetFactory.java | 11 +++--
...yBeforeAnnotationOnPropertyFacetFactory.java | 11 +++--
.../TypicalLengthOnPropertyFacetFactory.java | 12 ++++--
.../MaskFacetOnPropertyAnnotationFactory.java | 12 ++++--
.../runtimecontext/ConfigurationService.java | 45 --------------------
.../ConfigurationServiceAware.java | 29 -------------
.../ConfigurationServiceInternal.java | 45 ++++++++++++++++++++
.../runtimecontext/RuntimeContext.java | 2 -
.../runtimecontext/RuntimeContextAbstract.java | 10 -----
.../noruntime/RuntimeContextNoRuntime.java | 6 +--
.../bookmarks/BookmarkServiceDefault.java | 12 +-----
.../config/ConfigurationServiceDefault.java | 25 ++++-------
.../specloader/ObjectReflectorDefault.java | 3 ++
...MetaModelValidatorForDeprecatedAbstract.java | 4 +-
...itableAnnotationInJdoApplibFacetFactory.java | 12 ++++--
.../ActionAnnotationFacetFactoryTest.java | 5 ++-
...ewModelSemanticCheckingFacetFactoryTest.java | 11 ++++-
.../defaults/DefaultedFacetFactoryTest.java | 9 +++-
.../DomainObjectAnnotationFacetFactoryTest.java | 6 ++-
.../encodable/EncodableFacetFactoryTest.java | 10 ++++-
...tAnnotationElseConfigurationFactoryTest.java | 5 ++-
...cetAnnotationOrConfigurationFactoryTest.java | 5 ++-
.../ObjectReflectorDefaultTestAbstract.java | 6 +++
.../testspec/ObjectSpecificationStub.java | 7 ++-
.../internal/RuntimeContextFromSession.java | 2 +-
.../runtime/services/ServicesInstaller.java | 3 +-
.../isis/core/runtime/system/IsisSystem.java | 2 +
.../system/persistence/PersistenceSession.java | 9 +---
.../IsisComponentProviderDefault2.java | 2 +-
.../FormComponentPanelAbstract.java | 1 -
91 files changed, 666 insertions(+), 418 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
index 52c947f..475420e 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
@@ -241,7 +241,9 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
);
final ServicesInstaller installer = new ServicesInstallerFromConfigurationAndAnnotation();
- installer.setConfiguration(configuration);
+
+ //installer.setConfiguration(configuration);
+
final List<Object> serviceList = installer.getServices();
this.services.addAll(serviceList);
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java
index 28c12e5..21048ef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java
@@ -26,7 +26,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.core.commons.components.Installer;
-public abstract class InstallerAbstract implements Installer, IsisConfigurationBuilderAware, IsisConfigurationAware {
+public abstract class InstallerAbstract implements Installer, IsisConfigurationBuilderAware {
private final String type;
private final String name;
@@ -133,7 +133,7 @@ public abstract class InstallerAbstract implements Installer, IsisConfigurationB
*/
public void setConfiguration(final IsisConfiguration configuration) {
if (isisConfigurationBuilder != null) {
- throw new IllegalStateException("A IsisConfigurationBuilder has already been provided.");
+ throw new IllegalStateException("An IsisConfigurationBuilder has already been provided.");
}
this.configuration = configuration;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationAware.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationAware.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationAware.java
deleted file mode 100644
index 09bc9f3..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationAware.java
+++ /dev/null
@@ -1,32 +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.commons.config;
-
-/**
- * Allows components (eg facet factories) to indicate that they have a
- * dependency on {@link IsisConfiguration}.
- */
-public interface IsisConfigurationAware {
-
- /**
- * Inject the {@link IsisConfiguration} into the component.
- */
- void setConfiguration(IsisConfiguration configuration);
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
index f00c9f9..72f2c40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
@@ -36,10 +36,9 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationService;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceAware;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
-public class IsisConfigurationDefault implements IsisConfiguration, ConfigurationService {
+public class IsisConfigurationDefault implements IsisConfiguration, ConfigurationServiceInternal {
private static final Logger LOG = LoggerFactory.getLogger(IsisConfigurationDefault.class);
private final ResourceStreamSource resourceStreamSource;
@@ -460,14 +459,6 @@ public class IsisConfigurationDefault implements IsisConfiguration, Configuratio
@Override
public void injectInto(final Object candidate) {
- if (ConfigurationServiceAware.class.isAssignableFrom(candidate.getClass())) {
- final ConfigurationServiceAware cast = ConfigurationServiceAware.class.cast(candidate);
- cast.setConfigurationService(this);
- }
- if (IsisConfigurationAware.class.isAssignableFrom(candidate.getClass())) {
- final IsisConfigurationAware cast = IsisConfigurationAware.class.cast(candidate);
- cast.setConfiguration(this);
- }
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
index 9e3cd74..879d3eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
@@ -22,15 +22,16 @@ package org.apache.isis.core.metamodel.facets;
import java.util.List;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
public abstract class PropertyOrCollectionIdentifyingFacetFactoryAbstract
extends MethodPrefixBasedFacetFactoryAbstract
- implements PropertyOrCollectionIdentifyingFacetFactory, AdapterManagerAware, IsisConfigurationAware {
+ implements PropertyOrCollectionIdentifyingFacetFactory, AdapterManagerAware {
public PropertyOrCollectionIdentifyingFacetFactoryAbstract(final List<FeatureType> featureTypes, final String... prefixes) {
@@ -73,8 +74,12 @@ public abstract class PropertyOrCollectionIdentifyingFacetFactoryAbstract
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index 94af81e..d53a500 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -42,7 +42,6 @@ import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.eventbus.ActionInvokedEvent;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -89,6 +88,8 @@ import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFace
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
@@ -97,7 +98,7 @@ import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
import org.apache.isis.core.metamodel.transactions.TransactionStateProviderAware;
import org.apache.isis.core.metamodel.util.EventUtil;
-public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AdapterManagerAware, MetaModelValidatorRefiner,
+public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implements AdapterManagerAware, MetaModelValidatorRefiner,
TransactionStateProviderAware {
private final MetaModelValidatorForDeprecatedAnnotation actionSemanticsValidator = new MetaModelValidatorForDeprecatedAnnotation(ActionSemantics.class);
@@ -542,10 +543,14 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
// ///////////////////////////////////////////////////////////////
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- this.configuration = configuration;
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
+ this.configuration = configuration;
actionSemanticsValidator.setConfiguration(configuration);
actionInteractionValidator.setConfiguration(configuration);
postsActionInvokedEventValidator.setConfiguration(configuration);
@@ -560,6 +565,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
prototypeValidator.setConfiguration(configuration);
}
+
@Override
public void setAdapterManager(final AdapterManager adapterManager) {
this.adapterManager = adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java
index 82c9e0c..b3463b6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/maxlenannot/MaxLengthFacetOnActionAnnotationFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.actions.contributing.maxlenannot;
import org.apache.isis.applib.annotation.MaxLength;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +29,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -38,7 +40,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class MaxLengthFacetOnActionAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MaxLengthFacetOnActionAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(MaxLength.class);
@@ -63,8 +65,10 @@ public class MaxLengthFacetOnActionAnnotationFactory extends FacetFactoryAbstrac
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- validator.setConfiguration(configuration);
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ validator.setConfiguration((IsisConfigurationDefault)servicesInjector.lookupService(ConfigurationServiceInternal.class));
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetOnActionFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetOnActionFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetOnActionFactory.java
index 04bb1e7..4967c7d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetOnActionFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/paged/PagedFacetOnActionFactory.java
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.actions.contributing.paged;
import java.util.Properties;
+
import org.apache.isis.applib.annotation.Paged;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
@@ -30,6 +30,8 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -40,7 +42,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
*/
@Deprecated
public class PagedFacetOnActionFactory extends FacetFactoryAbstract
- implements ContributeeMemberFacetFactory, IsisConfigurationAware, MetaModelValidatorRefiner {
+ implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Paged.class);
@@ -92,9 +94,13 @@ public class PagedFacetOnActionFactory extends FacetFactoryAbstract
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
index 97b24eb..3ce11c4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.actions.debug.annotation;
import org.apache.isis.applib.annotation.Debug;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -39,7 +40,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class DebugFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class DebugFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Debug.class);
@@ -64,7 +65,10 @@ public class DebugFacetAnnotationFactory extends FacetFactoryAbstract implements
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
index df792d7..7f82d0c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.actions.exploration.annotation;
import org.apache.isis.applib.annotation.Exploration;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -39,7 +40,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class ExplorationFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class ExplorationFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Exploration.class);
@@ -64,8 +65,9 @@ public class ExplorationFacetAnnotationFactory extends FacetFactoryAbstract impl
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- validator.setConfiguration(configuration);
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ validator.setConfiguration((IsisConfiguration)servicesInjector.lookupService(ConfigurationServiceInternal.class));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
index 40431c8..a0f9d1f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facets.actions.interaction;
import java.lang.reflect.Method;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -33,6 +33,8 @@ import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -48,7 +50,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
private static final String EXPLORATION_PREFIX = "Exploration";
private static final String DEBUG_PREFIX = "Debug";
@@ -128,9 +130,13 @@ public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFa
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
explorationValidator.setConfiguration(configuration);
debugValidator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java
index ba3d450..3b8e27a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.actions.notcontributed.annotation;
import org.apache.isis.applib.annotation.NotContributed;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class NotContributedFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class NotContributedFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(NotContributed.class);
@@ -61,8 +62,12 @@ public class NotContributedFacetAnnotationFactory extends FacetFactoryAbstract i
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotationFactory.java
index 35995b2..261f9f3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/annotation/NotInServiceMenuFacetAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.annotatio
import org.apache.isis.applib.annotation.NotInServiceMenu;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class NotInServiceMenuFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class NotInServiceMenuFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(NotInServiceMenu.class);
@@ -61,8 +62,12 @@ public class NotInServiceMenuFacetAnnotationFactory extends FacetFactoryAbstract
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java
index c078bb3..be122a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuFacetViaMethodFactory.java
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.method;
import java.lang.reflect.Method;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -30,6 +30,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -37,7 +39,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class NotInServiceMenuFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class NotInServiceMenuFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
public static final String NOT_IN_SERVICE_MENU_PREFIX = "notInServiceMenu";
@@ -72,8 +74,12 @@ public class NotInServiceMenuFacetViaMethodFactory extends MethodPrefixBasedFace
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index b905a09..da5f805 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -34,7 +34,6 @@ import org.apache.isis.applib.annotation.PostsCollectionRemovedFromEvent;
import org.apache.isis.applib.annotation.TypeOf;
import org.apache.isis.applib.services.eventbus.CollectionDomainEvent;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -73,14 +72,14 @@ import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemove
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
import org.apache.isis.core.metamodel.util.EventUtil;
-public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation postsCollectionAddedToEventValidator = new MetaModelValidatorForDeprecatedAnnotation(PostsCollectionAddedToEvent.class);
private final MetaModelValidatorForDeprecatedAnnotation postsCollectionRemovedFromEventValidator = new MetaModelValidatorForDeprecatedAnnotation(PostsCollectionRemovedFromEvent.class);
@@ -385,8 +384,9 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract imple
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- this.configuration = configuration;
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector.lookupService(ConfigurationServiceInternal.class);
postsCollectionAddedToEventValidator.setConfiguration(configuration);
postsCollectionRemovedFromEventValidator.setConfiguration(configuration);
collectionInteractionValidator.setConfiguration(configuration);
@@ -396,4 +396,5 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract imple
disabledValidator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetOnCollectionFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetOnCollectionFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetOnCollectionFactory.java
index c110f7e..d3e220f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetOnCollectionFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/paged/PagedFacetOnCollectionFactory.java
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.collections.paged;
import java.util.Properties;
+
import org.apache.isis.applib.annotation.Paged;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
@@ -30,6 +30,8 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -38,7 +40,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
*/
@Deprecated
public class PagedFacetOnCollectionFactory extends FacetFactoryAbstract
- implements ContributeeMemberFacetFactory, IsisConfigurationAware,MetaModelValidatorRefiner {
+ implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Paged.class);
@@ -88,12 +90,17 @@ public class PagedFacetOnCollectionFactory extends FacetFactoryAbstract
return configuration;
}
+
@Override
- public void setConfiguration(IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
index 81a552a..81bf034 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
@@ -21,9 +21,10 @@ package org.apache.isis.core.metamodel.facets.collections.sortedby.annotation;
import java.util.Comparator;
import java.util.List;
+
import org.apache.isis.applib.annotation.SortedBy;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -31,6 +32,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -47,7 +50,7 @@ import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
* @deprecated
*/
@Deprecated
-public class SortedByFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class SortedByFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(SortedBy.class);
@@ -103,8 +106,9 @@ public class SortedByFacetAnnotationFactory extends FacetFactoryAbstract impleme
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- validator.setConfiguration(configuration);
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ validator.setConfiguration((IsisConfigurationDefault)servicesInjector.lookupService(ConfigurationServiceInternal.class));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
index f42fac3..4b967b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
@@ -22,10 +22,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import com.google.common.collect.Lists;
+
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -34,13 +35,15 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.TypedHolder;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
/**
* Central point for providing some kind of default for any {@link Facet}s
* required by the Apache Isis framework itself.
*
*/
-public class FallbackFacetFactory extends FacetFactoryAbstract implements IsisConfigurationAware {
+public class FallbackFacetFactory extends FacetFactoryAbstract {
public final static int PAGE_SIZE_STANDALONE_DEFAULT = 25;
public final static int PAGE_SIZE_PARENTED_DEFAULT = 12;
@@ -171,13 +174,18 @@ public class FallbackFacetFactory extends FacetFactoryAbstract implements IsisCo
return null;
}
- @Override
- public void setConfiguration(IsisConfiguration configuration) {
- this.configuration = configuration;
- }
-
+
public IsisConfiguration getConfiguration() {
return configuration;
}
+ @Override
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
+ this.configuration = configuration;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
index b74883b..2738067 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
@@ -30,7 +30,6 @@ import com.google.common.collect.Maps;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -38,10 +37,12 @@ import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-public class CssClassFacetOnActionFromConfiguredRegexFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, IsisConfigurationAware {
+public class CssClassFacetOnActionFromConfiguredRegexFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory {
public CssClassFacetOnActionFromConfiguredRegexFactory() {
super(FeatureType.ACTIONS_ONLY);
@@ -158,10 +159,14 @@ public class CssClassFacetOnActionFromConfiguredRegexFactory extends FacetFactor
private IsisConfiguration configuration;
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
}
+
//endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnMemberFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnMemberFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnMemberFactory.java
index 95becd0..300c7d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnMemberFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnMemberFactory.java
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.members.cssclass.annotprop;
import java.util.Properties;
+
import org.apache.isis.applib.annotation.CssClass;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -31,10 +31,12 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class CssClassFacetOnMemberFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner, IsisConfigurationAware {
+public class CssClassFacetOnMemberFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(CssClass.class);
@@ -92,11 +94,17 @@ public class CssClassFacetOnMemberFactory extends FacetFactoryAbstract implement
//region > injected
private IsisConfiguration configuration;
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
validator.setConfiguration(configuration);
}
+
+
//endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
index 8ab9477..50c1ddd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberFactory.java
@@ -26,11 +26,12 @@ import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import com.google.common.base.Strings;
+import com.google.common.collect.Maps;
+
import org.apache.isis.applib.annotation.CssClassFa;
-import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -38,13 +39,13 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
+import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-import com.google.common.base.Strings;
-import com.google.common.collect.Maps;
-
-public class CssClassFaFacetOnMemberFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner, IsisConfigurationAware {
+public class CssClassFaFacetOnMemberFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(CssClassFa.class);
@@ -171,13 +172,16 @@ public class CssClassFaFacetOnMemberFactory extends FacetFactoryAbstract impleme
metaModelValidator.add(validator);
}
- // region > injected
private IsisConfiguration configuration;
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
validator.setConfiguration(configuration);
}
- // endregion
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberFactory.java
index 35da2ca..61e2a7f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/annotprop/DescribedAsFacetOnMemberFactory.java
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.members.describedas.annotprop;
import java.util.Properties;
+
import org.apache.isis.applib.annotation.DescribedAs;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -31,11 +31,13 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class DescribedAsFacetOnMemberFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner, IsisConfigurationAware {
+public class DescribedAsFacetOnMemberFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(DescribedAs.class);
@@ -98,9 +100,14 @@ public class DescribedAsFacetOnMemberFactory extends FacetFactoryAbstract implem
metaModelValidator.add(validator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethodFactory.java
index 260eb52..b952a2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/describedas/staticmethod/DescribedAsFacetStaticMethodFactory.java
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facets.members.describedas.staticmethod;
import java.lang.reflect.Method;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
@@ -35,6 +35,8 @@ import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstra
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -45,7 +47,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class DescribedAsFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class DescribedAsFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
private static final String[] PREFIXES = { MethodPrefixConstants.DESCRIPTION_PREFIX };
@@ -106,9 +108,14 @@ public class DescribedAsFacetStaticMethodFactory extends MethodPrefixBasedFacetF
metaModelValidator.add(validator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetStaticMethodFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetStaticMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetStaticMethodFacetFactory.java
index 444141e..f18192f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetStaticMethodFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/staticmethod/DisabledFacetStaticMethodFacetFactory.java
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facets.members.disabled.staticmethod;
import java.lang.reflect.Method;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
@@ -34,6 +34,8 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -41,7 +43,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class DisabledFacetStaticMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class DisabledFacetStaticMethodFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
private static final String[] PREFIXES = { MethodPrefixConstants.PROTECT_PREFIX };
@@ -110,7 +112,10 @@ public class DisabledFacetStaticMethodFacetFactory extends MethodPrefixBasedFace
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetStaticMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetStaticMethodFactory.java
index 900eac5..27ef717 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetStaticMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/staticmethod/HiddenFacetStaticMethodFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.members.hidden.staticmethod;
import java.lang.reflect.Method;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
@@ -34,6 +33,8 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -41,7 +42,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class HiddenFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class HiddenFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
private static final String[] PREFIXES = { MethodPrefixConstants.ALWAYS_HIDE_PREFIX };
@@ -108,8 +109,12 @@ public class HiddenFacetStaticMethodFactory extends MethodPrefixBasedFacetFactor
metaModelValidator.add(validator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/annotprop/NamedFacetOnMemberFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/annotprop/NamedFacetOnMemberFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/annotprop/NamedFacetOnMemberFactory.java
index c4ed1a4..7513786 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/annotprop/NamedFacetOnMemberFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/annotprop/NamedFacetOnMemberFactory.java
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.members.named.annotprop;
import java.util.Properties;
+
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -31,12 +31,14 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class NamedFacetOnMemberFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner, IsisConfigurationAware {
+public class NamedFacetOnMemberFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
- private final MetaModelValidatorForDeprecatedAnnotation namedValidator = new MetaModelValidatorForDeprecatedAnnotation(Named.class);
+ private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Named.class);
public NamedFacetOnMemberFactory() {
@@ -47,7 +49,8 @@ public class NamedFacetOnMemberFactory extends FacetFactoryAbstract implements C
public void process(final ProcessMethodContext processMethodContext) {
NamedFacet namedFacet = createFromMetadataPropertiesIfPossible(processMethodContext);
if(namedFacet == null) {
- namedFacet = namedValidator.flagIfPresent(createFromAnnotationIfPossible(processMethodContext), processMethodContext);
+ namedFacet = validator
+ .flagIfPresent(createFromAnnotationIfPossible(processMethodContext), processMethodContext);
}
// no-op if null
FacetUtil.addFacet(namedFacet);
@@ -76,12 +79,16 @@ public class NamedFacetOnMemberFactory extends FacetFactoryAbstract implements C
@Override
public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(namedValidator);
+ metaModelValidator.add(validator);
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- namedValidator.setConfiguration(configuration);
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
+ validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethodFactory.java
index 3ca143a..6437fd6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/named/staticmethod/NamedFacetStaticMethodFactory.java
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facets.members.named.staticmethod;
import java.lang.reflect.Method;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
@@ -35,6 +35,8 @@ import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstra
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -45,7 +47,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class NamedFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class NamedFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
private static final String[] PREFIXES = { MethodPrefixConstants.NAME_PREFIX };
@@ -110,9 +112,13 @@ public class NamedFacetStaticMethodFactory extends MethodPrefixBasedFacetFactory
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java
index 2d5dea0..23f2947 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/render/annotprop/RenderFacetOrResolveFactory.java
@@ -20,10 +20,10 @@
package org.apache.isis.core.metamodel.facets.members.render.annotprop;
import java.util.Properties;
+
import org.apache.isis.applib.annotation.Render;
import org.apache.isis.applib.annotation.Resolve;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -32,11 +32,13 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.members.render.RenderFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
public class RenderFacetOrResolveFactory extends FacetFactoryAbstract
- implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner, IsisConfigurationAware {
+ implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation renderValidator = new MetaModelValidatorForDeprecatedAnnotation(Render.class);
private final MetaModelValidatorForDeprecatedAnnotation resolveValidator = new MetaModelValidatorForDeprecatedAnnotation(Resolve.class);
@@ -96,10 +98,15 @@ public class RenderFacetOrResolveFactory extends FacetFactoryAbstract
metaModelValidator.add(resolveValidator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
renderValidator.setConfiguration(configuration);
resolveValidator.setConfiguration(configuration);
}
+
}
[08/10] isis git commit: ISIS-1405: removing IsisConfigurationAware.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
index 6edcd3c..49d86cc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactory.java
@@ -26,16 +26,17 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.ViewModel;
import org.apache.isis.applib.annotation.ViewModelLayout;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForValidationFailures;
-public class ViewModelSemanticCheckingFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class ViewModelSemanticCheckingFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private IsisConfiguration configuration;
@@ -177,8 +178,14 @@ public class ViewModelSemanticCheckingFacetFactory extends FacetFactoryAbstract
metaModelValidator.add(validator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
}
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotationFactory.java
index 81cf308..4dd9dfb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.actionorder.annotation;
import org.apache.isis.applib.annotation.ActionOrder;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.actionorder.ActionOrderFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class ActionOrderFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class ActionOrderFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(ActionOrder.class);
@@ -61,8 +62,12 @@ public class ActionOrderFacetAnnotationFactory extends FacetFactoryAbstract impl
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotationFactory.java
index d923237..0b6398f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetViaBookmarkableAnnotationFactory.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.isis.applib.annotation.BookmarkPolicy;
import org.apache.isis.applib.annotation.Bookmarkable;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -34,6 +33,8 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacetFallback;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -46,7 +47,7 @@ import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
* @deprecated
*/
@Deprecated
-public class BookmarkPolicyFacetViaBookmarkableAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class BookmarkPolicyFacetViaBookmarkableAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Bookmarkable.class);
@@ -104,7 +105,10 @@ public class BookmarkPolicyFacetViaBookmarkableAnnotationFactory extends FacetFa
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclass/annotation/CssClassFacetOnTypeAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclass/annotation/CssClassFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclass/annotation/CssClassFacetOnTypeAnnotationFactory.java
index ed1645f..bbd7023 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclass/annotation/CssClassFacetOnTypeAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/cssclass/annotation/CssClassFacetOnTypeAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.cssclass.annotation;
import org.apache.isis.applib.annotation.CssClass;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class CssClassFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class CssClassFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(CssClass.class);
@@ -61,8 +62,12 @@ public class CssClassFacetOnTypeAnnotationFactory extends FacetFactoryAbstract i
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
index 6db38a2..778388c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
@@ -23,18 +23,17 @@ import com.google.common.base.Strings;
import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultsProviderUtil;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-public class DefaultedFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware {
+public class DefaultedFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract {
private IsisConfiguration configuration;
@@ -78,10 +77,15 @@ public class DefaultedFacetAnnotationElseConfigurationFactory extends FacetFacto
return configuration;
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/describedas/annotation/DescribedAsFacetOnTypeAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/describedas/annotation/DescribedAsFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/describedas/annotation/DescribedAsFacetOnTypeAnnotationFactory.java
index a0c6e23..a2a0cb6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/describedas/annotation/DescribedAsFacetOnTypeAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/describedas/annotation/DescribedAsFacetOnTypeAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.describedas.annotation;
import org.apache.isis.applib.annotation.DescribedAs;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class DescribedAsFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class DescribedAsFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(DescribedAs.class);
@@ -61,8 +62,12 @@ public class DescribedAsFacetOnTypeAnnotationFactory extends FacetFactoryAbstrac
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index c328e02..ec01a19 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -42,7 +42,6 @@ import org.apache.isis.applib.services.eventbus.ObjectRemovingEvent;
import org.apache.isis.applib.services.eventbus.ObjectUpdatedEvent;
import org.apache.isis.applib.services.eventbus.ObjectUpdatingEvent;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.Nullable;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
@@ -82,10 +81,10 @@ import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionServiceAware;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
@@ -98,7 +97,7 @@ import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapabl
public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
- implements IsisConfigurationAware, AdapterManagerAware,
+ implements AdapterManagerAware,
SpecificationLoaderAware, MetaModelValidatorRefiner, PersistenceSessionServiceAware,
PostConstructMethodCache {
@@ -493,8 +492,12 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
// //////////////////////////////////////
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
publishedObjectValidator.setConfiguration(configuration);
@@ -505,6 +508,7 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
objectTypeValidator.setConfiguration(configuration);
}
+
@Override
public void setAdapterManager(final AdapterManager adapterManager) {
this.adapterManager = adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
index 9e43ffc..308a3d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
@@ -19,17 +19,15 @@ package org.apache.isis.core.metamodel.facets.object.domainobjectlayout;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.ViewModelLayout;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class DomainObjectLayoutFacetFactory extends FacetFactoryAbstract implements ServicesInjectorAware,
- IsisConfigurationAware {
+public class DomainObjectLayoutFacetFactory extends FacetFactoryAbstract {
public DomainObjectLayoutFacetFactory() {
@@ -98,7 +96,12 @@ public class DomainObjectLayoutFacetFactory extends FacetFactoryAbstract impleme
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
}
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java
index c361446..a05a4ef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java
@@ -23,7 +23,6 @@ import com.google.common.base.Strings;
import org.apache.isis.applib.annotation.Encodable;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -33,8 +32,10 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncoderDecoderUtil;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-public class EncodableFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AdapterManagerAware {
+public class EncodableFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements AdapterManagerAware {
private IsisConfiguration configuration;
@@ -85,10 +86,14 @@ public class EncodableFacetAnnotationElseConfigurationFactory extends FacetFacto
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
}
+
@Override
public void setAdapterManager(final AdapterManager adapterManager) {
this.adapterManager = adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotationFactory.java
index 592c448..07647f8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.fieldorder.annotation;
import org.apache.isis.applib.annotation.FieldOrder;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.fieldorder.FieldOrderFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class FieldOrderFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class FieldOrderFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(FieldOrder.class);
@@ -61,7 +62,10 @@ public class FieldOrderFacetAnnotationFactory extends FacetFactoryAbstract imple
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/annotation/HiddenFacetOnTypeAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/annotation/HiddenFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/annotation/HiddenFacetOnTypeAnnotationFactory.java
index 6703300..ee62d07 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/annotation/HiddenFacetOnTypeAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/hidden/annotation/HiddenFacetOnTypeAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.hidden.annotation;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class HiddenFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class HiddenFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Hidden.class);
@@ -61,7 +62,10 @@ public class HiddenFacetOnTypeAnnotationFactory extends FacetFactoryAbstract imp
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mask/annotation/MaskFacetOnTypeAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mask/annotation/MaskFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mask/annotation/MaskFacetOnTypeAnnotationFactory.java
index 246ac84..09e9782 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mask/annotation/MaskFacetOnTypeAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mask/annotation/MaskFacetOnTypeAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.mask.annotation;
import org.apache.isis.applib.annotation.Mask;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.mask.MaskFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class MaskFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MaskFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Mask.class);
@@ -65,8 +66,10 @@ public class MaskFacetOnTypeAnnotationFactory extends FacetFactoryAbstract imple
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- validator.setConfiguration(configuration);
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ validator.setConfiguration((IsisConfiguration)servicesInjector.lookupService(ConfigurationServiceInternal.class));
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/maxlen/annotation/MaxLengthFacetOnTypeAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/maxlen/annotation/MaxLengthFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/maxlen/annotation/MaxLengthFacetOnTypeAnnotationFactory.java
index 918dfa3..8f2433a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/maxlen/annotation/MaxLengthFacetOnTypeAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/maxlen/annotation/MaxLengthFacetOnTypeAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.maxlen.annotation;
import org.apache.isis.applib.annotation.MaxLength;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class MaxLengthFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MaxLengthFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(MaxLength.class);
@@ -64,8 +65,12 @@ public class MaxLengthFacetOnTypeAnnotationFactory extends FacetFactoryAbstract
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/multiline/annotation/MultiLineFacetOnTypeAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/multiline/annotation/MultiLineFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/multiline/annotation/MultiLineFacetOnTypeAnnotationFactory.java
index c153236..bb25afe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/multiline/annotation/MultiLineFacetOnTypeAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/multiline/annotation/MultiLineFacetOnTypeAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.multiline.annotation;
import org.apache.isis.applib.annotation.MultiLine;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class MultiLineFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MultiLineFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(MultiLine.class);
@@ -65,8 +66,12 @@ public class MultiLineFacetOnTypeAnnotationFactory extends FacetFactoryAbstract
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/annotation/NamedFacetOnTypeAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/annotation/NamedFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/annotation/NamedFacetOnTypeAnnotationFactory.java
index 06c10c1..60ee4ac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/annotation/NamedFacetOnTypeAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/annotation/NamedFacetOnTypeAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.named.annotation;
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class NamedFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class NamedFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Named.class);
@@ -61,9 +62,14 @@ public class NamedFacetOnTypeAnnotationFactory extends FacetFactoryAbstract impl
metaModelValidator.add(validator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethodFactory.java
index 6c0ddc5..abdc804 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/named/staticmethod/NamedFacetStaticMethodFactory.java
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facets.object.named.staticmethod;
import java.lang.reflect.Method;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -31,6 +31,8 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -38,7 +40,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class NamedFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class NamedFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
private static final String[] PREFIXES = { MethodPrefixConstants.SINGULAR_NAME, };
@@ -69,9 +71,13 @@ public class NamedFacetStaticMethodFactory extends MethodPrefixBasedFacetFactory
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/paged/annotation/PagedFacetOnTypeAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/paged/annotation/PagedFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/paged/annotation/PagedFacetOnTypeAnnotationFactory.java
index 84c84fa..8b1fc7e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/paged/annotation/PagedFacetOnTypeAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/paged/annotation/PagedFacetOnTypeAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.paged.annotation;
import org.apache.isis.applib.annotation.Paged;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,13 +37,11 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class PagedFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class PagedFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Paged.class);
- private IsisConfiguration configuration;
-
public PagedFacetOnTypeAnnotationFactory() {
super(FeatureType.OBJECTS_ONLY);
}
@@ -67,14 +66,14 @@ public class PagedFacetOnTypeAnnotationFactory extends FacetFactoryAbstract impl
// //////////////////////////////////////
- public IsisConfiguration getConfiguration() {
- return configuration;
- }
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- this.configuration = configuration;
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
index 08b2335..4e7b96e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
@@ -23,7 +23,6 @@ import com.google.common.base.Strings;
import org.apache.isis.applib.annotation.Parseable;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -33,8 +32,10 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.parseable.ParserUtil;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AdapterManagerAware {
+public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements AdapterManagerAware {
private IsisConfiguration configuration;
@@ -83,11 +84,11 @@ public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFacto
return configuration;
}
- /**
- * Injected since {@link IsisConfigurationAware}.
- */
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/annotation/PluralAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/annotation/PluralAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/annotation/PluralAnnotationFacetFactory.java
index 8e94211..67520db 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/annotation/PluralAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/annotation/PluralAnnotationFacetFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.plural.annotation;
import org.apache.isis.applib.annotation.Plural;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class PluralAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class PluralAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Plural.class);
@@ -62,8 +63,12 @@ public class PluralAnnotationFacetFactory extends FacetFactoryAbstract implement
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetStaticMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetStaticMethodFactory.java
index 8c8d63f..481c044 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetStaticMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/plural/staticmethod/PluralFacetStaticMethodFactory.java
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facets.object.plural.staticmethod;
import java.lang.reflect.Method;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -30,6 +30,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -37,7 +39,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class PluralFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class PluralFacetStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
private static final String PLURAL_NAME = "pluralName";
@@ -70,8 +72,12 @@ public class PluralFacetStaticMethodFactory extends MethodPrefixBasedFacetFactor
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/regex/annotation/RegExFacetOnTypeAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/regex/annotation/RegExFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/regex/annotation/RegExFacetOnTypeAnnotationFactory.java
index b9a3f7d..6e4406d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/regex/annotation/RegExFacetOnTypeAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/regex/annotation/RegExFacetOnTypeAnnotationFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.regex.annotation;
import org.apache.isis.applib.annotation.RegEx;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +29,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.regex.RegExFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +38,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class RegExFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class RegExFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(RegEx.class);
@@ -69,9 +71,12 @@ public class RegExFacetOnTypeAnnotationFactory extends FacetFactoryAbstract impl
metaModelValidator.add(validator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- validator.setConfiguration(configuration);
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ validator.setConfiguration((IsisConfigurationDefault)servicesInjector.lookupService(ConfigurationServiceInternal.class));
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/typicallen/annotation/TypicalLengthFacetOnTypeAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/typicallen/annotation/TypicalLengthFacetOnTypeAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/typicallen/annotation/TypicalLengthFacetOnTypeAnnotationFactory.java
index 4596031..d3d6332 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/typicallen/annotation/TypicalLengthFacetOnTypeAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/typicallen/annotation/TypicalLengthFacetOnTypeAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.typicallen.annotation;
import org.apache.isis.applib.annotation.TypicalLength;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class TypicalLengthFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class TypicalLengthFacetOnTypeAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(TypicalLength.class);
@@ -60,9 +61,14 @@ public class TypicalLengthFacetOnTypeAnnotationFactory extends FacetFactoryAbstr
metaModelValidator.add(validator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java
index b23226b..27178b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.isis.applib.annotation.MustSatisfy;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -33,6 +32,7 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(MustSatisfy.class);
@@ -96,9 +96,13 @@ public class MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
index 47fe575..9a549c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
@@ -25,7 +25,6 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -43,6 +42,8 @@ import org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
/**
* Processes the {@link Value} annotation.
@@ -70,7 +71,7 @@ import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProv
* <p>
* Note that {@link ParentedCollectionFacet} is <i>not</i> installed.
*/
-public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AdapterManagerAware {
+public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbstract implements AdapterManagerAware {
private IsisConfiguration configuration;
private AdapterManager adapterManager;
@@ -123,12 +124,17 @@ public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbst
return configuration;
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
}
+
public AdapterManager getAdapterManager() {
return adapterManager;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
index e7f360c..fe130f3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
@@ -20,15 +20,16 @@
package org.apache.isis.core.metamodel.facets.object.value.vsp;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFactoryAbstract implements IsisConfigurationAware, AdapterManagerAware, ServicesInjectorAware {
+public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFactoryAbstract implements AdapterManagerAware, ServicesInjectorAware {
private IsisConfiguration configuration;
private AdapterManager adapterManager;
@@ -63,8 +64,12 @@ public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFa
return context;
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
this.configuration = configuration;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/multiline/annotation/MultiLineFacetOnParameterAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/multiline/annotation/MultiLineFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/multiline/annotation/MultiLineFacetOnParameterAnnotationFactory.java
index 1bdd619..4cc5b3f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/multiline/annotation/MultiLineFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/multiline/annotation/MultiLineFacetOnParameterAnnotationFactory.java
@@ -20,9 +20,10 @@
package org.apache.isis.core.metamodel.facets.param.multiline.annotation;
import java.lang.annotation.Annotation;
+
import org.apache.isis.applib.annotation.MultiLine;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
@@ -31,10 +32,12 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacetInferredFromMultiLineFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class MultiLineFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MultiLineFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(MultiLine.class);
@@ -85,8 +88,9 @@ public class MultiLineFacetOnParameterAnnotationFactory extends FacetFactoryAbst
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- validator.setConfiguration(configuration);
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ validator.setConfiguration((IsisConfigurationDefault)servicesInjector.lookupService(ConfigurationServiceInternal.class));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/named/annotation/NamedFacetOnParameterAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/named/annotation/NamedFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/named/annotation/NamedFacetOnParameterAnnotationFactory.java
index ec8aac3..f08e880 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/named/annotation/NamedFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/named/annotation/NamedFacetOnParameterAnnotationFactory.java
@@ -21,15 +21,18 @@ package org.apache.isis.core.metamodel.facets.param.named.annotation;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -37,7 +40,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class NamedFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class NamedFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Named.class);
@@ -68,9 +71,12 @@ public class NamedFacetOnParameterAnnotationFactory extends FacetFactoryAbstract
metaModelValidator.add(validator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- validator.setConfiguration(configuration);
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ validator.setConfiguration((IsisConfigurationDefault)servicesInjector.lookupService(ConfigurationServiceInternal.class));
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
index bb917ec..2dd6f61 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
@@ -21,13 +21,13 @@ package org.apache.isis.core.metamodel.facets.param.parameter;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+
import org.apache.isis.applib.annotation.MaxLength;
import org.apache.isis.applib.annotation.MustSatisfy;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.RegEx;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -39,18 +39,18 @@ import org.apache.isis.core.metamodel.facets.objectvalue.regex.RegExFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.regex.TitleFacetFormattedByRegex;
import org.apache.isis.core.metamodel.facets.param.parameter.mandatory.MandatoryFacetForParameterAnnotation;
import org.apache.isis.core.metamodel.facets.param.parameter.mandatory.MandatoryFacetInvertedByOptionalAnnotationOnParameter;
-import org.apache.isis.core.metamodel.facets.param.parameter.maxlen.MaxLengthFacetForParameterAnnotation;
import org.apache.isis.core.metamodel.facets.param.parameter.maxlen.MaxLengthFacetForMaxLengthAnnotationOnParameter;
+import org.apache.isis.core.metamodel.facets.param.parameter.maxlen.MaxLengthFacetForParameterAnnotation;
import org.apache.isis.core.metamodel.facets.param.parameter.mustsatisfy.MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter;
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.param.parameter.regex.RegExFacetFromRegExAnnotationOnParameter;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware, ServicesInjectorAware {
+public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation maxLengthValidator = new MetaModelValidatorForDeprecatedAnnotation(MaxLength.class);
private final MetaModelValidatorForDeprecatedAnnotation mustSatisfyValidator = new MetaModelValidatorForDeprecatedAnnotation(MustSatisfy.class);
@@ -110,10 +110,8 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
final Method method = processParameterContext.getMethod();
final int paramNum = processParameterContext.getParamNum();
final FacetedMethodParameter holder = processParameterContext.getFacetHolder();
- final Class<?>[] parameterTypes = method.getParameterTypes();
final Annotation[] parameterAnnotations = Annotations.getParameterAnnotations(method)[paramNum];
- boolean mustSatisfyAnnotationFound = false;
for (final Annotation parameterAnnotation : parameterAnnotations) {
if (parameterAnnotation instanceof MustSatisfy) {
final MustSatisfy annotation = (MustSatisfy) parameterAnnotation;
@@ -205,12 +203,17 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
metaModelValidator.add(optionalValidator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
maxLengthValidator.setConfiguration(configuration);
mustSatisfyValidator.setConfiguration(configuration);
regexValidator.setConfiguration(configuration);
optionalValidator.setConfiguration(configuration);
}
+
}
[02/10] isis git commit: ISIS-1404: AuthenticationSessionProvider is
now a domain service;
removed the AuthenticationSessionProviderAbstract and Aware interfaces.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 62ab8c7..7a466eb 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
@@ -123,7 +123,12 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPropertyAccessorFacetIsInstalledAndMethodRemoved() {
final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -148,7 +153,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testSetterFacetIsInstalledForSetterMethodAndMethodRemoved() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -178,7 +189,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInitializationFacetIsInstalledForSetterMethodAndMethodRemoved() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -208,7 +225,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testSetterFacetIsInstalledMeansNoDisabledOrDerivedFacetsInstalled() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -234,7 +257,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
facetFactoryForModify.setSpecificationLoader(programmableReflector);
- facetFactoryForModify.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactoryForModify.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactoryForModify.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final PropertySetAndClearFacetFactory facetFactoryForSetter = new PropertySetAndClearFacetFactory();
@@ -270,12 +299,24 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
facetFactoryForModify.setSpecificationLoader(programmableReflector);
- facetFactoryForModify.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactoryForModify.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactoryForModify.setDeploymentCategory(DeploymentCategory.PRODUCTION);
@@ -311,12 +352,24 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
facetFactoryForModify.setSpecificationLoader(programmableReflector);
- facetFactoryForModify.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactoryForModify.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactoryForModify.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -354,7 +407,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testClearFacet() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -384,7 +443,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testClearFacetViaSetterIfNoExplicitClearMethod() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -412,7 +477,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testChoicesFacetFoundAndMethodRemoved() {
final PropertyChoicesFacetViaMethodFactory facetFactory = new PropertyChoicesFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -443,7 +514,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testAutoCompleteFacetFoundAndMethodRemoved() {
final PropertyAutoCompleteFacetMethodFactory facetFactory = new PropertyAutoCompleteFacetMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -474,7 +551,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDefaultFacetFoundAndMethodRemoved() {
final PropertyDefaultFacetViaMethodFactory facetFactory = new PropertyDefaultFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -506,7 +589,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertyValidateFacetViaMethodFactory facetFactory = new PropertyValidateFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -538,7 +627,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final DisableForContextFacetViaMethodFactory facetFactory = new DisableForContextFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -570,7 +665,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final DisableForContextFacetViaMethodFactory facetFactory = new DisableForContextFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -601,7 +702,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testHiddenFacetFoundAndMethodRemoved() {
final HideForContextFacetViaMethodFactory facetFactory = new HideForContextFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -632,7 +739,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testHiddenFacetWithNoArgFoundAndMethodRemoved() {
final HideForContextFacetViaMethodFactory facetFactory = new HideForContextFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -663,7 +776,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPropertyFoundOnSuperclass() {
final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
class Customer {
@@ -691,19 +810,37 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final HideForContextFacetViaMethodFactory facetFactoryForHide = new HideForContextFacetViaMethodFactory();
facetFactoryForHide.setSpecificationLoader(programmableReflector);
- facetFactoryForHide.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactoryForHide.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactoryForHide.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final DisableForContextFacetViaMethodFactory facetFactoryForDisable = new DisableForContextFacetViaMethodFactory();
facetFactoryForDisable.setSpecificationLoader(programmableReflector);
facetFactoryForDisable.setServicesInjector(mockServicesInjector);
- facetFactoryForDisable.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactoryForDisable.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactoryForDisable.setDeploymentCategory(DeploymentCategory.PRODUCTION);
@@ -801,7 +938,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
@@ -821,7 +964,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
@@ -841,7 +990,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
@@ -858,7 +1013,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getLastName");
@@ -874,7 +1035,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
@@ -892,7 +1059,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getLastName");
@@ -909,7 +1082,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
@@ -930,7 +1109,13 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDisabledForSessionFacetAndRemovesMethod() {
final DisableForSessionFacetViaMethodFactory facetFactory = new DisableForSessionFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 9d5ef37..e2c433b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -42,7 +42,6 @@ import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
@@ -122,7 +121,8 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
protected void setValue(final ValueSemanticsProviderAndFacetAbstract<?> value) {
this.valueSemanticsProvider = value;
this.encodeableFacet = new EncodableFacetUsingEncoderDecoder(value, mockFacetHolder, mockAdapterManager, mockDependencyInjector);
- this.parseableFacet = new ParseableFacetUsingParser(value, mockFacetHolder, DeploymentCategory.PRODUCTION, mockAuthenticationSessionProvider, mockDependencyInjector, mockAdapterManager);
+ this.parseableFacet = new ParseableFacetUsingParser(value, mockFacetHolder,
+ mockDependencyInjector, mockAdapterManager);
}
protected ValueSemanticsProviderAndFacetAbstract<?> getValue() {
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 85d727e..058333a 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,9 +26,7 @@ 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.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAbstract;
import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -48,6 +46,7 @@ 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;
@@ -60,7 +59,6 @@ import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
*/
public class RuntimeContextFromSession extends RuntimeContextAbstract {
- private final AuthenticationSessionProvider authenticationSessionProvider;
private final PersistenceSessionService persistenceSessionService;
private final MessageBrokerService messageBrokerService;
private final LocalizationProviderAbstract localizationProvider;
@@ -76,14 +74,6 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
final SpecificationLoaderSpi specificationLoader) {
super(deploymentCategory, configuration, servicesInjector, specificationLoader);
- this.authenticationSessionProvider = new AuthenticationSessionProviderAbstract() {
-
- @Override
- public AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
- }
- };
-
this.persistenceSessionService = new PersistenceSessionServiceAbstract() {
@@ -224,11 +214,6 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
// //////////////////////////////////////////////////////////////////
@Override
- public AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
-
- @Override
public LocalizationProviderAbstract getLocalizationProvider() {
return localizationProvider;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
new file mode 100644
index 0000000..312f231
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.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.authsess;
+
+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.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.runtime.system.context.IsisContext;
+
+@DomainService(nature = NatureOfService.DOMAIN)
+public class AuthenticationSessionProviderDefault implements AuthenticationSessionProvider {
+
+ @Programmatic
+ @Override
+ public AuthenticationSession getAuthenticationSession() {
+ return IsisContext.getAuthenticationSession();
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 2b24c80..52ec15a 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
@@ -60,8 +60,6 @@ import org.slf4j.LoggerFactory;
import org.wicketstuff.select2.ApplicationSettings;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
@@ -141,7 +139,7 @@ import net.ftlines.wicketsource.WicketSource;
*/
public class IsisWicketApplication
extends AuthenticatedWebApplication
- implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, AuthenticationSessionProvider,
+ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
DeploymentCategoryProvider {
private static final long serialVersionUID = 1L;
@@ -808,11 +806,6 @@ public class IsisWicketApplication
}
- // /////////////////////////////////////////////////
- // Authentication Session
- // /////////////////////////////////////////////////
-
- @Override
public AuthenticationSession getAuthenticationSession() {
return IsisContext.getAuthenticationSession();
}
@@ -824,10 +817,6 @@ public class IsisWicketApplication
@Override
public void injectInto(final Object candidate) {
- if (AuthenticationSessionProviderAware.class.isAssignableFrom(candidate.getClass())) {
- final AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
- cast.setAuthenticationSessionProvider(this);
- }
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index 80e22c1..4c97270 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -22,16 +22,16 @@ package org.apache.isis.viewer.wicket.viewer.integration.wicket;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
+
import org.apache.wicket.Session;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.cycle.RequestCycle;
+
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.commons.ensure.Ensure;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
@@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.nullValue;
* also tracks thread usage (so that multiple concurrent requests are all
* associated with the same session).
*/
-public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession implements AuthenticationSessionProvider, BreadcrumbModelProvider, BookmarkedPagesModelProvider {
+public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession implements BreadcrumbModelProvider, BookmarkedPagesModelProvider {
private static final long serialVersionUID = 1L;
@@ -100,7 +100,6 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
log(SessionLoggingService.Type.LOGOUT, userName, causedBy);
}
- @Override
public AuthenticationSession getAuthenticationSession() {
return authenticationSession;
}
@@ -147,14 +146,6 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
// *Provider impl.
// /////////////////////////////////////////////////
- @Override
- public void injectInto(final Object candidate) {
- if (AuthenticationSessionProviderAware.class.isAssignableFrom(candidate.getClass())) {
- final AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
- cast.setAuthenticationSessionProvider(this);
- }
- }
-
private void log(
final SessionLoggingService.Type type,
final String username,
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 840c1dc..2503eba 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -26,8 +26,6 @@ import java.util.List;
import com.google.common.collect.Lists;
-import org.apache.wicket.Session;
-
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
@@ -666,7 +664,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
* testing.
*/
protected AuthenticationSession getAuthenticationSession() {
- return ((AuthenticationSessionProvider) Session.get()).getAuthenticationSession();
+ return getPersistenceSession().getServicesInjector().lookupService(AuthenticationSessionProvider.class).getAuthenticationSession();
}
public boolean isRequired() {
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
index efa53f6..f8f93c3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
@@ -21,16 +21,15 @@ package org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+
import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Lists;
-import org.apache.wicket.Session;
+
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.filter.Filters;
-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.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -143,9 +142,6 @@ public final class EntityActionUtil {
final ObjectSpecification adapterSpec = entityModel.getTypeOfSpecification();
final ObjectAdapter adapter = entityModel.load(ConcurrencyChecking.NO_CHECK);
- final AuthenticationSessionProvider asa = (AuthenticationSessionProvider) Session.get();
- AuthenticationSession authSession = asa.getAuthenticationSession();
-
final ObjectSpecification objectSpecification = entityModel.getTypeOfSpecification();
@SuppressWarnings({ "unchecked", "deprecation" })
Filter<ObjectAction> filter = Filters.and(
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
index 77ee33e..284c3ee 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
@@ -25,7 +25,6 @@ import com.google.common.collect.FluentIterable;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import org.apache.wicket.Session;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.markup.html.link.Link;
@@ -233,8 +232,7 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
///////////////////////////////////////////////////////
public AuthenticationSession getAuthenticationSession() {
- final AuthenticationSessionProvider asa = (AuthenticationSessionProvider) Session.get();
- return asa.getAuthenticationSession();
+ return getServicesInjector().lookupService(AuthenticationSessionProvider.class).getAuthenticationSession();
}
protected MessageBroker getMessageBroker() {
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 28531e6..53204ec 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
@@ -23,18 +23,15 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Session;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.model.IModel;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
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.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;
@@ -50,7 +47,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, AuthenticationSessionProvider, DeploymentCategoryProvider {
+ implements PersistenceSessionProvider, DeploymentCategoryProvider {
private static final long serialVersionUID = 1L;
@@ -138,9 +135,8 @@ public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T
*
* @return
*/
- @Override
public AuthenticationSession getAuthenticationSession() {
- return ((AuthenticationSessionProvider) Session.get()).getAuthenticationSession();
+ return IsisContext.getAuthenticationSession();
}
@Override
@@ -168,10 +164,6 @@ public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T
@Override
public void injectInto(final Object candidate) {
- if (AuthenticationSessionProviderAware.class.isAssignableFrom(candidate.getClass())) {
- final AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
- cast.setAuthenticationSessionProvider(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/70bbd7aa/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 4815d10..9294df0 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
@@ -19,21 +19,16 @@
package org.apache.isis.viewer.wicket.ui.panels;
-import java.util.List;
-
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IFormSubmitter;
import org.apache.wicket.model.IModel;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
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.DeploymentCategoryProvider;
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;
@@ -44,7 +39,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
public abstract class FormAbstract<T> extends Form<T>
implements IHeaderContributor, ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
- AuthenticationSessionProvider, DeploymentCategoryProvider, PersistenceSessionProvider {
+ DeploymentCategoryProvider, PersistenceSessionProvider {
private static final long serialVersionUID = 1L;
@@ -62,14 +57,7 @@ public abstract class FormAbstract<T> extends Form<T>
// ///////////////////////////////////////////////////////////////////
private String preValidationErrorIfAny;
- /**
- * Temporarily made available during {@link #process(IFormSubmitter)},
- * for the benefit of any form validation.
- */
- protected String getPreValidationErrorIfAny() {
- return preValidationErrorIfAny;
- }
-
+
@Override
public void process(final IFormSubmitter submittingComponent) {
try {
@@ -120,7 +108,6 @@ public abstract class FormAbstract<T> extends Form<T>
return IsisContext.getPersistenceSession();
}
- @Override
public AuthenticationSession getAuthenticationSession() {
return IsisContext.getAuthenticationSession();
}
@@ -130,10 +117,6 @@ public abstract class FormAbstract<T> extends Form<T>
return IsisContext.getDeploymentType().getDeploymentCategory();
}
- // UNUSED ?
- protected List<ObjectAdapter> getServiceAdapters() {
- return IsisContext.getPersistenceSession().getServices();
- }
// /////////////////////////////////////////////////
// *Provider impl.
@@ -141,10 +124,6 @@ public abstract class FormAbstract<T> extends Form<T>
@Override
public void injectInto(final Object candidate) {
- if (AuthenticationSessionProviderAware.class.isAssignableFrom(candidate.getClass())) {
- final AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
- cast.setAuthenticationSessionProvider(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/70bbd7aa/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 f165950..8578592 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
@@ -20,7 +20,6 @@
package org.apache.isis.viewer.wicket.ui.panels;
import org.apache.wicket.Component;
-import org.apache.wicket.Session;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
@@ -29,7 +28,6 @@ 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.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
@@ -52,7 +50,7 @@ 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, AuthenticationSessionProvider,
+public abstract class PanelAbstract<T extends IModel<?>> extends Panel implements IHeaderContributor, PersistenceSessionProvider,
DeploymentCategoryProvider {
private static final long serialVersionUID = 1L;
@@ -137,10 +135,8 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
*
* @return
*/
- @Override
public AuthenticationSession getAuthenticationSession() {
- final AuthenticationSessionProvider asa = (AuthenticationSessionProvider) Session.get();
- return asa.getAuthenticationSession();
+ return IsisContext.getAuthenticationSession();
}
@Override
@@ -177,10 +173,6 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel implement
@Override
public void injectInto(final Object candidate) {
- if (AuthenticationSessionProviderAware.class.isAssignableFrom(candidate.getClass())) {
- final AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
- cast.setAuthenticationSessionProvider(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/70bbd7aa/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
index 5abd727..b6ccdfa 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
@@ -25,6 +25,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.inject.Inject;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
@@ -49,11 +51,10 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.applib.services.wrapper.listeners.InteractionListener;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
-import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionServiceAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
+import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
+import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionServiceAware;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
import org.apache.isis.core.wrapper.dispatchers.InteractionEventDispatcher;
@@ -73,13 +74,12 @@ import org.apache.isis.core.wrapper.proxy.ProxyCreator;
* configuration is required.
*/
@DomainService(nature = NatureOfService.DOMAIN)
-public class WrapperFactoryDefault implements WrapperFactory, AuthenticationSessionProviderAware,
+public class WrapperFactoryDefault implements WrapperFactory,
SpecificationLoaderAware, AdapterManagerAware, PersistenceSessionServiceAware {
private final List<InteractionListener> listeners = new ArrayList<InteractionListener>();
private final Map<Class<? extends InteractionEvent>, InteractionEventDispatcher> dispatchersByEventClass = new HashMap<Class<? extends InteractionEvent>, InteractionEventDispatcher>();
- private AuthenticationSessionProvider authenticationSessionProvider;
private SpecificationLoader specificationLoader;
private AdapterManager adapterManager;
private PersistenceSessionService persistenceSessionService;
@@ -257,7 +257,7 @@ public class WrapperFactoryDefault implements WrapperFactory, AuthenticationSess
}
protected <T> T createProxy(final T domainObject, final ExecutionMode mode) {
- return proxyContextHandler.proxy(domainObject, this, mode, getAuthenticationSessionProvider(), getSpecificationLoader(), getAdapterManager(), getPersistenceSessionService());
+ return proxyContextHandler.proxy(domainObject, this, mode, authenticationSessionProvider, getSpecificationLoader(), getAdapterManager(), getPersistenceSessionService());
}
@Override
@@ -308,14 +308,6 @@ public class WrapperFactoryDefault implements WrapperFactory, AuthenticationSess
// Listeners
// /////////////////////////////////////////////////////////////
- protected AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
- @Programmatic
- @Override
- public void setAuthenticationSessionProvider(final AuthenticationSessionProvider authenticationSessionProvider) {
- this.authenticationSessionProvider = authenticationSessionProvider;
- }
protected AdapterManager getAdapterManager() {
return adapterManager;
@@ -346,5 +338,8 @@ public class WrapperFactoryDefault implements WrapperFactory, AuthenticationSess
}
+ @Inject
+ AuthenticationSessionProvider authenticationSessionProvider;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
new file mode 100644
index 0000000..21cdddb
--- /dev/null
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -0,0 +1,390 @@
+/*
+ * 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.wrapper;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import org.apache.isis.applib.services.wrapper.DisabledException;
+import org.apache.isis.applib.services.wrapper.HiddenException;
+import org.apache.isis.applib.services.wrapper.InvalidException;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facets.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred;
+import org.apache.isis.core.metamodel.facets.members.disabled.method.DisableForContextFacetViaMethod;
+import org.apache.isis.core.metamodel.facets.members.hidden.method.HideForContextFacetViaMethod;
+import org.apache.isis.core.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
+import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacetViaClearMethod;
+import org.apache.isis.core.metamodel.facets.properties.update.init.PropertyInitializationFacetViaSetterMethod;
+import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetViaModifyMethod;
+import org.apache.isis.core.metamodel.facets.properties.validating.method.PropertyValidateFacetViaMethod;
+import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
+import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
+import org.apache.isis.core.metamodel.specloader.specimpl.OneToOneAssociationDefault;
+import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
+import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.progmodel.wrapper.dom.employees.Employee;
+import org.apache.isis.progmodel.wrapper.dom.employees.EmployeeRepository;
+import org.apache.isis.progmodel.wrapper.dom.employees.EmployeeRepositoryImpl;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class WrapperFactoryDefaultTest_wrappedObject {
+
+ @Rule
+ public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
+
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ @Mock
+ private AdapterManager mockAdapterManager;
+ @Mock
+ private AuthenticationSessionProvider mockAuthenticationSessionProvider;
+ @Mock
+ private PersistenceSessionService mockPersistenceSessionService;
+ @Mock
+ private MessageBrokerService mockMessageBrokerService;
+ @Mock
+ private ServicesInjector mockServicesInjector;
+ @Mock
+ private SpecificationLoader mockSpecificationLoader;
+ @Mock
+ private DeploymentCategoryProvider mockDeploymentCategoryProvider;
+ @Mock
+ private IsisConfiguration mockConfiguration;
+
+ private ObjectMemberDependencies objectMemberDependencies;
+
+ @Mock
+ private ObjectSpecificationDefault mockEmployeeSpec;
+ private ObjectMember employeeNameMember;
+
+ @Mock
+ private ObjectSpecificationDefault mockStringSpec;
+
+ @Mock
+ private ObjectAdapter mockEmployeeAdapter;
+
+ @Mock
+ private ObjectAdapter mockAdapterForStringSmith;
+ @Mock
+ private ObjectAdapter mockAdapterForStringJones;
+
+
+ private final SimpleSession session = new SimpleSession("tester", Collections.<String>emptyList());
+
+ private EmployeeRepository employeeRepository;
+
+ private Employee employeeDO;
+ private Employee employeeWO;
+
+ private WrapperFactoryDefault wrapperFactory;
+
+ @Before
+ public void setUp() {
+
+ objectMemberDependencies = new ObjectMemberDependencies(
+ mockSpecificationLoader, mockServicesInjector,
+ mockPersistenceSessionService);
+
+ employeeRepository = new EmployeeRepositoryImpl();
+
+ employeeDO = new Employee();
+ employeeDO.setName("Smith");
+ employeeDO.setEmployeeRepository(employeeRepository);
+
+ wrapperFactory = createWrapperFactory();
+ wrapperFactory.setAdapterManager(mockAdapterManager);
+ wrapperFactory.setPersistenceSessionService(mockPersistenceSessionService);
+ wrapperFactory.setSpecificationLoader(mockSpecificationLoader);
+
+ context.checking(new Expectations() {
+ {
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ allowing(mockSpecificationLoader).loadSpecification(String.class);
+ will(returnValue(mockStringSpec));
+
+ allowing(mockStringSpec).getShortIdentifier();
+ will(returnValue(String.class.getName()));
+ }
+ });
+
+
+ final Method employeeGetNameMethod = methodOf(Employee.class, "getName");
+ final Method employeeSetNameMethod = methodOf(Employee.class, "setName", String.class);
+ final Method employeeModifyNameMethod = methodOf(Employee.class, "modifyName", String.class);
+ final Method employeeHideNameMethod = methodOf(Employee.class, "hideName");
+ final Method employeeDisableNameMethod = methodOf(Employee.class, "disableName");
+ final Method employeeValidateNameMethod = methodOf(Employee.class, "validateName", String.class);
+ final Method employeeClearNameMethod = methodOf(Employee.class, "clearName");
+ employeeNameMember = new OneToOneAssociationDefault(
+ facetedMethodForProperty(
+ employeeSetNameMethod, employeeGetNameMethod, employeeModifyNameMethod, employeeClearNameMethod, employeeHideNameMethod, employeeDisableNameMethod, employeeValidateNameMethod),
+ objectMemberDependencies);
+
+ context.checking(new Expectations() {
+ {
+ allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
+ will(returnValue(DeploymentCategory.PRODUCTION));
+
+ allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
+ will(returnValue(session));
+
+ allowing(mockAdapterManager).getAdapterFor(employeeDO);
+ will(returnValue(mockEmployeeAdapter));
+
+ allowing(mockEmployeeAdapter).getSpecification();
+ will(returnValue(mockEmployeeSpec));
+
+ allowing(mockSpecificationLoader).loadSpecification(Employee.class);
+ will(returnValue(mockEmployeeSpec));
+
+ allowing(mockEmployeeSpec).getMember(methodOf(Employee.class, "getEmployeeRepository"));
+ will(returnValue(null));
+
+ allowing(mockEmployeeSpec).getMember(employeeGetNameMethod);
+ will(returnValue(employeeNameMember));
+
+ allowing(mockEmployeeSpec).getMember(employeeSetNameMethod);
+ will(returnValue(employeeNameMember));
+
+ allowing(mockEmployeeSpec).getMember(employeeModifyNameMethod);
+ will(returnValue(employeeNameMember));
+
+ allowing(mockEmployeeSpec).getMember(employeeClearNameMethod);
+ will(returnValue(employeeNameMember));
+
+ allowing(mockEmployeeAdapter).getObject();
+ will(returnValue(employeeDO));
+
+ allowing(mockEmployeeAdapter).representsPersistent();
+ will(returnValue(true));
+ }
+ });
+
+
+ employeeWO = wrapperFactory.wrap(employeeDO);
+ }
+
+ protected WrapperFactoryDefault createWrapperFactory() {
+ return new WrapperFactoryDefault();
+ }
+
+ @Test
+ public void shouldWrapDomainObject() {
+ // then
+ assertThat(employeeWO, is(notNullValue()));
+ }
+
+ @Test
+ public void shouldBeAbleToInjectIntoDomainObjects() {
+ assertThat(employeeDO.getEmployeeRepository(), is(notNullValue()));
+ }
+
+ @Test
+ public void cannotAccessMethodNotCorrespondingToMember() {
+
+ expectedException.expectMessage(
+ "Method 'getEmployeeRepository' being invoked does not correspond to any of the object's fields or actions.");
+
+ // then
+ assertThat(employeeWO.getEmployeeRepository(), is(notNullValue()));
+ }
+
+ @Test
+ public void shouldBeAbleToReadVisibleProperty() {
+
+ allowingEmployeeHasSmithAdapter();
+
+
+ // then
+ assertThat(employeeWO.getName(), is(employeeDO.getName()));
+ }
+
+ @Test
+ public void shouldNotBeAbleToViewHiddenProperty() {
+
+ expectedException.expect(HiddenException.class);
+
+ allowingEmployeeHasSmithAdapter();
+
+ // given
+ employeeDO.whetherHideName = true;
+ // when
+ employeeWO.getName();
+ // then should throw exception
+ }
+
+ @Test
+ public void shouldBeAbleToModifyEnabledPropertyUsingSetter() {
+
+ allowingJonesStringValueAdapter();
+
+ context.checking(new Expectations() {
+ {
+
+ oneOf(mockAdapterManager).adapterFor("Jones");
+ will(returnValue(mockAdapterForStringJones));
+ }
+ });
+
+ // when
+ employeeWO.setName("Jones");
+ // then
+ assertThat(employeeDO.getName(), is("Jones"));
+ assertThat(employeeWO.getName(), is(employeeDO.getName()));
+ }
+
+ @Test
+ public void shouldNotBeAbleToModifyDisabledProperty() {
+
+ expectedException.expect(DisabledException.class);
+
+ // given
+ employeeDO.reasonDisableName = "sorry, no change allowed";
+ // when
+ employeeWO.setName("Jones");
+ // then should throw exception
+ }
+
+ @Test
+ public void shouldNotBeAbleToModifyPropertyUsingModify() {
+
+ allowingJonesStringValueAdapter();
+
+ expectedException.expect(UnsupportedOperationException.class);
+
+ // when
+ employeeWO.modifyName("Jones");
+ // then should throw exception
+ }
+
+ @Test
+ public void shouldNotBeAbleToModifyPropertyUsingClear() {
+
+ expectedException.expect(UnsupportedOperationException.class);
+
+ // when
+ employeeWO.clearName();
+ // then should throw exception
+ }
+
+ @Test
+ public void shouldNotBeAbleToModifyPropertyIfInvalid() {
+
+ allowingJonesStringValueAdapter();
+
+ expectedException.expect(InvalidException.class);
+
+ // given
+ employeeDO.reasonValidateName = "sorry, invalid data";
+ // when
+ employeeWO.setName("Jones");
+ // then should throw exception
+ }
+
+
+ // //////////////////////////////////////
+
+ private FacetedMethod facetedMethodForProperty(
+ Method init, Method accessor, Method modify, Method clear, Method hide, Method disable, Method validate) {
+ FacetedMethod facetedMethod = FacetedMethod.createForProperty(accessor.getDeclaringClass(), accessor);
+ FacetUtil.addFacet(new PropertyAccessorFacetViaAccessor(accessor, facetedMethod, mockDeploymentCategoryProvider.getDeploymentCategory(),
+ mockConfiguration, mockSpecificationLoader,
+ mockAuthenticationSessionProvider, mockAdapterManager
+ ));
+ FacetUtil.addFacet(new PropertyInitializationFacetViaSetterMethod(init, facetedMethod));
+ FacetUtil.addFacet(new PropertySetterFacetViaModifyMethod(modify, facetedMethod));
+ FacetUtil.addFacet(new PropertyClearFacetViaClearMethod(clear, facetedMethod));
+ FacetUtil.addFacet(new HideForContextFacetViaMethod(hide, facetedMethod));
+ FacetUtil.addFacet(new DisableForContextFacetViaMethod(disable, null, null, facetedMethod));
+ FacetUtil.addFacet(new PropertyValidateFacetViaMethod(validate, null, null, facetedMethod));
+ FacetUtil.addFacet(new NamedFacetInferred(accessor.getName(), facetedMethod));
+ return facetedMethod;
+ }
+
+ private static Method methodOf(Class<?> cls, String methodName) {
+ return methodOf(cls, methodName, new Class<?>[]{});
+ }
+
+ private static Method methodOf(Class<?> cls, String methodName, Class<?>... args) {
+ try {
+ return cls.getMethod(methodName, args);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ // //////////////////////////////////////
+
+ private void allowingEmployeeHasSmithAdapter() {
+ context.checking(new Expectations() {
+ {
+ allowing(mockAdapterManager).adapterFor("Smith");
+ will(returnValue(mockAdapterForStringSmith));
+
+ allowing(mockAdapterForStringSmith).getObject();
+ will(returnValue("Smith"));
+ }
+ });
+ }
+
+ private void allowingJonesStringValueAdapter() {
+ context.checking(new Expectations() {
+ {
+ allowing(mockAdapterManager).adapterFor("Jones");
+ will(returnValue(mockAdapterForStringJones));
+
+ allowing(mockAdapterForStringJones).getObject();
+ will(returnValue("Jones"));
+
+ allowing(mockAdapterForStringJones).isTransient();
+ will(returnValue(false));
+ }
+ });
+ }
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
new file mode 100644
index 0000000..47f6471
--- /dev/null
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -0,0 +1,275 @@
+/*
+ * 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.wrapper;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.jmock.Expectations;
+import org.jmock.auto.Mock;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.events.PropertyModifyEvent;
+import org.apache.isis.applib.events.PropertyUsabilityEvent;
+import org.apache.isis.applib.events.PropertyVisibilityEvent;
+import org.apache.isis.applib.filter.Filter;
+import org.apache.isis.applib.services.wrapper.DisabledException;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.consent.Allow;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.consent.Veto;
+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.members.disabled.DisabledFacet;
+import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetAbstractAlwaysEverywhere;
+import org.apache.isis.core.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessor;
+import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetViaSetterMethod;
+import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
+import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.progmodel.wrapper.dom.employees.Employee;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Contract test.
+ */
+public class WrapperFactoryDefaultTest_wrappedObject_transient {
+
+ @Rule
+ public final JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
+
+ @Mock
+ private AdapterManager mockAdapterManager;
+ @Mock
+ private AuthenticationSessionProvider mockAuthenticationSessionProvider;
+ @Mock
+ private DeploymentCategoryProvider mockDeploymentCategoryProvider;
+ @Mock
+ private IsisConfiguration mockConfiguration;
+ @Mock
+ private PersistenceSessionService mockPersistenceSessionService;
+ @Mock
+ private SpecificationLoader mockSpecificationLoader;
+
+ private Employee employeeDO;
+ @Mock
+ private ObjectAdapter mockEmployeeAdapter;
+ @Mock
+ private ObjectSpecificationDefault mockEmployeeSpec;
+ @Mock
+ private OneToOneAssociation mockPasswordMember;
+ @Mock
+ private Identifier mockPasswordIdentifier;
+
+
+ @Mock
+ protected ObjectAdapter mockPasswordAdapter;
+
+ private final String passwordValue = "12345678";
+
+ private final SimpleSession session = new SimpleSession("tester", Collections.<String>emptyList());
+
+ private List<Facet> facets;
+ private Method getPasswordMethod;
+ private Method setPasswordMethod;
+
+ private WrapperFactoryDefault wrapperFactory;
+ private Employee employeeWO;
+
+ @Before
+ public void setUp() throws Exception {
+
+ employeeDO = new Employee();
+ employeeDO.setName("Smith");
+
+ getPasswordMethod = Employee.class.getMethod("getPassword");
+ setPasswordMethod = Employee.class.getMethod("setPassword", String.class);
+
+ wrapperFactory = createWrapperFactory();
+ wrapperFactory.setAdapterManager(mockAdapterManager);
+ wrapperFactory.authenticationSessionProvider = mockAuthenticationSessionProvider;
+ wrapperFactory.setPersistenceSessionService(mockPersistenceSessionService);
+ wrapperFactory.setSpecificationLoader(mockSpecificationLoader);
+
+ context.checking(new Expectations() {
+ {
+ allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
+ will(returnValue(DeploymentCategory.PRODUCTION));
+
+ allowing(mockAdapterManager).getAdapterFor(employeeDO);
+ will(returnValue(mockEmployeeAdapter));
+
+ allowing(mockAdapterManager).adapterFor(passwordValue);
+ will(returnValue(mockPasswordAdapter));
+
+ allowing(mockEmployeeAdapter).getSpecification();
+ will(returnValue(mockEmployeeSpec));
+
+ allowing(mockEmployeeAdapter).getObject();
+ will(returnValue(employeeDO));
+
+ allowing(mockPasswordAdapter).getObject();
+ will(returnValue(passwordValue));
+
+ allowing(mockPasswordMember).getIdentifier();
+ will(returnValue(mockPasswordIdentifier));
+
+ allowing(mockSpecificationLoader).loadSpecification(Employee.class);
+ will(returnValue(mockEmployeeSpec));
+
+ allowing(mockEmployeeSpec).getMember(with(setPasswordMethod));
+ will(returnValue(mockPasswordMember));
+
+ allowing(mockEmployeeSpec).getMember(with(getPasswordMethod));
+ will(returnValue(mockPasswordMember));
+
+ allowing(mockPasswordMember).getName();
+ will(returnValue("password"));
+
+ allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
+ will(returnValue(session));
+
+ allowing(mockPasswordMember).isOneToOneAssociation();
+ will(returnValue(true));
+
+ allowing(mockPasswordMember).isOneToManyAssociation();
+ will(returnValue(false));
+ }
+ });
+
+ employeeWO = wrapperFactory.wrap(employeeDO);
+ }
+
+ /**
+ * Mandatory hook.
+ */
+ protected WrapperFactoryDefault createWrapperFactory() {
+ return new WrapperFactoryDefault();
+ }
+
+ @Test(expected = DisabledException.class)
+ public void shouldNotBeAbleToModifyProperty() {
+
+ // given
+ final DisabledFacet disabledFacet = new DisabledFacetAbstractAlwaysEverywhere(mockPasswordMember){};
+ facets = Arrays.asList(disabledFacet, new PropertySetterFacetViaSetterMethod(setPasswordMethod, mockPasswordMember));
+
+ final Consent visibilityConsent = new Allow(new InteractionResult(new PropertyVisibilityEvent(employeeDO, null)));
+
+ final InteractionResult usabilityInteractionResult = new InteractionResult(new PropertyUsabilityEvent(employeeDO, null));
+ usabilityInteractionResult.advise("disabled", disabledFacet);
+ final Consent usabilityConsent = new Veto(usabilityInteractionResult);
+
+ context.checking(new Expectations() {
+ {
+ allowing(mockPasswordMember).getFacets(with(any(Filter.class)));
+ will(returnValue(facets));
+
+ allowing(mockPasswordMember).isVisible(mockEmployeeAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE);
+ will(returnValue(visibilityConsent));
+
+ allowing(mockPasswordMember).isUsable(mockEmployeeAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE
+ );
+ will(returnValue(usabilityConsent));
+ }
+ });
+
+ // when
+ employeeWO.setPassword(passwordValue);
+
+ // then should throw exception
+ }
+
+ @Ignore("TODO - reinstate or replace with integration tests")
+ @Test
+ public void canModifyProperty() {
+ // given
+
+ final Consent visibilityConsent = new Allow(new InteractionResult(new PropertyVisibilityEvent(employeeDO, mockPasswordIdentifier)));
+ final Consent usabilityConsent = new Allow(new InteractionResult(new PropertyUsabilityEvent(employeeDO, mockPasswordIdentifier)));
+ final Consent validityConsent = new Allow(new InteractionResult(new PropertyModifyEvent(employeeDO, mockPasswordIdentifier, passwordValue)));
+
+ context.checking(new Expectations() {
+ {
+ allowing(mockPasswordMember).isVisible(mockEmployeeAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE);
+ will(returnValue(visibilityConsent));
+
+ allowing(mockPasswordMember).isUsable(mockEmployeeAdapter, InteractionInitiatedBy.USER, Where.ANYWHERE
+ );
+ will(returnValue(usabilityConsent));
+
+ allowing(mockPasswordMember).isAssociationValid(mockEmployeeAdapter, mockPasswordAdapter,
+ InteractionInitiatedBy.USER);
+ will(returnValue(validityConsent));
+ }
+ });
+
+ facets = Arrays.asList((Facet)new PropertySetterFacetViaSetterMethod(setPasswordMethod, mockPasswordMember));
+ context.checking(new Expectations() {
+ {
+ allowing(mockPasswordMember).getFacets(with(any(Filter.class)));
+ will(returnValue(facets));
+
+ oneOf(mockPasswordMember).set(mockEmployeeAdapter, mockPasswordAdapter, InteractionInitiatedBy.USER);
+ }
+ });
+
+ // when
+ employeeWO.setPassword(passwordValue);
+
+
+ // and given
+ facets = Arrays.asList((Facet)new PropertyAccessorFacetViaAccessor(getPasswordMethod, mockPasswordMember,
+ mockDeploymentCategoryProvider.getDeploymentCategory(), mockConfiguration, mockSpecificationLoader,
+ mockAuthenticationSessionProvider, mockAdapterManager
+ ));
+ context.checking(new Expectations() {
+ {
+ allowing(mockPasswordMember).getFacets(with(any(Filter.class)));
+ will(returnValue(facets));
+
+ oneOf(mockPasswordMember).get(mockEmployeeAdapter, InteractionInitiatedBy.USER);
+ will(returnValue(mockPasswordAdapter));
+ }
+ });
+
+ // then be allowed
+ assertThat(employeeWO.getPassword(), is(passwordValue));
+ }
+}
[07/10] isis git commit: ISIS-1405: removing IsisConfigurationAware.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java
index 452438a..b3ba65e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/renderedasdaybefore/annotation/RenderedAsDayBeforeFacetOnParameterAnnotationFactory.java
@@ -22,7 +22,6 @@ package org.apache.isis.core.metamodel.facets.param.renderedasdaybefore.annotati
import java.lang.annotation.Annotation;
import org.apache.isis.applib.annotation.RenderedAsDayBefore;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -30,6 +29,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -37,7 +38,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class RenderedAsDayBeforeFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class RenderedAsDayBeforeFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(RenderedAsDayBefore.class);
@@ -68,8 +69,12 @@ public class RenderedAsDayBeforeFacetOnParameterAnnotationFactory extends FacetF
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java
index 24b84b5..8888033 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/typicallen/annotation/TypicalLengthFacetOnParameterAnnotationFactory.java
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.param.typicallen.annotation;
import java.lang.annotation.Annotation;
+
import org.apache.isis.applib.annotation.TypicalLength;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -30,6 +30,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -37,7 +39,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class TypicalLengthFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class TypicalLengthFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(TypicalLength.class);
@@ -69,8 +71,12 @@ public class TypicalLengthFacetOnParameterAnnotationFactory extends FacetFactory
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
index 19ba629..2f261be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/validating/maskannot/MaskFacetOnParameterAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.param.validating.maskannot;
import org.apache.isis.applib.annotation.Mask;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -31,6 +30,8 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.mask.MaskFacet;
import org.apache.isis.core.metamodel.facets.object.mask.TitleFacetBasedOnMask;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -39,7 +40,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Mask.class);
@@ -92,8 +93,12 @@ public class MaskFacetOnParameterAnnotationFactory extends FacetFactoryAbstract
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java
index 4aa042a..72e3c82 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/mandatory/staticmethod/MandatoryFacetOnPropertyStaticMethodFactory.java
@@ -20,8 +20,8 @@
package org.apache.isis.core.metamodel.facets.properties.mandatory.staticmethod;
import java.lang.reflect.Method;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
@@ -33,6 +33,8 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
@@ -40,7 +42,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class MandatoryFacetOnPropertyStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MandatoryFacetOnPropertyStaticMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
private static final String[] PREFIXES = { MethodPrefixConstants.OPTIONAL_PREFIX };
@@ -100,9 +102,13 @@ public class MandatoryFacetOnPropertyStaticMethodFactory extends MethodPrefixBas
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java
index 985a32c..6638d5a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/multiline/annotation/MultiLineFacetOnPropertyFactory.java
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.properties.multiline.annotation;
import java.util.Properties;
+
import org.apache.isis.applib.annotation.MultiLine;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -32,10 +32,12 @@ import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacetInferredFromMultiLineFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class MultiLineFacetOnPropertyFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MultiLineFacetOnPropertyFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation multiLineValidator = new MetaModelValidatorForDeprecatedAnnotation(MultiLine.class);
@@ -93,9 +95,13 @@ public class MultiLineFacetOnPropertyFactory extends FacetFactoryAbstract implem
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
multiLineValidator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 442b23b..531f1ae 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -36,7 +36,6 @@ import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.eventbus.PropertyChangedEvent;
import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -86,12 +85,13 @@ import org.apache.isis.core.metamodel.facets.properties.property.regex.RegExFace
import org.apache.isis.core.metamodel.facets.properties.publish.PublishedPropertyFacet;
import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacet;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
import org.apache.isis.core.metamodel.util.EventUtil;
-public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation postsPropertyChangedEventValidator = new MetaModelValidatorForDeprecatedAnnotation(PostsPropertyChangedEvent.class);
private final MetaModelValidatorForDeprecatedAnnotation propertyInteractionValidator = new MetaModelValidatorForDeprecatedAnnotation(PropertyInteraction.class);
@@ -452,9 +452,12 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
// //////////////////////////////////////
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
- this.configuration = configuration;
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
postsPropertyChangedEventValidator.setConfiguration(configuration);
propertyInteractionValidator.setConfiguration(configuration);
regexValidator.setConfiguration(configuration);
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java
index de90d85..5b5db86 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/renderedasdaybefore/annotation/RenderedAsDayBeforeAnnotationOnPropertyFacetFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.properties.renderedasdaybefore.ann
import org.apache.isis.applib.annotation.RenderedAsDayBefore;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -29,6 +28,8 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.RenderedAdjustedFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -36,7 +37,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class RenderedAsDayBeforeAnnotationOnPropertyFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class RenderedAsDayBeforeAnnotationOnPropertyFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(RenderedAsDayBefore.class);
@@ -63,8 +64,12 @@ public class RenderedAsDayBeforeAnnotationOnPropertyFacetFactory extends FacetFa
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java
index 132a039..b6991ce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/typicallen/annotation/TypicalLengthOnPropertyFacetFactory.java
@@ -20,9 +20,9 @@
package org.apache.isis.core.metamodel.facets.properties.typicallen.annotation;
import java.util.Properties;
+
import org.apache.isis.applib.annotation.TypicalLength;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -31,10 +31,12 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class TypicalLengthOnPropertyFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory , MetaModelValidatorRefiner, IsisConfigurationAware {
+public class TypicalLengthOnPropertyFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory , MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(TypicalLength.class);
@@ -85,8 +87,12 @@ public class TypicalLengthOnPropertyFacetFactory extends FacetFactoryAbstract im
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
index a25e21e..af1ce53 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/maskannot/MaskFacetOnPropertyAnnotationFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.properties.validating.maskannot;
import org.apache.isis.applib.annotation.Mask;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -31,11 +30,13 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.mask.MaskFacet;
import org.apache.isis.core.metamodel.facets.object.mask.TitleFacetBasedOnMask;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Mask.class);
@@ -106,9 +107,14 @@ public class MaskFacetOnPropertyAnnotationFactory extends FacetFactoryAbstract i
metaModelValidator.add(validator);
}
+
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationService.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationService.java
deleted file mode 100644
index 1fa57b1..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationService.java
+++ /dev/null
@@ -1,45 +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.runtimecontext;
-
-import java.util.List;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-
-public interface ConfigurationService {
-
- void injectInto(final Object candidate);
-
- /**
- * Provided by {@link RuntimeContextAbstract} itself, cloned properties from
- * {@link IsisConfiguration}.
- *
- * <p>
- * Called by <tt>DomainObjectContainerDefault</tt>.
- */
- String getProperty(String name);
-
- /**
- * Provided by {@link RuntimeContextAbstract} itself, cloned properties from
- * {@link IsisConfiguration}.
- *
- * <p>
- * Called by <tt>DomainObjectContainerDefault</tt>.
- */
- List<String> getPropertyNames();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceAware.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceAware.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceAware.java
deleted file mode 100644
index c64b264..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceAware.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.runtimecontext;
-
-import org.apache.isis.applib.annotation.Programmatic;
-
-public interface ConfigurationServiceAware {
-
- @Programmatic
- public void setConfigurationService(ConfigurationService configurationService);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceInternal.java
new file mode 100644
index 0000000..b5a3dc2
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/ConfigurationServiceInternal.java
@@ -0,0 +1,45 @@
+/**
+ * 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.runtimecontext;
+
+import java.util.List;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+
+public interface ConfigurationServiceInternal {
+
+ void injectInto(final Object candidate);
+
+ /**
+ * Provided by {@link RuntimeContextAbstract} itself, cloned properties from
+ * {@link IsisConfiguration}.
+ *
+ * <p>
+ * Called by <tt>DomainObjectContainerDefault</tt>.
+ */
+ String getProperty(String name);
+
+ /**
+ * Provided by {@link RuntimeContextAbstract} itself, cloned properties from
+ * {@link IsisConfiguration}.
+ *
+ * <p>
+ * Called by <tt>DomainObjectContainerDefault</tt>.
+ */
+ List<String> getPropertyNames();
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 9f20fc9..d7ab75b 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
@@ -35,8 +35,6 @@ public interface RuntimeContext extends ApplicationScopedComponent {
// application-scoped
// //////////////////////////////////////
- public ConfigurationService getConfigurationService();
-
public ServicesInjector getServicesInjector();
public SpecificationLoader getSpecificationLoader();
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 babd24e..58443c6 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
@@ -19,31 +19,22 @@
package org.apache.isis.core.metamodel.runtimecontext;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
public abstract class RuntimeContextAbstract implements RuntimeContext {
- private final IsisConfigurationDefault configuration;
private final ServicesInjector servicesInjector;
private final SpecificationLoaderSpi specificationLoader;
public RuntimeContextAbstract(
- final IsisConfigurationDefault configuration,
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- this.configuration = configuration;
this.servicesInjector = servicesInjector;
this.specificationLoader = specificationLoader;
}
@Override
- public ConfigurationService getConfigurationService() {
- return configuration;
- }
-
- @Override
public ServicesInjector getServicesInjector() {
return servicesInjector;
}
@@ -66,7 +57,6 @@ public abstract class RuntimeContextAbstract implements RuntimeContext {
protected void injectSubcomponentsInto(final Object candidate) {
getTransactionStateProvider().injectInto(candidate);
getServicesInjector().injectInto(candidate);
- getConfigurationService().injectInto(candidate);
getLocalizationProvider().injectInto(candidate);
getPersistenceSessionService().injectInto(candidate);
getMessageBrokerService().injectInto(candidate);
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 165266f..da18619 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.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
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;
import org.apache.isis.core.metamodel.runtimecontext.LocalizationDefault;
import org.apache.isis.core.metamodel.runtimecontext.LocalizationProvider;
import org.apache.isis.core.metamodel.runtimecontext.LocalizationProviderAbstract;
@@ -55,15 +54,14 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
public RuntimeContextNoRuntime(
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- this(DeploymentCategory.PRODUCTION, new IsisConfigurationDefault(null), servicesInjector, specificationLoader);
+ this(new IsisConfigurationDefault(null), servicesInjector, specificationLoader);
}
public RuntimeContextNoRuntime(
- final DeploymentCategory deploymentCategory,
final IsisConfigurationDefault isisConfiguration,
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- super(isisConfiguration, servicesInjector, specificationLoader);
+ super(servicesInjector, specificationLoader);
persistenceSessionService = new PersistenceSessionServiceAbstract() {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
index 24df9d0..7ae5213 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
@@ -25,8 +25,6 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkHolder;
import org.apache.isis.applib.services.bookmark.BookmarkService2;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationService;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceAware;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionServiceAware;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
@@ -42,7 +40,7 @@ import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
@DomainService(
nature = NatureOfService.DOMAIN
)
-public class BookmarkServiceDefault implements BookmarkService2, ConfigurationServiceAware,
+public class BookmarkServiceDefault implements BookmarkService2,
PersistenceSessionServiceAware {
private PersistenceSessionService persistenceSessionService;
@@ -132,21 +130,13 @@ public class BookmarkServiceDefault implements BookmarkService2, ConfigurationSe
// //////////////////////////////////////
- private ConfigurationService configurationService;
- @Programmatic
- @Override
- public void setConfigurationService(final ConfigurationService configurationService) {
- this.configurationService = configurationService;
- }
@Override
public void setPersistenceSessionService(final PersistenceSessionService persistenceSessionService) {
this.persistenceSessionService = persistenceSessionService;
}
- // //////////////////////////////////////
-
@javax.inject.Inject
private WrapperFactory wrapperFactory;
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
index 10c12e1..dbf59bb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
@@ -25,19 +25,19 @@ import java.util.Set;
import java.util.TreeSet;
import javax.annotation.PostConstruct;
+import javax.inject.Inject;
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.applib.services.config.ConfigurationProperty;
+import org.apache.isis.applib.services.config.ConfigurationService;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
@DomainService(
nature = NatureOfService.DOMAIN
)
-public class ConfigurationServiceDefault
- implements org.apache.isis.applib.services.config.ConfigurationService,
- org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceAware {
-
+public class ConfigurationServiceDefault implements ConfigurationService {
private Map<String, String> properties;
@@ -60,7 +60,7 @@ public class ConfigurationServiceDefault
@Programmatic
@Override
public String getProperty(final String name) {
- return getConfigurationService().getProperty(name);
+ return configurationServiceInternal.getProperty(name);
}
@Programmatic
@@ -73,21 +73,12 @@ public class ConfigurationServiceDefault
@Programmatic
@Override
public List<String> getPropertyNames() {
- return getConfigurationService().getPropertyNames();
+ return configurationServiceInternal.getPropertyNames();
}
- private org.apache.isis.core.metamodel.runtimecontext.ConfigurationService configurationService;
-
- protected org.apache.isis.core.metamodel.runtimecontext.ConfigurationService getConfigurationService() {
- return configurationService;
- }
-
- @Programmatic
- @Override
- public void setConfigurationService(final org.apache.isis.core.metamodel.runtimecontext.ConfigurationService configurationService) {
- this.configurationService = configurationService;
- }
+ @Inject
+ ConfigurationServiceInternal configurationServiceInternal;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 3c1e437..af0be4e 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
@@ -37,6 +37,7 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ClassUtil;
@@ -46,6 +47,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
@@ -215,6 +217,7 @@ public final class ObjectReflectorDefault
// default subcomponents
if (this.runtimeContext == null) {
+ servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, new IsisConfigurationDefault(null));
this.runtimeContext = new RuntimeContextNoRuntime(servicesInjector, this);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
index cda3a8d..bea3c86 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForDeprecatedAbstract.java
@@ -19,11 +19,10 @@
package org.apache.isis.core.metamodel.specloader.validator;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.FacetFactory;
-public abstract class MetaModelValidatorForDeprecatedAbstract extends MetaModelValidatorAbstract implements IsisConfigurationAware {
+public abstract class MetaModelValidatorForDeprecatedAbstract extends MetaModelValidatorAbstract {
public static final String ISIS_REFLECTOR_ALLOW_DEPRECATED_KEY = "isis.reflector.validator.allowDeprecated";
public static final boolean ISIS_REFLECTOR_ALLOW_DEPRECATED_DEFAULT = true;
@@ -75,7 +74,6 @@ public abstract class MetaModelValidatorForDeprecatedAbstract extends MetaModelV
validationFailures.addAll(failures);
}
- @Override
public void setConfiguration(final IsisConfiguration configuration) {
this.configuration = configuration;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableAnnotationInJdoApplibFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableAnnotationInJdoApplibFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableAnnotationInJdoApplibFacetFactory.java
index f6cc97d..462418c5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableAnnotationInJdoApplibFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/AuditableAnnotationInJdoApplibFacetFactory.java
@@ -20,12 +20,13 @@ package org.apache.isis.objectstore.jdo.metamodel.facets.object.auditable;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
import org.apache.isis.core.objectstore.jdo.applib.annotations.Auditable;
@@ -36,7 +37,7 @@ import org.apache.isis.core.objectstore.jdo.applib.annotations.Auditable;
*
*/
@Deprecated
-public class AuditableAnnotationInJdoApplibFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
+public class AuditableAnnotationInJdoApplibFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Auditable.class);
@@ -53,7 +54,6 @@ public class AuditableAnnotationInJdoApplibFacetFactory extends FacetFactoryAbst
}
final AuditableFacetAnnotationInJdoApplib facet = new AuditableFacetAnnotationInJdoApplib(processClassContext.getFacetHolder());
FacetUtil.addFacet(validator.flagIfPresent(facet));
- return;
}
@@ -63,9 +63,13 @@ public class AuditableAnnotationInJdoApplibFacetFactory extends FacetFactoryAbst
}
@Override
- public void setConfiguration(final IsisConfiguration configuration) {
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = (IsisConfiguration) servicesInjector
+ .lookupService(ConfigurationServiceInternal.class);
validator.setConfiguration(configuration);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 a01e817..effc7ce 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
@@ -88,6 +88,7 @@ import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionPayl
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import static org.apache.isis.core.commons.matchers.IsisMatchers.classEqualTo;
@@ -128,7 +129,6 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
@Before
public void setUp() throws Exception {
facetFactory = new ActionAnnotationFacetFactory();
- facetFactory.setConfiguration(mockConfiguration);
facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
facetFactory.setServicesInjector(mockServicesInjector);
@@ -136,6 +136,9 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(mockConfiguration));
+
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 94adf4e..fe072fd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -27,6 +27,8 @@ import org.apache.isis.applib.RecreatableDomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -44,6 +46,9 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
@Mock
private IsisConfiguration mockConfiguration;
+ @Mock
+ private ServicesInjector mockServicesInjector;
+
private ViewModelSemanticCheckingFacetFactory facetFactory;
private ValidationFailures processThenRefine(final Class<?> cls) {
@@ -64,7 +69,11 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
will(returnValue(true));
}});
facetFactory = new ViewModelSemanticCheckingFacetFactory();
- facetFactory.setConfiguration(mockConfiguration);
+
+ context.checking(new Expectations() {{
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(mockConfiguration));
+ }});
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
index e9b3d7f..867a54e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
@@ -19,12 +19,16 @@
package org.apache.isis.core.metamodel.facets.object.defaults;
+import java.util.Collections;
+
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.defaults.annotcfg.DefaultedFacetAnnotationElseConfigurationFactory;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -36,8 +40,9 @@ public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
super.setUp();
facetFactory = new DefaultedFacetAnnotationElseConfigurationFactory();
- isisConfigurationDefault = new IsisConfigurationDefault();
- facetFactory.setConfiguration(isisConfigurationDefault);
+ ServicesInjectorDefault servicesInjector = new ServicesInjectorDefault(Collections.emptyList());
+ servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, isisConfigurationDefault = new IsisConfigurationDefault());
+ facetFactory.setServicesInjector(servicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 24a12bc..41c1583 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
@@ -63,6 +63,7 @@ import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObj
import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectPayloadFactoryDefault;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import static org.hamcrest.CoreMatchers.is;
@@ -77,7 +78,7 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
@Before
public void setUp() throws Exception {
facetFactory = new DomainObjectAnnotationFacetFactory();
- facetFactory.setConfiguration(mockConfiguration);
+
facetFactory.setServicesInjector(mockServicesInjector);
context.checking(new Expectations() {{
@@ -86,6 +87,9 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
+
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(mockConfiguration));
}});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
index d09a3dd..afb32f9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.facets.object.encodable;
+import java.util.Collections;
+
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.annotation.Encodable;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
@@ -28,6 +30,8 @@ import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.object.encodeable.annotcfg.EncodableFacetAnnotationElseConfigurationFactory;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncoderDecoderUtil;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
public class EncodableFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -40,7 +44,11 @@ public class EncodableFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory = new EncodableFacetAnnotationElseConfigurationFactory();
isisConfigurationDefault = new IsisConfigurationDefault();
- facetFactory.setConfiguration(isisConfigurationDefault);
+
+ ServicesInjectorDefault servicesInjector = new ServicesInjectorDefault(Collections.emptyList());
+ servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, isisConfigurationDefault = new IsisConfigurationDefault());
+ facetFactory.setServicesInjector(servicesInjector);
+
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 ce64eaa..4a58aae 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
@@ -32,6 +32,7 @@ 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.facets.AbstractFacetFactoryTest;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ParseableFacetAnnotationElseConfigurationFactoryTest extends AbstractFacetFactoryTest {
@@ -62,7 +63,6 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
facetFactory = new ParseableFacetAnnotationElseConfigurationFactory();
isisConfigurationDefault = new IsisConfigurationDefault();
- facetFactory.setConfiguration(isisConfigurationDefault);
facetFactory.setServicesInjector(mockServicesInjector);
context.checking(new Expectations(){{
@@ -71,6 +71,9 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
+
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(isisConfigurationDefault));
}});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 3098e8d..6ecebf9 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
@@ -43,6 +43,7 @@ import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengt
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;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFacetFactoryTest {
@@ -75,7 +76,6 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
facetFactory = new ValueFacetAnnotationOrConfigurationFactory();
isisConfigurationDefault = new IsisConfigurationDefault();
- facetFactory.setConfiguration(isisConfigurationDefault);
facetFactory.setServicesInjector(mockServicesInjector);
context.checking(new Expectations(){{
@@ -84,6 +84,9 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
+
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(isisConfigurationDefault));
}});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTestAbstract.java
index 27a465e..429941a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefaultTestAbstract.java
@@ -32,6 +32,7 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
@@ -42,6 +43,7 @@ import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson;
import org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
@@ -90,6 +92,10 @@ public abstract class ObjectReflectorDefaultTestAbstract {
new MetaModelValidatorDefault(),
Lists.<LayoutMetadataReader>newArrayList(
new LayoutMetadataReaderFromJson()), mockServicesInjector);
+ context.checking(new Expectations() {{
+ allowing(mockServicesInjector).lookupService(ConfigurationServiceInternal.class);
+ will(returnValue(new IsisConfigurationDefault(null)));
+ }});
runtimeContext =
new RuntimeContextNoRuntime(
new ServicesInjectorDefault(Collections.emptyList()), reflector);
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index 215cac7..5accaa7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -29,6 +29,7 @@ import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -40,6 +41,7 @@ import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
@@ -72,8 +74,11 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
public ObjectSpecificationStub(final Class<?> type) {
this(type.getName());
+ ServicesInjectorDefault servicesInjector = new ServicesInjectorDefault(Collections.emptyList());
+ servicesInjector.addFallbackIfRequired(
+ ConfigurationServiceInternal.class, new IsisConfigurationDefault(null));
runtimeContext = new RuntimeContextNoRuntime(
- new ServicesInjectorDefault(Collections.emptyList()), null);
+ servicesInjector, null);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 f067393..cfad852 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
@@ -70,7 +70,7 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
final IsisConfigurationDefault configuration,
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- super(configuration, servicesInjector, specificationLoader);
+ super(servicesInjector, specificationLoader);
this.persistenceSessionService = new PersistenceSessionServiceAbstract() {
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
index 26793cb..8e72ba1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstaller.java
@@ -22,9 +22,8 @@ package org.apache.isis.core.runtime.services;
import java.util.List;
import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.commons.config.IsisConfigurationAware;
-public interface ServicesInstaller extends Installer, IsisConfigurationAware {
+public interface ServicesInstaller extends Installer {
void init();
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
index 3eebf74..45a6e90 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
@@ -40,6 +40,7 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.lang.ListExtensions;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -149,6 +150,7 @@ public class IsisSystem implements ApplicationScopedComponent {
// services
ServicesInjectorDefault servicesInjector = isisComponentProvider.provideServiceInjector();
servicesInjector.addFallbackIfRequired(FixtureScripts.class, new FixtureScriptsDefault());
+ servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, configuration);
servicesInjector.validateServices();
// authentication, authorization
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 72310b0..a86e9fc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -89,8 +89,7 @@ import org.apache.isis.core.metamodel.facets.object.callbacks.UpdatingLifecycleE
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationService;
-import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceAware;
+import org.apache.isis.core.metamodel.runtimecontext.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerService;
import org.apache.isis.core.metamodel.runtimecontext.MessageBrokerServiceAware;
import org.apache.isis.core.metamodel.runtimecontext.PersistenceSessionService;
@@ -156,7 +155,7 @@ public class PersistenceSession implements
AdapterManager,
MessageBrokerService,
PersistenceSessionService,
- ConfigurationService,
+ ConfigurationServiceInternal,
IsisLifecycleListener2.PersistenceSessionLifecycleManagement,
IsisTransactionManager.PersistenceSessionTransactionManagement,
PersistenceQueryProcessorAbstract.PersistenceSessionQueryProcessorManagement {
@@ -410,10 +409,6 @@ public class PersistenceSession implements
final PersistenceSessionServiceAware cast = PersistenceSessionServiceAware.class.cast(candidate);
cast.setPersistenceSessionService(this);
}
- if (ConfigurationServiceAware.class.isAssignableFrom(candidate.getClass())) {
- final ConfigurationServiceAware cast = ConfigurationServiceAware.class.cast(candidate);
- cast.setConfigurationService(this);
- }
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
index 159e2ac..3b8671f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
@@ -121,7 +121,7 @@ public class IsisComponentProviderDefault2 extends IsisComponentProviderAbstract
@Override
protected void doPutConfigurationProperty(final String key, final String value) {
// bit hacky :-(
- IsisConfigurationDefault configurationDefault = (IsisConfigurationDefault) this.configuration;
+ IsisConfigurationDefault configurationDefault = this.configuration;
configurationDefault.put(key, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/62f5ad7d/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 a743879..e340d72 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
@@ -30,7 +30,6 @@ import org.apache.wicket.model.IModel;
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.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
[04/10] isis git commit: ISIS-1404: AuthenticationSessionProvider is
now a domain service;
removed the AuthenticationSessionProviderAbstract and Aware interfaces.
Posted by da...@apache.org.
ISIS-1404: AuthenticationSessionProvider is now a domain service; removed the AuthenticationSessionProviderAbstract and Aware interfaces.
In addition, FacetFactoryAbstract now implements ServiceInjectorAware, none of the subclass FacetFactorys do. The intention here is that we can just let FacetFactory reach into ServicesInjector to pull out the domain services, such as AuthenticationSessionProvider impl'n.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/70bbd7aa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/70bbd7aa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/70bbd7aa
Branch: refs/heads/ISIS-1406
Commit: 70bbd7aa62347d9f078cedec7589583f135d7689
Parents: 1b8ac93
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 17 23:56:35 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue May 17 23:56:35 2016 +0100
----------------------------------------------------------------------
.../AuthenticationSessionProvider.java | 14 +-
.../AuthenticationSessionProviderAbstract.java | 29 --
.../AuthenticationSessionProviderAware.java | 29 --
.../metamodel/facets/FacetFactoryAbstract.java | 27 +-
.../action/ActionAnnotationFacetFactory.java | 22 +-
.../ActionValidationFacetViaMethodFactory.java | 10 +-
.../all/i18n/TranslationFacetFactory.java | 11 +-
.../CollectionAnnotationFacetFactory.java | 7 +-
...nAddToRemoveFromAndValidateFacetFactory.java | 14 +-
...FacetOnActionFromConfiguredRegexFactory.java | 12 +-
.../DisableForContextFacetViaMethodFactory.java | 11 +-
.../annotprop/MemberOrderFacetFactory.java | 9 +-
.../autocomplete/AutoCompleteFacetAbstract.java | 3 +-
.../enums/EnumValueSemanticsProvider.java | 2 +-
...FacetAnnotationElseConfigurationFactory.java | 15 +-
.../DisabledObjectFacetViaMethodFactory.java | 11 +-
.../DomainObjectAnnotationFacetFactory.java | 11 +-
...oCompleteFacetForAutoCompleteAnnotation.java | 7 +-
...oCompleteFacetForDomainObjectAnnotation.java | 2 +-
.../DomainObjectLayoutFacetFactory.java | 5 -
...FacetAnnotationElseConfigurationFactory.java | 9 +-
.../facets/object/grid/GridFacetFactory.java | 9 +-
.../MixinFacetForMixinAnnotationFactory.java | 8 +-
.../parseable/ParseableFacetAbstract.java | 18 +-
.../annotcfg/ParseableFacetAnnotation.java | 21 +-
...FacetAnnotationElseConfigurationFactory.java | 22 +-
.../ParseableFacetFromConfiguration.java | 10 +-
.../parser/ParseableFacetUsingParser.java | 13 +-
.../RecreatableObjectFacetFactory.java | 10 +-
.../methods/TitleFacetViaMethodsFactory.java | 10 +-
...MustSatisfyAnnotationOnTypeFacetFactory.java | 10 +-
.../ValidateObjectFacetMethodFactory.java | 7 +-
.../facets/object/value/ValueFacetAbstract.java | 10 +-
...ueFacetAnnotationOrConfigurationFactory.java | 27 +-
...ValueFacetUsingSemanticsProviderFactory.java | 17 +-
.../ValueSemanticsProviderAndFacetAbstract.java | 13 +-
.../vsp/ValueSemanticsProviderContext.java | 19 +-
.../ParameterAnnotationFacetFactory.java | 7 -
.../PropertyAnnotationFacetFactory.java | 9 +-
.../update/PropertyModifyFacetFactory.java | 10 +-
.../PropertyValidateFacetViaMethodFactory.java | 12 +-
.../runtimecontext/RuntimeContext.java | 12 -
.../runtimecontext/RuntimeContextAbstract.java | 1 -
.../noruntime/RuntimeContextNoRuntime.java | 12 -
.../container/DomainObjectContainerDefault.java | 16 +-
.../services/user/UserServiceDefault.java | 23 +-
.../actions/ActionMethodsFacetFactoryTest.java | 160 +++++++-
.../PrototypeFacetAnnotationFactoryTest.java | 8 +-
.../ExplorationFacetAnnotationFactoryTest.java | 6 +-
.../CollectionFieldMethodsFacetFactoryTest.java | 208 ++++++++--
...etFromBoundedMarkerInterfaceFactoryTest.java | 8 +-
...esFacetFromBoundedAnnotationFactoryTest.java | 8 +-
.../TitleAnnotationFacetFactoryTest.java | 6 +-
...tAnnotationElseConfigurationFactoryTest.java | 8 +-
.../ParseableFacetUsingParserTest.java | 4 +-
...cetAnnotationOrConfigurationFactoryTest.java | 8 +-
.../PropertyMethodsFacetFactoryTest.java | 247 ++++++++++--
.../ValueSemanticsProviderAbstractTestCase.java | 4 +-
.../internal/RuntimeContextFromSession.java | 17 +-
.../AuthenticationSessionProviderDefault.java | 34 ++
.../wicket/viewer/IsisWicketApplication.java | 13 +-
.../wicket/AuthenticatedWebSessionForIsis.java | 15 +-
.../viewer/wicket/model/models/ScalarModel.java | 4 +-
.../entityactions/EntityActionUtil.java | 8 +-
.../collection/bulk/BulkActionsLinkFactory.java | 4 +-
.../FormComponentPanelAbstract.java | 14 +-
.../viewer/wicket/ui/panels/FormAbstract.java | 27 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 12 +-
.../core/wrapper/WrapperFactoryDefault.java | 23 +-
...WrapperFactoryDefaultTest_wrappedObject.java | 390 +++++++++++++++++++
...toryDefaultTest_wrappedObject_transient.java | 275 +++++++++++++
...WrapperFactoryDefaultTest_wrappedObject.java | 389 ------------------
...toryDefaultTest_wrappedObject_transient.java | 276 -------------
73 files changed, 1446 insertions(+), 1316 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProvider.java
index fa03a54..cd77a66 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProvider.java
@@ -16,16 +16,14 @@
*/
package org.apache.isis.core.commons.authentication;
-public interface AuthenticationSessionProvider {
+import org.apache.isis.applib.annotation.Programmatic;
- void injectInto(final Object candidate);
+/**
+ * This is implemented by an (internal) domain service
+ */
+public interface AuthenticationSessionProvider {
- /**
- * Provided by <tt>AuthenticationManager</tt> when used by framework.
- *
- * <p>
- * Called in multiple places.
- */
+ @Programmatic
AuthenticationSession getAuthenticationSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAbstract.java
deleted file mode 100644
index 2ac6340..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAbstract.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.commons.authentication;
-
-public abstract class AuthenticationSessionProviderAbstract implements AuthenticationSessionProvider {
-
- @Override
- public void injectInto(final Object candidate) {
- if (AuthenticationSessionProviderAware.class.isAssignableFrom(candidate.getClass())) {
- final AuthenticationSessionProviderAware cast = AuthenticationSessionProviderAware.class.cast(candidate);
- cast.setAuthenticationSessionProvider(this);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAware.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAware.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAware.java
deleted file mode 100644
index 39bd5a4..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionProviderAware.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.commons.authentication;
-
-import org.apache.isis.applib.annotation.Programmatic;
-
-public interface AuthenticationSessionProviderAware {
-
- @Programmatic
- public void setAuthenticationSessionProvider(AuthenticationSessionProvider authenticationSessionProvider);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 2b1201a..95dddea 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
@@ -24,20 +24,18 @@ import java.util.List;
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.DeploymentCategoryAware;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
+import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
-public abstract class FacetFactoryAbstract implements FacetFactory, SpecificationLoaderAware,
- AuthenticationSessionProviderAware, DeploymentCategoryAware {
+public abstract class FacetFactoryAbstract implements FacetFactory, SpecificationLoaderAware, DeploymentCategoryAware, ServicesInjectorAware {
private final List<FeatureType> featureTypes;
- private SpecificationLoader specificationLoader;
- private AuthenticationSessionProvider authenticationSessionProvider;
private DeploymentCategory deploymentCategory;
public FacetFactoryAbstract(final List<FeatureType> featureTypes) {
@@ -65,6 +63,8 @@ public abstract class FacetFactoryAbstract implements FacetFactory, Specificatio
// Dependencies (injected)
// ////////////////////////////////////////////////////////////////
+ private SpecificationLoader specificationLoader;
+
protected SpecificationLoader getSpecificationLoader() {
return specificationLoader;
}
@@ -77,15 +77,13 @@ public abstract class FacetFactoryAbstract implements FacetFactory, Specificatio
this.specificationLoader = specificationLookup;
}
- @Override
- public void setAuthenticationSessionProvider(final AuthenticationSessionProvider authenticationSessionProvider) {
- this.authenticationSessionProvider = authenticationSessionProvider;
- }
protected AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
+ return servicesInjector.lookupService(AuthenticationSessionProvider.class);
}
+
+
@Override
public void setDeploymentCategory(final DeploymentCategory deploymentCategory) {
this.deploymentCategory = deploymentCategory;
@@ -95,4 +93,13 @@ public abstract class FacetFactoryAbstract implements FacetFactory, Specificatio
return deploymentCategory;
}
+
+
+ protected ServicesInjector servicesInjector;
+
+ @Override
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ this.servicesInjector = servicesInjector;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index 51aaffb..94af81e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -89,8 +89,6 @@ import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFace
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
@@ -99,7 +97,7 @@ import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
import org.apache.isis.core.metamodel.transactions.TransactionStateProviderAware;
import org.apache.isis.core.metamodel.util.EventUtil;
-public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implements ServicesInjectorAware, IsisConfigurationAware, AdapterManagerAware, MetaModelValidatorRefiner,
+public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AdapterManagerAware, MetaModelValidatorRefiner,
TransactionStateProviderAware {
private final MetaModelValidatorForDeprecatedAnnotation actionSemanticsValidator = new MetaModelValidatorForDeprecatedAnnotation(ActionSemantics.class);
@@ -116,7 +114,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
private final MetaModelValidatorForDeprecatedAnnotation prototypeValidator = new MetaModelValidatorForDeprecatedAnnotation(Prototype.class);
- private ServicesInjector servicesInjector;
private IsisConfiguration configuration;
private AdapterManager adapterManager;
private TransactionStateProvider transactionStateProvider;
@@ -218,7 +215,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
actionInvocationFacet = actionInteractionValidator.flagIfPresent(
new ActionInvocationFacetForPostsActionInvokedEventAnnotation(
actionInvokedEventType, actionMethod, typeSpec, returnSpec, holder,
- getDeploymentCategory(), configuration, getServicesInjector(),
+ getDeploymentCategory(), configuration, servicesInjector,
getAuthenticationSessionProvider(), getAdapterManager(),
transactionStateProvider
), processMethodContext);
@@ -228,7 +225,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
actionInvocationFacet = actionInteractionValidator.flagIfPresent(
new ActionInvocationFacetForDomainEventFromActionInteractionAnnotation(
actionDomainEventType, actionMethod, typeSpec, returnSpec, holder,
- getDeploymentCategory(), configuration, getServicesInjector(),
+ getDeploymentCategory(), configuration, servicesInjector,
getAuthenticationSessionProvider(), getAdapterManager(),
transactionStateProvider
), processMethodContext);
@@ -237,7 +234,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
if (action != null) {
actionInvocationFacet = new ActionInvocationFacetForDomainEventFromActionAnnotation(
actionDomainEventType, actionMethod, typeSpec, returnSpec, holder,
- getDeploymentCategory(), configuration, getServicesInjector(),
+ getDeploymentCategory(), configuration, servicesInjector,
getAuthenticationSessionProvider(),
getAdapterManager(), transactionStateProvider
);
@@ -246,7 +243,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
{
actionInvocationFacet = new ActionInvocationFacetForDomainEventFromDefault(
actionDomainEventType, actionMethod, typeSpec, returnSpec, holder,
- getDeploymentCategory(), configuration, getServicesInjector(), getAuthenticationSessionProvider(),
+ getDeploymentCategory(), configuration, servicesInjector, getAuthenticationSessionProvider(),
getAdapterManager(), transactionStateProvider
);
}
@@ -546,11 +543,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
// ///////////////////////////////////////////////////////////////
@Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
-
- @Override
public void setConfiguration(final IsisConfiguration configuration) {
this.configuration = configuration;
@@ -577,10 +569,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
return adapterManager;
}
- private ServicesInjector getServicesInjector() {
- return servicesInjector;
- }
-
@Override
public void setTransactionStateProvider(final TransactionStateProvider transactionStateProvider) {
this.transactionStateProvider = transactionStateProvider;
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
index 9f8681f..05acafe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
/**
* Sets up {@link ActionValidationFacet}.
*/
-public class ActionValidationFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements ServicesInjectorAware {
+public class ActionValidationFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract {
private static final String[] PREFIXES = { MethodPrefixConstants.VALIDATE_PREFIX };
@@ -118,12 +118,4 @@ public class ActionValidationFacetViaMethodFactory extends MethodPrefixBasedFace
}
- // //////////////////////////////////////
-
- private ServicesInjector servicesInjector;
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/TranslationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/TranslationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/TranslationFacetFactory.java
index 7637e48..bbd88d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/TranslationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/i18n/TranslationFacetFactory.java
@@ -30,12 +30,8 @@ import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
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.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class TranslationFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, ServicesInjectorAware {
-
- private ServicesInjector servicesInjector;
+public class TranslationFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory {
private TranslationService translationService;
@@ -139,9 +135,4 @@ public class TranslationFacetFactory extends FacetFactoryAbstract implements Con
return translationService;
}
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index 433e208..b905a09 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -80,7 +80,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorCom
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
import org.apache.isis.core.metamodel.util.EventUtil;
-public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract implements ServicesInjectorAware, MetaModelValidatorRefiner, IsisConfigurationAware {
+public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
private final MetaModelValidatorForDeprecatedAnnotation postsCollectionAddedToEventValidator = new MetaModelValidatorForDeprecatedAnnotation(PostsCollectionAddedToEvent.class);
private final MetaModelValidatorForDeprecatedAnnotation postsCollectionRemovedFromEventValidator = new MetaModelValidatorForDeprecatedAnnotation(PostsCollectionRemovedFromEvent.class);
@@ -92,7 +92,6 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract imple
private final CollectionTypeRegistry collectionTypeRegistry = new CollectionTypeRegistry();
- private ServicesInjector servicesInjector;
private IsisConfiguration configuration;
public CollectionAnnotationFacetFactory() {
@@ -397,8 +396,4 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract imple
disabledValidator.setConfiguration(configuration);
}
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
index c8fdbfc..3edbaa6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/modify/CollectionAddToRemoveFromAndValidateFacetFactory.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.collections.modify;
import java.lang.reflect.Method;
+
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.lang.StringExtensions;
@@ -35,15 +36,13 @@ import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.facets.collections.validate.CollectionValidateAddToFacetViaMethod;
import org.apache.isis.core.metamodel.facets.collections.validate.CollectionValidateRemoveFromFacetViaMethod;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
/**
* TODO: should probably split out into two {@link FacetFactory}s, one for
* <tt>addTo()</tt>/<tt>removeFrom()</tt> and one for <tt>validateAddTo()</tt>/
* <tt>validateRemoveFrom()</tt>.
*/
-public class CollectionAddToRemoveFromAndValidateFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements ServicesInjectorAware {
+public class CollectionAddToRemoveFromAndValidateFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
private static final String[] PREFIXES = {};
@@ -194,13 +193,4 @@ public class CollectionAddToRemoveFromAndValidateFacetFactory extends MethodPref
FacetUtil.addFacet(facet);
}
- // ///////////////////////////////////////////////////////
- // Dependencies (injected)
- // ///////////////////////////////////////////////////////
-
- private ServicesInjector servicesInjector;
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
index 874617c..b74883b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
@@ -24,8 +24,10 @@ import java.util.Map;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
+
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationAware;
@@ -36,12 +38,10 @@ import org.apache.isis.core.metamodel.facets.ContributeeMemberFacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-public class CssClassFacetOnActionFromConfiguredRegexFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, IsisConfigurationAware, ServicesInjectorAware {
+public class CssClassFacetOnActionFromConfiguredRegexFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, IsisConfigurationAware {
public CssClassFacetOnActionFromConfiguredRegexFactory() {
super(FeatureType.ACTIONS_ONLY);
@@ -162,12 +162,6 @@ public class CssClassFacetOnActionFromConfiguredRegexFactory extends FacetFactor
this.configuration = configuration;
}
- private ServicesInjector servicesInjector;
- @Override
- public void setServicesInjector(ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
-
//endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
index 5b9b2e0..6b1910a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.members.disabled.method;
import java.lang.reflect.Method;
+
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.lang.StringExtensions;
@@ -32,10 +33,8 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class DisableForContextFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements ServicesInjectorAware {
+public class DisableForContextFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract {
private static final String[] PREFIXES = { MethodPrefixConstants.DISABLE_PREFIX };
@@ -89,10 +88,4 @@ public class DisableForContextFacetViaMethodFactory extends MethodPrefixBasedFac
FacetUtil.addFacet(new DisableForContextFacetViaMethod(disableMethod, translationService, translationContext, facetHolder));
}
- private ServicesInjector servicesInjector;
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/annotprop/MemberOrderFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/annotprop/MemberOrderFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/annotprop/MemberOrderFacetFactory.java
index f45e6e0..bf51b34 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/annotprop/MemberOrderFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/annotprop/MemberOrderFacetFactory.java
@@ -33,9 +33,7 @@ import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class MemberOrderFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory, ServicesInjectorAware {
-
- private ServicesInjector servicesInjector;
+public class MemberOrderFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory {
public MemberOrderFacetFactory() {
super(FeatureType.MEMBERS);
@@ -93,9 +91,4 @@ public class MemberOrderFacetFactory extends FacetFactoryAbstract implements Con
}
}
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
index e443a40..68c3cd5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
@@ -80,16 +80,15 @@ public abstract class AutoCompleteFacetAbstract extends FacetAbstract implements
final DeploymentCategory deploymentCategory,
final SpecificationLoader specificationLoader,
final ServicesInjector servicesInjector,
- final AuthenticationSessionProvider authenticationSessionProvider,
final AdapterManager adapterManager) {
super(type(), holder, Derivation.NOT_DERIVED);
this.repositoryClass = repositoryClass;
this.actionName = actionName;
this.deploymentCategory = deploymentCategory;
this.specificationLoader = specificationLoader;
- this.authenticationSessionProvider = authenticationSessionProvider;
this.adapterManager = adapterManager;
this.servicesInjector = servicesInjector;
+ this.authenticationSessionProvider = servicesInjector.lookupService(AuthenticationSessionProvider.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java
index a242d46..1c6748d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java
@@ -116,7 +116,7 @@ public class EnumValueSemanticsProvider<T extends Enum<T>> extends ValueSemantic
@Override
protected String titleString(final Object object, final Localization localization) {
- final TranslationService translationService = getDependencyInjector().lookupService(TranslationService.class);
+ final TranslationService translationService = getServicesInjector().lookupService(TranslationService.class);
if (titleMethod != null) {
// sadness: same as in TranslationFactory
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
index a889860..6db38a2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/defaults/annotcfg/DefaultedFacetAnnotationElseConfigurationFactory.java
@@ -34,10 +34,9 @@ import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultsProviderUtil;
-public class DefaultedFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, ServicesInjectorAware {
+public class DefaultedFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware {
private IsisConfiguration configuration;
- private ServicesInjector servicesInjector;
public DefaultedFacetAnnotationElseConfigurationFactory() {
super(FeatureType.OBJECTS_ONLY);
@@ -53,7 +52,7 @@ public class DefaultedFacetAnnotationElseConfigurationFactory extends FacetFacto
// create from annotation, if present
if (annotation != null) {
- final DefaultedFacetAbstract facet = new DefaultedFacetAnnotation(cls, getIsisConfiguration(), holder, getServicesInjector());
+ final DefaultedFacetAbstract facet = new DefaultedFacetAnnotation(cls, getIsisConfiguration(), holder, servicesInjector);
if (facet.isValid()) {
return facet;
}
@@ -62,7 +61,7 @@ public class DefaultedFacetAnnotationElseConfigurationFactory extends FacetFacto
// otherwise, try to create from configuration, if present
final String providerName = DefaultsProviderUtil.defaultsProviderNameFromConfiguration(cls, getIsisConfiguration());
if (!Strings.isNullOrEmpty(providerName)) {
- final DefaultedFacetFromConfiguration facet = new DefaultedFacetFromConfiguration(providerName, holder, getServicesInjector());
+ final DefaultedFacetFromConfiguration facet = new DefaultedFacetFromConfiguration(providerName, holder, servicesInjector);
if (facet.isValid()) {
return facet;
}
@@ -84,13 +83,5 @@ public class DefaultedFacetAnnotationElseConfigurationFactory extends FacetFacto
this.configuration = configuration;
}
- private ServicesInjector getServicesInjector() {
- return servicesInjector;
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector dependencyInjector) {
- this.servicesInjector = dependencyInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
index e88efdd..d7163fa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/disabled/method/DisabledObjectFacetViaMethodFactory.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.object.disabled.method;
import java.lang.reflect.Method;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
@@ -32,8 +33,6 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.disabled.DisabledObjectFacet;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
@@ -48,12 +47,11 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
* class is being processed}, the {@link ObjectMember member}s for the
* {@link ObjectSpecification spec} are not known.
*/
-public class DisabledObjectFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements ServicesInjectorAware {
+public class DisabledObjectFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract {
private static final String DISABLED_PREFIX = "disabled";
private static final String[] PREFIXES = { DISABLED_PREFIX, };
- private ServicesInjector servicesInjector;
public DisabledObjectFacetViaMethodFactory() {
super(FeatureType.EVERYTHING_BUT_PARAMETERS, OrphanValidation.VALIDATE, PREFIXES);
@@ -92,9 +90,4 @@ public class DisabledObjectFacetViaMethodFactory extends MethodPrefixBasedFacetF
facet.copyOnto(member);
}
}
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 124f7c2..c328e02 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -98,7 +98,7 @@ import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapabl
public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
- implements IsisConfigurationAware, AdapterManagerAware, ServicesInjectorAware,
+ implements IsisConfigurationAware, AdapterManagerAware,
SpecificationLoaderAware, MetaModelValidatorRefiner, PersistenceSessionServiceAware,
PostConstructMethodCache {
@@ -112,7 +112,6 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
private IsisConfiguration configuration;
private AdapterManager adapterManager;
- private ServicesInjector servicesInjector;
private PersistenceSessionService persistenceSessionService;
public DomainObjectAnnotationFacetFactory() {
@@ -209,8 +208,7 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
Facet facet = autoCompleteValidator.flagIfPresent(
AutoCompleteFacetForAutoCompleteAnnotation.create(annotation, facetHolder,
getDeploymentCategory(), getSpecificationLoader(),
- servicesInjector, getAuthenticationSessionProvider(),
- adapterManager
+ servicesInjector, adapterManager
));
// else check from @DomainObject(auditing=...)
@@ -513,11 +511,6 @@ public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
}
@Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
-
- @Override
public void setPersistenceSessionService(final PersistenceSessionService persistenceSessionService) {
this.persistenceSessionService = persistenceSessionService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForAutoCompleteAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForAutoCompleteAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForAutoCompleteAnnotation.java
index 09b257f..9986651 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForAutoCompleteAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForAutoCompleteAnnotation.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.facets.object.domainobject.autocomplete;
import org.apache.isis.applib.annotation.AutoComplete;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -41,7 +40,6 @@ public class AutoCompleteFacetForAutoCompleteAnnotation extends AutoCompleteFace
final DeploymentCategory deploymentCategory,
final SpecificationLoader specificationLoader,
final ServicesInjector servicesInjector,
- final AuthenticationSessionProvider authenticationSessionProvider,
final AdapterManager adapterManager) {
if(annotation == null) {
@@ -52,7 +50,7 @@ public class AutoCompleteFacetForAutoCompleteAnnotation extends AutoCompleteFace
final String actionName = annotation.action();
return new AutoCompleteFacetForAutoCompleteAnnotation(holder, repositoryClass, actionName, deploymentCategory,
- specificationLoader, servicesInjector, authenticationSessionProvider, adapterManager
+ specificationLoader, servicesInjector, adapterManager
);
}
@@ -63,10 +61,9 @@ public class AutoCompleteFacetForAutoCompleteAnnotation extends AutoCompleteFace
final DeploymentCategory deploymentCategory,
final SpecificationLoader specificationLoader,
final ServicesInjector servicesInjector,
- final AuthenticationSessionProvider authenticationSessionProvider,
final AdapterManager adapterManager) {
super(holder, repositoryClass, actionName, deploymentCategory, specificationLoader, servicesInjector,
- authenticationSessionProvider, adapterManager
+ adapterManager
);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java
index 5913aa2..c148387 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/autocomplete/AutoCompleteFacetForDomainObjectAnnotation.java
@@ -66,7 +66,7 @@ public class AutoCompleteFacetForDomainObjectAnnotation extends AutoCompleteFace
final AuthenticationSessionProvider authenticationSessionProvider,
final AdapterManager adapterManager) {
super(holder, repositoryClass, actionName, deploymentCategory, specificationLoader, servicesInjector,
- authenticationSessionProvider, adapterManager
+ adapterManager
);
this.repositoryClass = repositoryClass;
this.actionName = actionName;
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
index 2c3b375..9e43ffc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFacetFactory.java
@@ -94,13 +94,8 @@ public class DomainObjectLayoutFacetFactory extends FacetFactoryAbstract impleme
}
- private ServicesInjector servicesInjector;
private IsisConfiguration configuration;
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
@Override
public void setConfiguration(final IsisConfiguration configuration) {
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java
index 4f9f70f..c361446 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/encodeable/annotcfg/EncodableFacetAnnotationElseConfigurationFactory.java
@@ -33,15 +33,12 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncoderDecoderUtil;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class EncodableFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, ServicesInjectorAware, AdapterManagerAware {
+public class EncodableFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AdapterManagerAware {
private IsisConfiguration configuration;
private AdapterManager adapterManager;
- private ServicesInjector servicesInjector;
public EncodableFacetAnnotationElseConfigurationFactory() {
super(FeatureType.OBJECTS_ONLY);
@@ -97,9 +94,5 @@ public class EncodableFacetAnnotationElseConfigurationFactory extends FacetFacto
this.adapterManager = adapterManager;
}
- @Override
- public void setServicesInjector(final ServicesInjector dependencyInjector) {
- this.servicesInjector = dependencyInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetFactory.java
index e91f2ce..b9f85fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/grid/GridFacetFactory.java
@@ -25,9 +25,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class GridFacetFactory extends FacetFactoryAbstract implements ServicesInjectorAware {
+public class GridFacetFactory extends FacetFactoryAbstract {
private static final Logger LOG = LoggerFactory.getLogger(GridFacetFactory.class);
@@ -44,11 +43,5 @@ public class GridFacetFactory extends FacetFactoryAbstract implements ServicesIn
FacetUtil.addFacet(GridFacetDefault.create(facetHolder, gridService));
}
- private ServicesInjector servicesInjector;
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForMixinAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForMixinAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForMixinAnnotationFactory.java
index 9f333d7..9abf95d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForMixinAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForMixinAnnotationFactory.java
@@ -26,9 +26,7 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class MixinFacetForMixinAnnotationFactory extends FacetFactoryAbstract implements ServicesInjectorAware {
-
- private ServicesInjector servicesInjector;
+public class MixinFacetForMixinAnnotationFactory extends FacetFactoryAbstract {
public MixinFacetForMixinAnnotationFactory() {
super(FeatureType.OBJECTS_ONLY);
@@ -50,8 +48,4 @@ public class MixinFacetForMixinAnnotationFactory extends FacetFactoryAbstract im
facetHolder.addFacet(mixinFacet);
}
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java
index b6075bc..59eb105 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java
@@ -21,12 +21,10 @@ package org.apache.isis.core.metamodel.facets.object.parseable;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.lang.ClassExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
@@ -39,17 +37,25 @@ public abstract class ParseableFacetAbstract extends FacetAbstract implements Pa
// to delegate to
private final ParseableFacetUsingParser parseableFacetUsingParser;
- public ParseableFacetAbstract(final String candidateParserName, final Class<?> candidateParserClass, final FacetHolder holder, DeploymentCategory deploymentCategory, final AuthenticationSessionProvider authenticationSessionProvider, final ServicesInjector dependencyInjector, final AdapterManager adapterManager) {
+ public ParseableFacetAbstract(
+ final String candidateParserName,
+ final Class<?> candidateParserClass,
+ final FacetHolder holder,
+ final ServicesInjector servicesInjector,
+ final AdapterManager adapterManager) {
super(ParseableFacet.class, holder, Derivation.NOT_DERIVED);
this.parserClass = ParserUtil.parserOrNull(candidateParserClass, candidateParserName);
this.parseableFacetUsingParser = isValid()?
- createParser(holder, deploymentCategory, authenticationSessionProvider, dependencyInjector, adapterManager):null;
+ createParser(holder, servicesInjector, adapterManager):null;
}
- private ParseableFacetUsingParser createParser(final FacetHolder holder, DeploymentCategory deploymentCategory, final AuthenticationSessionProvider authenticationSessionProvider, final ServicesInjector dependencyInjector, final AdapterManager adapterManager) {
+ private ParseableFacetUsingParser createParser(
+ final FacetHolder holder,
+ final ServicesInjector servicesInjector,
+ final AdapterManager adapterManager) {
final Parser<?> parser = (Parser<?>) ClassExtensions.newInstance(parserClass, FacetHolder.class, holder);
- return new ParseableFacetUsingParser(parser, holder, deploymentCategory, authenticationSessionProvider, dependencyInjector, adapterManager);
+ return new ParseableFacetUsingParser(parser, holder, servicesInjector, adapterManager);
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotation.java
index b1303ef..8257497 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotation.java
@@ -22,10 +22,8 @@ package org.apache.isis.core.metamodel.facets.object.parseable.annotcfg;
import com.google.common.base.Strings;
import org.apache.isis.applib.annotation.Parseable;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.parseable.ParserUtil;
@@ -47,12 +45,23 @@ public class ParseableFacetAnnotation extends ParseableFacetAbstract {
return annotation.parserClass();
}
- public ParseableFacetAnnotation(final Class<?> annotatedClass, final IsisConfiguration configuration, final FacetHolder holder, DeploymentCategory deploymentCategory, final AuthenticationSessionProvider authenticationSessionProvider, final AdapterManager adapterManager, final ServicesInjector dependencyInjector) {
- this(parserName(annotatedClass, configuration), parserClass(annotatedClass), holder, deploymentCategory, authenticationSessionProvider, adapterManager, dependencyInjector);
+ public ParseableFacetAnnotation(
+ final Class<?> annotatedClass,
+ final IsisConfiguration configuration,
+ final FacetHolder holder,
+ final AdapterManager adapterManager,
+ final ServicesInjector dependencyInjector) {
+ this(parserName(annotatedClass, configuration), parserClass(annotatedClass), holder,
+ adapterManager, dependencyInjector);
}
- private ParseableFacetAnnotation(final String candidateParserName, final Class<?> candidateParserClass, final FacetHolder holder, DeploymentCategory deploymentCategory, final AuthenticationSessionProvider authenticationSessionProvider, final AdapterManager adapterManager, final ServicesInjector dependencyInjector) {
- super(candidateParserName, candidateParserClass, holder, deploymentCategory, authenticationSessionProvider, dependencyInjector, adapterManager);
+ private ParseableFacetAnnotation(
+ final String candidateParserName,
+ final Class<?> candidateParserClass,
+ final FacetHolder holder,
+ final AdapterManager adapterManager,
+ final ServicesInjector dependencyInjector) {
+ super(candidateParserName, candidateParserClass, holder, dependencyInjector, adapterManager);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
index bbb416c..08b2335 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetAnnotationElseConfigurationFactory.java
@@ -22,8 +22,6 @@ package org.apache.isis.core.metamodel.facets.object.parseable.annotcfg;
import com.google.common.base.Strings;
import org.apache.isis.applib.annotation.Parseable;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
@@ -35,16 +33,12 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.parseable.ParserUtil;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterManagerAware, ServicesInjectorAware {
+public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AdapterManagerAware {
private IsisConfiguration configuration;
- private AuthenticationSessionProvider authenticationSessionProvider;
private AdapterManager adapterManager;
- private ServicesInjector servicesInjector;
public ParseableFacetAnnotationElseConfigurationFactory() {
super(FeatureType.OBJECTS_ONLY);
@@ -60,7 +54,8 @@ public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFacto
// create from annotation, if present
if (annotation != null) {
- final ParseableFacetAnnotation facet = new ParseableFacetAnnotation(cls, getIsisConfiguration(), holder, getDeploymentCategory(), authenticationSessionProvider, adapterManager, servicesInjector);
+ final ParseableFacetAnnotation facet = new ParseableFacetAnnotation(cls, getIsisConfiguration(), holder,
+ adapterManager, servicesInjector);
if (facet.isValid()) {
return facet;
}
@@ -69,7 +64,8 @@ public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFacto
// otherwise, try to create from configuration, if present
final String parserName = ParserUtil.parserNameFromConfiguration(cls, getIsisConfiguration());
if (!Strings.isNullOrEmpty(parserName)) {
- final ParseableFacetFromConfiguration facet = new ParseableFacetFromConfiguration(parserName, holder, getDeploymentCategory(), authenticationSessionProvider, servicesInjector, adapterManager);
+ final ParseableFacetFromConfiguration facet = new ParseableFacetFromConfiguration(parserName, holder,
+ servicesInjector, adapterManager);
if (facet.isValid()) {
return facet;
}
@@ -95,20 +91,12 @@ public class ParseableFacetAnnotationElseConfigurationFactory extends FacetFacto
this.configuration = configuration;
}
- @Override
- public void setAuthenticationSessionProvider(final AuthenticationSessionProvider authenticationSessionProvider) {
- this.authenticationSessionProvider = authenticationSessionProvider;
- }
@Override
public void setAdapterManager(final AdapterManager adapterManager) {
this.adapterManager = adapterManager;
}
- @Override
- public void setServicesInjector(final ServicesInjector dependencyInjector) {
- this.servicesInjector = dependencyInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetFromConfiguration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetFromConfiguration.java
index 5a29246..5947f308 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/annotcfg/ParseableFacetFromConfiguration.java
@@ -19,16 +19,18 @@
package org.apache.isis.core.metamodel.facets.object.parseable.annotcfg;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacetAbstract;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
public class ParseableFacetFromConfiguration extends ParseableFacetAbstract {
- public ParseableFacetFromConfiguration(final String candidateParserName, final FacetHolder holder, DeploymentCategory deploymentCategory, final AuthenticationSessionProvider authenticationSessionProvider, final ServicesInjector dependencyInjector, final AdapterManager adapterManager) {
- super(candidateParserName, null, holder, deploymentCategory, authenticationSessionProvider, dependencyInjector, adapterManager);
+ public ParseableFacetFromConfiguration(
+ final String candidateParserName,
+ final FacetHolder holder,
+ final ServicesInjector servicesInjector,
+ final AdapterManager adapterManager) {
+ super(candidateParserName, null, holder, servicesInjector, adapterManager);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
index ba1895c..9045b2f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
@@ -30,7 +30,6 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.consent.InteractionResultSet;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
@@ -46,19 +45,19 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class ParseableFacetUsingParser extends FacetAbstract implements ParseableFacet {
private final Parser<?> parser;
- private final DeploymentCategory deploymentCategory;
private final AuthenticationSessionProvider authenticationSessionProvider;
private final ServicesInjector dependencyInjector;
private final AdapterManager adapterManager;
public ParseableFacetUsingParser(
- final Parser<?> parser, final FacetHolder holder,
- final DeploymentCategory deploymentCategory, final AuthenticationSessionProvider authenticationSessionProvider, final ServicesInjector dependencyInjector, final AdapterManager adapterManager) {
+ final Parser<?> parser,
+ final FacetHolder holder,
+ final ServicesInjector servicesInjector,
+ final AdapterManager adapterManager) {
super(ParseableFacet.class, holder, Derivation.NOT_DERIVED);
this.parser = parser;
- this.deploymentCategory = deploymentCategory;
- this.authenticationSessionProvider = authenticationSessionProvider;
- this.dependencyInjector = dependencyInjector;
+ this.authenticationSessionProvider = servicesInjector.lookupService(AuthenticationSessionProvider.class);
+ this.dependencyInjector = servicesInjector;
this.adapterManager = adapterManager;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index 939e9bf..d8a98c1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -51,9 +51,8 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVis
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
public class RecreatableObjectFacetFactory extends FacetFactoryAbstract
- implements ServicesInjectorAware, AdapterManagerAware, MetaModelValidatorRefiner, PostConstructMethodCache {
+ implements AdapterManagerAware, MetaModelValidatorRefiner, PostConstructMethodCache {
- private ServicesInjector servicesInjector;
private AdapterManager adapterManager;
public RecreatableObjectFacetFactory() {
@@ -130,13 +129,6 @@ public class RecreatableObjectFacetFactory extends FacetFactoryAbstract
// //////////////////////////////////////
-
-
- @Override
- public void setServicesInjector(ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
-
@Override
public void setAdapterManager(AdapterManager adapterManager) {
this.adapterManager = adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
index df86510..668df64 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaMethodsFactory.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.fallback.FallbackFacetFactory;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class TitleFacetViaMethodsFactory extends MethodPrefixBasedFacetFactoryAbstract implements ServicesInjectorAware {
+public class TitleFacetViaMethodsFactory extends MethodPrefixBasedFacetFactoryAbstract {
private static final String TO_STRING = "toString";
private static final String TITLE = "title";
@@ -93,12 +93,4 @@ public class TitleFacetViaMethodsFactory extends MethodPrefixBasedFacetFactoryAb
}
}
- // //////////////////////////////////////
-
- private ServicesInjector servicesInjector;
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java
index a495d47..b23226b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.object.validating.mustsatisfyspec;
import java.util.ArrayList;
import java.util.List;
+
import org.apache.isis.applib.annotation.MustSatisfy;
import org.apache.isis.applib.spec.Specification;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -33,7 +34,6 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* @deprecated
*/
@Deprecated
-public class MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware, ServicesInjectorAware {
+public class MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(MustSatisfy.class);
@@ -101,10 +101,4 @@ public class MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory
}
- private ServicesInjector servicesInjector;
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
index 26f58c1..0cc54f8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/validateobject/method/ValidateObjectFacetMethodFactory.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstra
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class ValidateObjectFacetMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements ServicesInjectorAware {
+public class ValidateObjectFacetMethodFactory extends MethodPrefixBasedFacetFactoryAbstract {
private static final String VALIDATE_PREFIX = "validate";
@@ -62,9 +62,4 @@ public class ValidateObjectFacetMethodFactory extends MethodPrefixBasedFacetFact
}
}
- private ServicesInjector servicesInjector;
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAbstract.java
index bc41a4c..2a8262c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAbstract.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.facets.object.value;
import org.apache.isis.applib.adapters.*;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.ClassExtensions;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
@@ -125,7 +124,8 @@ public abstract class ValueFacetAbstract extends MultipleValueFacetAbstract impl
// Parser
final Parser<?> parser = semanticsProvider.getParser();
if (parser != null) {
- facetHolder.addFacet(new ParseableFacetUsingParser(parser, holder, getDeploymentCategory(context), getAuthenticationSessionProvider(), getDependencyInjector(), getAdapterMap()));
+ facetHolder.addFacet(new ParseableFacetUsingParser(parser, holder,
+ getDependencyInjector(), getAdapterMap()));
facetHolder.addFacet(new TitleFacetUsingParser(parser, holder, getDependencyInjector()));
facetHolder.addFacet(new TypicalLengthFacetUsingParser(parser, holder, getDependencyInjector()));
if(parser instanceof Parser2) {
@@ -185,11 +185,7 @@ public abstract class ValueFacetAbstract extends MultipleValueFacetAbstract impl
}
public ServicesInjector getDependencyInjector() {
- return context.getDependencyInjector();
- }
-
- public AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return context.getAuthenticationSessionProvider();
+ return context.getServicesInjector();
}
}
[03/10] isis git commit: ISIS-1404: AuthenticationSessionProvider is
now a domain service;
removed the AuthenticationSessionProviderAbstract and Aware interfaces.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
index eab7343..47fe575 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/annotcfg/ValueFacetAnnotationOrConfigurationFactory.java
@@ -24,8 +24,6 @@ import com.google.common.base.Strings;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
@@ -45,8 +43,6 @@ import org.apache.isis.core.metamodel.facets.object.value.EqualByContentFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderContext;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
/**
* Processes the {@link Value} annotation.
@@ -74,12 +70,10 @@ import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
* <p>
* Note that {@link ParentedCollectionFacet} is <i>not</i> installed.
*/
-public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterManagerAware, ServicesInjectorAware {
+public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbstract implements IsisConfigurationAware, AdapterManagerAware {
private IsisConfiguration configuration;
- private AuthenticationSessionProvider authenticationSessionProvider;
private AdapterManager adapterManager;
- private ServicesInjector servicesInjector;
public ValueFacetAnnotationOrConfigurationFactory() {
super(FeatureType.OBJECTS_ONLY);
@@ -118,7 +112,7 @@ public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbst
}
protected ValueSemanticsProviderContext createValueSemanticsProviderContext() {
- return new ValueSemanticsProviderContext(getDeploymentCategory(), getAuthenticationSessionProvider(), getSpecificationLoader(), getAdapterManager(), getServicesInjector());
+ return new ValueSemanticsProviderContext(getDeploymentCategory(), getSpecificationLoader(), getAdapterManager(), servicesInjector);
}
// ////////////////////////////////////////////////////////////////////
@@ -134,14 +128,6 @@ public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbst
this.configuration = configuration;
}
- public AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
-
- @Override
- public void setAuthenticationSessionProvider(final AuthenticationSessionProvider authenticationSessionProvider) {
- this.authenticationSessionProvider = authenticationSessionProvider;
- }
public AdapterManager getAdapterManager() {
return adapterManager;
@@ -152,13 +138,4 @@ public class ValueFacetAnnotationOrConfigurationFactory extends FacetFactoryAbst
this.adapterManager = adapterManager;
}
- public ServicesInjector getServicesInjector() {
- return servicesInjector;
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector dependencyInjector) {
- this.servicesInjector = dependencyInjector;
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
index e5cefc1..e7f360c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueFacetUsingSemanticsProviderFactory.java
@@ -19,8 +19,6 @@
package org.apache.isis.core.metamodel.facets.object.value.vsp;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationAware;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
@@ -28,15 +26,12 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFactoryAbstract implements IsisConfigurationAware, AuthenticationSessionProviderAware, AdapterManagerAware, ServicesInjectorAware {
+public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFactoryAbstract implements IsisConfigurationAware, AdapterManagerAware, ServicesInjectorAware {
private IsisConfiguration configuration;
- private AuthenticationSessionProvider authenticationSessionProvider;
private AdapterManager adapterManager;
- private ServicesInjector servicesInjector;
/**
* Lazily created.
@@ -63,7 +58,7 @@ public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFa
public ValueSemanticsProviderContext getContext() {
if (context == null) {
- context = new ValueSemanticsProviderContext(getDeploymentCategory(), authenticationSessionProvider, getSpecificationLoader(), adapterManager, servicesInjector);
+ context = new ValueSemanticsProviderContext(getDeploymentCategory(), getSpecificationLoader(), adapterManager, servicesInjector);
}
return context;
}
@@ -73,19 +68,11 @@ public abstract class ValueFacetUsingSemanticsProviderFactory<T> extends FacetFa
this.configuration = configuration;
}
- @Override
- public void setAuthenticationSessionProvider(final AuthenticationSessionProvider authenticationSessionProvider) {
- this.authenticationSessionProvider = authenticationSessionProvider;
- }
@Override
public void setAdapterManager(final AdapterManager adapterManager) {
this.adapterManager = adapterManager;
}
- @Override
- public void setServicesInjector(final ServicesInjector dependencyInjector) {
- this.servicesInjector = dependencyInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
index efa4577..05a5704 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
@@ -23,6 +23,7 @@ import java.text.DecimalFormat;
import java.text.Format;
import java.text.NumberFormat;
import java.util.Locale;
+
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
@@ -30,7 +31,6 @@ import org.apache.isis.applib.adapters.Parser2;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
@@ -349,15 +349,8 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
/**
* From {@link #getContext() context.}
*/
- protected ServicesInjector getDependencyInjector() {
- return context.getDependencyInjector();
- }
-
- /**
- * From {@link #getContext() context.}
- */
- protected AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return context.getAuthenticationSessionProvider();
+ protected ServicesInjector getServicesInjector() {
+ return context.getServicesInjector();
}
// //////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderContext.java
index 22bd976..b8c9e99 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderContext.java
@@ -25,28 +25,25 @@ import org.apache.isis.core.metamodel.spec.SpecificationLoader;
public class ValueSemanticsProviderContext {
private final DeploymentCategory deploymentCategory;
- private final AuthenticationSessionProvider authenticationSessionProvider;
private final SpecificationLoader specificationLookup;
private final AdapterManager adapterManager;
- private final ServicesInjector dependencyInjector;
+ private final ServicesInjector servicesInjector;
public ValueSemanticsProviderContext(
- final DeploymentCategory deploymentCategory, final AuthenticationSessionProvider authenticationSessionProvider, final SpecificationLoader specificationLookup, final AdapterManager adapterManager, final ServicesInjector dependencyInjector) {
+ final DeploymentCategory deploymentCategory,
+ final SpecificationLoader specificationLookup,
+ final AdapterManager adapterManager,
+ final ServicesInjector servicesInjector) {
this.deploymentCategory = deploymentCategory;
- this.authenticationSessionProvider = authenticationSessionProvider;
this.specificationLookup = specificationLookup;
this.adapterManager = adapterManager;
- this.dependencyInjector = dependencyInjector;
+ this.servicesInjector = servicesInjector;
}
public DeploymentCategory getDeploymentCategory() {
return deploymentCategory;
}
- public AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
-
public SpecificationLoader getSpecificationLoader() {
return specificationLookup;
}
@@ -55,7 +52,7 @@ public class ValueSemanticsProviderContext {
return adapterManager;
}
- public ServicesInjector getDependencyInjector() {
- return dependencyInjector;
+ public ServicesInjector getServicesInjector() {
+ return servicesInjector;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
index f416911..bb917ec 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
@@ -213,11 +213,4 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
optionalValidator.setConfiguration(configuration);
}
-
- private ServicesInjector servicesInjector;
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index dcfd486..442b23b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -87,12 +87,11 @@ import org.apache.isis.core.metamodel.facets.properties.publish.PublishedPropert
import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacet;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
import org.apache.isis.core.metamodel.util.EventUtil;
-public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract implements ServicesInjectorAware, MetaModelValidatorRefiner, IsisConfigurationAware {
+public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, IsisConfigurationAware {
private final MetaModelValidatorForDeprecatedAnnotation postsPropertyChangedEventValidator = new MetaModelValidatorForDeprecatedAnnotation(PostsPropertyChangedEvent.class);
private final MetaModelValidatorForDeprecatedAnnotation propertyInteractionValidator = new MetaModelValidatorForDeprecatedAnnotation(PropertyInteraction.class);
@@ -105,7 +104,6 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
private final MetaModelValidatorForDeprecatedAnnotation mustSatisfyValidator = new MetaModelValidatorForDeprecatedAnnotation(MustSatisfy.class);
private final MetaModelValidatorForDeprecatedAnnotation notPersistedValidator = new MetaModelValidatorForDeprecatedAnnotation(NotPersisted.class);
- private ServicesInjector servicesInjector;
private IsisConfiguration configuration;
public PropertyAnnotationFacetFactory() {
@@ -469,9 +467,4 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
notPersistedValidator.setConfiguration(configuration);
}
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/PropertyModifyFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
index 907e1b9..9c87d00 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/update/PropertyModifyFacetFactory.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.properties.update;
import java.lang.reflect.Method;
+
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -29,13 +30,10 @@ import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstra
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacetViaModifyMethod;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class PropertyModifyFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements ServicesInjectorAware {
+public class PropertyModifyFacetFactory extends MethodPrefixBasedFacetFactoryAbstract {
private static final String[] PREFIXES = { MethodPrefixConstants.MODIFY_PREFIX };
- private ServicesInjector servicesInjector;
public PropertyModifyFacetFactory() {
super(FeatureType.PROPERTIES_ONLY, OrphanValidation.VALIDATE, PREFIXES);
@@ -67,8 +65,4 @@ public class PropertyModifyFacetFactory extends MethodPrefixBasedFacetFactoryAbs
FacetUtil.addFacet(new PropertySetterFacetViaModifyMethod(modifyMethod, property));
}
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
index dda8815..0b48b80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/validating/method/PropertyValidateFacetViaMethodFactory.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.properties.validating.method;
import java.lang.reflect.Method;
+
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.lang.StringExtensions;
@@ -30,10 +31,8 @@ import org.apache.isis.core.metamodel.facets.MethodFinderUtils;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.MethodPrefixConstants;
import org.apache.isis.core.metamodel.methodutils.MethodScope;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
-public class PropertyValidateFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract implements ServicesInjectorAware {
+public class PropertyValidateFacetViaMethodFactory extends MethodPrefixBasedFacetFactoryAbstract {
private static final String[] PREFIXES = { MethodPrefixConstants.VALIDATE_PREFIX };
@@ -76,11 +75,4 @@ public class PropertyValidateFacetViaMethodFactory extends MethodPrefixBasedFace
}
- private ServicesInjector servicesInjector;
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
-
- this.servicesInjector = servicesInjector;
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 3b0d604..868d81e 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
@@ -19,8 +19,6 @@
package org.apache.isis.core.metamodel.runtimecontext;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -50,16 +48,6 @@ public interface RuntimeContext extends ApplicationScopedComponent {
// session-scoped
// //////////////////////////////////////
- /**
- * A mechanism for returning the <tt>current</tt>
- * {@link AuthenticationSession}.
- *
- * <p>
- * Note that the scope of {@link RuntimeContext} is global, whereas
- * {@link AuthenticationSession} may change over time.
- */
- public AuthenticationSessionProvider getAuthenticationSessionProvider();
-
public LocalizationProvider getLocalizationProvider();
public MessageBrokerService getMessageBrokerService();
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 e647090..f9f1a6b 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
@@ -82,7 +82,6 @@ public abstract class RuntimeContextAbstract implements RuntimeContext {
}
protected void injectSubcomponentsInto(final Object candidate) {
- getAuthenticationSessionProvider().injectInto(candidate);
getDeploymentCategoryProvider().injectInto(candidate);
getTransactionStateProvider().injectInto(candidate);
getServicesInjector().injectInto(candidate);
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 46dbb78..043e83e 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
@@ -51,7 +51,6 @@ import org.apache.isis.core.metamodel.transactions.TransactionStateProviderAbstr
public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
- private final AuthenticationSessionProviderAbstract authenticationSessionProvider;
private final PersistenceSessionServiceAbstract persistenceSessionService;
private final LocalizationProviderAbstract localizationProvider;
private final MessageBrokerServiceAbstract messageBrokerService;
@@ -68,12 +67,6 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
super(deploymentCategory, isisConfiguration, servicesInjector, specificationLoader);
- authenticationSessionProvider = new AuthenticationSessionProviderAbstract() {
- @Override
- public AuthenticationSession getAuthenticationSession() {
- throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
- }
- };
persistenceSessionService = new PersistenceSessionServiceAbstract() {
@Override
@@ -235,11 +228,6 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
@Override
- public AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
-
- @Override
public PersistenceSessionService getPersistenceSessionService() {
return persistenceSessionService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index 0bfcab2..6868e22 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -44,14 +44,12 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -73,7 +71,7 @@ import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
public class DomainObjectContainerDefault
implements DomainObjectContainer,
PersistenceSessionServiceAware, SpecificationLoaderAware,
- AuthenticationSessionProviderAware, AdapterManagerAware, ExceptionRecognizer {
+ AdapterManagerAware, ExceptionRecognizer {
//region > titleOf
@@ -655,7 +653,6 @@ public class DomainObjectContainerDefault
private PersistenceSessionService persistenceSessionService;
private SpecificationLoader specificationLoader;
- private AuthenticationSessionProvider authenticationSessionProvider;
private AdapterManager adapterManager;
@@ -669,15 +666,6 @@ public class DomainObjectContainerDefault
this.specificationLoader = specificationLoader;
}
- protected AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
-
- @Programmatic
- @Override
- public void setAuthenticationSessionProvider(final AuthenticationSessionProvider authenticationSessionProvider) {
- this.authenticationSessionProvider = authenticationSessionProvider;
- }
protected AdapterManager getAdapterManager() {
return adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
index 5561dcf..5174814 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
@@ -23,6 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
+import javax.inject.Inject;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
@@ -32,17 +34,17 @@ import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
@DomainService(
nature = NatureOfService.DOMAIN
)
-public class UserServiceDefault implements UserService, AuthenticationSessionProviderAware {
+public class UserServiceDefault implements UserService {
@Programmatic
@Override
public UserMemento getUser() {
- final AuthenticationSession session = getAuthenticationSessionProvider().getAuthenticationSession();
+ final AuthenticationSession session =
+ authenticationSessionProvider.getAuthenticationSession();
final UserAndRoleOverrides userAndRoleOverrides = currentOverridesIfAny();
@@ -123,18 +125,7 @@ public class UserServiceDefault implements UserService, AuthenticationSessionPro
}
-
- private AuthenticationSessionProvider authenticationSessionProvider;
-
-
- protected AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
-
- @Programmatic
- @Override
- public void setAuthenticationSessionProvider(final AuthenticationSessionProvider authenticationSessionProvider) {
- this.authenticationSessionProvider = authenticationSessionProvider;
- }
+ @Inject
+ AuthenticationSessionProvider authenticationSessionProvider;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 7aefdc6..cf62b71 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
@@ -121,7 +121,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -146,7 +152,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -172,7 +184,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -198,7 +216,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -221,7 +245,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -245,7 +275,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -276,7 +312,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionValidationFacetViaMethodFactory facetFactory = new ActionValidationFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setServicesInjector(mockServicesInjector);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -308,7 +350,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -339,7 +387,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -364,7 +418,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionChoicesFacetViaMethodFactory facetFactory = new ActionChoicesFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
class Customer {
@SuppressWarnings("unused")
@@ -395,7 +455,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionChoicesFacetViaMethodFactory facetFactory = new ActionChoicesFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -460,7 +526,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
@@ -499,7 +571,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setSpecificationLoader(programmableReflector);
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
@@ -534,7 +612,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
@@ -571,7 +655,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
@@ -611,7 +701,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionParameterDefaultsFacetViaMethodFactory facetFactory = new ActionParameterDefaultsFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -660,7 +756,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionParameterChoicesFacetViaMethodFactory facetFactory = new ActionParameterChoicesFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -724,7 +826,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionParameterAutoCompleteFacetViaMethodFactory facetFactory = new ActionParameterAutoCompleteFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -763,7 +871,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionParameterChoicesFacetViaMethodFactory facetFactoryForParams = new ActionParameterChoicesFacetViaMethodFactory();
facetFactoryForParams.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -804,7 +918,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
final ActionParameterDefaultsFacetViaMethodFactory facetFactoryForParams = new ActionParameterDefaultsFacetViaMethodFactory();
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 deee711..ba35651 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
@@ -67,7 +67,13 @@ public class PrototypeFacetAnnotationFactoryTest extends AbstractFacetFactoryTes
facetFactory = new ActionAnnotationFacetFactory();
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 88bd39c..d6240eb 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
@@ -58,15 +58,17 @@ public class ExplorationFacetAnnotationFactoryTest extends AbstractFacetFactoryT
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
- allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
will(returnValue(mockAuthenticationSession));
}});
facetFactory = new ExplorationFacetAnnotationFactory();
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 c637b8a..74803af 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
@@ -112,7 +112,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -137,7 +143,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -162,7 +174,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -187,7 +205,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
class Customer {
@SuppressWarnings("unused")
@@ -212,7 +236,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -240,7 +270,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -266,7 +302,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -288,7 +330,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -314,7 +362,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -347,7 +401,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -377,7 +437,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -410,7 +476,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -440,7 +512,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionClearFacetFactory facetFactory = new CollectionClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings({ "hiding", "unused" })
class Order {
@@ -473,7 +551,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionClearFacetFactory facetFactory = new CollectionClearFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings({ "hiding", "unused" })
class Order {
@@ -500,7 +584,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -539,7 +629,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setServicesInjector(mockServicesInjector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -577,7 +673,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
@SuppressWarnings("hiding")
class Order {
@@ -607,7 +709,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final CollectionAccessorFacetViaAccessorFactory facetFactoryForAccessor = new CollectionAccessorFacetViaAccessorFactory();
facetFactoryForAccessor.setSpecificationLoader(programmableReflector);
facetFactoryForAccessor.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactoryForAccessor.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactoryForAccessor.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactoryForHelpers = new CollectionAddToRemoveFromAndValidateFacetFactory();
@@ -707,7 +815,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method nameMethod = findMethod(CustomerStatic.class, "nameOrders");
@@ -727,7 +841,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionOrders");
@@ -747,7 +867,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOrders");
@@ -765,7 +891,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOtherOrders");
@@ -781,7 +913,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method protectMethod = findMethod(CustomerStatic.class, "protectOrders");
@@ -801,7 +939,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
final Method protectMethod = findMethod(CustomerStatic.class, "protectOtherOrders");
@@ -817,7 +961,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method hideMethod = findMethod(CustomerStatic.class, "hideOrders", new Class[] { UserMemento.class });
@@ -837,7 +987,13 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
final DisableForSessionFacetViaMethodFactory facetFactory = new DisableForSessionFacetViaMethodFactory();
facetFactory.setSpecificationLoader(programmableReflector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method disableMethod = findMethod(CustomerStatic.class, "disableOrders", new Class[] { UserMemento.class });
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 91d9875..4039981 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
@@ -62,7 +62,13 @@ public class ChoicesFacetFromBoundedMarkerInterfaceFactoryTest extends AbstractF
facetFactory = new ChoicesFacetFromBoundedMarkerInterfaceFactory();
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 5fb7741..32a5117 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
@@ -61,7 +61,13 @@ public class ChoicesFacetFromBoundedAnnotationFactoryTest extends AbstractFacetF
facetFactory = new DomainObjectAnnotationFacetFactory();
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 700e856..fcce199 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,6 +32,7 @@ import org.junit.Test;
import org.apache.isis.applib.annotation.Title;
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.facetapi.Facet;
@@ -69,11 +70,14 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
facetFactory = new TitleAnnotationFacetFactory();
facetFactory.setAdapterManager(mockAdapterManager);
facetFactory.setSpecificationLoader(mockSpecificationLoaderSpi);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
context.checking(new Expectations() {
{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
allowing(mockLocalizationProvider).getLocalization();
will(returnValue(new LocalizationDefault()));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 0fb60dd..03b27df 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
@@ -65,7 +65,13 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
isisConfigurationDefault = new IsisConfigurationDefault();
facetFactory.setConfiguration(isisConfigurationDefault);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
index 7cb3425..b7b19ba 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
@@ -33,7 +33,6 @@ import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
@@ -107,7 +106,8 @@ public class ParseableFacetUsingParserTest {
return null;
}
};
- parseableFacetUsingParser = new ParseableFacetUsingParser(parser, mockFacetHolder, DeploymentCategory.PRODUCTION, mockAuthenticationSessionProvider, mockDependencyInjector, mockAdapterManager);
+ parseableFacetUsingParser = new ParseableFacetUsingParser(parser, mockFacetHolder,
+ mockDependencyInjector, mockAdapterManager);
}
@Ignore
http://git-wip-us.apache.org/repos/asf/isis/blob/70bbd7aa/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 3292cd5..4a83554 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -77,7 +77,13 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
isisConfigurationDefault = new IsisConfigurationDefault();
facetFactory.setConfiguration(isisConfigurationDefault);
- facetFactory.setAuthenticationSessionProvider(mockAuthenticationSessionProvider);
+ facetFactory.setServicesInjector(mockServicesInjector);
+ context.checking(new Expectations(){{
+ allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ }});
+
facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
}
[06/10] isis git commit: ISIS-1405: DeploymentCategoryProvider now
implemented by a domain service,
so can be looked up from ServicesInjector. Removed
DeploymentCategoryProviderAware.
Posted by da...@apache.org.
ISIS-1405: DeploymentCategoryProvider now implemented by a domain service, so can be looked up from ServicesInjector. Removed DeploymentCategoryProviderAware.
Also removed duplication in setup of various facet factory unit tests per injection, expectations etc.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0c794397
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0c794397
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0c794397
Branch: refs/heads/ISIS-1406
Commit: 0c7943971380a06f36c45f31651944cda599c250
Parents: 70bbd7a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed May 18 06:28:49 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed May 18 06:28:49 2016 +0100
----------------------------------------------------------------------
.../deployment/DeploymentCategoryAware.java | 29 --
.../deployment/DeploymentCategoryProvider.java | 5 +-
.../DeploymentCategoryProviderAbstract.java | 28 --
.../metamodel/facets/FacetFactoryAbstract.java | 13 +-
.../runtimecontext/RuntimeContext.java | 3 -
.../runtimecontext/RuntimeContextAbstract.java | 19 --
.../noruntime/RuntimeContextNoRuntime.java | 5 +-
.../services/grid/GridLoaderServiceDefault.java | 18 +-
.../grid/GridSystemServiceAbstract.java | 21 +-
.../facets/AbstractFacetFactoryTest.java | 3 +
.../actions/ActionMethodsFacetFactoryTest.java | 191 +++----------
.../ActionAnnotationFacetFactoryTest.java | 13 +-
...tationFacetFactoryTest_actionInvocation.java | 29 +-
.../PrototypeFacetAnnotationFactoryTest.java | 11 +-
.../ExplorationFacetAnnotationFactoryTest.java | 4 +-
.../CollectionFieldMethodsFacetFactoryTest.java | 251 +++--------------
...etFromBoundedMarkerInterfaceFactoryTest.java | 5 +-
...esFacetFromBoundedAnnotationFactoryTest.java | 5 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 9 +-
.../TitleAnnotationFacetFactoryTest.java | 5 +-
...tAnnotationElseConfigurationFactoryTest.java | 5 +-
...cetAnnotationOrConfigurationFactoryTest.java | 6 +-
.../ParameterAnnotationFacetFactoryTest.java | 10 +-
.../PropertyMethodsFacetFactoryTest.java | 271 ++++---------------
.../PropertyAnnotationFacetFactoryTest.java | 10 +-
.../internal/RuntimeContextFromSession.java | 4 +-
.../DeploymentCategoryProviderDefault.java | 34 +++
.../core/runtime/system/DeploymentType.java | 4 +-
.../wicket/viewer/IsisWicketApplication.java | 13 +-
.../FormComponentPanelAbstract.java | 16 +-
.../viewer/wicket/ui/panels/FormAbstract.java | 17 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 16 +-
32 files changed, 284 insertions(+), 789 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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
deleted file mode 100644
index 6eb4f5b..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryAware.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 DeploymentCategoryAware {
-
- @Programmatic
- public void setDeploymentCategory(DeploymentCategory deploymentCategory);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProvider.java
index 8949bd0..d47a825 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProvider.java
@@ -19,9 +19,10 @@
package org.apache.isis.core.metamodel.deployment;
+/**
+ * Implemented by an internal domain service.
+ */
public interface DeploymentCategoryProvider {
- void injectInto(final Object candidate);
-
DeploymentCategory getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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
deleted file mode 100644
index 1ca1904..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/deployment/DeploymentCategoryProviderAbstract.java
+++ /dev/null
@@ -1,28 +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;
-
-public abstract class DeploymentCategoryProviderAbstract implements DeploymentCategoryProvider {
-
- 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/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 95dddea..f9811bd 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
@@ -25,19 +25,17 @@ import com.google.common.collect.ImmutableList;
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.facetapi.FeatureType;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
-public abstract class FacetFactoryAbstract implements FacetFactory, SpecificationLoaderAware, DeploymentCategoryAware, ServicesInjectorAware {
+public abstract class FacetFactoryAbstract implements FacetFactory, SpecificationLoaderAware, ServicesInjectorAware {
private final List<FeatureType> featureTypes;
- private DeploymentCategory deploymentCategory;
-
public FacetFactoryAbstract(final List<FeatureType> featureTypes) {
this.featureTypes = ImmutableList.copyOf(featureTypes);
}
@@ -84,13 +82,8 @@ public abstract class FacetFactoryAbstract implements FacetFactory, Specificatio
- @Override
- public void setDeploymentCategory(final DeploymentCategory deploymentCategory) {
- this.deploymentCategory = deploymentCategory;
- }
-
protected DeploymentCategory getDeploymentCategory() {
- return deploymentCategory;
+ return servicesInjector.lookupService(DeploymentCategoryProvider.class).getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 868d81e..9f20fc9 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
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.runtimecontext;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.transactions.TransactionStateProvider;
@@ -36,8 +35,6 @@ public interface RuntimeContext extends ApplicationScopedComponent {
// application-scoped
// //////////////////////////////////////
- public DeploymentCategoryProvider getDeploymentCategoryProvider();
-
public ConfigurationService getConfigurationService();
public ServicesInjector getServicesInjector();
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 f9f1a6b..babd24e 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
@@ -20,24 +20,18 @@
package org.apache.isis.core.metamodel.runtimecontext;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProviderAbstract;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
public abstract class RuntimeContextAbstract implements RuntimeContext {
- private final DeploymentCategory deploymentCategory;
private final IsisConfigurationDefault configuration;
private final ServicesInjector servicesInjector;
private final SpecificationLoaderSpi specificationLoader;
public RuntimeContextAbstract(
- final DeploymentCategory deploymentCategory,
final IsisConfigurationDefault configuration,
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- this.deploymentCategory = deploymentCategory;
this.configuration = configuration;
this.servicesInjector = servicesInjector;
this.specificationLoader = specificationLoader;
@@ -45,18 +39,6 @@ public abstract class RuntimeContextAbstract implements RuntimeContext {
@Override
- public DeploymentCategoryProvider getDeploymentCategoryProvider() {
- return new DeploymentCategoryProviderAbstract() {
-
- @Override
- public DeploymentCategory getDeploymentCategory() {
- return deploymentCategory;
- }
- };
- }
-
-
- @Override
public ConfigurationService getConfigurationService() {
return configuration;
}
@@ -82,7 +64,6 @@ public abstract class RuntimeContextAbstract implements RuntimeContext {
}
protected void injectSubcomponentsInto(final Object candidate) {
- getDeploymentCategoryProvider().injectInto(candidate);
getTransactionStateProvider().injectInto(candidate);
getServicesInjector().injectInto(candidate);
getConfigurationService().injectInto(candidate);
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 043e83e..165266f 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
@@ -25,9 +25,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.AuthenticationSession;
-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.AdapterManagerAware;
@@ -66,7 +63,7 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
final IsisConfigurationDefault isisConfiguration,
final ServicesInjector servicesInjector,
final SpecificationLoaderSpi specificationLoader) {
- super(deploymentCategory, isisConfiguration, servicesInjector, specificationLoader);
+ super(isisConfiguration, servicesInjector, specificationLoader);
persistenceSessionService = new PersistenceSessionServiceAbstract() {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index 76a74b4..e24b021 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -40,16 +40,15 @@ 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.applib.layout.component.Grid;
-import org.apache.isis.applib.services.grid.GridSystemService;
import org.apache.isis.applib.services.grid.GridLoaderService;
+import org.apache.isis.applib.services.grid.GridSystemService;
import org.apache.isis.applib.services.jaxb.JaxbService;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
@DomainService(
nature = NatureOfService.DOMAIN
)
-public class GridLoaderServiceDefault implements GridLoaderService, DeploymentCategoryAware {
+public class GridLoaderServiceDefault implements GridLoaderService {
private static final Logger LOG = LoggerFactory.getLogger(GridLoaderServiceDefault.class);
@@ -78,7 +77,7 @@ public class GridLoaderServiceDefault implements GridLoaderService, DeploymentCa
@Override
public boolean supportsReloading() {
- return !deploymentCategory.isProduction();
+ return !deploymentCategoryProvider.getDeploymentCategory().isProduction();
}
@Override
@@ -187,13 +186,8 @@ public class GridLoaderServiceDefault implements GridLoaderService, DeploymentCa
//region > injected dependencies
-
- private DeploymentCategory deploymentCategory;
-
- @Override
- public void setDeploymentCategory(final DeploymentCategory deploymentCategory) {
- this.deploymentCategory = deploymentCategory;
- }
+ @Inject
+ DeploymentCategoryProvider deploymentCategoryProvider;
@Inject
DomainObjectContainer container;
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
index 54ea7a2..0c32add 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -53,8 +53,8 @@ import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.applib.services.grid.GridSystemService;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.jaxb.JaxbService;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryAware;
+import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -114,7 +114,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
public abstract class GridSystemServiceAbstract<G extends Grid>
- implements GridSystemService<G>, SpecificationLoaderAware, DeploymentCategoryAware {
+ implements GridSystemService<G>, SpecificationLoaderAware {
private static final Logger LOG = LoggerFactory.getLogger(GridSystemServiceAbstract.class);
@@ -173,8 +173,8 @@ public abstract class GridSystemServiceAbstract<G extends Grid>
}
} else {
- if(!deploymentCategory.isProduction()) {
- container.warnUser("Grid metadata errors for " + grid.getDomainClass().getName() + "; check the error log");
+ if(!deploymentCategoryProvider.getDeploymentCategory().isProduction()) {
+ messageService.warnUser("Grid metadata errors for " + grid.getDomainClass().getName() + "; check the error log");
}
LOG.error("Grid metadata errors:\n\n" + jaxbService.toXml(grid) + "\n\n");
}
@@ -695,14 +695,11 @@ public abstract class GridSystemServiceAbstract<G extends Grid>
@Inject
protected DomainObjectContainer container;
+ @Inject
+ protected MessageService messageService;
- protected DeploymentCategory deploymentCategory;
-
- @Programmatic
- @Override
- public void setDeploymentCategory(final DeploymentCategory deploymentCategory) {
- this.deploymentCategory = deploymentCategory;
- }
+ @Inject
+ DeploymentCategoryProvider deploymentCategoryProvider;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index d8ce122..bc92caf 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -27,6 +27,7 @@ import org.junit.Rule;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.i18n.TranslationService;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -59,6 +60,7 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
protected ServicesInjector mockServicesInjector;
protected TranslationService mockTranslationService;
protected DeploymentCategoryProvider mockDeploymentCategoryProvider;
+ protected AuthenticationSessionProvider mockAuthenticationSessionProvider;
protected ProgrammableReflector programmableReflector;
protected ProgrammableMethodRemover methodRemover;
@@ -91,6 +93,7 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
methodRemover = new ProgrammableMethodRemover();
mockDeploymentCategoryProvider = context.mock(DeploymentCategoryProvider.class);
+ mockAuthenticationSessionProvider = context.mock(AuthenticationSessionProvider.class);
mockServicesInjector = context.mock(ServicesInjector.class);
mockTranslationService = context.mock(TranslationService.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 cf62b71..94a4b9b 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
@@ -24,7 +24,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
+
import org.jmock.Expectations;
+
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.security.UserMemento;
@@ -36,6 +38,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.FacetedMethod;
import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
@@ -93,6 +96,22 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
private AuthenticationSessionProvider mockAuthenticationSessionProvider;
private TranslationService mockTranslationService;
+ 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));
+
+ allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
+ will(returnValue(DeploymentCategory.PRODUCTION));
+ }});
+ }
+
public void setUp() throws Exception {
super.setUp();
mockServicesInjector = context.mock(ServicesInjector.class);
@@ -119,15 +138,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testProvidesDefaultNameForActionButIgnoresAnyNamedAnnotation() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -150,14 +162,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPicksUpDebugPrefixAndSetsNameAppropriatelyAlso() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -182,14 +188,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPicksUpExplorationPrefixAndSetsNameAppropriatelyAlso() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -214,14 +214,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testCannotHaveBothDebugAndThenExplorationPrefix() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -243,14 +237,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testCannotHaveBothExplorationAndThenDebugPrefix() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -272,15 +260,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsValidateMethodNoArgsFacetAndRemovesMethod() {
final ActionValidationFacetViaMethodFactory facetFactory = new ActionValidationFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -310,16 +291,9 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsValidateMethodSomeArgsFacetAndRemovesMethod() {
final ActionValidationFacetViaMethodFactory facetFactory = new ActionValidationFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
- facetFactory.setServicesInjector(mockServicesInjector);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
@@ -348,14 +322,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterDefaultsMethodNoArgsFacetAndRemovesMethod() {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -385,14 +353,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterDefaultsMethodSomeArgsIsIgnored() {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -416,15 +378,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterChoicesMethodNoArgsFacetAndRemovesMethod() {
final ActionChoicesFacetViaMethodFactory facetFactory = new ActionChoicesFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@SuppressWarnings("unused")
@@ -453,14 +408,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterChoicesMethodSomeArgsIsIgnored() {
final ActionChoicesFacetViaMethodFactory facetFactory = new ActionChoicesFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -524,14 +473,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -570,15 +513,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
-
- facetFactory.setSpecificationLoader(programmableReflector);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideSomeAction", new Class[] {});
@@ -610,14 +546,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -653,14 +583,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -699,14 +623,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterDefaultsMethodAndRemovesMethod() {
final ActionParameterDefaultsFacetViaMethodFactory facetFactory = new ActionParameterDefaultsFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -754,14 +672,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterChoicesMethodAndRemovesMethod() {
final ActionParameterChoicesFacetViaMethodFactory facetFactory = new ActionParameterChoicesFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -824,14 +736,8 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsParameterAutoCompleteMethodAndRemovesMethod() {
final ActionParameterAutoCompleteFacetViaMethodFactory facetFactory = new ActionParameterAutoCompleteFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -865,18 +771,13 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testBothChoicesMethodCausesException() {
final ActionChoicesFacetViaMethodFactory facetFactory = new ActionChoicesFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
final ActionParameterChoicesFacetViaMethodFactory facetFactoryForParams = new ActionParameterChoicesFacetViaMethodFactory();
- facetFactoryForParams.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForParams);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
@@ -916,19 +817,15 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testBothDefaultMethodCausesException() {
final ActionDefaultsFacetViaMethodFactory facetFactory = new ActionDefaultsFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
final ActionParameterDefaultsFacetViaMethodFactory facetFactoryForParams = new ActionParameterDefaultsFacetViaMethodFactory();
- facetFactoryForParams.setSpecificationLoader(programmableReflector);
+
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForParams);
+
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
class Customer {
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 2ad3875..a01e817 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,7 +52,9 @@ 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.commons.authentication.AuthenticationSessionProvider;
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.FacetFactory.ProcessMethodContext;
@@ -129,8 +131,17 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
facetFactory.setConfiguration(mockConfiguration);
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(mockDeploymentCategoryProvider).getDeploymentCategory();
+ will(returnValue(DeploymentCategory.PRODUCTION));
+ }});
actionMethod = findMethod(Customer.class, "someAction");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 df24c41..03dcaf6 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
@@ -21,10 +21,15 @@ package org.apache.isis.core.metamodel.facets.actions.action;
import java.lang.reflect.Method;
+import org.jmock.Expectations;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
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.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventAbstract;
@@ -46,11 +51,26 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
public void setUp() throws Exception {
super.setUp();
- facetFactory = new ActionAnnotationFacetFactory();
+ this.facetFactory = new ActionAnnotationFacetFactory();;
+
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
+ }
+
+ private void injectServicesIntoAndAllowingServiceInjectorLookups(final FacetFactoryAbstract facetFactory) {
facetFactory.setSpecificationLoader(programmableReflector);
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(mockDeploymentCategoryProvider).getDeploymentCategory();
+ will(returnValue(DeploymentCategory.PRODUCTION));
+ }});
}
public void testActionInvocationFacetIsInstalledAndMethodRemoved() {
@@ -155,13 +175,14 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
final ActionParameterChoicesFacetViaMethodFactory facetFactoryForChoices = new ActionParameterChoicesFacetViaMethodFactory();
facetFactoryForChoices.setSpecificationLoader(programmableReflector);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
- facetFactoryForChoices.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForChoices);
final DisableForContextFacetViaMethodFactory facetFactoryForDisable = new DisableForContextFacetViaMethodFactory();
facetFactoryForDisable.setSpecificationLoader(programmableReflector);
programmableReflector.setLoadSpecificationStringReturn(voidSpec);
facetFactoryForDisable.setServicesInjector(mockServicesInjector);
- facetFactoryForDisable.setDeploymentCategory(DeploymentCategory.PRODUCTION);
+
class Customer {
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 ba35651..78bb38d 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
@@ -56,17 +56,18 @@ public class PrototypeFacetAnnotationFactoryTest extends AbstractFacetFactoryTes
final AuthenticationSession mockAuthenticationSession = context.mock(AuthenticationSession.class);
context.checking(new Expectations() {{
- allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
- will(returnValue(DeploymentCategory.PRODUCTION));
-
allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
-
will(returnValue(mockAuthenticationSession));
+
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
+
+ allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
+ will(returnValue(DeploymentCategory.PRODUCTION));
}});
facetFactory = new ActionAnnotationFacetFactory();
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setServicesInjector(mockServicesInjector);
context.checking(new Expectations(){{
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 d6240eb..ab7ea7e 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
@@ -61,13 +61,15 @@ public class ExplorationFacetAnnotationFactoryTest extends AbstractFacetFactoryT
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
+
allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
will(returnValue(mockAuthenticationSession));
}});
facetFactory = new ExplorationFacetAnnotationFactory();
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setServicesInjector(mockServicesInjector);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 74803af..3f80dcc 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
@@ -34,6 +34,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.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
@@ -85,6 +86,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void setUp() throws Exception {
super.setUp();
+
mockServicesInjector = context.mock(ServicesInjector.class);
mockTranslationService = context.mock(TranslationService.class);
@@ -108,17 +110,26 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
}
- public void testPropertyAccessorFacetIsInstalledForJavaUtilCollectionAndMethodRemoved() {
- final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
+ private void injectServicesIntoAndAllowingServiceInjectorLookups(final FacetFactoryAbstract ffa) {
+ ffa.setSpecificationLoader(programmableReflector);
+ ffa.setServicesInjector(mockServicesInjector);
+
context.checking(new Expectations(){{
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
+
+ allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
+ will(returnValue(DeploymentCategory.PRODUCTION));
}});
+ }
+ public void testPropertyAccessorFacetIsInstalledForJavaUtilCollectionAndMethodRemoved() {
+ final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
+
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -141,15 +152,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForJavaUtilListAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -172,15 +176,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForJavaUtilSetAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -203,14 +200,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForObjectArrayAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
class Customer {
@@ -234,14 +225,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForOrderArrayAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
@@ -268,15 +253,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testAddToFacetIsInstalledViaAccessorIfNoExplicitAddToMethodExists() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
class Order {
@@ -300,15 +278,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCannotInferTypeOfFacetIfNoExplicitAddToOrRemoveFromMethods() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
class Order {
@@ -328,15 +299,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testRemoveFromFacetIsInstalledViaAccessorIfNoExplicitRemoveFromMethodExists() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
class Order {
@@ -360,15 +324,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testAddToFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
class Order {
@@ -399,15 +356,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCanInferTypeOfFacetFromExplicitAddToMethod() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
class Order {
@@ -435,15 +385,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testRemoveFromFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
class Order {
@@ -474,15 +417,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCanInferTypeOfFacetFromExplicitRemoveFromMethod() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
class Order {
@@ -510,15 +446,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testClearFacetIsInstalledAndMethodRemoved() {
final CollectionClearFacetFactory facetFactory = new CollectionClearFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings({ "hiding", "unused" })
class Order {
@@ -549,15 +478,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testClearFacetIsInstalledViaAccessorIfNoExplicitClearMethod() {
final CollectionClearFacetFactory facetFactory = new CollectionClearFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings({ "hiding", "unused" })
class Order {
@@ -581,16 +503,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testValidateAddToFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
class Order {
@@ -626,16 +540,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testValidateRemoveFromFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setServicesInjector(mockServicesInjector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
class Order {
@@ -671,15 +577,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testMethodFoundInSuperclass() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
@SuppressWarnings("hiding")
class Order {
@@ -707,20 +606,12 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testMethodFoundInSuperclassButHelpeMethodsFoundInSubclasses() {
final CollectionAccessorFacetViaAccessorFactory facetFactoryForAccessor = new CollectionAccessorFacetViaAccessorFactory();
- facetFactoryForAccessor.setSpecificationLoader(programmableReflector);
- facetFactoryForAccessor.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactoryForAccessor.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
-
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForAccessor);
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactoryForHelpers = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactoryForHelpers.setSpecificationLoader(programmableReflector);
- facetFactoryForHelpers.setServicesInjector(mockServicesInjector);
+
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactoryForHelpers);
@SuppressWarnings("hiding")
class Order {
@@ -813,15 +704,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method nameMethod = findMethod(CustomerStatic.class, "nameOrders");
@@ -839,15 +723,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionOrders");
@@ -865,15 +742,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOrders");
@@ -889,15 +759,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOtherOrders");
@@ -911,15 +774,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method protectMethod = findMethod(CustomerStatic.class, "protectOrders");
@@ -937,15 +793,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
final Method protectMethod = findMethod(CustomerStatic.class, "protectOtherOrders");
@@ -959,15 +808,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method hideMethod = findMethod(CustomerStatic.class, "hideOrders", new Class[] { UserMemento.class });
@@ -985,15 +827,8 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDisabledForSessionFacetAndRemovesMethod() {
final DisableForSessionFacetViaMethodFactory facetFactory = new DisableForSessionFacetViaMethodFactory();
- facetFactory.setSpecificationLoader(programmableReflector);
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
- facetFactory.setServicesInjector(mockServicesInjector);
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
+ injectServicesIntoAndAllowingServiceInjectorLookups(facetFactory);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method disableMethod = findMethod(CustomerStatic.class, "disableOrders", new Class[] { UserMemento.class });
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 4039981..67e6eab 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
@@ -56,17 +56,18 @@ public class ChoicesFacetFromBoundedMarkerInterfaceFactoryTest extends AbstractF
will(returnValue(DeploymentCategory.PRODUCTION));
allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
-
will(returnValue(mockAuthenticationSession));
}});
facetFactory = new ChoicesFacetFromBoundedMarkerInterfaceFactory();
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setServicesInjector(mockServicesInjector);
+
context.checking(new Expectations(){{
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
}});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 32a5117..6450b4a 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
@@ -55,17 +55,18 @@ public class ChoicesFacetFromBoundedAnnotationFactoryTest extends AbstractFacetF
will(returnValue(DeploymentCategory.PRODUCTION));
allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
-
will(returnValue(mockAuthenticationSession));
}});
facetFactory = new DomainObjectAnnotationFacetFactory();
- facetFactory.setDeploymentCategory(DeploymentCategory.PRODUCTION);
facetFactory.setServicesInjector(mockServicesInjector);
+
context.checking(new Expectations(){{
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
+ will(returnValue(mockDeploymentCategoryProvider));
}});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0c794397/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 633e54e..24a12bc 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
@@ -36,6 +36,7 @@ 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.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.FacetFactory.ProcessClassContext;
@@ -78,8 +79,14 @@ public class DomainObjectAnnotationFacetFactoryTest extends AbstractFacetFactory
facetFactory = new DomainObjectAnnotationFacetFactory();
facetFactory.setConfiguration(mockConfiguration);
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));
+ }});
}
@After
[10/10] isis git commit: ISIS-1406: refactoring
IsisConfigurationBuilder and IsisConfiguration (WIP)
Posted by da...@apache.org.
ISIS-1406: refactoring IsisConfigurationBuilder and IsisConfiguration (WIP)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dcaab8ea
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dcaab8ea
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dcaab8ea
Branch: refs/heads/ISIS-1406
Commit: dcaab8ead2a2bf2fd64d1e55ca69dc43c3a7297e
Parents: 62f5ad7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu May 19 09:41:30 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu May 19 09:41:30 2016 +0100
----------------------------------------------------------------------
...IsisConfigurationBuilderResourceStreams.java | 39 ++++++++-
.../installerregistry/InstallerLookup.java | 92 +++-----------------
.../core/runtime/runner/IsisInjectModule.java | 46 +++-------
.../isis/core/runtime/runner/IsisRunner.java | 45 +++++++---
.../isis/core/runtime/system/IsisSystem.java | 3 +-
.../IsisComponentProviderDefault2.java | 2 +-
.../IsisComponentProviderUsingInstallers.java | 6 +-
.../core/webapp/IsisWebAppBootstrapper.java | 27 +++---
.../core/webapp/IsisWebAppBootstrapperUtil.java | 52 -----------
.../wicket/viewer/IsisWicketApplication.java | 13 ++-
.../core/webserver/WebServerBootstrapper.java | 2 -
11 files changed, 119 insertions(+), 208 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java
index 48c282e..695cfd9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java
@@ -105,12 +105,39 @@ public class IsisConfigurationBuilderResourceStreams implements IsisConfiguratio
configuration = new IsisConfigurationDefault(resourceStreamSource);
}
- /**
- * May be overridden by subclasses if required.
- */
public void addDefaultConfigurationResources() {
addConfigurationResource(ConfigurationConstants.DEFAULT_CONFIG_FILE, NotFoundPolicy.FAIL_FAST);
- addConfigurationResource(ConfigurationConstants.WEB_CONFIG_FILE, NotFoundPolicy.CONTINUE);
+ addConfigurationResource(ConfigurationConstants.WEB_CONFIG_FILE, NotFoundPolicy.CONTINUE); //web.properties
+ addConfigurationResource("war.properties", NotFoundPolicy.CONTINUE);
+
+ addConfigurationResource("viewer_wicket.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("viewer_restful.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("viewer_restfulobjects.properties", NotFoundPolicy.CONTINUE);
+
+ addConfigurationResource("persistor_datanucleus.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("persistor.properties", NotFoundPolicy.CONTINUE);
+
+ addConfigurationResource("authentication_shiro.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("authentication_bypass.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("authentication.properties", NotFoundPolicy.CONTINUE);
+
+ addConfigurationResource("authorization_shiro.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("authorization_bypass.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("authorization.properties", NotFoundPolicy.CONTINUE);
+
+ addConfigurationResource("reflector_java.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("reflector.properties", NotFoundPolicy.CONTINUE);
+
+ addConfigurationResource("fixtures-installer_configuration.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("fixtures-installer_noop.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("fixtures-installer.properties", NotFoundPolicy.CONTINUE);
+
+ addConfigurationResource("services-installer_annotation.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("services-installer_configuration.properties", NotFoundPolicy.CONTINUE);
+
+ addConfigurationResource("services-installer_configuration-and-annotation.properties", NotFoundPolicy.CONTINUE);
+ addConfigurationResource("services-installer.properties", NotFoundPolicy.CONTINUE);
+
}
// ////////////////////////////////////////////////////////////
@@ -174,6 +201,10 @@ public class IsisConfigurationBuilderResourceStreams implements IsisConfiguratio
*/
@Override
public synchronized IsisConfigurationDefault getConfiguration() {
+ if(!locked) {
+ lockConfiguration();
+ dumpResourcesToLog();
+ }
return configuration;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
index 2124c1f..93c01c6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.Lists;
-import com.google.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,10 +34,8 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.Installer;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderAware;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.commons.config.NotFoundPolicy;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.ensure.Ensure;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -90,15 +87,19 @@ import static org.hamcrest.CoreMatchers.nullValue;
* even if it has not been registered in <tt>installer-registry.properties</tt>
* : just specify the {@link Installer}'s fully qualified class name.
*/
-public class InstallerLookup implements InstallerRepository, ApplicationScopedComponent, IsisConfigurationBuilderAware, SystemDependencyInjector {
+public class InstallerLookup implements InstallerRepository, ApplicationScopedComponent, SystemDependencyInjector {
private static final Logger LOG = LoggerFactory.getLogger(InstallerLookup.class);
+ private final IsisConfigurationDefault isisConfiguration;
+
//region > Constructor
private final List<Installer> installerList = Lists.newArrayList();
- public InstallerLookup() {
+ public InstallerLookup(final IsisConfigurationDefault isisConfiguration) {
+ this.isisConfiguration = isisConfiguration;
+
final InputStream in = getInstallerRegistryStream(IsisInstallerRegistry.INSTALLER_REGISTRY_FILE);
final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
try {
@@ -135,11 +136,14 @@ public class InstallerLookup implements InstallerRepository, ApplicationScopedCo
//endregion
+ //region > Configuration
+ public IsisConfigurationDefault getConfiguration() {
+ return isisConfiguration;
+ }
+ //endregion
+
//region > InstallerRepository impl.
- /**
- * This method (and only this method) may be called prior to {@link #init()
- * initialization}.
- */
+
@Override
public Installer[] getInstallers(final Class<?> cls) {
final List<Installer> list = new ArrayList<Installer>();
@@ -152,19 +156,6 @@ public class InstallerLookup implements InstallerRepository, ApplicationScopedCo
}
//endregion
- //region > init, shutdown
- public void init() {
- ensureDependenciesInjected();
- }
-
- private void ensureDependenciesInjected() {
- Ensure.ensureThatState(isisConfigurationBuilder, is(not(nullValue())));
- }
-
- public void shutdown() {
- // nothing to do.
- }
- //endregion
//region > metamodel
public ObjectReflectorInstaller reflectorInstaller(final String requested) {
@@ -216,7 +207,6 @@ public class InstallerLookup implements InstallerRepository, ApplicationScopedCo
Assert.assertNotNull("No name specified", implName);
for (final Installer installer : installerList) {
if (cls.isAssignableFrom(installer.getClass()) && installer.getName().equals(implName)) {
- mergeConfigurationFor(installer);
injectDependenciesInto(installer);
return (T) installer;
}
@@ -229,23 +219,6 @@ public class InstallerLookup implements InstallerRepository, ApplicationScopedCo
try {
final Installer installer = ObjectExtensions.asT(InstanceUtil.createInstance(implClassName));
if (installer != null) {
- mergeConfigurationFor(installer);
- injectDependenciesInto(installer);
- }
- return installer;
- } catch (final InstanceCreationException e) {
- throw new InstanceCreationException("Specification error in " + IsisInstallerRegistry.INSTALLER_REGISTRY_FILE, e);
- } catch (final UnavailableClassException e) {
- return null;
- }
- }
-
- @SuppressWarnings("unchecked")
- public <T extends Installer> T getInstaller(final Class<T> installerCls) {
- try {
- final T installer = (T) (InstanceUtil.createInstance(installerCls));
- if (installer != null) {
- mergeConfigurationFor(installer);
injectDependenciesInto(installer);
}
return installer;
@@ -292,28 +265,6 @@ public class InstallerLookup implements InstallerRepository, ApplicationScopedCo
}
//endregion
- //region > Configuration
- /**
- * Returns a <i>snapshot</i> of the current {@link IsisConfiguration}.
- *
- * <p>
- * The {@link IsisConfiguration} could subsequently be appended to if
- * further {@link Installer}s are loaded.
- */
- public IsisConfigurationDefault getConfiguration() {
- return isisConfigurationBuilder.getConfiguration();
- }
-
- public void mergeConfigurationFor(final Installer installer) {
- for (final String installerConfigResource : installer.getConfigurationResources()) {
- isisConfigurationBuilder.addConfigurationResource(installerConfigResource, NotFoundPolicy.CONTINUE);
- }
- }
-
- public void putConfigurationProperty(final String key, final String value) {
- isisConfigurationBuilder.put(key, value);
- }
- //endregion
//region > SystemDependencyInjector, Injectable
@Override
@@ -331,25 +282,8 @@ public class InstallerLookup implements InstallerRepository, ApplicationScopedCo
final InstallerLookupAware cast = InstallerLookupAware.class.cast(candidate);
cast.setInstallerLookup(this);
}
- isisConfigurationBuilder.injectInto(candidate);
}
//endregion
- //region > Dependencies (injected)
-
- /**
- * A mutable representation of the {@link IsisConfiguration configuration},
- * injected prior to {@link #init()}.
- *
- * @see #setConfigurationBuilder(IsisConfigurationBuilder)
- */
- private IsisConfigurationBuilder isisConfigurationBuilder;
-
- @Override
- @Inject
- public void setConfigurationBuilder(final IsisConfigurationBuilder configurationLoader) {
- this.isisConfigurationBuilder = configurationLoader;
- }
- //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
index e83a31f..efba9e8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
@@ -25,8 +25,8 @@ import com.google.inject.Provides;
import com.google.inject.Singleton;
import org.apache.isis.applib.AppManifest;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.runtime.installerregistry.InstallerLookup;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
@@ -36,31 +36,13 @@ public class IsisInjectModule extends AbstractModule {
private final DeploymentType deploymentType;
private final InstallerLookup installerLookup;
- private final IsisConfigurationBuilder isisConfigurationBuilder;
+ private final IsisConfiguration isisConfiguration;
- private static InstallerLookup defaultInstallerLookup() {
- return new InstallerLookup();
- }
-
- private static IsisConfigurationBuilderDefault defaultConfigurationBuilder() {
- return new IsisConfigurationBuilderDefault();
- }
-
- public IsisInjectModule(final DeploymentType deploymentType) {
- this(deploymentType, defaultConfigurationBuilder(), defaultInstallerLookup());
- }
-
- public IsisInjectModule(final DeploymentType deploymentType, final IsisConfigurationBuilder isisConfigurationBuilder) {
- this(deploymentType, isisConfigurationBuilder, defaultInstallerLookup());
- }
-
- public IsisInjectModule(final DeploymentType deploymentType, final InstallerLookup installerLookup) {
- this(deploymentType, defaultConfigurationBuilder(), installerLookup);
- }
-
- public IsisInjectModule(final DeploymentType deploymentType, final IsisConfigurationBuilder isisConfigurationBuilder, final InstallerLookup installerLookup) {
- this.installerLookup = installerLookup;
- this.isisConfigurationBuilder = isisConfigurationBuilder;
+ public IsisInjectModule(
+ final DeploymentType deploymentType,
+ final IsisConfigurationDefault isisConfiguration) {
+ this.installerLookup = new InstallerLookup(isisConfiguration);
+ this.isisConfiguration = isisConfiguration;
this.deploymentType = deploymentType;
}
@@ -80,8 +62,8 @@ public class IsisInjectModule extends AbstractModule {
@SuppressWarnings("unused")
@Provides
@Singleton
- private IsisConfigurationBuilder providesConfigurationBuilder() {
- return isisConfigurationBuilder;
+ private IsisConfiguration providesConfiguration() {
+ return isisConfiguration;
}
/**
@@ -91,17 +73,14 @@ public class IsisInjectModule extends AbstractModule {
@Provides
@Singleton
@Inject
- private InstallerLookup providesInstallerLookup(final IsisConfigurationBuilder configBuilder) {
- // wire up and initialize installer lookup
- configBuilder.injectInto(installerLookup);
- installerLookup.init();
+ private InstallerLookup providesInstallerLookup() {
return installerLookup;
}
@Override
protected void configure() {
requireBinding(DeploymentType.class);
- requireBinding(IsisConfigurationBuilder.class);
+ requireBinding(IsisConfiguration.class);
requireBinding(InstallerLookup.class);
bind(AppManifest.class).toInstance(IsisSystemFactory.APP_MANIFEST_NOOP);
}
@@ -117,6 +96,7 @@ public class IsisInjectModule extends AbstractModule {
final IsisSystemFactory systemFactory = new IsisSystemFactory(installerLookup);
final IsisSystem system = systemFactory.createSystem(deploymentType, appManifestIfAny);
+
// as a side-effect, if the metamodel turns out to be invalid, then
// this will push the MetaModelInvalidException into IsisContext.
system.init();
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java
index 29f560e..b9d3364 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java
@@ -22,22 +22,38 @@ package org.apache.isis.core.runtime.runner;
import java.io.File;
import java.util.Collections;
import java.util.List;
+
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import org.apache.commons.cli.*;
+
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.runtime.installerregistry.InstallerLookup;
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandler;
-import org.apache.isis.core.runtime.runner.opts.*;
+import org.apache.isis.core.runtime.runner.opts.OptionHandlerAdditionalProperty;
+import org.apache.isis.core.runtime.runner.opts.OptionHandlerAppManifest;
+import org.apache.isis.core.runtime.runner.opts.OptionHandlerConfiguration;
+import org.apache.isis.core.runtime.runner.opts.OptionHandlerDeploymentType;
+import org.apache.isis.core.runtime.runner.opts.OptionHandlerFixture;
+import org.apache.isis.core.runtime.runner.opts.OptionHandlerFixtureFromEnvironmentVariable;
+import org.apache.isis.core.runtime.runner.opts.OptionHandlerHelp;
+import org.apache.isis.core.runtime.runner.opts.OptionHandlerSystemProperties;
+import org.apache.isis.core.runtime.runner.opts.OptionHandlerVersion;
import org.apache.isis.core.runtime.runner.opts.OptionValidator;
import org.apache.isis.core.runtime.system.DeploymentType;
@@ -49,13 +65,14 @@ public class IsisRunner {
private final String[] args;
private final OptionHandlerDeploymentType optionHandlerDeploymentType;
- private final InstallerLookup installerLookup;
private final List<OptionHandler> optionHandlers = Lists.newArrayList();
private final List<OptionValidator> validators = Lists.newArrayList();
+
private IsisConfigurationBuilder isisConfigurationBuilder;
+ private InstallerLookup installerLookup;
- private Injector globalInjector;;
+ private Injector globalInjector;
// ///////////////////////////////////////////////////////////////////////////////////////
// Construction and adjustments
@@ -67,9 +84,8 @@ public class IsisRunner {
// setup logging immediately
loggingConfigurer.configureLogging(determineConfigDirectory(), args);
- this.installerLookup = new InstallerLookup();
- addStandardOptionHandlersAndValidators(this.installerLookup);
+ addStandardOptionHandlersAndValidators();
}
// REVIEW is this something that IsisConfigBuilder should know about?
@@ -121,6 +137,8 @@ public class IsisRunner {
*/
public void setConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder) {
this.isisConfigurationBuilder = isisConfigurationBuilder;
+ this.installerLookup = new InstallerLookup(isisConfigurationBuilder.getConfiguration());
+
}
// ///////////////////////////////////////////////////////////////////////////////////////
@@ -201,15 +219,18 @@ public class IsisRunner {
final DeploymentType deploymentType = optionHandlerDeploymentType.getDeploymentType();
- this.globalInjector = createGuiceInjector(deploymentType, isisConfigurationBuilder, installerLookup, optionHandlers);
+ IsisConfigurationDefault isisConfiguration = isisConfigurationBuilder.getConfiguration();
+
+ this.globalInjector = createGuiceInjector(deploymentType, isisConfiguration);
bootstrapper.bootstrap(globalInjector);
- isisConfigurationBuilder.lockConfiguration();
- isisConfigurationBuilder.dumpResourcesToLog();
}
- private Injector createGuiceInjector(final DeploymentType deploymentType, final IsisConfigurationBuilder isisConfigurationBuilder, final InstallerLookup installerLookup, final List<OptionHandler> optionHandlers) {
- final IsisInjectModule isisModule = new IsisInjectModule(deploymentType, isisConfigurationBuilder, installerLookup);
+ private Injector createGuiceInjector(
+ final DeploymentType deploymentType,
+ final IsisConfigurationDefault isisConfiguration) {
+ final IsisInjectModule isisModule =
+ new IsisInjectModule(deploymentType, isisConfiguration);
return Guice.createInjector(isisModule);
}
@@ -221,7 +242,7 @@ public class IsisRunner {
return Collections.unmodifiableList(optionHandlers);
}
- private void addStandardOptionHandlersAndValidators(final InstallerLookup installerLookup) {
+ private void addStandardOptionHandlersAndValidators() {
addOptionHandler(optionHandlerDeploymentType);
addOptionHandler(new OptionHandlerConfiguration());
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
index 45a6e90..04b2f5c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
@@ -145,7 +145,8 @@ public class IsisSystem implements ApplicationScopedComponent {
try {
// configuration
- final IsisConfigurationDefault configuration = isisComponentProvider.getConfiguration();
+ // TODO: HACKY
+ final IsisConfigurationDefault configuration = (IsisConfigurationDefault) isisComponentProvider.getConfiguration();
// services
ServicesInjectorDefault servicesInjector = isisComponentProvider.provideServiceInjector();
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
index 3b8671f..159e2ac 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
@@ -121,7 +121,7 @@ public class IsisComponentProviderDefault2 extends IsisComponentProviderAbstract
@Override
protected void doPutConfigurationProperty(final String key, final String value) {
// bit hacky :-(
- IsisConfigurationDefault configurationDefault = this.configuration;
+ IsisConfigurationDefault configurationDefault = (IsisConfigurationDefault) this.configuration;
configurationDefault.put(key, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
index 2c99632..9d00f39 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
@@ -24,6 +24,8 @@ import java.util.List;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.fixturescripts.FixtureScript;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
@@ -107,7 +109,6 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProviderA
reflectorInstaller = this.installerLookup.reflectorInstaller(
configProperty(SystemConstants.REFLECTOR_KEY));
-
// ensure we were able to load all components via InstallerLookup (fail fast)
ensureThatState(authenticationInstaller, is(not(nullValue())),
"authenticationInstaller could not be looked up");
@@ -150,7 +151,8 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProviderA
}
protected void doPutConfigurationProperty(final String key, final String value) {
- this.installerLookup.putConfigurationProperty(key, value);
+ IsisConfigurationDefault configuration = (IsisConfigurationDefault) this.installerLookup.getConfiguration();
+ configuration.put(key, value);
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index e989fb4..cfcab14 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderResourceStreams;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.config.NotFoundPolicy;
import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
@@ -106,21 +107,20 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
final DeploymentType deploymentType = determineDeploymentType(isisConfigurationBuilder, servletContext);
- addConfigurationResourcesForWebApps(isisConfigurationBuilder);
addConfigurationResourcesForDeploymentType(isisConfigurationBuilder, deploymentType);
- IsisWebAppBootstrapperUtil.addConfigurationResourcesForViewers(isisConfigurationBuilder, servletContext);
isisConfigurationBuilder.add(WebAppConstants.WEB_APP_DIR, webappDir);
+
isisConfigurationBuilder.add(SystemConstants.NOSPLASH_KEY, "true");
- final InstallerLookup installerLookup = new InstallerLookup();
+ IsisConfigurationDefault isisConfiguration = isisConfigurationBuilder.getConfiguration();
+
+ final InstallerLookup installerLookup = new InstallerLookup(isisConfiguration);
- injector = createGuiceInjector(isisConfigurationBuilder, deploymentType, installerLookup);
+ injector = createGuiceInjector(isisConfiguration, deploymentType);
final IsisSystem system = injector.getInstance(IsisSystem.class);
- isisConfigurationBuilder.lockConfiguration();
- isisConfigurationBuilder.dumpResourcesToLog();
servletContext.setAttribute(WebAppConstants.ISIS_SYSTEM_KEY, system);
} catch (final RuntimeException e) {
@@ -131,10 +131,9 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
}
private Injector createGuiceInjector(
- final IsisConfigurationBuilder isisConfigurationBuilder,
- final DeploymentType deploymentType,
- final InstallerLookup installerLookup) {
- final IsisInjectModule isisModule = new IsisInjectModule(deploymentType, isisConfigurationBuilder, installerLookup);
+ final IsisConfigurationDefault isisConfiguration,
+ final DeploymentType deploymentType) {
+ final IsisInjectModule isisModule = new IsisInjectModule(deploymentType, isisConfiguration);
return Guice.createInjector(isisModule);
}
@@ -163,7 +162,9 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
* <p>
* If no setting is found, defaults to {@link WebAppConstants#DEPLOYMENT_TYPE_DEFAULT}.
*/
- private DeploymentType determineDeploymentType(final IsisConfigurationBuilder isisConfigurationBuilder, final ServletContext servletContext) {
+ private DeploymentType determineDeploymentType(
+ final IsisConfigurationBuilder isisConfigurationBuilder,
+ final ServletContext servletContext) {
String deploymentTypeStr = servletContext.getInitParameter(WebAppConstants.DEPLOYMENT_TYPE_KEY);
if (deploymentTypeStr == null) {
deploymentTypeStr = servletContext.getInitParameter(SystemConstants.DEPLOYMENT_TYPE_KEY);
@@ -184,10 +185,6 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
configurationLoader.addConfigurationResource(resourceName, NotFoundPolicy.CONTINUE);
}
- private static void addConfigurationResourcesForWebApps(final IsisConfigurationBuilder configurationLoader) {
- configurationLoader.addConfigurationResource("web.properties", NotFoundPolicy.CONTINUE);
- configurationLoader.addConfigurationResource("war.properties", NotFoundPolicy.CONTINUE);
- }
// /////////////////////////////////////////////////////
// Destroy
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapperUtil.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapperUtil.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapperUtil.java
deleted file mode 100644
index d859b56..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapperUtil.java
+++ /dev/null
@@ -1,52 +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.webapp;
-
-import javax.servlet.ServletContext;
-
-import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.core.commons.config.NotFoundPolicy;
-
-
-/**
- * Factored out of {@link IsisWebAppBootstrapper} in order that can
- * be reused by other bootstrappers (eg the wicket viewer's
- * <tt>IsisWicketApplication</tt>).
- */
-public final class IsisWebAppBootstrapperUtil {
-
- private IsisWebAppBootstrapperUtil(){}
-
- public static void addConfigurationResourcesForViewers(final IsisConfigurationBuilder configurationLoader, final ServletContext servletContext) {
- addConfigurationResourcesForContextParam(configurationLoader, servletContext, "isis.viewers");
- addConfigurationResourcesForContextParam(configurationLoader, servletContext, "isis.viewer");
- }
-
- private static void addConfigurationResourcesForContextParam(final IsisConfigurationBuilder configurationLoader, final ServletContext servletContext, final String name) {
- final String viewers = servletContext.getInitParameter(name);
- if (viewers == null) {
- return;
- }
- for (final String viewer : viewers.split(",")) {
- configurationLoader.addConfigurationResource("viewer_" + viewer + ".properties", NotFoundPolicy.CONTINUE);
- }
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/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 9781237..09ec550 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
@@ -64,6 +64,7 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderResourceStreams;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
import org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath;
@@ -77,7 +78,6 @@ import org.apache.isis.core.runtime.runner.opts.OptionHandlerInitParameters;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.webapp.IsisWebAppBootstrapperUtil;
import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.core.webapp.config.ResourceStreamSourceForWebInf;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
@@ -253,8 +253,9 @@ public class IsisWicketApplication
requestCycleListeners.add(new PageRequestHandlerTracker());
final IsisConfigurationBuilder isisConfigurationBuilder = createConfigBuilder();
-
- final IsisInjectModule isisModule = newIsisModule(deploymentType, isisConfigurationBuilder);
+ final IsisConfigurationDefault configuration = isisConfigurationBuilder.getConfiguration();
+
+ final IsisInjectModule isisModule = newIsisModule(deploymentType, configuration);
final Injector injector = Guice.createInjector(isisModule, newIsisWicketModule());
initWicketComponentInjection(injector);
injector.injectMembers(this);
@@ -264,7 +265,6 @@ public class IsisWicketApplication
webRequestCycleForIsis.setPageClassRegistry(pageClassRegistry);
}
- final IsisConfiguration configuration = isisConfigurationBuilder.getConfiguration();
this.getMarkupSettings().setStripWicketTags(determineStripWicketTags(configuration));
getDebugSettings().setAjaxDebugModeEnabled(determineAjaxDebugModeEnabled(configuration));
@@ -452,7 +452,6 @@ public class IsisWicketApplication
primeConfigurationBuilder(configurationBuilder, servletContext);
configurationBuilder.addDefaultConfigurationResources();
- IsisWebAppBootstrapperUtil.addConfigurationResourcesForViewers(configurationBuilder, servletContext);
return configurationBuilder;
}
@@ -694,8 +693,8 @@ public class IsisWicketApplication
return deploymentType.getConfigurationType();
}
- protected IsisInjectModule newIsisModule(final DeploymentType deploymentType, final IsisConfigurationBuilder isisConfigurationBuilder) {
- return new IsisInjectModule(deploymentType, isisConfigurationBuilder);
+ protected IsisInjectModule newIsisModule(final DeploymentType deploymentType, final IsisConfigurationDefault isisConfiguration) {
+ return new IsisInjectModule(deploymentType, isisConfiguration);
}
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/dcaab8ea/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
index 999f75c..ee6e5f4 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
@@ -24,7 +24,6 @@ import java.util.Map;
import com.google.inject.Injector;
-import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.webapp.WebAppContext;
import org.slf4j.Logger;
@@ -78,7 +77,6 @@ final class WebServerBootstrapper implements IsisBootstrapper {
// TODO get and use the address
jettyServer = new Server(port);
- Connector[] connectors = jettyServer.getConnectors();
final WebAppContext context = new WebAppContext(SRC_MAIN_WEBAPP, webappContextPath);
copyConfigurationPrimersIntoServletContext(context);
[05/10] isis git commit: ISIS-1405: DeploymentCategoryProvider now
implemented by a domain service,
so can be looked up from ServicesInjector. Removed
DeploymentCategoryProviderAware.
Posted by da...@apache.org.
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
*