You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/09/27 08:22:26 UTC
[causeway] branch CAUSEWAY-3607 created (now 666f4dd1ee)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch CAUSEWAY-3607
in repository https://gitbox.apache.org/repos/asf/causeway.git
at 666f4dd1ee Revert "CAUSEWAY-3607: fixes ParamDto getting initialized by its "Friendly Name""
This branch includes the following new commits:
new bed7356584 Revert "CAUSEWAY-3607: fixes ambiguity for parameter by name lookups"
new 666f4dd1ee Revert "CAUSEWAY-3607: fixes ParamDto getting initialized by its "Friendly Name""
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.
[causeway] 02/02: Revert "CAUSEWAY-3607: fixes ParamDto getting initialized by its "Friendly Name""
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3607
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 666f4dd1eea201dd6719561e236cf4e2a4421da0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 27 09:16:52 2023 +0100
Revert "CAUSEWAY-3607: fixes ParamDto getting initialized by its "Friendly Name""
This reverts commit f5c1500b8dd007bff31f4680e6c3a07b5a40a66d.
---
.../java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java | 4 ----
.../core/runtimeservices/command/CommandDtoFactoryDefault.java | 6 ++++--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java
index 8c83d52b33..7de01bbdde 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/util/schema/CommonDtoUtils.java
@@ -623,10 +623,6 @@ public final class CommonDtoUtils {
// -- PARAM DTO FACTORIES
- /**
- * @param paramName name by which the parameter is identified
- * (not its friendly name for rendering)
- */
public static ParamDto paramDto(final @NonNull String paramName) {
val paramDto = new ParamDto();
if(paramName.isBlank()) {
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandDtoFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandDtoFactoryDefault.java
index 7846ba9d0e..bb688dee6e 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandDtoFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/command/CommandDtoFactoryDefault.java
@@ -31,8 +31,8 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.applib.services.user.UserService;
import org.apache.causeway.applib.util.schema.CommandDtoUtils;
-import org.apache.causeway.applib.util.schema.CommonDtoUtils;
import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.facetapi.FeatureType;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.IdentifierUtil;
import org.apache.causeway.core.metamodel.interactions.InteractionHead;
@@ -120,7 +120,9 @@ public class CommandDtoFactoryDefault implements CommandDtoFactory {
val argAdapter = argAdapters.getElseFail(paramNum);
- final ParamDto paramDto = CommonDtoUtils.paramDto(actionParameter.getId());
+ final ParamDto paramDto = new ParamDto();
+ paramDto.setName(actionParameter.getStaticFriendlyName()
+ .orElseThrow(_Exceptions::unexpectedCodeReach));
actionParameter.getFeatureIdentifier();
[causeway] 01/02: Revert "CAUSEWAY-3607: fixes ambiguity for parameter by name lookups"
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3607
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit bed735658432fd6d3afb21c84c50577e2a184afe
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 27 09:16:32 2023 +0100
Revert "CAUSEWAY-3607: fixes ambiguity for parameter by name lookups"
This reverts commit ee04e7d2ac0926d6416cd188382448a77d34cd3e.
---
.../causeway/core/metamodel/spec/feature/ObjectAction.java | 7 +++++--
.../metamodel/specloader/specimpl/ObjectActionDefault.java | 11 ++++++++++-
.../viewer/resources/ObjectActionArgHelper.java | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAction.java
index b249d16020..8074932852 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/feature/ObjectAction.java
@@ -223,10 +223,13 @@ public interface ObjectAction extends ObjectMember {
return getParameters().getElseFail(paramIndex);
}
+ /**
+ * Returns the parameter with provided id.
+ */
+ ObjectActionParameter getParameterById(String paramId);
+
/**
* Returns the parameter with provided name.
- * @param paramName name by which the parameter is identified
- * (not its friendly name for rendering)
*/
ObjectActionParameter getParameterByName(String paramName);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 36b2793320..d59d33002b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -254,10 +254,19 @@ implements ObjectAction {
return getParameters().map(ObjectActionParameter::getElementType);
}
+ @Override
+ public ObjectActionParameter getParameterById(final String paramId) {
+ return getParameters().stream()
+ .filter(param->Objects.equals(paramId, param.getId()))
+ .findAny()
+ .orElse(null);
+ }
+
@Override
public ObjectActionParameter getParameterByName(final String paramName) {
return getParameters().stream()
- .filter(param->Objects.equals(paramName, param.getId()))
+ .filter(param->Objects.equals(paramName, param.getStaticFriendlyName()
+ .orElseThrow(_Exceptions::unexpectedCodeReach)))
.findAny()
.orElse(null);
}
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
index 3bc5da9dff..384823065b 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ObjectActionArgHelper.java
@@ -90,7 +90,7 @@ public class ObjectActionArgHelper {
.map(Map.Entry::getKey)
.filter(argName->!argName.startsWith("x-ro"))
.forEach(argName->{
- if (action.getParameterByName(argName) == null) {
+ if (action.getParameterById(argName) == null) {
String reason = String.format("Argument '%s' found but no such parameter", argName);
arguments.mapPutString("x-ro-invalidReason", reason);
throw RestfulObjectsApplicationException