You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/09/03 16:23:12 UTC
[5/5] isis git commit: ISIS-1194 (and also ISIS-1044): removing
unused code.
ISIS-1194 (and also ISIS-1044): removing unused code.
- ActionFacet#invoke(...)
- Memento#encodedData, recreateFrom
- unused parameters (DeploymentCategory and AuthenticationSessionProvider) in ObjectFeature (members and parameters) class hierarchy
- removed DeploymentCategory and AuthenticationSessionProvider fields for SpecificationContext and ObjectMemberContext
- removed ObjectAssociationFilters static class, no longer used
Also:
- renamed SpecificationContext to ObjectSpecificationDependencies
- renamed ObjectMemberContext to ObjectMemberDependencies
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/69450a33
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/69450a33
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/69450a33
Branch: refs/heads/master
Commit: 69450a333e250d07700464a4743a3c6d47285e71
Parents: dd162be
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 3 15:22:38 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 3 15:22:38 2015 +0100
----------------------------------------------------------------------
.../invocation/ActionInvocationFacet.java | 10 --
...onInvocationFacetForDomainEventAbstract.java | 12 +-
.../CollectionAccessorFacetViaAccessor.java | 2 -
...creatableObjectFacetDeclarativeAbstract.java | 6 +-
.../choices/PropertyChoicesFacet.java | 5 +-
...ertyChoicesFacetDerivedFromChoicesFacet.java | 6 +-
.../method/PropertyChoicesFacetViaMethod.java | 4 -
.../spec/ObjectSpecificationDependencies.java | 63 ++++++++++
.../metamodel/spec/SpecificationContext.java | 71 -----------
.../metamodel/spec/feature/ObjectAction.java | 12 +-
.../spec/feature/ObjectActionParameter.java | 13 +--
.../spec/feature/ObjectAssociation.java | 12 +-
.../spec/feature/ObjectAssociationFilters.java | 108 -----------------
.../spec/feature/ObjectMemberContext.java | 75 ------------
.../spec/feature/ObjectMemberDependencies.java | 59 ++++++++++
.../specloader/ObjectReflectorDefault.java | 12 +-
.../specimpl/ObjectActionContributee.java | 15 +--
.../specloader/specimpl/ObjectActionImpl.java | 12 +-
.../specimpl/ObjectActionParameterAbstract.java | 26 +----
...jectActionParameterParseableContributee.java | 2 -
.../specimpl/ObjectAssociationAbstract.java | 10 +-
.../specimpl/ObjectMemberAbstract.java | 52 +++------
.../specimpl/ObjectSpecificationAbstract.java | 86 +++++++-------
.../OneToManyAssociationContributee.java | 17 +--
.../specimpl/OneToManyAssociationImpl.java | 15 +--
.../OneToOneActionParameterContributee.java | 4 -
.../OneToOneAssociationContributee.java | 6 +-
.../specimpl/OneToOneAssociationImpl.java | 39 ++-----
.../dflt/ObjectSpecificationDefault.java | 16 +--
.../ObjectSpecificationOnStandaloneList.java | 10 +-
.../feature/ObjectAssociationFiltersTests.java | 64 ----------
.../specimpl/ObjectAssociationAbstractTest.java | 9 +-
...ectAssociationAbstractTest_alwaysHidden.java | 9 +-
.../isis/core/runtime/memento/Memento.java | 22 ----
.../ActionInvocationFacetWrapTransaction.java | 18 ---
.../runtime/system/ObjectActionImplTest.java | 7 +-
.../system/ObjectMemberAbstractTest.java | 8 +-
.../system/OneToManyAssociationImplTest.java | 6 +-
.../viewer/wicket/model/models/ActionModel.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 4 +-
.../collection/bulk/BulkActionsLinkFactory.java | 2 +-
.../wicket/ui/fixtures/ActionFixtures.java | 117 -------------------
.../wicket/ui/fixtures/AdapterFixtures.java | 44 -------
.../viewer/wicket/ui/fixtures/SpecFixtures.java | 44 -------
.../handlers/DomainObjectInvocationHandler.java | 14 ---
...WrapperFactoryDefaultTest_wrappedObject.java | 9 +-
46 files changed, 289 insertions(+), 870 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
index 1ce0b61..eb33902 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacet.java
@@ -24,10 +24,8 @@ import java.util.List;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.CommandContext;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
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.IdentifiedHolder;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -43,14 +41,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
*/
public interface ActionInvocationFacet extends Facet {
- @Deprecated
- public ObjectAdapter invoke(
- ObjectAdapter targetAdapter,
- ObjectAdapter[] argumentAdapters,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory,
- final InteractionInitiatedBy interactionInitiatedBy);
-
public ObjectAdapter invoke(
ObjectAction owningAction,
ObjectAdapter targetAdapter,
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index acf8074..fa8dc68 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -150,7 +150,7 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
/**
* Introduced to disambiguate the meaning of <tt>null</tt> as a return value of
- * {@link ActionInvocationFacet#invoke(ObjectAdapter, ObjectAdapter[], AuthenticationSession, DeploymentCategory, InteractionInitiatedBy)}
+ * {@link ActionInvocationFacet#invoke(ObjectAdapter, ObjectAdapter[], InteractionInitiatedBy)}
*/
public static class InvocationResult {
@@ -188,16 +188,6 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
@Override
public ObjectAdapter invoke(
- final ObjectAdapter targetAdapter,
- final ObjectAdapter[] argumentAdapters,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory, final InteractionInitiatedBy interactionInitiatedBy) {
- return invoke(null, targetAdapter, argumentAdapters,
- interactionInitiatedBy);
- }
-
- @Override
- public ObjectAdapter invoke(
final ObjectAction owningAction,
final ObjectAdapter targetAdapter,
final ObjectAdapter[] arguments,
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
index 13c0610..6e2893f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/accessor/CollectionAccessorFacetViaAccessor.java
@@ -80,8 +80,6 @@ public class CollectionAccessorFacetViaAccessor
final ObjectAdapter collectionAdapter = getAdapterManager().adapterFor(collectionOrArray);
- final AuthenticationSession authenticationSession = getAuthenticationSession();
- final DeploymentCategory deploymentCategory = getDeploymentCategory();
boolean filterForVisibility = getConfiguration().getBoolean("isis.reflector.facet.filterVisibility", true);
if(filterForVisibility) {
final List<ObjectAdapter> visibleAdapters =
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeAbstract.java
index 551f3f0..16bbe25 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetDeclarativeAbstract.java
@@ -135,7 +135,11 @@ public abstract class RecreatableObjectFacetDeclarativeAbstract extends Recreata
}
// otherwise, include
- final ObjectAdapter propertyValueAdapter = property.get(adapterManager.adapterFor(viewModelPojo),
+
+ // REVIEW: this look to be the same as viewModelAdapter, above?
+ final ObjectAdapter ownerAdapter = adapterManager.adapterFor(viewModelPojo);
+
+ final ObjectAdapter propertyValueAdapter = property.get(ownerAdapter,
InteractionInitiatedBy.FRAMEWORK);
if(propertyValueAdapter != null) {
final Object propertyValue = propertyValueAdapter.getObject();
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java
index 809fd2e..a1bdb5c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/PropertyChoicesFacet.java
@@ -19,10 +19,8 @@
package org.apache.isis.core.metamodel.facets.properties.choices;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
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.spec.SpecificationLoader;
@@ -50,6 +48,5 @@ public interface PropertyChoicesFacet extends Facet {
public Object[] getChoices(
final ObjectAdapter adapter,
final SpecificationLoader specificationLookup,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory, final InteractionInitiatedBy interactionInitiatedBy);
+ final InteractionInitiatedBy interactionInitiatedBy);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
index 55d6d18..5ba5ac8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
@@ -19,10 +19,8 @@
package org.apache.isis.core.metamodel.facets.properties.choices.enums;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
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.FacetHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
@@ -39,9 +37,7 @@ public class PropertyChoicesFacetDerivedFromChoicesFacet extends PropertyChoices
@Override
public Object[] getChoices(
final ObjectAdapter adapter,
- final SpecificationLoader specificationLookupUNUSED,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory,
+ final SpecificationLoader specificationLoader,
final InteractionInitiatedBy interactionInitiatedBy) {
final FacetHolder facetHolder = getFacetHolder();
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
index 411c7dd..fface56 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
@@ -23,12 +23,10 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.lang.ObjectExtensions;
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.FacetHolder;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -68,8 +66,6 @@ public class PropertyChoicesFacetViaMethod extends PropertyChoicesFacetAbstract
public Object[] getChoices(
final ObjectAdapter owningAdapter,
final SpecificationLoader specificationLookup,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory,
final InteractionInitiatedBy interactionInitiatedBy) {
final Object options = ObjectAdapter.InvokeUtils.invoke(method, owningAdapter);
if (options == null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationDependencies.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationDependencies.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationDependencies.java
new file mode 100644
index 0000000..4240d69
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecificationDependencies.java
@@ -0,0 +1,63 @@
+/**
+ * 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.spec;
+
+import org.apache.isis.core.metamodel.adapter.ServicesProvider;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
+
+public class ObjectSpecificationDependencies {
+
+ private final DeploymentCategory deploymentCategory;
+ private final ServicesProvider servicesProvider;
+ private final ObjectInstantiator objectInstantiator;
+ private final SpecificationLoader specificationLoader;
+ private final FacetProcessor facetProcessor;
+
+ public ObjectSpecificationDependencies(
+ final DeploymentCategory deploymentCategory,
+ final ServicesProvider servicesProvider,
+ final ObjectInstantiator objectInstantiator,
+ final SpecificationLoader specificationLoader,
+ final FacetProcessor facetProcessor) {
+ this.deploymentCategory = deploymentCategory;
+ this.servicesProvider = servicesProvider;
+ this.objectInstantiator = objectInstantiator;
+ this.specificationLoader = specificationLoader;
+ this.facetProcessor = facetProcessor;
+ }
+
+ public DeploymentCategory getDeploymentCategory() {
+ return deploymentCategory;
+ }
+
+ public ServicesProvider getServicesProvider() {
+ return servicesProvider;
+ }
+
+ public ObjectInstantiator getObjectInstantiator() {
+ return objectInstantiator;
+ }
+
+ public SpecificationLoader getSpecificationLoader() {
+ return specificationLoader;
+ }
+
+ public FacetProcessor getFacetProcessor() {
+ return facetProcessor;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java
deleted file mode 100644
index 30fd6f3..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/SpecificationContext.java
+++ /dev/null
@@ -1,71 +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.spec;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.adapter.ServicesProvider;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
-
-public class SpecificationContext {
-
- private final DeploymentCategory deploymentCategory;
- private final AuthenticationSessionProvider authenticationSessionProvider;
- private final ServicesProvider servicesProvider;
- private final ObjectInstantiator objectInstantiator;
- private final SpecificationLoader specificationLoader;
- private final FacetProcessor facetProcessor;
-
- public SpecificationContext(
- final DeploymentCategory deploymentCategory,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final ServicesProvider servicesProvider,
- final ObjectInstantiator objectInstantiator,
- final SpecificationLoader specificationLoader,
- final FacetProcessor facetProcessor) {
- this.deploymentCategory = deploymentCategory;
- this.authenticationSessionProvider = authenticationSessionProvider;
- this.servicesProvider = servicesProvider;
- this.objectInstantiator = objectInstantiator;
- this.specificationLoader = specificationLoader;
- this.facetProcessor = facetProcessor;
- }
-
- public DeploymentCategory getDeploymentCategory() {
- return deploymentCategory;
- }
-
- public AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
-
- public ServicesProvider getServicesProvider() {
- return servicesProvider;
- }
-
- public ObjectInstantiator getObjectInstantiator() {
- return objectInstantiator;
- }
-
- public SpecificationLoader getSpecificationLoader() {
- return specificationLoader;
- }
-
- public FacetProcessor getFacetProcessor() {
- return facetProcessor;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index 7e0fbae..65f0115 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -32,12 +32,10 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.lang.StringFunctions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
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.FacetFilters;
import org.apache.isis.core.metamodel.facets.actions.bulk.BulkFacet;
@@ -103,7 +101,6 @@ public interface ObjectAction extends ObjectMember {
ObjectAdapter executeWithRuleChecking(
final ObjectAdapter target,
final ObjectAdapter[] parameters,
- final AuthenticationSession authenticationSession,
final InteractionInitiatedBy interactionInitiatedBy,
final Where where) throws AuthorizationException;
@@ -185,9 +182,8 @@ public interface ObjectAction extends ObjectMember {
* the user can choose from.
*/
ObjectAdapter[][] getChoices(
- ObjectAdapter target,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory, final InteractionInitiatedBy interactionInitiatedBy);
+ final ObjectAdapter target,
+ final InteractionInitiatedBy interactionInitiatedBy);
// //////////////////////////////////////////////////////
// Utils
@@ -270,7 +266,6 @@ public interface ObjectAction extends ObjectMember {
private Predicates() {
}
- // UNUSED?
public static Predicate<ObjectAction> dynamicallyVisible(
final ObjectAdapter target,
final InteractionInitiatedBy interactionInitiatedBy,
@@ -279,12 +274,10 @@ public interface ObjectAction extends ObjectMember {
.asPredicate(Filters.dynamicallyVisible(target, interactionInitiatedBy, where));
}
- // UNUSED?
public static Predicate<ObjectAction> withId(final String actionId) {
return org.apache.isis.applib.filter.Filters.asPredicate(Filters.withId(actionId));
}
- // UNUSED?
public static Predicate<ObjectAction> withNoValidationRules() {
return org.apache.isis.applib.filter.Filters.asPredicate(Filters.withNoValidationRules());
}
@@ -302,7 +295,6 @@ public interface ObjectAction extends ObjectMember {
return org.apache.isis.applib.filter.Filters.asPredicate(Filters.notBulkOnly());
}
- // UNUSED?
public static Predicate<ObjectAction> memberOrderOf(ObjectAssociation association) {
return org.apache.isis.applib.filter.Filters.asPredicate(Filters.memberOrderOf(association));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
index 6503304..a99967d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
@@ -23,10 +23,8 @@ import com.google.common.base.Function;
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.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.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.interactions.ActionArgumentContext;
@@ -40,9 +38,7 @@ public interface ObjectActionParameter extends ObjectFeature, CurrentHolder {
*
* <p>
* Either this or {@link #isCollection()} will be true.
- *
- * <p>
- * Design note: modelled after {@link ObjectAssociation#isNotCollection()}
+ * </p>
*/
boolean isObject();
@@ -142,9 +138,10 @@ public interface ObjectActionParameter extends ObjectFeature, CurrentHolder {
* @return
*/
String isValid(
- ObjectAdapter adapter,
- Object proposedValue,
- final InteractionInitiatedBy interactionInitiatedBy, Localization localization);
+ final ObjectAdapter adapter,
+ final Object proposedValue,
+ final InteractionInitiatedBy interactionInitiatedBy,
+ final Localization localization);
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
index 7e76770..8e32a1d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociation.java
@@ -31,11 +31,9 @@ import com.google.common.collect.Maps;
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
@@ -97,8 +95,7 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
public ObjectAdapter[] getAutoComplete(
final ObjectAdapter object,
final String searchArg,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory, final InteractionInitiatedBy interactionInitiatedBy);
+ final InteractionInitiatedBy interactionInitiatedBy);
int getAutoCompleteMinLength();
@@ -173,35 +170,30 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
/**
* Only fields that are for reference properties (ie 1:1 associations)
*/
- // UNUSED ?
public final static Predicate<ObjectAssociation> REFERENCE_PROPERTIES =
org.apache.isis.applib.filter.Filters.asPredicate(Filters.REFERENCE_PROPERTIES);
/**
* Only fields that are for properties (ie 1:1 associations)
*/
- // UNUSED ?
public final static Predicate<ObjectAssociation> WHERE_VISIBLE_IN_COLLECTION_TABLE =
org.apache.isis.applib.filter.Filters.asPredicate(Filters.WHERE_VISIBLE_IN_COLLECTION_TABLE);
/**
* Only fields that are for properties (ie 1:1 associations)
*/
- // UNUSED ?
public final static Predicate<ObjectAssociation> WHERE_VISIBLE_IN_STANDALONE_TABLE =
org.apache.isis.applib.filter.Filters.asPredicate(Filters.WHERE_VISIBLE_IN_STANDALONE_TABLE);
/**
* All fields (that is, excludes out nothing).
*/
- // UNUSED ?
public final static Predicate<ObjectAssociation> ALL =
org.apache.isis.applib.filter.Filters.asPredicate(Filters.ALL);
/**
* Only fields that are for collections (ie 1:m associations)
*/
- // UNUSED ?
public final static Predicate<ObjectAssociation> COLLECTIONS =
org.apache.isis.applib.filter.Filters.asPredicate(Filters.COLLECTIONS);
@@ -212,12 +204,10 @@ public interface ObjectAssociation extends ObjectMember, CurrentHolder {
public static final Predicate<ObjectAssociation> VISIBLE_AT_LEAST_SOMETIMES =
org.apache.isis.applib.filter.Filters.asPredicate(Filters.VISIBLE_AT_LEAST_SOMETIMES);
- // UNUSED ?
public static final Predicate<ObjectAssociation> staticallyVisible(final Where context) {
return org.apache.isis.applib.filter.Filters.asPredicate(Filters.staticallyVisible(context));
}
- // UNUSED ?
public static final Predicate<ObjectAssociation> dynamicallyVisible(
final ObjectAdapter target,
final InteractionInitiatedBy interactionInitiatedBy,
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
deleted file mode 100644
index a0e0b5d..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFilters.java
+++ /dev/null
@@ -1,108 +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.spec.feature;
-
-import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-
-@Deprecated
-public class ObjectAssociationFilters {
-
- /**
- * @deprecated - use {@link ObjectAssociation.Filters#PROPERTIES}
- */
- @Deprecated
- // UNUSED?
- public final static Filter<ObjectAssociation> PROPERTIES = ObjectAssociation.Filters.PROPERTIES;
-
- /**
- * @deprecated - use {@link ObjectAssociation.Filters#REFERENCE_PROPERTIES}
- */
- @Deprecated
- // UNUSED?
- public final static Filter<ObjectAssociation> REFERENCE_PROPERTIES = ObjectAssociation.Filters.REFERENCE_PROPERTIES;
-
- /**
- * @deprecated - use {@link ObjectAssociation.Filters#WHERE_VISIBLE_IN_COLLECTION_TABLE}
- */
- @Deprecated
- // UNUSED?
- public final static Filter<ObjectAssociation> WHERE_VISIBLE_IN_COLLECTION_TABLE = ObjectAssociation.Filters.WHERE_VISIBLE_IN_COLLECTION_TABLE;
-
- /**
- * @deprecated - use {@link ObjectAssociation.Filters#WHERE_VISIBLE_IN_STANDALONE_TABLE}
- */
- @Deprecated
- // UNUSED?
- public final static Filter<ObjectAssociation> WHERE_VISIBLE_IN_STANDALONE_TABLE = ObjectAssociation.Filters.WHERE_VISIBLE_IN_STANDALONE_TABLE;
-
- /**
- * @deprecated
- */
- @Deprecated
- // UNUSED ?
- public final static Filter<ObjectAssociation> ALL = ObjectAssociation.Filters.ALL;
-
- /**
- * @deprecated
- */
- @Deprecated
- // UNUSED ?
- public final static Filter<ObjectAssociation> COLLECTIONS = ObjectAssociation.Filters.COLLECTIONS;
-
- /**
- * @deprecated
- */
- @Deprecated
- // UNUSED ?
- public static final Filter<ObjectAssociation> VISIBLE_AT_LEAST_SOMETIMES = ObjectAssociation.Filters.VISIBLE_AT_LEAST_SOMETIMES;
-
- /**
- * @deprecated
- */
- @Deprecated
- // UNUSED ?
- public static final Filter<ObjectAssociation> staticallyVisible(final Where context) {
- return ObjectAssociation.Filters.staticallyVisible(context);
- }
-
- /**
- * @deprecated
- */
- // UNUSED ?
- @Deprecated
- public static Filter<ObjectAssociation> dynamicallyVisible(
- final ObjectAdapter target,
- final InteractionInitiatedBy interactionInitiatedBy,
- final Where where) {
- return ObjectAssociation.Filters.dynamicallyVisible(target, interactionInitiatedBy, where);
- }
-
- /**
- * @deprecated
- */
- @Deprecated
- public static Filter<ObjectAssociation> enabled(
- final ObjectAdapter adapter,
- final InteractionInitiatedBy interactionInitiatedBy,
- final Where where) {
- return ObjectAssociation.Filters.enabled(adapter, interactionInitiatedBy, where);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java
deleted file mode 100644
index 076c6b6..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberContext.java
+++ /dev/null
@@ -1,75 +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.spec.feature;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
-import org.apache.isis.core.metamodel.adapter.ServicesProvider;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-
-public class ObjectMemberContext {
-
- private final DeploymentCategory deploymentCategory;
- private final AuthenticationSessionProvider authenticationSessionProvider;
- private final SpecificationLoader specificationLoader;
- private final AdapterManager adapterManager;
- private final QuerySubmitter querySubmitter;
- private final ServicesProvider servicesProvider;
-
- public ObjectMemberContext(
- final DeploymentCategory deploymentCategory,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final SpecificationLoader specificationLoader,
- final AdapterManager adapterManager,
- final QuerySubmitter querySubmitter,
- final ServicesProvider servicesProvider) {
-
- this.deploymentCategory = deploymentCategory;
- this.authenticationSessionProvider = authenticationSessionProvider;
- this.specificationLoader = specificationLoader;
- this.adapterManager = adapterManager;
- this.querySubmitter = querySubmitter;
-
- this.servicesProvider = servicesProvider;
- }
-
- public DeploymentCategory getDeploymentCategory() {
- return deploymentCategory;
- }
-
- public AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
-
- public SpecificationLoader getSpecificationLoader() {
- return specificationLoader;
- }
-
- public AdapterManager getAdapterManager() {
- return adapterManager;
- }
-
- public ServicesProvider getServicesProvider() {
- return servicesProvider;
- }
-
- public QuerySubmitter getQuerySubmitter() {
- return querySubmitter;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java
new file mode 100644
index 0000000..a323828
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMemberDependencies.java
@@ -0,0 +1,59 @@
+/**
+ * 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.spec.feature;
+
+import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
+import org.apache.isis.core.metamodel.adapter.ServicesProvider;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+
+public class ObjectMemberDependencies {
+
+ private final SpecificationLoader specificationLoader;
+ private final AdapterManager adapterManager;
+ private final QuerySubmitter querySubmitter;
+ private final ServicesProvider servicesProvider;
+
+ public ObjectMemberDependencies(
+ final SpecificationLoader specificationLoader,
+ final AdapterManager adapterManager,
+ final QuerySubmitter querySubmitter,
+ final ServicesProvider servicesProvider) {
+
+ this.specificationLoader = specificationLoader;
+ this.adapterManager = adapterManager;
+ this.querySubmitter = querySubmitter;
+
+ this.servicesProvider = servicesProvider;
+ }
+
+ public SpecificationLoader getSpecificationLoader() {
+ return specificationLoader;
+ }
+
+ public AdapterManager getAdapterManager() {
+ return adapterManager;
+ }
+
+ public ServicesProvider getServicesProvider() {
+ return servicesProvider;
+ }
+
+ public QuerySubmitter getQuerySubmitter() {
+ return querySubmitter;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/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 77158b3..198a2f7 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
@@ -52,7 +52,7 @@ import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
import org.apache.isis.core.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
import org.apache.isis.core.metamodel.spec.*;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
import org.apache.isis.core.metamodel.specloader.specimpl.CreateObjectContext;
@@ -439,20 +439,22 @@ public final class ObjectReflectorDefault implements SpecificationLoaderSpi, App
final ObjectInstantiator objectInstantiator = getRuntimeContext().getObjectInstantiator();
// create contexts as inputs ...
- final SpecificationContext specContext = new SpecificationContext(getDeploymentCategory(), authenticationSessionProvider, servicesProvider, objectInstantiator, specificationLookup, facetProcessor);
+ final ObjectSpecificationDependencies specContext = new ObjectSpecificationDependencies(getDeploymentCategory(), servicesProvider, objectInstantiator, specificationLookup, facetProcessor);
final AdapterManager adapterMap = getRuntimeContext().getAdapterManager();
- final ObjectMemberContext objectMemberContext = new ObjectMemberContext(getDeploymentCategory(), authenticationSessionProvider, specificationLookup, adapterMap, getRuntimeContext().getQuerySubmitter(), servicesProvider);
+ final ObjectMemberDependencies objectMemberDependencies = new ObjectMemberDependencies(
+ specificationLookup, adapterMap, getRuntimeContext().getQuerySubmitter(), servicesProvider);
// ... and create the specs
if (FreeStandingList.class.isAssignableFrom(cls)) {
- return new ObjectSpecificationOnStandaloneList(specContext, objectMemberContext);
+ return new ObjectSpecificationOnStandaloneList(specContext, objectMemberDependencies);
} else {
final SpecificationLoaderSpi specificationLoader = this;
final ServicesInjector dependencyInjector = getRuntimeContext().getServicesInjector();
final CreateObjectContext createObjectContext = new CreateObjectContext(adapterMap, dependencyInjector);
final FacetedMethodsBuilderContext facetedMethodsBuilderContext = new FacetedMethodsBuilderContext(specificationLoader, facetProcessor, layoutMetadataReaders);
- return new ObjectSpecificationDefault(cls, facetedMethodsBuilderContext, specContext, objectMemberContext, createObjectContext);
+ return new ObjectSpecificationDefault(cls, facetedMethodsBuilderContext, specContext,
+ objectMemberDependencies, createObjectContext);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
index fc2c9cc..895886f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionContributee.java
@@ -30,12 +30,10 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.Command.Executor;
import org.apache.isis.applib.services.command.CommandContext;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
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.FacetHolderImpl;
@@ -49,7 +47,7 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
public class ObjectActionContributee extends ObjectActionImpl implements ContributeeMember {
@@ -80,8 +78,8 @@ public class ObjectActionContributee extends ObjectActionImpl implements Contrib
final ObjectActionImpl serviceAction,
final int contributeeParam,
final ObjectSpecification contributeeType,
- final ObjectMemberContext objectMemberContext) {
- super(serviceAction.getFacetedMethod(), objectMemberContext);
+ final ObjectMemberDependencies objectMemberDependencies) {
+ super(serviceAction.getFacetedMethod(), objectMemberDependencies);
this.serviceAdapter = serviceAdapter;
this.serviceAction = serviceAction;
@@ -189,10 +187,9 @@ public class ObjectActionContributee extends ObjectActionImpl implements Contrib
@Override
public ObjectAdapter[][] getChoices(
final ObjectAdapter target,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory, final InteractionInitiatedBy interactionInitiatedBy) {
- final ObjectAdapter[][] serviceChoices = serviceAction.getChoices(serviceAdapter, authenticationSession,
- deploymentCategory, interactionInitiatedBy);
+ final InteractionInitiatedBy interactionInitiatedBy) {
+ final ObjectAdapter[][] serviceChoices = serviceAction.getChoices(serviceAdapter,
+ interactionInitiatedBy);
return removeElementFromArray(serviceChoices, contributeeParam, new ObjectAdapter[][]{});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
index 4d40f3d..098584f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
@@ -31,14 +31,12 @@ import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
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.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -67,7 +65,7 @@ import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectAction {
private final static Logger LOG = LoggerFactory.getLogger(ObjectActionImpl.class);
@@ -91,8 +89,8 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
// Constructors
// //////////////////////////////////////////////////////////////////
- public ObjectActionImpl(final FacetedMethod facetedMethod, final ObjectMemberContext objectMemberContext) {
- super(facetedMethod, FeatureType.ACTION, objectMemberContext);
+ public ObjectActionImpl(final FacetedMethod facetedMethod, final ObjectMemberDependencies objectMemberDependencies) {
+ super(facetedMethod, FeatureType.ACTION, objectMemberDependencies);
}
// //////////////////////////////////////////////////////////////////
@@ -351,7 +349,6 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
public ObjectAdapter executeWithRuleChecking(
final ObjectAdapter target,
final ObjectAdapter[] arguments,
- final AuthenticationSession authenticationSession,
final InteractionInitiatedBy interactionInitiatedBy,
final Where where) {
@@ -457,11 +454,8 @@ public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectActi
@Override
public ObjectAdapter[][] getChoices(
final ObjectAdapter target,
- final AuthenticationSession authenticationSessionUNUSED,
- final DeploymentCategory deploymentCategory,
final InteractionInitiatedBy interactionInitiatedBy) {
- final AuthenticationSession session = getAuthenticationSession();
final int parameterCount = getParameterCount();
Object[][] parameterChoicesPojos;
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index d5688ba..38ed345 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -28,8 +28,6 @@ import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryFindAllInstances;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.lang.ClassExtensions;
import org.apache.isis.core.commons.lang.ListExtensions;
import org.apache.isis.core.commons.lang.StringExtensions;
@@ -40,14 +38,15 @@ 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.InteractionResultSet;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
import org.apache.isis.core.metamodel.facets.TypedHolder;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.object.choices.ChoicesFacetFromBoundedAbstract;
+import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
import org.apache.isis.core.metamodel.facets.param.autocomplete.ActionParameterAutoCompleteFacet;
+import org.apache.isis.core.metamodel.facets.param.autocomplete.MinLengthUtil;
import org.apache.isis.core.metamodel.facets.param.choices.ActionParameterChoicesFacet;
import org.apache.isis.core.metamodel.facets.param.defaults.ActionParameterDefaultsFacet;
import org.apache.isis.core.metamodel.interactions.ActionArgumentContext;
@@ -58,8 +57,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.facets.object.choices.ChoicesFacetFromBoundedAbstract;
-import org.apache.isis.core.metamodel.facets.param.autocomplete.MinLengthUtil;
public abstract class ObjectActionParameterAbstract implements ObjectActionParameter {
@@ -263,9 +260,6 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
final String searchArg,
final InteractionInitiatedBy interactionInitiatedBy) {
- final AuthenticationSession authenticationSession = getAuthenticationSession();
- final DeploymentCategory deploymentCategory = getDeploymentCategory();
-
final List<ObjectAdapter> adapters = Lists.newArrayList();
final ActionParameterAutoCompleteFacet facet = getFacet(ActionParameterAutoCompleteFacet.class);
@@ -320,8 +314,6 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
final ObjectAdapter target,
final List<ObjectAdapter> args,
final InteractionInitiatedBy interactionInitiatedBy) {
- final AuthenticationSession session = getAuthenticationSession();
- final DeploymentCategory deploymentCategory = getDeploymentCategory();
final List<ObjectAdapter> adapters = Lists.newArrayList();
final ActionParameterChoicesFacet facet = getFacet(ActionParameterChoicesFacet.class);
@@ -516,18 +508,10 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
// Dependencies (from parent)
// /////////////////////////////////////////////////////////////
- private DeploymentCategory getDeploymentCategory() {
- return parentAction.getDeploymentCategory();
- }
-
protected SpecificationLoader getSpecificationLoader() {
return parentAction.getSpecificationLoader();
}
- protected AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return parentAction.getAuthenticationSessionProvider();
- }
-
protected AdapterManager getAdapterMap() {
return parentAction.getAdapterManager();
}
@@ -536,8 +520,4 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
return parentAction.getQuerySubmitter();
}
- protected AuthenticationSession getAuthenticationSession() {
- return getAuthenticationSessionProvider().getAuthenticationSession();
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableContributee.java
index 5e282f2..d70de92 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterParseableContributee.java
@@ -64,8 +64,6 @@ public class ObjectActionParameterParseableContributee extends ObjectActionParam
final ObjectAdapter adapter,
final String searchArg,
final InteractionInitiatedBy interactionInitiatedBy) {
- final AuthenticationSession authenticationSession = getAuthenticationSession();
- final DeploymentCategory deploymentCategory = serviceAction.getDeploymentCategory();
return serviceActionParameter.getAutoComplete(serviceAdapter, searchArg,
interactionInitiatedBy);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
index 03a81e9..fd738bf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstract.java
@@ -29,15 +29,19 @@ import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedF
import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
// TODO need to pull up the common methods. like getName(), from subclasses
public abstract class ObjectAssociationAbstract extends ObjectMemberAbstract implements ObjectAssociation {
private final ObjectSpecification specification;
- public ObjectAssociationAbstract(final FacetedMethod facetedMethod, final FeatureType featureType, final ObjectSpecification specification, final ObjectMemberContext parameterObject) {
- super(facetedMethod, featureType, parameterObject);
+ public ObjectAssociationAbstract(
+ final FacetedMethod facetedMethod,
+ final FeatureType featureType,
+ final ObjectSpecification specification,
+ final ObjectMemberDependencies dependencies) {
+ super(facetedMethod, featureType, dependencies);
if (specification == null) {
throw new IllegalArgumentException("field type for '" + getId() + "' must exist");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
index d7d53d3..3edcbbf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstract.java
@@ -20,12 +20,11 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
import java.util.List;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.QuerySubmitter;
@@ -34,7 +33,6 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
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.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MultiTypedFacet;
@@ -43,11 +41,17 @@ import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.help.HelpFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.interactions.*;
+import org.apache.isis.core.metamodel.interactions.AccessContext;
+import org.apache.isis.core.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
+import org.apache.isis.core.metamodel.interactions.InteractionUtils;
+import org.apache.isis.core.metamodel.interactions.UsabilityContext;
+import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
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.ObjectMemberContext;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
public abstract class ObjectMemberAbstract implements ObjectMember {
@@ -62,14 +66,15 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
private final String id;
private final FacetedMethod facetedMethod;
private final FeatureType featureType;
- private final AuthenticationSessionProvider authenticationSessionProvider;
private final SpecificationLoader specificationLookup;
private final AdapterManager adapterManager;
private final ServicesProvider servicesProvider;
private final QuerySubmitter querySubmitter;
- private final DeploymentCategory deploymentCategory;
- protected ObjectMemberAbstract(final FacetedMethod facetedMethod, final FeatureType featureType, final ObjectMemberContext objectMemberContext) {
+ protected ObjectMemberAbstract(
+ final FacetedMethod facetedMethod,
+ final FeatureType featureType,
+ final ObjectMemberDependencies objectMemberDependencies) {
final String id = facetedMethod.getIdentifier().getMemberName();
if (id == null) {
throw new IllegalArgumentException("Name must always be set");
@@ -79,22 +84,13 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
this.id = id;
this.defaultName = StringExtensions.asNaturalName2(this.id);
- this.deploymentCategory = objectMemberContext.getDeploymentCategory();
- this.authenticationSessionProvider = objectMemberContext.getAuthenticationSessionProvider();
- this.specificationLookup = objectMemberContext.getSpecificationLoader();
- this.adapterManager = objectMemberContext.getAdapterManager();
- this.servicesProvider = objectMemberContext.getServicesProvider();
- this.querySubmitter = objectMemberContext.getQuerySubmitter();
+ this.specificationLookup = objectMemberDependencies.getSpecificationLoader();
+ this.adapterManager = objectMemberDependencies.getAdapterManager();
+ this.servicesProvider = objectMemberDependencies.getServicesProvider();
+ this.querySubmitter = objectMemberDependencies.getQuerySubmitter();
}
- // /////////////////////////////////////////////////////////////
- // from context
- // /////////////////////////////////////////////////////////////
- public DeploymentCategory getDeploymentCategory() {
- return deploymentCategory;
- }
-
// /////////////////////////////////////////////////////////////
// Identifiers
// /////////////////////////////////////////////////////////////
@@ -320,17 +316,6 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
return featureType.isProperty();
}
- // //////////////////////////////////////////////////////////////////
- // Convenience
- // //////////////////////////////////////////////////////////////////
-
- /**
- * The current {@link AuthenticationSession} (can change over time so do not
- * cache).
- */
- protected AuthenticationSession getAuthenticationSession() {
- return authenticationSessionProvider.getAuthenticationSession();
- }
// //////////////////////////////////////////////////////////////////
// toString
@@ -345,9 +330,6 @@ public abstract class ObjectMemberAbstract implements ObjectMember {
// Dependencies
// //////////////////////////////////////////////////////////////////
- public AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
public SpecificationLoader getSpecificationLoader() {
return specificationLookup;
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index ad7c6d5..c6aa040 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -19,14 +19,21 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.NotPersistable;
import org.apache.isis.applib.annotation.When;
@@ -35,7 +42,6 @@ import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.commons.lang.ClassExtensions;
import org.apache.isis.core.commons.util.ToString;
@@ -49,13 +55,14 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
+import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.all.help.HelpFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
-import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.object.parented.ParentedFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.object.dirty.ClearDirtyObjectFacet;
import org.apache.isis.core.metamodel.facets.object.dirty.IsDirtyObjectFacet;
import org.apache.isis.core.metamodel.facets.object.dirty.MarkDirtyObjectFacet;
@@ -65,20 +72,33 @@ import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.facets.object.membergroups.MemberGroupLayoutFacet;
import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
+import org.apache.isis.core.metamodel.facets.object.parented.ParentedFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.interactions.InteractionContext;
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.core.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.core.metamodel.layout.DeweyOrderSet;
-import org.apache.isis.core.metamodel.spec.*;
-import org.apache.isis.core.metamodel.spec.feature.*;
+import org.apache.isis.core.metamodel.spec.ActionType;
+import org.apache.isis.core.metamodel.spec.Instance;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiator;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecificationDependencies;
+import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
+import org.apache.isis.core.metamodel.spec.Persistability;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.feature.Contributed;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.facetprocessor.FacetProcessor;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implements ObjectSpecification {
@@ -104,7 +124,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
private final DeploymentCategory deploymentCategory;
- private final AuthenticationSessionProvider authenticationSessionProvider;
private final ServicesProvider servicesProvider;
private final ObjectInstantiator objectInstantiator;
private final SpecificationLoader specificationLoader;
@@ -116,7 +135,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
*/
protected Properties metadataProperties;
- protected final ObjectMemberContext objectMemberContext;
+ protected final ObjectMemberDependencies objectMemberDependencies;
private final List<ObjectAssociation> associations = Lists.newArrayList();
@@ -168,8 +187,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
public ObjectSpecificationAbstract(
final Class<?> introspectedClass,
final String shortName,
- final SpecificationContext specificationContext,
- final ObjectMemberContext objectMemberContext) {
+ final ObjectSpecificationDependencies objectSpecificationDependencies,
+ final ObjectMemberDependencies objectMemberDependencies) {
this.correspondingClass = introspectedClass;
this.fullName = introspectedClass.getName();
@@ -178,14 +197,13 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
this.isAbstract = ClassExtensions.isAbstract(introspectedClass);
this.identifier = Identifier.classIdentifier(introspectedClass);
- this.deploymentCategory = specificationContext.getDeploymentCategory();
- this.authenticationSessionProvider = specificationContext.getAuthenticationSessionProvider();
- this.servicesProvider = specificationContext.getServicesProvider();
- this.objectInstantiator = specificationContext.getObjectInstantiator();
- this.specificationLoader = specificationContext.getSpecificationLoader();
- this.facetProcessor = specificationContext.getFacetProcessor();
+ this.deploymentCategory = objectSpecificationDependencies.getDeploymentCategory();
+ this.servicesProvider = objectSpecificationDependencies.getServicesProvider();
+ this.objectInstantiator = objectSpecificationDependencies.getObjectInstantiator();
+ this.specificationLoader = objectSpecificationDependencies.getSpecificationLoader();
+ this.facetProcessor = objectSpecificationDependencies.getFacetProcessor();
- this.objectMemberContext = objectMemberContext;
+ this.objectMemberDependencies = objectMemberDependencies;
}
@@ -218,7 +236,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
/**
* As provided explicitly within the
- * {@link #ObjectSpecificationAbstract(Class, String, org.apache.isis.core.metamodel.spec.SpecificationContext, org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext)}
+ * {@link #ObjectSpecificationAbstract(Class, String, ObjectSpecificationDependencies, ObjectMemberDependencies)}
* constructor}.
*
* <p>
@@ -994,8 +1012,10 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
public ObjectAssociation apply(ObjectActionImpl input) {
final ObjectSpecification returnType = input.getReturnType();
final ObjectAssociationAbstract association = returnType.isNotCollection()
- ? new OneToOneAssociationContributee(serviceAdapter, input, contributeeType, objectMemberContext)
- : new OneToManyAssociationContributee(serviceAdapter, input, contributeeType, objectMemberContext);
+ ? new OneToOneAssociationContributee(serviceAdapter, input, contributeeType,
+ objectMemberDependencies)
+ : new OneToManyAssociationContributee(serviceAdapter, input, contributeeType,
+ objectMemberDependencies);
facetProcessor.processMemberOrder(metadataProperties, association);
return association;
}
@@ -1053,7 +1073,8 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
final int contributeeParam = contributeeParameterMatchOf(contributedAction);
if (contributeeParam != -1) {
ObjectActionContributee contributeeAction =
- new ObjectActionContributee(serviceAdapter, contributedAction, contributeeParam, this, objectMemberContext);
+ new ObjectActionContributee(serviceAdapter, contributedAction, contributeeParam, this,
+ objectMemberDependencies);
facetProcessor.processMemberOrder(metadataProperties, contributeeAction);
contributeeActions.add(contributeeAction);
}
@@ -1185,26 +1206,9 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
}
// //////////////////////////////////////////////////////////////////////
- // Convenience
- // //////////////////////////////////////////////////////////////////////
-
- /**
- * convenience method to return the current {@link AuthenticationSession}
- * from the {@link #getAuthenticationSessionProvider() injected}
- * {@link AuthenticationSessionProvider}.
- */
- protected final AuthenticationSession getAuthenticationSession() {
- return getAuthenticationSessionProvider().getAuthenticationSession();
- }
-
- // //////////////////////////////////////////////////////////////////////
// Dependencies (injected in constructor)
// //////////////////////////////////////////////////////////////////////
- protected AuthenticationSessionProvider getAuthenticationSessionProvider() {
- return authenticationSessionProvider;
- }
-
public ServicesProvider getServicesProvider() {
return servicesProvider;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69450a33/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
index 9d15ced..6e21a37 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
@@ -17,11 +17,11 @@
package org.apache.isis.core.metamodel.specloader.specimpl;
import java.util.List;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -42,7 +42,7 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMemberDependencies;
public class OneToManyAssociationContributee extends OneToManyAssociationImpl implements ContributeeMember {
@@ -58,9 +58,9 @@ public class OneToManyAssociationContributee extends OneToManyAssociationImpl im
private final Identifier identifier;
- private static ObjectSpecification typeOfSpec(final ObjectActionImpl objectAction, ObjectMemberContext objectMemberContext) {
+ private static ObjectSpecification typeOfSpec(final ObjectActionImpl objectAction, ObjectMemberDependencies objectMemberDependencies) {
final TypeOfFacet actionTypeOfFacet = objectAction.getFacet(TypeOfFacet.class);
- SpecificationLoader specificationLookup = objectMemberContext.getSpecificationLoader();
+ SpecificationLoader specificationLookup = objectMemberDependencies.getSpecificationLoader();
// TODO: a bit of a hack; ought really to set up a fallback TypeOfFacetDefault which ensures that there is always
// a TypeOfFacet for any contributee associations created from contributed actions.
Class<? extends Object> cls = actionTypeOfFacet != null? actionTypeOfFacet.value(): Object.class;
@@ -71,8 +71,9 @@ public class OneToManyAssociationContributee extends OneToManyAssociationImpl im
final ObjectAdapter serviceAdapter,
final ObjectActionImpl serviceAction,
final ObjectSpecification contributeeType,
- final ObjectMemberContext objectMemberContext) {
- super(serviceAction.getFacetedMethod(), typeOfSpec(serviceAction, objectMemberContext), objectMemberContext);
+ final ObjectMemberDependencies objectMemberDependencies) {
+ super(serviceAction.getFacetedMethod(), typeOfSpec(serviceAction, objectMemberDependencies),
+ objectMemberDependencies);
this.serviceAdapter = serviceAdapter;
this.serviceAction = serviceAction;
@@ -81,7 +82,8 @@ public class OneToManyAssociationContributee extends OneToManyAssociationImpl im
//
final NotPersistedFacet notPersistedFacet = new NotPersistedFacetAbstract(this) {};
final DisabledFacet disabledFacet = disabledFacet();
- final TypeOfFacet typeOfFacet = new TypeOfFacetAbstract(getSpecification().getCorrespondingClass(), this, objectMemberContext.getSpecificationLoader()) {};
+ final TypeOfFacet typeOfFacet = new TypeOfFacetAbstract(getSpecification().getCorrespondingClass(), this, objectMemberDependencies
+ .getSpecificationLoader()) {};
FacetUtil.addFacet(notPersistedFacet);
FacetUtil.addFacet(disabledFacet);
@@ -142,7 +144,6 @@ public class OneToManyAssociationContributee extends OneToManyAssociationImpl im
final ObjectAdapter contributee,
final InteractionInitiatedBy interactionInitiatedBy,
Where where) {
- final AuthenticationSession session = getAuthenticationSession();
final VisibilityContext<?> ic = ((ObjectMemberAbstract)serviceAction).createVisibleInteractionContext(
serviceAdapter, interactionInitiatedBy, where);
ic.putContributee(0, contributee); // by definition, the contributee will be the first arg of the service action