You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/05/02 17:34:07 UTC
[isis] branch master updated (d9cde2e1dc -> 36d98a5b5c)
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 d9cde2e1dc ISIS-2902: split factory method Identifier.propertyOrCollectionIdentifier(..) into Identifier.propertyIdentifier(..) and Identifier.collectionIdentifier(..)
new e068026133 ISIS-2902: java-doc fix
new 36d98a5b5c ISIS-2902: replace trivial uses of ManagedMember.MemberType (enum name related)
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:
api/applib/src/main/java/org/apache/isis/applib/Identifier.java | 4 ++--
.../isis/core/metamodel/interactions/managed/ActionInteraction.java | 6 +++---
.../core/metamodel/interactions/managed/CollectionInteraction.java | 4 ++--
.../isis/core/metamodel/interactions/managed/InteractionVeto.java | 4 ++--
.../core/metamodel/interactions/managed/PropertyInteraction.java | 4 ++--
.../restfulobjects/viewer/resources/_DomainResourceHelper.java | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
[isis] 02/02: ISIS-2902: replace trivial uses of ManagedMember.MemberType (enum name related)
Posted by ah...@apache.org.
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 36d98a5b5c95ca169f357e1a4cc1212c3c360a89
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon May 2 19:34:01 2022 +0200
ISIS-2902: replace trivial uses of ManagedMember.MemberType (enum name
related)
---
.../isis/core/metamodel/interactions/managed/ActionInteraction.java | 6 +++---
.../core/metamodel/interactions/managed/CollectionInteraction.java | 4 ++--
.../isis/core/metamodel/interactions/managed/InteractionVeto.java | 4 ++--
.../core/metamodel/interactions/managed/PropertyInteraction.java | 4 ++--
.../restfulobjects/viewer/resources/_DomainResourceHelper.java | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
index 2d3a25bd78..0afce5ccba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ActionInteraction.java
@@ -21,12 +21,12 @@ package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.function.Function;
+import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.functional.Railway;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-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.ManagedObjects;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
@@ -72,7 +72,7 @@ extends MemberInteraction<ManagedAction, ActionInteraction> {
final InteractionRailway<ManagedAction> railway = managedAction.isPresent()
? InteractionRailway.success(managedAction.get())
- : InteractionRailway.veto(InteractionVeto.notFound(MemberType.ACTION, memberId));
+ : InteractionRailway.veto(InteractionVeto.notFound(Identifier.Type.ACTION, memberId));
return new ActionInteraction(
managedAction.map(ManagedAction::getAction),
@@ -88,7 +88,7 @@ extends MemberInteraction<ManagedAction, ActionInteraction> {
public static ActionInteraction empty(final String actionId) {
return new ActionInteraction(
Optional.empty(),
- InteractionRailway.veto(InteractionVeto.notFound(MemberType.ACTION, actionId)));
+ InteractionRailway.veto(InteractionVeto.notFound(Identifier.Type.ACTION, actionId)));
}
ActionInteraction(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java
index 09aff8d9bf..9bfb817a60 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/CollectionInteraction.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.function.Function;
+import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import lombok.NonNull;
@@ -40,7 +40,7 @@ extends MemberInteraction<ManagedCollection, CollectionInteraction> {
final InteractionRailway<ManagedCollection> railway = managedCollection.isPresent()
? InteractionRailway.success(managedCollection.get())
- : InteractionRailway.veto(InteractionVeto.notFound(MemberType.COLLECTION, memberId));
+ : InteractionRailway.veto(InteractionVeto.notFound(Identifier.Type.COLLECTION, memberId));
return new CollectionInteraction(railway);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/InteractionVeto.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/InteractionVeto.java
index 2cee8de2e2..ff3958ab16 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/InteractionVeto.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/InteractionVeto.java
@@ -22,9 +22,9 @@ import java.io.Serializable;
import org.springframework.lang.Nullable;
+import org.apache.isis.applib.Identifier;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.Veto;
-import org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType;
import lombok.AccessLevel;
import lombok.Getter;
@@ -53,7 +53,7 @@ public class InteractionVeto implements Serializable {
@NonNull private final Consent vetoConsent;
public static InteractionVeto notFound(
- @NonNull final MemberType memberType,
+ @NonNull final Identifier.Type memberType,
@Nullable final String memberId) {
val reason = String.format("member '%s' in %s either does not exist, is disabled or is not visible",
"" + memberId,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
index f9a74676b0..9b84509881 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/PropertyInteraction.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.metamodel.interactions.managed;
import java.util.Optional;
import java.util.function.Function;
+import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import lombok.NonNull;
@@ -40,7 +40,7 @@ extends MemberInteraction<ManagedProperty, PropertyInteraction> {
final InteractionRailway<ManagedProperty> railway = managedProperty.isPresent()
? InteractionRailway.success(managedProperty.get())
- : InteractionRailway.veto(InteractionVeto.notFound(MemberType.PROPERTY, memberId));
+ : InteractionRailway.veto(InteractionVeto.notFound(Identifier.Type.PROPERTY, memberId));
return new PropertyInteraction(railway);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java
index 53ce0d3b09..40c893aa58 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/_DomainResourceHelper.java
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.LongAdder;
import javax.ws.rs.core.Response;
+import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.functional.Railway;
@@ -30,7 +31,6 @@ import org.apache.isis.core.metamodel.interactions.managed.ActionInteraction.Res
import org.apache.isis.core.metamodel.interactions.managed.ActionInteraction.SemanticConstraint;
import org.apache.isis.core.metamodel.interactions.managed.InteractionVeto;
import org.apache.isis.core.metamodel.interactions.managed.ManagedMember;
-import org.apache.isis.core.metamodel.interactions.managed.ManagedMember.MemberType;
import org.apache.isis.core.metamodel.interactions.managed.MemberInteraction.AccessIntent;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
@@ -216,7 +216,7 @@ class _DomainResourceHelper {
// no such action or not visible or not usable
throw InteractionFailureHandler.onFailure(actionInteraction
.getInteractionVeto()
- .orElseGet(()->InteractionVeto.notFound(MemberType.ACTION, actionId))); // unexpected code reach
+ .orElseGet(()->InteractionVeto.notFound(Identifier.Type.ACTION, actionId))); // unexpected code reach
}
val hasParams = pendingArgs.getParamCount()>0;
[isis] 01/02: ISIS-2902: java-doc fix
Posted by ah...@apache.org.
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 e0680261330234d3b393861e509dfdd6a3d5cad9
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon May 2 19:26:16 2022 +0200
ISIS-2902: java-doc fix
---
api/applib/src/main/java/org/apache/isis/applib/Identifier.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/Identifier.java b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
index 80a7a1f1fe..dea20e8406 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/Identifier.java
@@ -72,11 +72,11 @@ implements
*/
ACTION_PARAMETER,
/**
- * <i>One to One Association (Property)</i> (of any cardinality), either declared or mixed in.
+ * <i>One to One Association (Property)</i> either declared or mixed in.
*/
PROPERTY,
/**
- * <i>One to Many Association (Collection)</i> (of any cardinality), either declared or mixed in.
+ * <i>One to Many Association (Collection)</i> either declared or mixed in.
*/
COLLECTION
;