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 14:33:18 UTC
[87/87] [abbrv] isis git commit: ISIS-1044: remove DeploymentCategory,
AuthenticationSession from the InteractionContext class hierarchy.
ISIS-1044: remove DeploymentCategory, AuthenticationSession from the InteractionContext class hierarchy.
...refactoring any remaining usages of these fields to instead be injected via constructor:
- DisableForSessionFacetAbstract
- HideForSessionFacetAbstract
- ExplorationFacetAbstract
- PrototypeFacetAbstract
Also:
- reorder the remaining parameters in the constructors of InteractionContext and its subclasses.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6b5d586e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6b5d586e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6b5d586e
Branch: refs/heads/master
Commit: 6b5d586ea20fdea3556544c8312f8012cb60d384
Parents: 6f865c5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 3 13:25:09 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 3 13:25:09 2015 +0100
----------------------------------------------------------------------
.../core/metamodel/adapter/ObjectAdapter.java | 31 ++++---------------
.../action/ActionAnnotationFacetFactory.java | 6 ++--
...onInvocationFacetForDomainEventAbstract.java | 6 ++--
.../PrototypeFacetForActionAnnotation.java | 10 +++---
.../PrototypeFacetForPrototypeAnnotation.java | 14 ++++++---
.../exploration/ExplorationFacetAbstract.java | 12 ++++++--
.../annotation/ExplorationFacetAnnotation.java | 5 +--
.../ExplorationFacetAnnotationFactory.java | 2 +-
...ActionNamedDebugExplorationFacetFactory.java | 2 +-
.../ExplorationFacetViaNamingConvention.java | 6 ++--
.../prototype/PrototypeFacetAbstract.java | 11 +++++--
.../CollectionAccessorFacetViaAccessor.java | 2 +-
.../DisableForSessionFacetAbstract.java | 15 +++++++--
.../forsession/DisableForSessionFacetNone.java | 7 +++--
.../DisableForSessionFacetViaMethod.java | 8 +++--
.../DisableForSessionFacetViaMethodFactory.java | 10 ++++--
.../forsession/HideForSessionFacetAbstract.java | 15 +++++++--
.../forsession/HideForSessionFacetNone.java | 7 +++--
.../HideForSessionFacetViaMethod.java | 7 +++--
.../HideForSessionFacetViaMethodFactory.java | 10 ++++--
.../autocomplete/AutoCompleteFacetAbstract.java | 2 +-
.../ChoicesFacetFromBoundedAbstract.java | 2 +-
.../parser/ParseableFacetUsingParser.java | 14 +++------
...tionParameterAutoCompleteFacetViaMethod.java | 2 +-
.../method/ActionChoicesFacetViaMethod.java | 1 -
.../ActionParameterChoicesFacetViaMethod.java | 1 -
.../PropertyAccessorFacetViaAccessor.java | 2 +-
.../method/PropertyAutoCompleteFacetMethod.java | 1 -
.../metamodel/interactions/AccessContext.java | 10 +++---
.../interactions/ActionArgumentContext.java | 12 +++++---
.../interactions/ActionInvocationContext.java | 11 ++++---
.../interactions/ActionUsabilityContext.java | 11 ++++---
.../interactions/ActionVisibilityContext.java | 10 +++---
.../interactions/CollectionAccessContext.java | 14 ++++-----
.../interactions/CollectionAddToContext.java | 10 +++---
.../CollectionRemoveFromContext.java | 10 +++---
.../CollectionUsabilityContext.java | 10 +++---
.../CollectionVisibilityContext.java | 15 ++++-----
.../interactions/InteractionContext.java | 23 ++++----------
.../interactions/ObjectTitleContext.java | 15 ++++-----
.../interactions/ObjectValidityContext.java | 14 ++++-----
.../interactions/ObjectVisibilityContext.java | 10 ++----
.../interactions/ParseValueContext.java | 15 ++++-----
.../interactions/PropertyAccessContext.java | 15 ++++-----
.../interactions/PropertyModifyContext.java | 15 ++++-----
.../interactions/PropertyUsabilityContext.java | 15 ++++-----
.../interactions/PropertyVisibilityContext.java | 10 +++---
.../interactions/UsabilityContext.java | 11 ++++---
.../metamodel/interactions/ValidityContext.java | 10 +++---
.../interactions/VisibilityContext.java | 10 ++----
.../metamodel/spec/ObjectSpecification.java | 18 ++++++-----
.../specloader/specimpl/ObjectActionImpl.java | 9 +++---
.../specimpl/ObjectActionParameterAbstract.java | 3 +-
.../specimpl/ObjectSpecificationAbstract.java | 18 ++++++-----
.../specimpl/OneToManyAssociationImpl.java | 17 ++++-------
.../specimpl/OneToOneAssociationImpl.java | 19 ++++--------
.../standard/AuthorizationFacetAbstract.java | 17 +++++++++--
.../standard/AuthorizationFacetFactory.java | 3 +-
.../standard/AuthorizationFacetImpl.java | 8 +++--
.../PrototypeFacetAnnotationFactoryTest.java | 32 ++++++++++++++++++++
.../ExplorationFacetAnnotationFactoryTest.java | 31 +++++++++++++++++++
.../prototype/PrototypeFacetAbstractTest.java | 10 ++----
.../testspec/ObjectSpecificationStub.java | 8 ++---
.../system/ObjectMemberAbstractTest.java | 25 +++++++++++----
.../CollectionContentsSortableDataProvider.java | 6 +---
.../wicket/ui/pages/entity/EntityPage.java | 6 +---
66 files changed, 418 insertions(+), 299 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index e6bbb13..a194b06 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -27,7 +27,6 @@ import com.google.common.base.Function;
import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.lang.ClassExtensions;
import org.apache.isis.core.commons.lang.ListExtensions;
import org.apache.isis.core.commons.lang.MethodExtensions;
@@ -40,7 +39,6 @@ import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.adapter.version.Version;
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.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
@@ -351,18 +349,16 @@ public interface ObjectAdapter extends Instance, org.apache.isis.applib.annotati
*/
public static List<ObjectAdapter> visibleAdapters(
final ObjectAdapter collectionAdapter,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory,
final InteractionInitiatedBy interactionInitiatedBy) {
final CollectionFacet facet = CollectionFacet.Utils.getCollectionFacetFromSpec(collectionAdapter);
Iterable<ObjectAdapter> objectAdapters = facet.iterable(collectionAdapter);
- return visibleAdapters(objectAdapters, authenticationSession, deploymentCategory, interactionInitiatedBy);
+ return visibleAdapters(objectAdapters, interactionInitiatedBy);
}
/**
- * as per {@link #visibleAdapters(ObjectAdapter, AuthenticationSession, DeploymentCategory, InteractionInitiatedBy)}.
+ * as per {@link #visibleAdapters(ObjectAdapter, InteractionInitiatedBy)}.
* @param objectAdapters - iterable over the respective adapters of a collection (as returned by a getter of a collection, or of an autoCompleteNXxx() or choicesNXxx() method, etc
* @param authenticationSession - the user requesting the collection; if null then no visibility checking will be performed
* @param deploymentCategory - whether prototyping etc; may influence visibility
@@ -370,12 +366,10 @@ public interface ObjectAdapter extends Instance, org.apache.isis.applib.annotati
*/
public static List<ObjectAdapter> visibleAdapters(
final Iterable<ObjectAdapter> objectAdapters,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory,
final InteractionInitiatedBy interactionInitiatedBy) {
final List<ObjectAdapter> adapters = Lists.newArrayList();
for (final ObjectAdapter adapter : objectAdapters) {
- final boolean visible = isVisible(adapter, authenticationSession, deploymentCategory,
+ final boolean visible = isVisible(adapter,
interactionInitiatedBy);
if(visible) {
adapters.add(adapter);
@@ -386,40 +380,27 @@ public interface ObjectAdapter extends Instance, org.apache.isis.applib.annotati
/**
* @param adapter - an adapter around the domain object whose visibility is being checked
- * @param authenticationSession - the user requesting the collection; if null then no visibility checking will be performed
- * @param deploymentCategory - whether prototyping etc; may influence visibility
* @param interactionInitiatedBy
*/
public static boolean isVisible(
final ObjectAdapter adapter,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory,
final InteractionInitiatedBy interactionInitiatedBy) {
if(adapter.isDestroyed()) {
return false;
}
if(interactionInitiatedBy == InteractionInitiatedBy.FRAMEWORK) { return true; }
- if(authenticationSession == null) {
- return true;
- }
final ObjectSpecification objectSpecification = adapter.getSpecification();
- final VisibilityContext<?> context = createVisibleInteractionContext(adapter, authenticationSession,
- deploymentCategory, interactionInitiatedBy);
+ final VisibilityContext<?> context = createVisibleInteractionContext(adapter,
+ interactionInitiatedBy);
InteractionResult visibleResult = InteractionUtils.isVisibleResult(objectSpecification, context);
return visibleResult.isNotVetoing();
}
private static VisibilityContext<?> createVisibleInteractionContext(
final ObjectAdapter objectAdapter,
- final AuthenticationSession authenticationSession,
- final DeploymentCategory deploymentCategory,
final InteractionInitiatedBy interactionInitiatedBy) {
return new ObjectVisibilityContext(
- deploymentCategory,
- authenticationSession,
- interactionInitiatedBy,
- objectAdapter,
- objectAdapter.getSpecification().getIdentifier(),
+ objectAdapter, objectAdapter.getSpecification().getIdentifier(), interactionInitiatedBy,
Where.OBJECT_FORMS);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/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 c73f530..a3fa1bc 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
@@ -286,14 +286,16 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract implement
// check for deprecated @Prototype
final Prototype annotation = Annotations.getAnnotation(method, Prototype.class);
- final PrototypeFacet facet1 = PrototypeFacetForPrototypeAnnotation.create(annotation, holder);
+ final PrototypeFacet facet1 = PrototypeFacetForPrototypeAnnotation.create(annotation, holder,
+ getDeploymentCategory());
FacetUtil.addFacet(prototypeValidator.flagIfPresent(facet1, processMethodContext));
PrototypeFacet facet = facet1;
// else search for @Action(restrictTo=...)
final Action action = Annotations.getAnnotation(method, Action.class);
if(facet == null) {
- facet = PrototypeFacetForActionAnnotation.create(action, holder);
+ facet = PrototypeFacetForActionAnnotation.create(action, holder,
+ getDeploymentCategory());
}
FacetUtil.addFacet(facet);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/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 ba0279d..880f377 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
@@ -247,7 +247,7 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
final List<ObjectAdapter> visibleAdapters =
ObjectAdapter.Util.visibleAdapters(
adapterList,
- session, deploymentCategory, interactionInitiatedBy);
+ interactionInitiatedBy);
final Object visibleObjects =
CollectionUtils.copyOf(
Lists.transform(visibleAdapters, ObjectAdapter.Functions.getObject()),
@@ -261,8 +261,8 @@ public abstract class ActionInvocationFacetForDomainEventAbstract
} else {
boolean visible =
ObjectAdapter.Util.isVisible(
- invocationResultAdapter, session,
- deploymentCategory, interactionInitiatedBy);
+ invocationResultAdapter,
+ interactionInitiatedBy);
if(!visible) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
index 0eba467..edf8d79 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForActionAnnotation.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.actions.action.prototype;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
@@ -29,16 +30,17 @@ public class PrototypeFacetForActionAnnotation extends PrototypeFacetAbstract {
public static PrototypeFacet create(
final Action action,
- final FacetHolder holder) {
+ final FacetHolder holder,
+ final DeploymentCategory deploymentCategory) {
return action == null || action.restrictTo() == RestrictTo.NO_RESTRICTIONS
? null
- : new PrototypeFacetForActionAnnotation(holder);
+ : new PrototypeFacetForActionAnnotation(holder, deploymentCategory);
}
- private PrototypeFacetForActionAnnotation(FacetHolder holder) {
- super(holder);
+ private PrototypeFacetForActionAnnotation(FacetHolder holder, final DeploymentCategory deploymentCategory) {
+ super(holder, deploymentCategory);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java
index 9676eab..7afba4e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/prototype/PrototypeFacetForPrototypeAnnotation.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.actions.action.prototype;
import org.apache.isis.applib.annotation.Prototype;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
@@ -30,12 +31,17 @@ import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbs
@Deprecated
public class PrototypeFacetForPrototypeAnnotation extends PrototypeFacetAbstract {
- public PrototypeFacetForPrototypeAnnotation(final FacetHolder holder) {
- super(holder);
+ public PrototypeFacetForPrototypeAnnotation(
+ final FacetHolder holder,
+ final DeploymentCategory deploymentCategory) {
+ super(holder, deploymentCategory);
}
- public static PrototypeFacet create(final Prototype annotation, final FacetHolder holder) {
- return annotation == null ? null : new PrototypeFacetForPrototypeAnnotation(holder);
+ public static PrototypeFacet create(
+ final Prototype annotation,
+ final FacetHolder holder,
+ final DeploymentCategory deploymentCategory) {
+ return annotation == null ? null : new PrototypeFacetForPrototypeAnnotation(holder, deploymentCategory);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
index 0491f75..3094c4e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.actions.exploration;
import org.apache.isis.applib.events.VisibilityEvent;
+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.facets.MarkerFacetAbstract;
@@ -31,19 +32,24 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
@Deprecated
public abstract class ExplorationFacetAbstract extends MarkerFacetAbstract implements ExplorationFacet {
+ private final DeploymentCategory deploymentCategory;
+
public static Class<? extends Facet> type() {
return ExplorationFacet.class;
}
- public ExplorationFacetAbstract(final FacetHolder holder) {
+ public ExplorationFacetAbstract(final FacetHolder holder, final DeploymentCategory deploymentCategory) {
super(type(), holder);
+ this.deploymentCategory = deploymentCategory;
}
@Override
public String hides(
VisibilityContext<? extends VisibilityEvent> ic) {
- return ic.getDeploymentCategory().isExploring()? null: "Not visible";
+ return getDeploymentCategory().isExploring()? null: "Not visible";
}
-
+ protected DeploymentCategory getDeploymentCategory() {
+ return deploymentCategory;
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
index be43a65..e6fba56 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
@@ -19,6 +19,7 @@
package org.apache.isis.core.metamodel.facets.actions.exploration.annotation;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacetAbstract;
@@ -28,8 +29,8 @@ import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFace
@Deprecated
public class ExplorationFacetAnnotation extends ExplorationFacetAbstract {
- public ExplorationFacetAnnotation(final FacetHolder holder) {
- super(holder);
+ public ExplorationFacetAnnotation(final FacetHolder holder, final DeploymentCategory deploymentCategory) {
+ super(holder, deploymentCategory);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/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 9b99ef7..df792d7 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
@@ -55,7 +55,7 @@ public class ExplorationFacetAnnotationFactory extends FacetFactoryAbstract impl
}
private ExplorationFacet create(final Exploration annotation, final FacetHolder holder) {
- return annotation == null ? null : new ExplorationFacetAnnotation(holder);
+ return annotation == null ? null : new ExplorationFacetAnnotation(holder, getDeploymentCategory());
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/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 6c024e4..40431c8 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
@@ -98,7 +98,7 @@ public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFa
return;
}
final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
- final Facet facet = new ExplorationFacetViaNamingConvention(facetedMethod);
+ final Facet facet = new ExplorationFacetViaNamingConvention(facetedMethod, getDeploymentCategory());
FacetUtil.addFacet(explorationValidator.flagIfPresent(facet, processMethodContext));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
index e5abbe1..a638ed4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
@@ -19,6 +19,7 @@
package org.apache.isis.core.metamodel.facets.actions.interaction;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacetAbstract;
@@ -28,8 +29,9 @@ import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFace
@Deprecated
public class ExplorationFacetViaNamingConvention extends ExplorationFacetAbstract {
- public ExplorationFacetViaNamingConvention(final FacetHolder holder) {
- super(holder);
+ public ExplorationFacetViaNamingConvention(
+ final FacetHolder holder, final DeploymentCategory deploymentCategory) {
+ super(holder, deploymentCategory);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
index dc765ff..0375662 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstract.java
@@ -28,21 +28,26 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
public abstract class PrototypeFacetAbstract extends MarkerFacetAbstract implements PrototypeFacet {
+ private final DeploymentCategory deploymentCategory;
+
public static Class<? extends Facet> type() {
return PrototypeFacet.class;
}
- public PrototypeFacetAbstract(final FacetHolder holder) {
+ public PrototypeFacetAbstract(final FacetHolder holder, final DeploymentCategory deploymentCategory) {
super(type(), holder);
+ this.deploymentCategory = deploymentCategory;
}
@Override
public String hides(
final VisibilityContext<? extends VisibilityEvent> ic) {
- final DeploymentCategory deploymentCategory = ic.getDeploymentCategory();
- return deploymentCategory.isProduction()
+ return getDeploymentCategory().isProduction()
? "Prototyping action not visible in production mode"
: null;
}
+ protected DeploymentCategory getDeploymentCategory() {
+ return deploymentCategory;
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/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 30b4156..13c0610 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
@@ -87,7 +87,7 @@ public class CollectionAccessorFacetViaAccessor
final List<ObjectAdapter> visibleAdapters =
ObjectAdapter.Util.visibleAdapters(
collectionAdapter,
- authenticationSession, deploymentCategory, interactionInitiatedBy);
+ interactionInitiatedBy);
final Object visibleObjects =
CollectionUtils.copyOf(
Lists.transform(visibleAdapters, ObjectAdapter.Functions.getObject()),
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetAbstract.java
index 67f9c29..eaac187 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetAbstract.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.members.disabled.forsession;
import org.apache.isis.applib.events.UsabilityEvent;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -28,18 +29,26 @@ import org.apache.isis.core.metamodel.interactions.UsabilityContext;
public abstract class DisableForSessionFacetAbstract extends FacetAbstract implements DisableForSessionFacet {
+ private final AuthenticationSessionProvider authenticationSessionProvider;
+
public static Class<? extends Facet> type() {
return DisableForSessionFacet.class;
}
- public DisableForSessionFacetAbstract(final FacetHolder holder) {
+ public DisableForSessionFacetAbstract(
+ final FacetHolder holder,
+ final AuthenticationSessionProvider authenticationSessionProvider) {
super(type(), holder, Derivation.NOT_DERIVED);
+ this.authenticationSessionProvider = authenticationSessionProvider;
}
@Override
public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
- final AuthenticationSession session = ic.getSession();
- return disabledReason(session);
+ return disabledReason(getAuthenticationSession());
+ }
+
+ protected AuthenticationSession getAuthenticationSession() {
+ return authenticationSessionProvider.getAuthenticationSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java
index 9178ea8..f8dd5ec 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetNone.java
@@ -20,12 +20,15 @@
package org.apache.isis.core.metamodel.facets.members.disabled.forsession;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class DisableForSessionFacetNone extends DisableForSessionFacetAbstract {
- public DisableForSessionFacetNone(final FacetHolder holder) {
- super(holder);
+ public DisableForSessionFacetNone(
+ final FacetHolder holder,
+ final AuthenticationSessionProvider authenticationSessionProvider) {
+ super(holder, authenticationSessionProvider);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethod.java
index 1fb2be1..4e95be3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethod.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.authentication.AuthenticationSessionUtils;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -33,8 +34,11 @@ public class DisableForSessionFacetViaMethod extends DisableForSessionFacetAbstr
private final Method method;
- public DisableForSessionFacetViaMethod(final Method method, final FacetHolder holder) {
- super(holder);
+ public DisableForSessionFacetViaMethod(
+ final Method method,
+ final FacetHolder holder,
+ final AuthenticationSessionProvider authenticationSessionProvider) {
+ super(holder, authenticationSessionProvider);
this.method = method;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethodFactory.java
index d32f8c1..bad66b4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/forsession/DisableForSessionFacetViaMethodFactory.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.metamodel.facets.members.disabled.forsession;
import java.lang.reflect.Method;
import org.apache.isis.applib.security.UserMemento;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -50,10 +51,12 @@ public class DisableForSessionFacetViaMethodFactory extends MethodPrefixBasedFac
@Override
public void process(final ProcessMethodContext processMethodContext) {
- attachDisableFacetIfDisableMethodForSessionIsFound(processMethodContext);
+ attachDisableFacetIfDisableMethodForSessionIsFound(processMethodContext, getAuthenticationSessionProvider());
}
- public static void attachDisableFacetIfDisableMethodForSessionIsFound(final ProcessMethodContext processMethodContext) {
+ public static void attachDisableFacetIfDisableMethodForSessionIsFound(
+ final ProcessMethodContext processMethodContext,
+ final AuthenticationSessionProvider authenticationSessionProvider) {
final Method method = processMethodContext.getMethod();
final String capitalizedName = StringExtensions.asJavaBaseNameStripAccessorPrefixIfRequired(method.getName());
@@ -68,7 +71,8 @@ public class DisableForSessionFacetViaMethodFactory extends MethodPrefixBasedFac
processMethodContext.removeMethod(disableForSessionMethod);
final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
- FacetUtil.addFacet(new DisableForSessionFacetViaMethod(disableForSessionMethod, facetedMethod));
+ FacetUtil.addFacet(new DisableForSessionFacetViaMethod(disableForSessionMethod, facetedMethod,
+ authenticationSessionProvider));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetAbstract.java
index ca17ee7..759f925 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetAbstract.java
@@ -20,6 +20,8 @@
package org.apache.isis.core.metamodel.facets.members.hidden.forsession;
import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -34,16 +36,25 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
*/
public abstract class HideForSessionFacetAbstract extends FacetAbstract implements HideForSessionFacet {
+ private final AuthenticationSessionProvider authenticationSessionProvider;
+
public static Class<? extends Facet> type() {
return HideForSessionFacet.class;
}
- public HideForSessionFacetAbstract(final FacetHolder holder) {
+ public HideForSessionFacetAbstract(
+ final FacetHolder holder,
+ final AuthenticationSessionProvider authenticationSessionProvider) {
super(type(), holder, Derivation.NOT_DERIVED);
+ this.authenticationSessionProvider = authenticationSessionProvider;
}
@Override
public String hides(final VisibilityContext<? extends VisibilityEvent> ic) {
- return hiddenReason(ic.getSession());
+ return hiddenReason(getAuthenticationSession());
+ }
+
+ protected AuthenticationSession getAuthenticationSession() {
+ return authenticationSessionProvider.getAuthenticationSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java
index 4820b66..f8cfa6f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetNone.java
@@ -20,12 +20,15 @@
package org.apache.isis.core.metamodel.facets.members.hidden.forsession;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class HideForSessionFacetNone extends HideForSessionFacetAbstract {
- public HideForSessionFacetNone(final FacetHolder holder) {
- super(holder);
+ public HideForSessionFacetNone(
+ final FacetHolder holder,
+ final AuthenticationSessionProvider authenticationSessionProvider) {
+ super(holder, authenticationSessionProvider);
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethod.java
index a81ee79..5d00c8b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethod.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.authentication.AuthenticationSessionUtils;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -33,8 +34,10 @@ public class HideForSessionFacetViaMethod extends HideForSessionFacetAbstract im
private final Method method;
- public HideForSessionFacetViaMethod(final Method method, final FacetHolder holder) {
- super(holder);
+ public HideForSessionFacetViaMethod(
+ final Method method,
+ final FacetHolder holder, final AuthenticationSessionProvider authenticationSessionProvider) {
+ super(holder, authenticationSessionProvider);
this.method = method;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethodFactory.java
index e8cf388..fad2395 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/forsession/HideForSessionFacetViaMethodFactory.java
@@ -22,6 +22,7 @@ package org.apache.isis.core.metamodel.facets.members.hidden.forsession;
import java.lang.reflect.Method;
import org.apache.isis.applib.security.UserMemento;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -51,11 +52,13 @@ public class HideForSessionFacetViaMethodFactory extends MethodPrefixBasedFacetF
@Override
public void process(final ProcessMethodContext processMethodContext) {
// hideXxx(UserMemento)
- attachHideFacetIfHideMethodForSessionIsFound(processMethodContext);
+ attachHideFacetIfHideMethodForSessionIsFound(processMethodContext, getAuthenticationSessionProvider());
}
- public static void attachHideFacetIfHideMethodForSessionIsFound(final ProcessMethodContext processMethodContext) {
+ public static void attachHideFacetIfHideMethodForSessionIsFound(
+ final ProcessMethodContext processMethodContext,
+ final AuthenticationSessionProvider authenticationSessionProvider) {
final Method method = processMethodContext.getMethod();
final String capitalizedName = StringExtensions.asJavaBaseNameStripAccessorPrefixIfRequired(method.getName());
@@ -70,7 +73,8 @@ public class HideForSessionFacetViaMethodFactory extends MethodPrefixBasedFacetF
processMethodContext.removeMethod(hideForSessionMethod);
final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
- FacetUtil.addFacet(new HideForSessionFacetViaMethod(hideForSessionMethod, facetedMethod));
+ FacetUtil.addFacet(new HideForSessionFacetViaMethod(hideForSessionMethod, facetedMethod,
+ authenticationSessionProvider));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/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 913d694..1bddac1 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
@@ -108,7 +108,7 @@ public abstract class AutoCompleteFacetAbstract extends FacetAbstract implements
final AuthenticationSession authenticationSession = getAuthenticationSession();
final DeploymentCategory deploymentCategory = getDeploymentCategory();
return ObjectAdapter.Util.visibleAdapters(
- adapterList, authenticationSession, deploymentCategory, interactionInitiatedBy);
+ adapterList, interactionInitiatedBy);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
index ce2658c..a651278 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/ChoicesFacetFromBoundedAbstract.java
@@ -133,7 +133,7 @@ public abstract class ChoicesFacetFromBoundedAbstract
final DeploymentCategory deploymentCategory = getDeploymentCategory();
final List<ObjectAdapter> adapters =
ObjectAdapter.Util.visibleAdapters(
- allInstancesAdapter, authenticationSession, deploymentCategory, interactionInitiatedBy);
+ allInstancesAdapter, interactionInitiatedBy);
final List<Object> pojos = Lists.transform(adapters, ObjectAdapter.Functions.getObject());
return Lists.newArrayList(pojos).toArray();
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/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 14b63b8..b811543 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
@@ -82,15 +82,11 @@ public class ParseableFacetUsingParser extends FacetAbstract implements Parseabl
// (eg pick up any @RegEx on value type)
if (getFacetHolder().containsFacet(ValueFacet.class)) {
final ObjectAdapter entryAdapter = getAdapterManager().adapterFor(entry);
- final AuthenticationSession session = getAuthenticationSessionProvider().getAuthenticationSession();
final Identifier identifier = getIdentified().getIdentifier();
final ParseValueContext parseValueContext =
new ParseValueContext(
- deploymentCategory, session,
- interactionInitiatedBy,
- contextAdapter,
- identifier,
- entryAdapter);
+ contextAdapter, identifier, entryAdapter, interactionInitiatedBy
+ );
validate(parseValueContext);
}
@@ -108,12 +104,10 @@ public class ParseableFacetUsingParser extends FacetAbstract implements Parseabl
// (eg pick up any validate() methods on it)
final ObjectAdapter adapter = getAdapterManager().adapterFor(parsed);
final ObjectSpecification specification = adapter.getSpecification();
- final AuthenticationSession session = getAuthenticationSessionProvider().getAuthenticationSession();
final ObjectValidityContext validateContext =
specification.createValidityInteractionContext(
- deploymentCategory, session,
- interactionInitiatedBy,
- adapter);
+ adapter, interactionInitiatedBy
+ );
validate(validateContext);
return adapter;
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
index adba970..3ccd57d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethod.java
@@ -100,7 +100,7 @@ public class ActionParameterAutoCompleteFacetViaMethod extends ActionParameterAu
final List<ObjectAdapter> visibleAdapters =
ObjectAdapter.Util.visibleAdapters(
collectionAdapter,
- authenticationSession, deploymentCategory, interactionInitiatedBy);
+ interactionInitiatedBy);
final List<Object> visibleObjects = Lists.newArrayList(
Iterables.transform(visibleAdapters, ObjectAdapter.Functions.getObject()));
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
index d5affec..c346676 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
@@ -117,7 +117,6 @@ public class ActionChoicesFacetViaMethod extends ActionChoicesFacetAbstract impl
final List<ObjectAdapter> visibleAdapters =
ObjectAdapter.Util.visibleAdapters(
collectionAdapter,
- authenticationSession, deploymentCategory,
interactionInitiatedBy);
final List<Object> filteredObjects = Lists.newArrayList(
Iterables.transform(visibleAdapters, ObjectAdapter.Functions.getObject()));
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
index 723fc34..52bd857 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
@@ -92,7 +92,6 @@ public class ActionParameterChoicesFacetViaMethod extends ActionParameterChoices
final List<ObjectAdapter> visibleAdapters =
ObjectAdapter.Util.visibleAdapters(
objectAdapter,
- authenticationSession, deploymentCategory,
interactionInitiatedBy);
final List<Object> visibleObjects = Lists.newArrayList(
Iterables.transform(visibleAdapters, ObjectAdapter.Functions.getObject()));
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
index bf247a7..7397fa1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
@@ -85,7 +85,7 @@ public class PropertyAccessorFacetViaAccessor
if(filterForVisibility) {
final ObjectAdapter referencedAdapter = getAdapterManager().adapterFor(referencedObject);
final boolean visible = ObjectAdapter.Util
- .isVisible(referencedAdapter, authenticationSession, deploymentCategory, interactionInitiatedBy);
+ .isVisible(referencedAdapter, interactionInitiatedBy);
if (!visible) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
index 790b5c8..ce1997d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/autocomplete/method/PropertyAutoCompleteFacetMethod.java
@@ -112,7 +112,6 @@ public class PropertyAutoCompleteFacetMethod extends PropertyAutoCompleteFacetAb
final List<ObjectAdapter> visibleAdapters =
ObjectAdapter.Util.visibleAdapters(
collectionAdapter,
- authenticationSession, deploymentCategory,
interactionInitiatedBy);
final List<Object> filteredObjects = Lists.newArrayList(
Iterables.transform(visibleAdapters, ObjectAdapter.Functions.getObject()));
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
index 531905e..ff1653f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/AccessContext.java
@@ -21,11 +21,9 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.AccessEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
/**
* See {@link InteractionContext} for overview; analogous to {@link AccessEvent}
@@ -33,8 +31,12 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
*/
public abstract class AccessContext<T extends AccessEvent> extends InteractionContext<T> {
- public AccessContext(final InteractionContextType interactionType, DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final Identifier identifier, final ObjectAdapter target) {
- super(interactionType, deploymentCategory, session, invocationMethod, identifier, target);
+ public AccessContext(
+ final InteractionContextType interactionType,
+ final Identifier identifier,
+ final ObjectAdapter target,
+ final InteractionInitiatedBy interactionInitiatedBy) {
+ super(interactionType, interactionInitiatedBy, identifier, target);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
index f7c086d..fda8abc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionArgumentContext.java
@@ -21,11 +21,10 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.ActionArgumentEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+
import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
/**
@@ -38,8 +37,13 @@ public class ActionArgumentContext extends ValidityContext<ActionArgumentEvent>
private final int position;
private final ObjectAdapter proposed;
- public ActionArgumentContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final ObjectAdapter target, final Identifier id, final ObjectAdapter[] args, final int position) {
- super(InteractionContextType.ACTION_PROPOSED_ARGUMENT, deploymentCategory, session, invocationMethod, id, target);
+ public ActionArgumentContext(
+ final ObjectAdapter targetAdapter,
+ final Identifier id,
+ final ObjectAdapter[] args,
+ final int position,
+ final InteractionInitiatedBy interactionInitiatedBy) {
+ super(InteractionContextType.ACTION_PROPOSED_ARGUMENT, targetAdapter, id, interactionInitiatedBy);
this.args = args;
this.position = position;
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
index b1024de..afe4f8e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionInvocationContext.java
@@ -21,11 +21,10 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.ActionInvocationEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+
import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
/**
@@ -36,8 +35,12 @@ public class ActionInvocationContext extends ValidityContext<ActionInvocationEve
private final ObjectAdapter[] args;
- public ActionInvocationContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final ObjectAdapter target, final Identifier id, final ObjectAdapter[] args) {
- super(InteractionContextType.ACTION_INVOKE, deploymentCategory, session, invocationMethod, id, target);
+ public ActionInvocationContext(
+ final ObjectAdapter targetAdapter,
+ final Identifier id,
+ final ObjectAdapter[] args,
+ final InteractionInitiatedBy interactionInitiatedBy) {
+ super(InteractionContextType.ACTION_INVOKE, targetAdapter, id, interactionInitiatedBy);
this.args = args;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
index 292323a..73aeefd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionUsabilityContext.java
@@ -22,11 +22,10 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.ActionUsabilityEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+
import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
/**
@@ -35,8 +34,12 @@ import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
*/
public class ActionUsabilityContext extends UsabilityContext<ActionUsabilityEvent> {
- public ActionUsabilityContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final ObjectAdapter target, final Identifier id, Where where) {
- super(InteractionContextType.ACTION_USABLE, deploymentCategory, session, invocationMethod, id, target, where);
+ public ActionUsabilityContext(
+ final ObjectAdapter targetAdapter,
+ final Identifier id,
+ final InteractionInitiatedBy interactionInitiatedBy,
+ final Where where) {
+ super(InteractionContextType.ACTION_USABLE, targetAdapter, id, interactionInitiatedBy, where);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
index 0aefda3..85b8fdc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ActionVisibilityContext.java
@@ -22,11 +22,9 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.ActionVisibilityEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
@@ -36,8 +34,12 @@ import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
*/
public class ActionVisibilityContext extends VisibilityContext<ActionVisibilityEvent> {
- public ActionVisibilityContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final ObjectAdapter target, final Identifier identifier, Where where) {
- super(InteractionContextType.ACTION_VISIBLE, deploymentCategory, session, invocationMethod, identifier, target, where);
+ public ActionVisibilityContext(
+ final ObjectAdapter targetAdapter,
+ final Identifier identifier,
+ final InteractionInitiatedBy interactionInitiatedBy,
+ final Where where) {
+ super(InteractionContextType.ACTION_VISIBLE, targetAdapter, identifier, interactionInitiatedBy, where);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
index 428b229..d8e55a1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAccessContext.java
@@ -19,16 +19,13 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.CollectionAccessEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
/**
* See {@link InteractionContext} for overview; analogous to
@@ -36,8 +33,11 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
*/
public class CollectionAccessContext extends AccessContext<CollectionAccessEvent> {
- public CollectionAccessContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final ObjectAdapter target, final Identifier identifier) {
- super(InteractionContextType.COLLECTION_READ, deploymentCategory, session, invocationMethod, identifier, target);
+ public CollectionAccessContext(
+ final ObjectAdapter target,
+ final Identifier identifier,
+ final InteractionInitiatedBy interactionInitiatedBy) {
+ super(InteractionContextType.COLLECTION_READ, identifier, target, interactionInitiatedBy);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
index d7b9db2..c75dd4d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionAddToContext.java
@@ -21,11 +21,9 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.CollectionAddToEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
/**
* See {@link InteractionContext} for overview; analogous to
@@ -35,8 +33,12 @@ public class CollectionAddToContext extends ValidityContext<CollectionAddToEvent
private final ObjectAdapter proposed;
- public CollectionAddToContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final ObjectAdapter target, final Identifier id, final ObjectAdapter proposed) {
- super(InteractionContextType.COLLECTION_ADD_TO, deploymentCategory, session, invocationMethod, id, target);
+ public CollectionAddToContext(
+ final ObjectAdapter targetAdapter,
+ final Identifier id,
+ final ObjectAdapter proposed,
+ final InteractionInitiatedBy interactionInitiatedBy) {
+ super(InteractionContextType.COLLECTION_ADD_TO, targetAdapter, id, interactionInitiatedBy);
this.proposed = proposed;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
index ea7652d..d6cba32 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionRemoveFromContext.java
@@ -21,11 +21,9 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.CollectionRemoveFromEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
@@ -37,8 +35,12 @@ public class CollectionRemoveFromContext extends ValidityContext<CollectionRemov
private final ObjectAdapter proposed;
- public CollectionRemoveFromContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final ObjectAdapter target, final Identifier identifier, final ObjectAdapter proposed) {
- super(InteractionContextType.COLLECTION_REMOVE_FROM, deploymentCategory, session, invocationMethod, identifier, target);
+ public CollectionRemoveFromContext(
+ final ObjectAdapter targetAdapter,
+ final Identifier identifier,
+ final ObjectAdapter proposed,
+ final InteractionInitiatedBy interactionInitiatedBy) {
+ super(InteractionContextType.COLLECTION_REMOVE_FROM, targetAdapter, identifier, interactionInitiatedBy);
this.proposed = proposed;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
index cc62393..e7916df 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionUsabilityContext.java
@@ -22,11 +22,9 @@ package org.apache.isis.core.metamodel.interactions;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.CollectionUsabilityEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
/**
* See {@link InteractionContext} for overview; analogous to
@@ -34,8 +32,12 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
*/
public class CollectionUsabilityContext extends UsabilityContext<CollectionUsabilityEvent> {
- public CollectionUsabilityContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final ObjectAdapter target, final Identifier identifier, Where where) {
- super(InteractionContextType.COLLECTION_USABLE, deploymentCategory, session, invocationMethod, identifier, target, where);
+ public CollectionUsabilityContext(
+ final ObjectAdapter targetAdapter,
+ final Identifier identifier,
+ final InteractionInitiatedBy interactionInitiatedBy,
+ final Where where) {
+ super(InteractionContextType.COLLECTION_USABLE, targetAdapter, identifier, interactionInitiatedBy, where);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
index bf55212..927d402 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/CollectionVisibilityContext.java
@@ -19,17 +19,14 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.events.CollectionVisibilityEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
/**
* See {@link InteractionContext} for overview; analogous to
@@ -37,8 +34,12 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
*/
public class CollectionVisibilityContext extends VisibilityContext<CollectionVisibilityEvent> {
- public CollectionVisibilityContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final ObjectAdapter target, final Identifier identifier, Where where) {
- super(InteractionContextType.COLLECTION_VISIBLE, deploymentCategory, session, invocationMethod, identifier, target, where);
+ public CollectionVisibilityContext(
+ final ObjectAdapter target,
+ final Identifier identifierAdapter,
+ final InteractionInitiatedBy interactionInitiatedBy,
+ final Where where) {
+ super(InteractionContextType.COLLECTION_VISIBLE, target, identifierAdapter, interactionInitiatedBy, where);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
index a8aa47f..81a21b5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
@@ -29,7 +29,6 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
@@ -63,25 +62,22 @@ public abstract class InteractionContext<T extends InteractionEvent> {
private final InteractionContextType interactionType;
private final Identifier identifier;
private final InteractionInitiatedBy interactionInitiatedBy;
- private final AuthenticationSession session;
private final ObjectAdapter target;
- private final DeploymentCategory deploymentCategory;
-
+
private int contributeeParam = -1; // no contributee
private ObjectAdapter contributee = null;
- public InteractionContext(final InteractionContextType interactionType, DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final Identifier identifier, final ObjectAdapter target) {
+ public InteractionContext(
+ final InteractionContextType interactionType,
+ final InteractionInitiatedBy invocationMethod,
+ final Identifier identifier,
+ final ObjectAdapter target) {
this.interactionType = interactionType;
this.interactionInitiatedBy = invocationMethod;
this.identifier = identifier;
- this.session = session;
this.target = target;
- this.deploymentCategory = deploymentCategory;
}
- public DeploymentCategory getDeploymentCategory() {
- return deploymentCategory;
- }
/**
* The type of interaction.
@@ -112,13 +108,6 @@ public abstract class InteractionContext<T extends InteractionEvent> {
return identifier;
}
- /**
- * The {@link AuthenticationSession user or role} that is performing this
- * interaction.
- */
- public AuthenticationSession getSession() {
- return session;
- }
/**
* How the interaction was initiated.
http://git-wip-us.apache.org/repos/asf/isis/blob/6b5d586e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
index 41246a2..ac4eeb6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/ObjectTitleContext.java
@@ -19,16 +19,13 @@
package org.apache.isis.core.metamodel.interactions;
-import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
-
-
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.events.ObjectTitleEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+
+import static org.apache.isis.core.metamodel.adapter.ObjectAdapter.Util.unwrap;
/**
* See {@link InteractionContext} for overview; analogous to
@@ -38,8 +35,12 @@ public class ObjectTitleContext extends AccessContext<ObjectTitleEvent> {
private final String title;
- public ObjectTitleContext(DeploymentCategory deploymentCategory, final AuthenticationSession session, final InteractionInitiatedBy invocationMethod, final ObjectAdapter target, final Identifier identifier, final String title) {
- super(InteractionContextType.OBJECT_TITLE, deploymentCategory, session, invocationMethod, identifier, target);
+ public ObjectTitleContext(
+ final ObjectAdapter targetAdapter,
+ final Identifier identifier,
+ final String title,
+ final InteractionInitiatedBy interactionInitiatedBy) {
+ super(InteractionContextType.OBJECT_TITLE, identifier, targetAdapter, interactionInitiatedBy);
this.title = title;
}