[isis] branch master updated: ISIS-2340: further simplify InteractionContext
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 1ba2f91 ISIS-2340: further simplify InteractionContext
1ba2f91 is described below
commit 1ba2f91d36e0ec96abb049ad1ac09ec2f9ef492c
Author: Andi Huber
AuthorDate: Sun May 10 10:48:17 2020 +0200
ISIS-2340: further simplify InteractionContext
---
.../core/metamodel/interactions/AccessContext.java | 3 +-
.../metamodel/interactions/InteractionContext.java | 87 +-
.../metamodel/interactions/UsabilityContext.java | 13 +---
.../metamodel/interactions/ValidityContext.java| 3 +-
.../metamodel/interactions/VisibilityContext.java | 12 +--
5 files changed, 43 insertions(+), 75 deletions(-)
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 c3664e7..9aedd46 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
@@ -20,6 +20,7 @@
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.services.wrapper.events.AccessEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -38,7 +39,7 @@ implements InteractionEventSupplier {
final Identifier identifier,
final ManagedObject target,
final InteractionInitiatedBy interactionInitiatedBy) {
-super(interactionType, interactionInitiatedBy, identifier, target);
+super(interactionType, interactionInitiatedBy, identifier, target,
Where.NOT_SPECIFIED);
}
}
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 7ca66ae..547fe91 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
@@ -20,6 +20,7 @@
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.services.wrapper.events.InteractionEvent;
import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -27,6 +28,9 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.security.authentication.AuthenticationSession;
+import lombok.Getter;
+import lombok.Setter;
+
/**
* Represents an interaction between the framework and (a {@link Facet} of) the
* domain object.
@@ -55,25 +59,6 @@ import
org.apache.isis.core.security.authentication.AuthenticationSession;
*/
public abstract class InteractionContext {
-private final InteractionContextType interactionType;
-private final InteractionInitiatedBy interactionInitiatedBy;
-private final Identifier identifier;
-private final ManagedObject target;
-
-private ManagedObject mixedInAdapter = null; // for mixin members only,
obviously
-
-public InteractionContext(
-final InteractionContextType interactionType,
-final InteractionInitiatedBy invocationMethod,
-final Identifier identifier,
-final ManagedObject target) {
-this.interactionType = interactionType;
-this.interactionInitiatedBy = invocationMethod;
-this.identifier = identifier;
-this.target = target;
-}
-
-
/**
* The type of interaction.
*
@@ -86,12 +71,16 @@ public abstract class InteractionContext {
*
* Alternatively, {@link Facet}s can use instanceof.
*/
-public InteractionContextType getInteractionType() {
-return interactionType;
-}
-
+@Getter private final InteractionContextType interactionType;
+
/**
- * The identifier of the object or member that is being identified with.
+ * How the interaction was initiated.
+ */
+@Getter private final InteractionInitiatedBy initiatedBy;
+
+/**
+ * The identifier of the object or member that this interaction is being
+ * identified with.
*
*
* If the {@link #getInteractionType() type} is
@@ -99,43 +88,41 @@ public abstract class InteractionContext {
* the {@link #getTarget() target}
[isis] branch master updated: ISIS-2340: further remove contributee leftovers
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new c795aea ISIS-2340: further remove contributee leftovers
c795aea is described below
commit c795aea4d79ffcbaa3606ce43a97fabbcd050175
Author: Andi Huber
AuthorDate: Sun May 10 10:00:17 2020 +0200
ISIS-2340: further remove contributee leftovers
---
.../invocation/ActionDomainEventFacetAbstract.java | 14 +-
.../members/disabled/DisabledFacetAbstract.java| 7 -
.../method/DisableForContextFacetViaMethod.java| 4 +-
.../method/HideForContextFacetViaMethod.java | 4 +-
.../metamodel/interactions/InteractionContext.java | 25 +--
.../isis/core/metamodel/spec/ManagedObject.java| 21 +--
.../metamodel/specloader/specimpl/Factories.java | 17 --
.../specimpl/OneToManyAssociationContributee.java | 191 -
.../specimpl/OneToOneAssociationContributee.java | 174 ---
9 files changed, 7 insertions(+), 450 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
index 38cd4e5..0b22107 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
@@ -44,7 +44,6 @@ import
org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import lombok.Getter;
import lombok.Setter;
-import lombok.val;
public abstract class ActionDomainEventFacetAbstract
extends SingleClassValueFacetAbstract
@@ -146,20 +145,9 @@ implements ActionDomainEventFacet {
return ((ActionInteractionContext) ic).getObjectAction();
}
+@Deprecated
private static Can argumentAdaptersFrom(
final InteractionContext ic) {
-
-val contributee = ic.getContributeeWithParamIndex();
-
-if(contributee!=null) {
-
-val adapter = contributee.getIndex() == 0
-? contributee.getValue()
-: ManagedObject.unspecified();
-
-return Can.ofSingleton(adapter);
-
-}
return Can.empty();
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
index 1524db7..fddf865 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/DisabledFacetAbstract.java
@@ -26,11 +26,8 @@ import
org.apache.isis.applib.services.wrapper.events.UsabilityEvent;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.WhereValueFacetAbstract;
-import org.apache.isis.core.metamodel.interactions.ActionUsabilityContext;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import
org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationContributee;
-import
org.apache.isis.core.metamodel.specloader.specimpl.OneToOneAssociationContributee;
public abstract class DisabledFacetAbstract extends WhereValueFacetAbstract
implements DisabledFacet {
@@ -71,10 +68,6 @@ public abstract class DisabledFacetAbstract extends
WhereValueFacetAbstract impl
return null;
}
-if(ic instanceof ActionUsabilityContext && (getFacetHolder()
instanceof OneToOneAssociationContributee || getFacetHolder() instanceof
OneToManyAssociationContributee)) {
-// otherwise ends up vetoing the invocation of the contributing
action
-return null;
-}
final ManagedObject target = ic.getTarget();
final String disabledReason = disabledReason(target);
if (disabledReason != null) {
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
index 4752df3..4beb180 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethod.java
+++
[isis] branch master updated: ISIS-2340: simplify InteractionContext (split out generic type param into its own interface)
This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git The following commit(s) were added to refs/heads/master by this push: new 79ea575 ISIS-2340: simplify InteractionContext (split out generic type param into its own interface) 79ea575 is described below commit 79ea5756f4e56a04dfabf05546e0f759c2b5cd59 Author: Andi Huber AuthorDate: Sun May 10 10:35:14 2020 +0200 ISIS-2340: simplify InteractionContext (split out generic type param into its own interface) --- .../standard/AuthorizationFacetAbstract.java | 6 ++--- .../hidden/HiddenFacetForActionAnnotation.java | 3 ++- .../invocation/ActionDomainEventFacetAbstract.java | 14 +--- .../PrototypeFacetForActionAnnotation.java | 3 ++- .../notinservicemenu/NotInServiceMenuFacet.java| 3 +-- ...viceMenuFacetDerivedFromDomainServiceFacet.java | 6 ++--- .../actions/prototype/PrototypeFacetAbstract.java | 3 +-- .../ActionParameterValidationFacetAbstract.java| 7 +++--- .../validate/ActionValidationFacetAbstract.java| 7 +++--- .../modify/CollectionDomainEventFacetAbstract.java | 9 +++- .../CollectionValidateAddToFacetAbstract.java | 3 +-- .../CollectionValidateRemoveFromFacetAbstract.java | 3 +-- .../facets/fallback/MaxLengthFacetUnlimited.java | 3 +-- .../members/disabled/DisabledFacetAbstract.java| 3 +-- .../method/DisableForContextFacetNone.java | 3 +-- .../method/DisableForContextFacetViaMethod.java| 3 +-- .../facets/members/hidden/HiddenFacetAbstract.java | 3 +-- .../hidden/method/HideForContextFacetNone.java | 3 +-- .../method/HideForContextFacetViaMethod.java | 3 +-- .../choices/ChoicesFacetFromBoundedAbstract.java | 6 ++--- .../disabled/DisabledObjectFacetAbstract.java | 6 + .../object/hidden/HiddenObjectFacetAbstract.java | 6 + .../hidden/method/HiddenObjectFacetViaMethod.java | 7 +++--- .../object/immutable/ImmutableFacetAbstract.java | 3 +-- .../ObjectValidPropertiesFacetAbstract.java| 3 +-- .../parser/ParseableFacetUsingParser.java | 2 +- .../ValidateObjectFacetAbstract.java | 3 +-- .../mandatory/MandatoryFacetAbstract.java | 3 +-- .../objectvalue/maxlen/MaxLengthFacetAbstract.java | 3 +-- .../MustSatisfySpecificationFacetAbstract.java | 5 + .../objectvalue/regex/RegExFacetAbstract.java | 3 +-- .../ActionParameterDisabledFacetAbstract.java | 3 +-- .../hide/ActionParameterHiddenFacetAbstract.java | 3 +-- .../ActionParameterValidationFacetAbstract.java| 3 +-- .../modify/PropertyDomainEventFacetAbstract.java | 9 +++- .../validating/PropertyValidateFacetAbstract.java | 3 +-- .../dflt/PropertyValidateFacetDefault.java | 3 +-- .../core/metamodel/interactions/AccessContext.java | 4 +++- .../interactions/ActionArgUsabilityContext.java| 2 +- .../interactions/ActionArgValidityContext.java | 2 +- .../interactions/ActionArgVisibilityContext.java | 2 +- .../interactions/ActionUsabilityContext.java | 8 --- .../interactions/ActionValidityContext.java| 6 ++--- .../interactions/ActionVisibilityContext.java | 8 --- .../interactions/CollectionAccessContext.java | 6 ++--- .../interactions/CollectionAddToContext.java | 4 +++- .../interactions/CollectionRemoveFromContext.java | 8 --- .../interactions/CollectionUsabilityContext.java | 3 ++- .../interactions/CollectionVisibilityContext.java | 7 +++--- .../interactions/DisablingInteractionAdvisor.java | 3 +-- .../interactions/HidingInteractionAdvisor.java | 3 +-- .../metamodel/interactions/InteractionContext.java | 11 ++--- .../InteractionEventSupplier.java} | 24 +--- .../metamodel/interactions/InteractionUtils.java | 8 +++ .../metamodel/interactions/ObjectTitleContext.java | 7 +++--- .../interactions/ObjectValidityContext.java| 8 --- .../interactions/ObjectVisibilityContext.java | 8 --- .../metamodel/interactions/ParseValueContext.java | 8 --- .../interactions/PropertyAccessContext.java| 7 +++--- .../interactions/PropertyModifyContext.java| 8 --- .../interactions/PropertyUsabilityContext.java | 7 +++--- .../interactions/PropertyVisibilityContext.java| 6 ++--- .../metamodel/interactions/UsabilityContext.java | 4 +++- .../interactions/ValidatingInteractionAdvisor.java | 3 +-- .../metamodel/interactions/ValidityContext.java| 4 +++- .../metamodel/interactions/VisibilityContext.java | 4 +++- .../isis/core/metamodel/spec/ManagedObject.java| 2 +- .../specloader/specimpl/ObjectActionDefault.java | 18 --- .../specloader/specimpl/ObjectActionMixedIn.java | 6 ++--- .../specimpl/ObjectActionParameterAbstract.java| 10
[isis] branch master updated: ISIS-2340: simplify metamodel for mixins
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 9a6c794 ISIS-2340: simplify metamodel for mixins
9a6c794 is described below
commit 9a6c794693b33239e4fbcfce66dec507365a9900
Author: Andi Huber
AuthorDate: Sun May 10 14:38:35 2020 +0200
ISIS-2340: simplify metamodel for mixins
---
.../core/metamodel/consent/InteractionAdvisor.java | 4 +-
.../action/invocation/ActionDomainEventFacet.java | 3 +-
.../parser/ParseableFacetUsingParser.java | 3 +-
.../disable/ActionParameterDisabledFacet.java | 1 +
.../core/metamodel/interactions/AccessContext.java | 5 +-
.../interactions/ActionArgUsabilityContext.java| 5 +-
.../interactions/ActionArgValidityContext.java | 8 +-
.../interactions/ActionArgVisibilityContext.java | 5 +-
.../interactions/ActionUsabilityContext.java | 5 +-
.../interactions/ActionValidityContext.java| 4 +-
.../interactions/ActionVisibilityContext.java | 5 +-
.../interactions/CollectionAccessContext.java | 5 +-
.../interactions/CollectionAddToContext.java | 4 +-
.../interactions/CollectionRemoveFromContext.java | 4 +-
.../interactions/CollectionUsabilityContext.java | 5 +-
.../interactions/CollectionVisibilityContext.java | 5 +-
.../metamodel/interactions/InteractionContext.java | 41 +++-
.../metamodel/interactions/InteractionUtils.java | 19 +++-
.../metamodel/interactions/ObjectTitleContext.java | 4 +-
.../interactions/ObjectValidityContext.java| 4 +-
.../interactions/ObjectVisibilityContext.java | 5 +-
.../metamodel/interactions/ParseValueContext.java | 4 +-
.../interactions/PropertyAccessContext.java| 4 +-
.../interactions/PropertyModifyContext.java| 4 +-
.../interactions/PropertyUsabilityContext.java | 5 +-
.../interactions/PropertyVisibilityContext.java| 5 +-
.../metamodel/interactions/UsabilityContext.java | 5 +-
.../metamodel/interactions/ValidityContext.java| 5 +-
.../metamodel/interactions/VisibilityContext.java | 5 +-
.../spec/feature/ObjectActionParameter.java| 13 +--
.../spec/interaction/ManagedParameter.java | 8 +-
.../specloader/specimpl/ObjectActionDefault.java | 46 ++---
.../specloader/specimpl/ObjectActionMixedIn.java | 113 +++--
.../specimpl/ObjectActionParameterAbstract.java| 44
.../ObjectActionParameterMixedInAbstract.java | 60 ---
.../specimpl/ObjectAssociationAbstract.java| 9 +-
.../specloader/specimpl/ObjectMemberAbstract.java | 30 ++
.../specimpl/OneToManyActionParameterDefault.java | 4 +-
.../specimpl/OneToManyActionParameterMixedIn.java | 40
.../specimpl/OneToManyAssociationDefault.java | 23 +++--
.../specimpl/OneToManyAssociationMixedIn.java | 38 ++-
.../specimpl/OneToOneActionParameterDefault.java | 3 +-
.../specimpl/OneToOneActionParameterMixedIn.java | 35 ---
.../specimpl/OneToOneAssociationDefault.java | 22 ++--
.../specimpl/OneToOneAssociationMixedIn.java | 37 ++-
...ionParameterAbstractTest_getId_and_getName.java | 13 +--
.../runtime/system/ObjectMemberAbstractTest.java | 22 ++--
.../model/action/form/FormPendingParamUiModel.java | 8 +-
.../viewer/resources/ObjectActionArgHelper.java| 6 +-
.../viewer/wicket/model/models/ActionModel.java| 5 +-
.../wicket/model/models/ScalarParameterModel.java | 21 +++-
51 files changed, 323 insertions(+), 458 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
index 28d8a5f..3c295b4 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/consent/InteractionAdvisor.java
@@ -26,6 +26,7 @@ import
org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.InteractionAdvisorFacet;
+import org.apache.isis.core.metamodel.interactions.InteractionContext;
/**
* Marker interface for implementations (specifically, {@link Facet}s) that can
@@ -34,6 +35,8 @@ import
org.apache.isis.core.metamodel.interactions.InteractionAdvisorFacet;
* Used within {@link Allow} and {@link Veto}.
*/
public interface InteractionAdvisor {
+
+//boolean handles(InteractionContext ic);
/**
* For testing purposes only.
@@ -97,7 +100,6 @@ public interface InteractionAdvisor {
return null;
}
-
[isis] branch master updated: ISIS-2340: fixing some regressions from prev. commit(s)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new d5eea5d ISIS-2340: fixing some regressions from prev. commit(s)
d5eea5d is described below
commit d5eea5d2f500f6349e18d6dc3e75e825b2f83145
Author: Andi Huber
AuthorDate: Sun May 10 18:31:57 2020 +0200
ISIS-2340: fixing some regressions from prev. commit(s)
further simplifying
---
.../core/metamodel/facets/DomainEventHelper.java | 57 ++--
.../invocation/ActionDomainEventFacetAbstract.java | 6 +--
.../action/invocation/ActionInvocationFacet.java | 4 +-
...ctionInvocationFacetForDomainEventAbstract.java | 13 +++--
...ectionAddToFacetForDomainEventFromAbstract.java | 12 +++--
.../modify/CollectionDomainEventFacetAbstract.java | 6 +--
...nRemoveFromFacetForDomainEventFromAbstract.java | 12 +++--
.../facets/object/mixin/MixinFacetAbstract.java| 21
.../parser/ParseableFacetUsingParser.java | 7 +--
.../modify/PropertyDomainEventFacetAbstract.java | 6 +--
...tySetterOrClearFacetForDomainEventAbstract.java | 19 ---
.../metamodel/interactions/InteractionContext.java | 56 +++
.../core/metamodel/spec/feature/ObjectAction.java | 11 ++--
.../metamodel/spec/interaction/ManagedAction.java | 4 +-
.../specloader/specimpl/ObjectActionDefault.java | 32 ++-
.../specloader/specimpl/ObjectActionMixedIn.java | 63 --
.../specloader/specimpl/ObjectMemberAbstract.java | 9 ++--
.../specimpl/OneToManyAssociationMixedIn.java | 5 +-
.../specimpl/OneToOneAssociationMixedIn.java | 8 ++-
.../command/CommandExecutorServiceDefault.java | 5 +-
.../handlers/DomainObjectInvocationHandler.java| 8 +--
.../jdo/dom/user/ApplicationUserRepository.java| 4 +-
.../viewer/vaadin/ui/pages/main/MainView.java | 4 +-
.../viewer/wicket/model/models/ActionModel.java| 7 +--
24 files changed, 190 insertions(+), 189 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
index 9fe41ef..adba4d4 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
@@ -19,6 +19,11 @@
package org.apache.isis.core.metamodel.facets;
+import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
+import static
org.apache.isis.core.commons.internal.reflection._Reflect.Filter.paramAssignableFrom;
+import static
org.apache.isis.core.commons.internal.reflection._Reflect.Filter.paramAssignableFromValue;
+import static
org.apache.isis.core.commons.internal.reflection._Reflect.Filter.paramCount;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
@@ -38,17 +43,13 @@ import
org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.internal.reflection._Reflect;
import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
+import org.apache.isis.core.metamodel.interactions.InteractionContext.Head;
import org.apache.isis.core.metamodel.services.events.MetamodelEventService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
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 static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
-import static
org.apache.isis.core.commons.internal.reflection._Reflect.Filter.paramAssignableFrom;
-import static
org.apache.isis.core.commons.internal.reflection._Reflect.Filter.paramAssignableFromValue;
-import static
org.apache.isis.core.commons.internal.reflection._Reflect.Filter.paramCount;
-
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -72,13 +73,13 @@ public class DomainEventHelper {
@NonNull final Class> eventType,
final ObjectAction objectAction,
final IdentifiedHolder identified,
-final ManagedObject targetAdapter,
-final ManagedObject mixedInAdapter,
+final Head head,
final Can argumentAdapters,
final ManagedObject resultAdapter) {
-return postEventForAction(phase, uncheckedCast(eventType),
/*existingEvent*/null, objectAction, identified,
-targetAdapter, mixedInAdapter, argumentAdapters,
resultAdapter);
+return postEventForAction(phase,
[isis] branch master updated: ISIS-2340: fixes test mockups
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 9576d49 ISIS-2340: fixes test mockups
9576d49 is described below
commit 9576d490ca3513f7e40a59d395436968bd3081a3
Author: Andi Huber
AuthorDate: Sun May 10 21:41:32 2020 +0200
ISIS-2340: fixes test mockups
---
.../metamodel/interactions/InteractionContext.java | 9 ++--
.../WrapperFactoryDefault_wrappedObject_Test.java | 59 +++---
2 files changed, 46 insertions(+), 22 deletions(-)
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 1255054..1c12751 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
@@ -70,7 +70,7 @@ public abstract class InteractionContext {
* Model that holds the objects involved with the interaction.
* @since 2.0
*/
-@Value(staticConstructor = "of2")
+@Value(staticConstructor = "unchecked")
public static class Head {
/**
* The owning object that this interaction is associated with.
@@ -85,16 +85,15 @@ public abstract class InteractionContext {
/** in support of legacy code */
public static Head of(@NonNull ManagedObject owner, @NonNull
ManagedObject target) {
if(ManagedObject.isSpecified(owner)
-&& owner.getSpecification().getBeanSort().isMixin()
-&& owner.getPojo()==null) {
-throw _Exceptions.unrecoverableFormatted("owner not spec. %s",
owner);
+&& owner.getSpecification().getBeanSort().isMixin()) {
+throw _Exceptions.unrecoverableFormatted("unexpected: owner is
a mixin %s", owner);
}
if(ManagedObject.isSpecified(target)
&& target.getSpecification().getBeanSort().isMixin()
&& target.getPojo()==null) {
throw _Exceptions.unrecoverableFormatted("target not spec.
%s", target);
}
-return of2(owner, target);
+return unchecked(owner, target);
}
/** when owner equals target (no mixin) */
diff --git
a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 0bd3fbf..68e63b0 100644
---
a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++
b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -19,10 +19,16 @@
package org.apache.isis.core.runtimeservices.wrapper;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
+import java.util.stream.Stream;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
@@ -31,11 +37,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
+import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.command.Command.Executor;
@@ -43,6 +45,7 @@ import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.command.CommandExecutorService;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.applib.services.metamodel.BeanSort;
import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.HiddenException;
import org.apache.isis.applib.services.wrapper.InvalidException;
@@ -65,6 +68,7 @@ import
org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyCle
import
org.apache.isis.core.metamodel.facets.properties.update.init.PropertyInitializationFacetViaSetterMethod;
import
[isis] branch master updated: ISIS-2340: fixes test mockups (2)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new c813611 ISIS-2340: fixes test mockups (2)
c813611 is described below
commit c8136118e7f660a5a2587d1414a5087e46854f18
Author: Andi Huber
AuthorDate: Sun May 10 21:49:51 2020 +0200
ISIS-2340: fixes test mockups (2)
---
.../wrapper/WrapperFactoryDefault_wrappedObject_Test.java | 2 --
.../org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java | 4
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 68e63b0..63fac2a 100644
---
a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++
b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -365,8 +365,6 @@ public class WrapperFactoryDefault_wrappedObject_Test {
ignoring(mockCommand);
-//ignoring(mockStringSpec);
-
allowing(mockStringSpec).isParented();
will(returnValue(false));
diff --git
a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 554f888..00ed51d 100644
---
a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++
b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -38,6 +38,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.services.metamodel.BeanSort;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import
org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
@@ -117,6 +118,9 @@ public class ObjectMemberAbstractTest {
allowing(mockSpecForCustomer).isViewModel();
will(returnValue(false));
+
+allowing(mockSpecForCustomer).getBeanSort();
+will(returnValue(BeanSort.ENTITY));
allowing(mockSpecForCustomer).getShortIdentifier();
will(returnValue("Customer"));
[isis] branch master updated: ISIS-2340: move ia-context's head to its own class
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new d99fd2c ISIS-2340: move ia-context's head to its own class
d99fd2c is described below
commit d99fd2c284e7a2b23544adb5834c08c81a941538
Author: Andi Huber
AuthorDate: Mon May 11 07:11:42 2020 +0200
ISIS-2340: move ia-context's head to its own class
---
.../core/metamodel/facets/DomainEventHelper.java | 12 +--
.../action/invocation/ActionInvocationFacet.java | 4 +-
...ctionInvocationFacetForDomainEventAbstract.java | 6 +-
...ectionAddToFacetForDomainEventFromAbstract.java | 4 +-
...nRemoveFromFacetForDomainEventFromAbstract.java | 4 +-
.../parser/ParseableFacetUsingParser.java | 4 +-
...tySetterOrClearFacetForDomainEventAbstract.java | 6 +-
.../core/metamodel/interactions/AccessContext.java | 2 +-
.../interactions/ActionArgUsabilityContext.java| 2 +-
.../interactions/ActionArgValidityContext.java | 2 +-
.../interactions/ActionArgVisibilityContext.java | 2 +-
.../interactions/ActionUsabilityContext.java | 2 +-
.../interactions/ActionValidityContext.java| 2 +-
.../interactions/ActionVisibilityContext.java | 2 +-
.../interactions/CollectionAccessContext.java | 2 +-
.../interactions/CollectionAddToContext.java | 2 +-
.../interactions/CollectionRemoveFromContext.java | 2 +-
.../interactions/CollectionUsabilityContext.java | 2 +-
.../interactions/CollectionVisibilityContext.java | 2 +-
.../metamodel/interactions/InteractionContext.java | 66 +
.../metamodel/interactions/InteractionHead.java| 85 ++
.../metamodel/interactions/ObjectTitleContext.java | 2 +-
.../interactions/ObjectValidityContext.java| 2 +-
.../interactions/ObjectVisibilityContext.java | 2 +-
.../metamodel/interactions/ParseValueContext.java | 2 +-
.../interactions/PropertyAccessContext.java| 2 +-
.../interactions/PropertyModifyContext.java| 2 +-
.../interactions/PropertyUsabilityContext.java | 2 +-
.../interactions/PropertyVisibilityContext.java| 2 +-
.../metamodel/interactions/UsabilityContext.java | 2 +-
.../metamodel/interactions/ValidityContext.java| 2 +-
.../metamodel/interactions/VisibilityContext.java | 2 +-
.../core/metamodel/spec/feature/ObjectAction.java | 8 +-
.../spec/feature/ObjectActionParameter.java| 12 +--
.../metamodel/spec/interaction/ManagedAction.java | 4 +-
.../spec/interaction/ManagedParameter.java | 6 +-
.../specloader/specimpl/ObjectActionDefault.java | 16 ++--
.../specloader/specimpl/ObjectActionMixedIn.java | 10 +--
.../specimpl/ObjectActionParameterAbstract.java| 14 ++--
.../specimpl/ObjectAssociationAbstract.java| 6 +-
.../specimpl/OneToManyAssociationMixedIn.java | 6 +-
.../specimpl/OneToOneAssociationMixedIn.java | 6 +-
...ionParameterAbstractTest_getId_and_getName.java | 4 +-
.../command/CommandExecutorServiceDefault.java | 4 +-
.../handlers/DomainObjectInvocationHandler.java| 6 +-
.../viewer/vaadin/ui/pages/main/MainView.java | 4 +-
.../runtime/system/ObjectMemberAbstractTest.java | 6 +-
.../model/action/form/FormPendingParamUiModel.java | 4 +-
.../common/model/feature/ParameterUiModel.java | 2 +-
.../domainobjects/ObjectActionReprRenderer.java| 4 +-
.../viewer/resources/ObjectActionArgHelper.java| 6 +-
.../viewer/wicket/model/models/ActionModel.java| 12 +--
.../wicket/model/models/ScalarParameterModel.java | 10 +--
53 files changed, 205 insertions(+), 182 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
index adba4d4..9e02b3e 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/DomainEventHelper.java
@@ -43,7 +43,7 @@ import
org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.internal.reflection._Reflect;
import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
-import org.apache.isis.core.metamodel.interactions.InteractionContext.Head;
+import org.apache.isis.core.metamodel.interactions.InteractionHead;
import org.apache.isis.core.metamodel.services.events.MetamodelEventService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -73,7 +73,7 @@ public class DomainEventHelper {
@NonNull final Class> eventType,
final ObjectAction objectAction,
[isis] 02/02: ISIS-2340: couple pending params model with interaction api
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0c3e655f5fbbad5186f1a5c04fc39e89ad7d0e73
Author: Andi Huber
AuthorDate: Mon May 11 07:58:55 2020 +0200
ISIS-2340: couple pending params model with interaction api
---
.../metamodel/interactions/InteractionHead.java| 9 ++--
.../managed/ActionInteractionHead.java}| 56 --
.../managed/HasMetaModel.java} | 32 ++---
.../interactions/managed/ManagedParameter.java | 4 +-
.../core/metamodel/spec/feature/ObjectAction.java | 4 +-
.../specloader/specimpl/ObjectActionDefault.java | 5 +-
.../specloader/specimpl/ObjectActionMixedIn.java | 5 +-
.../specloader/specimpl/PendingParameterModel.java | 5 +-
.../handlers/DomainObjectInvocationHandler.java| 3 +-
.../common/model/action/form/FormUiModel.java | 1 -
.../common/model/feature/ParameterUiModel.java | 4 +-
.../viewer/resources/ObjectActionArgHelper.java| 4 +-
.../viewer/wicket/model/models/ActionModel.java| 6 +--
.../wicket/model/models/ScalarParameterModel.java | 15 ++
14 files changed, 63 insertions(+), 90 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionHead.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionHead.java
index 0911256..73c30b0 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionHead.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionHead.java
@@ -26,14 +26,17 @@ import javax.annotation.Nullable;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import lombok.AccessLevel;
+import lombok.Getter;
import lombok.NonNull;
-import lombok.Value;
+import lombok.RequiredArgsConstructor;
/**
* Model that holds the objects involved with the interaction.
* @since 2.0
*/
-@Value(staticConstructor = "unchecked")
+@Getter
+@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
public class InteractionHead {
/**
* The owning object of an interaction.
@@ -57,7 +60,7 @@ public class InteractionHead {
&& target.getPojo()==null) {
throw _Exceptions.unrecoverableFormatted("target not spec. %s",
target);
}
-return unchecked(owner, target);
+return new InteractionHead(owner, target);
}
/** Simple case, when owner equals target. (no mixin) */
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModelHead.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteractionHead.java
similarity index 76%
rename from
core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModelHead.java
rename to
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteractionHead.java
index 92d3676..5b2587f 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModelHead.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteractionHead.java
@@ -16,40 +16,44 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.specloader.specimpl;
+package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Objects;
import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.metamodel.interactions.InteractionHead;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import
org.apache.isis.core.metamodel.specloader.specimpl.PendingParameterModel;
import lombok.Getter;
import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.extern.log4j.Log4j2;
-/**
- * The 'head' of a {@link PendingParameterModel}, which in contrast to the
(owning)
- * {@link PendingParameterModel} holds no parameter values.
- *
- * @since 2.0.0
- */
-@Getter
-@RequiredArgsConstructor(staticName = "of")
@Log4j2
-public class PendingParameterModelHead {
+public class ActionInteractionHead
+extends InteractionHead
+implements HasMetaModel {
-@NonNull private final ObjectAction action;
-@NonNull private final ManagedObject actionOwner;
+@Getter(onMethod = @__(@Override))
+@NonNull private final ObjectAction metaModel;
-/**
- * typically equal to {@code actionOwner}, except for mixins,
- * where {@code actionTarget} is the mixin instance
- */
-@NonNull private final ManagedObject actionTarget;
+public static
[isis] branch master updated (d99fd2c -> 0c3e655)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from d99fd2c ISIS-2340: move ia-context's head to its own class
new 9982bd6 ISIS-2340: rename package f. managed interaction stuff
new 0c3e655 ISIS-2340: couple pending params model with interaction api
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../metamodel/interactions/InteractionHead.java| 9 ++--
.../managed}/ActionInteraction.java| 4 +-
.../managed/ActionInteractionHead.java}| 56 --
.../managed}/CollectionInteraction.java| 4 +-
.../interactions/managed/HasMetaModel.java | 9 ++--
.../managed}/InteractionVeto.java | 4 +-
.../managed}/ManagedAction.java| 2 +-
.../managed}/ManagedCollection.java| 2 +-
.../managed}/ManagedMember.java| 2 +-
.../managed}/ManagedParameter.java | 6 +--
.../managed}/ManagedParameterList.java | 2 +-
.../managed}/ManagedProperty.java | 2 +-
.../managed}/MemberInteraction.java| 2 +-
.../managed}/PropertyInteraction.java | 4 +-
.../core/metamodel/spec/feature/ObjectAction.java | 4 +-
.../specloader/specimpl/ObjectActionDefault.java | 5 +-
.../specloader/specimpl/ObjectActionMixedIn.java | 5 +-
.../specloader/specimpl/PendingParameterModel.java | 5 +-
.../handlers/DomainObjectInvocationHandler.java| 3 +-
.../viewer/vaadin/ui/binding/BinderUtil.java | 2 +-
.../vaadin/ui/components/collection/TableView.java | 2 +-
.../ui/components/object/ObjectFormView.java | 8 ++--
.../common/model/action/form/FormUiModel.java | 1 -
.../common/model/binding/UiComponentFactory.java | 6 +--
.../common/model/feature/ParameterUiModel.java | 4 +-
.../AbstractObjectMemberReprRenderer.java | 2 +-
.../domainobjects/DomainObjectReprRenderer.java| 6 +--
.../domainobjects/ObjectActionReprRenderer.java| 2 +-
.../domainobjects/ObjectAndActionInvocation.java | 2 +-
.../ObjectCollectionReprRenderer.java | 2 +-
.../domainobjects/ObjectPropertyReprRenderer.java | 2 +-
.../rendering/service/RepresentationService.java | 6 +--
.../RepresentationServiceContentNegotiator.java| 6 +--
.../service/conneg/ContentNegotiationService.java | 6 +--
.../conneg/ContentNegotiationServiceAbstract.java | 6 +--
...entNegotiationServiceForRestfulObjectsV1_0.java | 6 +--
.../ContentNegotiationServiceOrgApacheIsisV1.java | 6 +--
.../resources/DomainObjectResourceServerside.java | 6 +--
.../viewer/resources/DomainResourceHelper.java | 12 ++---
.../resources/InteractionFailureHandler.java | 4 +-
.../viewer/resources/ObjectActionArgHelper.java| 6 +--
.../resources/ObjectAdapterAccessHelper.java | 16 +++
.../viewer/wicket/model/models/ActionModel.java| 6 +--
.../wicket/model/models/ScalarParameterModel.java | 15 ++
44 files changed, 134 insertions(+), 136 deletions(-)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/{spec/interaction
=> interactions/managed}/ActionInteraction.java (97%)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/{specloader/specimpl/PendingParameterModelHead.java
=> interactions/managed/ActionInteractionHead.java} (76%)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/{spec/interaction
=> interactions/managed}/CollectionInteraction.java (93%)
copy
viewers/common/src/main/java/org/apache/isis/viewer/common/model/HasParentUiModel.java
=>
core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/HasMetaModel.java
(80%)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/{spec/interaction
=> interactions/managed}/InteractionVeto.java (95%)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/{spec/interaction
=> interactions/managed}/ManagedAction.java (97%)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/{spec/interaction
=> interactions/managed}/ManagedCollection.java (97%)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/{spec/interaction
=> interactions/managed}/ManagedMember.java (98%)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/{spec/interaction
=> interactions/managed}/ManagedParameter.java (86%)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/{spec/interaction
=> interactions/managed}/ManagedParameterList.java (97%)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/{spec/interaction
=>
[isis] 01/02: ISIS-2340: rename package f. managed interaction stuff
This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git commit 9982bd635cda428dc7e012e9776fa874d42b93de Author: Andi Huber AuthorDate: Mon May 11 07:19:39 2020 +0200 ISIS-2340: rename package f. managed interaction stuff --- .../managed}/ActionInteraction.java | 4 ++-- .../managed}/CollectionInteraction.java | 4 ++-- .../managed}/InteractionVeto.java| 4 ++-- .../managed}/ManagedAction.java | 2 +- .../managed}/ManagedCollection.java | 2 +- .../managed}/ManagedMember.java | 2 +- .../managed}/ManagedParameter.java | 2 +- .../managed}/ManagedParameterList.java | 2 +- .../managed}/ManagedProperty.java| 2 +- .../managed}/MemberInteraction.java | 2 +- .../managed}/PropertyInteraction.java| 4 ++-- .../incubator/viewer/vaadin/ui/binding/BinderUtil.java | 2 +- .../vaadin/ui/components/collection/TableView.java | 2 +- .../vaadin/ui/components/object/ObjectFormView.java | 8 .../viewer/common/model/binding/UiComponentFactory.java | 6 +++--- .../domainobjects/AbstractObjectMemberReprRenderer.java | 2 +- .../domainobjects/DomainObjectReprRenderer.java | 6 +++--- .../domainobjects/ObjectActionReprRenderer.java | 2 +- .../domainobjects/ObjectAndActionInvocation.java | 2 +- .../domainobjects/ObjectCollectionReprRenderer.java | 2 +- .../domainobjects/ObjectPropertyReprRenderer.java| 2 +- .../rendering/service/RepresentationService.java | 6 +++--- .../service/RepresentationServiceContentNegotiator.java | 6 +++--- .../service/conneg/ContentNegotiationService.java| 6 +++--- .../conneg/ContentNegotiationServiceAbstract.java| 6 +++--- .../ContentNegotiationServiceForRestfulObjectsV1_0.java | 6 +++--- .../conneg/ContentNegotiationServiceOrgApacheIsisV1.java | 6 +++--- .../viewer/resources/DomainObjectResourceServerside.java | 6 +++--- .../viewer/resources/DomainResourceHelper.java | 12 ++-- .../viewer/resources/InteractionFailureHandler.java | 4 ++-- .../viewer/resources/ObjectActionArgHelper.java | 2 +- .../viewer/resources/ObjectAdapterAccessHelper.java | 16 .../viewer/wicket/model/models/ScalarParameterModel.java | 2 +- 33 files changed, 71 insertions(+), 71 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ActionInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java similarity index 97% rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ActionInteraction.java rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java index 107a9b8..df1428d 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/ActionInteraction.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.isis.core.metamodel.spec.interaction; +package org.apache.isis.core.metamodel.interactions.managed; import java.util.function.Function; @@ -24,8 +24,8 @@ import org.apache.isis.core.commons.collections.Can; import org.apache.isis.core.commons.internal.base._Either; import org.apache.isis.core.commons.internal.exceptions._Exceptions; import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy; +import org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType; import org.apache.isis.core.metamodel.spec.ManagedObject; -import org.apache.isis.core.metamodel.spec.interaction.ManagedMember.MemberType; import lombok.Data; import lombok.NonNull; diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/CollectionInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java similarity index 93% rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/CollectionInteraction.java rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java index 8b84f98..6a3cf3f 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/interaction/CollectionInteraction.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java @@ -16,11 +16,11 @@ * specific language governing permissions
