You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2025/02/21 09:37:40 UTC
(causeway) branch main updated: CAUSEWAY-3859: Java record refactoring (part 36)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new ca239966417 CAUSEWAY-3859: Java record refactoring (part 36)
ca239966417 is described below
commit ca239966417ec5924b556d6e1dc37f5323a68b8e
Author: andi-huber <ah...@apache.org>
AuthorDate: Fri Feb 21 10:37:35 2025 +0100
CAUSEWAY-3859: Java record refactoring (part 36)
---
.../core/metamodel/facets/ActionSupport.java | 62 +++++++--------
.../core/metamodel/facets/ParameterSupport.java | 93 ++++++++++------------
.../ActionValidationFacetViaMethodFactory.java | 4 +-
...ParameterAutoCompleteFacetViaMethodFactory.java | 6 +-
...ctionParameterChoicesFacetViaMethodFactory.java | 6 +-
...tionParameterDefaultsFacetViaMethodFactory.java | 6 +-
...tionParameterDisabledFacetViaMethodFactory.java | 4 +-
...ActionParameterHiddenFacetViaMethodFactory.java | 4 +-
...ActionParameterSupportFacetFactoryAbstract.java | 6 +-
...onParameterValidationFacetViaMethodFactory.java | 4 +-
10 files changed, 94 insertions(+), 101 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ActionSupport.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ActionSupport.java
index 99795373e96..fa20b8eaf4a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ActionSupport.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ActionSupport.java
@@ -23,6 +23,8 @@
import java.util.Optional;
import java.util.function.Consumer;
+import org.jspecify.annotations.NonNull;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.collections._Arrays;
@@ -33,25 +35,24 @@
import org.apache.causeway.core.metamodel.methods.MethodFinderPAT.MethodAndPatConstructor;
import lombok.Builder;
-import lombok.Getter;
-import org.jspecify.annotations.NonNull;
import lombok.RequiredArgsConstructor;
-import lombok.Value;
-
-public final class ActionSupport {
- @Value @Builder
- public static class ActionSupportingMethodSearchRequest {
+public record ActionSupport() {
- FacetFactory.@NonNull ProcessMethodContext processMethodContext;
- @Getter @NonNull MethodFinder methodFinder;
- @NonNull EnumSet<SearchAlgorithm> searchAlgorithms;
+ @Builder(builderMethodName = "builderInternal")
+ public record ActionSupportingMethodSearchRequest(
+ FacetFactory.@NonNull ProcessMethodContext processMethodContext,
+ @NonNull MethodFinder methodFinder,
+ @NonNull EnumSet<SearchAlgorithm> searchAlgorithms,
+ @NonNull Can<Class<?>> additionalParamTypes) {
- @Builder.Default
- final @NonNull Can<Class<?>> additionalParamTypes = Can.empty();
-
- @Getter(lazy = true) Class<?>[] paramTypes =
- getProcessMethodContext().getMethod().getParameterTypes();
+ public static ActionSupportingMethodSearchRequestBuilder builder() {
+ return builderInternal()
+ .additionalParamTypes(Can.empty());
+ }
+ public Class<?>[] paramTypes() {
+ return processMethodContext().getMethod().getParameterTypes();
+ }
}
@FunctionalInterface
@@ -66,8 +67,8 @@ public static enum SearchAlgorithm
implements SearchFunction {
/** Parameter as a Tuple */
PAT(ActionSupport::findActionSupportingMethodWithPATArg),
- ALL_PARAM_TYPES(ActionSupport::findActionSupportingMethodWithAllParamTypes),
- ;
+ ALL_PARAM_TYPES(ActionSupport::findActionSupportingMethodWithAllParamTypes);
+
private final SearchFunction searchFunction;
@Override
public void search(
@@ -77,11 +78,10 @@ public void search(
}
}
- @Value(staticConstructor = "of")
- public static class ActionSupportingMethodSearchResult {
- ResolvedMethod supportingMethod;
- Class<?> returnType;
- Optional<ResolvedConstructor> patConstructor;
+ public record ActionSupportingMethodSearchResult(
+ ResolvedMethod supportingMethod,
+ Class<?> returnType,
+ Optional<ResolvedConstructor> patConstructor) {
}
public static void findActionSupportingMethods(
@@ -102,17 +102,16 @@ private final static void findActionSupportingMethodWithPATArg(
MethodFinderPAT
.findMethodWithPATArg(
- searchRequest.getMethodFinder(),
- searchRequest.getParamTypes(),
- searchRequest.getAdditionalParamTypes())
+ searchRequest.methodFinder(),
+ searchRequest.paramTypes(),
+ searchRequest.additionalParamTypes())
.map(ActionSupport::toSearchResult)
.forEach(onMethodFound);
}
private static ActionSupportingMethodSearchResult toSearchResult(
final MethodAndPatConstructor supportingMethodAndPatConstructor) {
- return ActionSupportingMethodSearchResult
- .of(
+ return new ActionSupportingMethodSearchResult(
supportingMethodAndPatConstructor.supportingMethod(),
supportingMethodAndPatConstructor.supportingMethod().returnType(),
Optional.of(supportingMethodAndPatConstructor.patConstructor()));
@@ -122,10 +121,10 @@ private final static void findActionSupportingMethodWithAllParamTypes(
final ActionSupportingMethodSearchRequest searchRequest,
final Consumer<ActionSupportingMethodSearchResult> onMethodFound) {
- var paramTypes = searchRequest.getParamTypes();
- var finderOptions = searchRequest.getMethodFinder();
+ var paramTypes = searchRequest.paramTypes();
+ var finderOptions = searchRequest.methodFinder();
- var additionalParamTypes = searchRequest.getAdditionalParamTypes();
+ var additionalParamTypes = searchRequest.additionalParamTypes();
var additionalParamCount = additionalParamTypes.size();
final int paramsConsideredCount = paramTypes.length + additionalParamCount;
@@ -142,8 +141,7 @@ private final static void findActionSupportingMethodWithAllParamTypes(
private static ActionSupportingMethodSearchResult toSearchResult(
final ResolvedMethod supportingMethod) {
- return ActionSupportingMethodSearchResult
- .of(supportingMethod, supportingMethod.returnType(), Optional.empty());
+ return new ActionSupportingMethodSearchResult(supportingMethod, supportingMethod.returnType(), Optional.empty());
}
// -- PARAM UTIL
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ParameterSupport.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ParameterSupport.java
index ee723370c27..924e68a2a3f 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ParameterSupport.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/ParameterSupport.java
@@ -23,6 +23,8 @@
import java.util.function.Consumer;
import java.util.function.IntFunction;
+import org.jspecify.annotations.NonNull;
+
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal._Constants;
import org.apache.causeway.commons.internal.collections._Arrays;
@@ -36,46 +38,42 @@
import org.apache.causeway.core.metamodel.methods.MethodFinderPAT.MethodAndPatConstructor;
import lombok.Builder;
-import lombok.Getter;
-import org.jspecify.annotations.NonNull;
import lombok.RequiredArgsConstructor;
-import lombok.Value;
/**
- *
* @since 2.0
- *
*/
-public final class ParameterSupport {
-
- @Value @Builder
- public static class ParamSupportingMethodSearchRequest {
-
- FacetFactory.@NonNull ProcessMethodContext processMethodContext;
- @NonNull Can<IntFunction<String>> paramIndexToMethodNameProviders;
- @NonNull Can<SearchAlgorithm> searchAlgorithms;
- @NonNull ReturnTypePattern returnTypePattern;
-
- @Builder.Default
- final @NonNull Can<Class<?>> additionalParamTypes = Can.empty();
-
- @Getter(lazy = true) Class<?>[] paramTypes =
- getProcessMethodContext().getMethod().getParameterTypes();
+public record ParameterSupport() {
+
+ @Builder(builderMethodName = "builderInternal")
+ public record ParamSupportingMethodSearchRequest(
+ FacetFactory.@NonNull ProcessMethodContext processMethodContext,
+ @NonNull Can<IntFunction<String>> paramIndexToMethodNameProviders,
+ @NonNull Can<SearchAlgorithm> searchAlgorithms,
+ @NonNull ReturnTypePattern returnTypePattern,
+ @NonNull Can<Class<?>> additionalParamTypes) {
+
+ public static ParamSupportingMethodSearchRequestBuilder builder() {
+ return builderInternal()
+ .additionalParamTypes(Can.empty());
+ }
- Can<String> getSupporingMethodNameCandidates(final int paramNr) {
- return getParamIndexToMethodNameProviders()
- .map(provider->provider.apply(paramNr));
+ public Class<?>[] paramTypes() {
+ return processMethodContext().getMethod().getParameterTypes();
}
+ private Can<String> getSupporingMethodNameCandidates(final int paramIndex) {
+ return paramIndexToMethodNameProviders()
+ .map(provider->provider.apply(paramIndex));
+ }
}
- @Value(staticConstructor = "of")
- public static class ParamSupportingMethodSearchResult {
- int paramIndex;
- Class<?> paramType;
- ResolvedMethod supportingMethod;
- Optional<ResolvedConstructor> patConstructor;
- ResolvedType paramSupportReturnType;
+ public record ParamSupportingMethodSearchResult(
+ int paramIndex,
+ Class<?> paramType,
+ ResolvedMethod supportingMethod,
+ Optional<ResolvedConstructor> patConstructor,
+ ResolvedType paramSupportReturnType) {
}
@FunctionalInterface
@@ -94,8 +92,8 @@ public static enum SearchAlgorithm
/** Starting with all-args working its way down to no-arg.*/
SWEEP(ParameterSupport::findParamSupportingMethod),
/** Argument matches return type.*/
- SINGLEARG_BEING_PARAMTYPE(ParameterSupport::singleArgBeingParamType)
- ;
+ SINGLEARG_BEING_PARAMTYPE(ParameterSupport::singleArgBeingParamType);
+
private final SearchFunction searchFunction;
@Override
public void search(
@@ -110,7 +108,7 @@ public static void findParamSupportingMethods(
final ParamSupportingMethodSearchRequest searchRequest,
final Consumer<ParamSupportingMethodSearchResult> onMethodFound) {
- var actionMethod = searchRequest.getProcessMethodContext().getMethod();
+ var actionMethod = searchRequest.processMethodContext().getMethod();
var paramCount = actionMethod.getParameterCount();
for (int i = 0; i < paramCount; i++) {
@@ -119,7 +117,6 @@ public static void findParamSupportingMethods(
searchAlgorithm.search(searchRequest, paramNum, onMethodFound);
}
}
-
}
private static void findParamSupportingMethodWithPATArg(
@@ -127,9 +124,9 @@ private static void findParamSupportingMethodWithPATArg(
final int paramIndex,
final Consumer<ParamSupportingMethodSearchResult> onMethodFound) {
- var processMethodContext = searchRequest.getProcessMethodContext();
+ var processMethodContext = searchRequest.processMethodContext();
var type = processMethodContext.getCls();
- var paramTypes = searchRequest.getParamTypes();
+ var paramTypes = searchRequest.paramTypes();
var methodNames = searchRequest.getSupporingMethodNameCandidates(paramIndex);
var paramType = paramTypes[paramIndex];
@@ -138,9 +135,9 @@ private static void findParamSupportingMethodWithPATArg(
.findMethodWithPATArg(
MethodFinder
.memberSupport(type, methodNames, processMethodContext.getIntrospectionPolicy())
- .withReturnTypeAnyOf(searchRequest.getReturnTypePattern().matchingTypes(paramType)),
+ .withReturnTypeAnyOf(searchRequest.returnTypePattern().matchingTypes(paramType)),
paramTypes,
- searchRequest.getAdditionalParamTypes())
+ searchRequest.additionalParamTypes())
.map(methodAndPatConstructor->toSearchResult(type, paramIndex, paramType, methodAndPatConstructor))
.forEach(onMethodFound);
}
@@ -150,8 +147,7 @@ private static ParamSupportingMethodSearchResult toSearchResult(
final int paramIndex,
final Class<?> paramType,
final MethodAndPatConstructor supportingMethodAndPatConstructor) {
- return ParamSupportingMethodSearchResult
- .of(paramIndex, paramType,
+ return new ParamSupportingMethodSearchResult(paramIndex, paramType,
supportingMethodAndPatConstructor.supportingMethod(),
Optional.of(supportingMethodAndPatConstructor.patConstructor()),
_GenericResolver.forMethodReturn(
@@ -163,16 +159,16 @@ private static void singleArgBeingParamType(
final int paramIndex,
final Consumer<ParamSupportingMethodSearchResult> onMethodFound) {
- var processMethodContext = searchRequest.getProcessMethodContext();
+ var processMethodContext = searchRequest.processMethodContext();
var type = processMethodContext.getCls();
- var paramTypes = searchRequest.getParamTypes();
+ var paramTypes = searchRequest.paramTypes();
var methodNames = searchRequest.getSupporingMethodNameCandidates(paramIndex);
var paramType = paramTypes[paramIndex];
var signature = new Class<?>[]{paramType};
MethodFinder
.memberSupport(type, methodNames, processMethodContext.getIntrospectionPolicy())
- .withReturnTypeAnyOf(searchRequest.getReturnTypePattern().matchingTypes(paramType))
+ .withReturnTypeAnyOf(searchRequest.returnTypePattern().matchingTypes(paramType))
.streamMethodsMatchingSignature(signature)
.map(supportingMethod->toSearchResult(paramIndex, paramType, supportingMethod))
.forEach(onMethodFound);
@@ -186,12 +182,12 @@ private static void findParamSupportingMethod(
final int paramIndex,
final Consumer<ParamSupportingMethodSearchResult> onMethodFound) {
- var processMethodContext = searchRequest.getProcessMethodContext();
+ var processMethodContext = searchRequest.processMethodContext();
var type = processMethodContext.getCls();
- var paramTypes = searchRequest.getParamTypes();
+ var paramTypes = searchRequest.paramTypes();
var methodNames = searchRequest.getSupporingMethodNameCandidates(paramIndex);
var paramType = paramTypes[paramIndex];
- var additionalParamTypes = searchRequest.getAdditionalParamTypes();
+ var additionalParamTypes = searchRequest.additionalParamTypes();
//limit: [0 .. paramIndex + 1]
for(int limit = paramIndex + 1; limit>=0; --limit) {
@@ -199,7 +195,7 @@ private static void findParamSupportingMethod(
var supportingMethod =
MethodFinder
.memberSupport(type, methodNames, processMethodContext.getIntrospectionPolicy())
- .withReturnTypeAnyOf(searchRequest.getReturnTypePattern().matchingTypes(paramType))
+ .withReturnTypeAnyOf(searchRequest.returnTypePattern().matchingTypes(paramType))
.streamMethodsMatchingSignature(signature)
.findFirst()
.orElse(null);
@@ -214,8 +210,7 @@ private static ParamSupportingMethodSearchResult toSearchResult(
final int paramIndex,
final Class<?> paramType,
final ResolvedMethod supportingMethod) {
- return ParamSupportingMethodSearchResult
- .of(paramIndex, paramType,
+ return new ParamSupportingMethodSearchResult(paramIndex, paramType,
supportingMethod,
Optional.empty(),
_GenericResolver.forMethodReturn(supportingMethod));
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
index 3cc98321ae1..7ffbac02be8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/validate/method/ActionValidationFacetViaMethodFactory.java
@@ -53,9 +53,9 @@ protected final void search(
.build();
ActionSupport.findActionSupportingMethods(searchRequest, searchResult -> {
- var validateMethod = searchResult.getSupportingMethod();
+ var validateMethod = searchResult.supportingMethod();
processMethodContext.removeMethod(validateMethod);
- var patConstructor = searchResult.getPatConstructor();
+ var patConstructor = searchResult.patConstructor();
addFacet(
new ActionValidationFacetViaMethod(
validateMethod, patConstructor, processMethodContext.getFacetHolder()));
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
index 4ca4dbca3e4..b5b31db68d5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/autocomplete/method/ActionParameterAutoCompleteFacetViaMethodFactory.java
@@ -41,9 +41,9 @@ public ActionParameterAutoCompleteFacetViaMethodFactory(final MetaModelContext m
protected void onSearchResult(
final FacetedMethodParameter paramAsHolder,
final ParamSupportingMethodSearchResult searchResult) {
- var autoCompleteMethod = searchResult.getSupportingMethod();
- var patConstructor = searchResult.getPatConstructor();
- var paramSupportReturnType = searchResult.getParamSupportReturnType();
+ var autoCompleteMethod = searchResult.supportingMethod();
+ var patConstructor = searchResult.patConstructor();
+ var paramSupportReturnType = searchResult.paramSupportReturnType();
addFacet(
new ActionParameterAutoCompleteFacetViaMethod(
autoCompleteMethod, paramSupportReturnType, patConstructor, paramAsHolder));
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
index 4f71c7480ac..6c64d631677 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethodFactory.java
@@ -38,9 +38,9 @@ public ActionParameterChoicesFacetViaMethodFactory(final MetaModelContext mmc) {
protected void onSearchResult(
final FacetedMethodParameter paramAsHolder,
final ParamSupportingMethodSearchResult searchResult) {
- var choicesMethod = searchResult.getSupportingMethod();
- var patConstructor = searchResult.getPatConstructor();
- var paramSupportReturnType = searchResult.getParamSupportReturnType();
+ var choicesMethod = searchResult.supportingMethod();
+ var patConstructor = searchResult.patConstructor();
+ var paramSupportReturnType = searchResult.paramSupportReturnType();
addFacet(
new ActionParameterChoicesFacetViaMethod(
choicesMethod, paramSupportReturnType, patConstructor, paramAsHolder));
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
index 1722f49a17d..3a8bbb2ce4a 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetViaMethodFactory.java
@@ -38,9 +38,9 @@ public ActionParameterDefaultsFacetViaMethodFactory(final MetaModelContext mmc)
protected void onSearchResult(
final FacetedMethodParameter paramAsHolder,
final ParamSupportingMethodSearchResult searchResult) {
- var defaultMethod = searchResult.getSupportingMethod();
- var paramIndex = searchResult.getParamIndex();
- var patConstructor = searchResult.getPatConstructor();
+ var defaultMethod = searchResult.supportingMethod();
+ var paramIndex = searchResult.paramIndex();
+ var patConstructor = searchResult.patConstructor();
addFacet(
new ActionParameterDefaultsFacetViaMethod(
defaultMethod, paramIndex, patConstructor, paramAsHolder));
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
index 35cff9975f1..1f8ceda670d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/disable/method/ActionParameterDisabledFacetViaMethodFactory.java
@@ -42,8 +42,8 @@ public ActionParameterDisabledFacetViaMethodFactory(final MetaModelContext mmc)
protected void onSearchResult(
final FacetedMethodParameter paramAsHolder,
final ParamSupportingMethodSearchResult searchResult) {
- var disableMethod = searchResult.getSupportingMethod();
- var patConstructor = searchResult.getPatConstructor();
+ var disableMethod = searchResult.supportingMethod();
+ var patConstructor = searchResult.patConstructor();
addFacet(
new ActionParameterDisabledFacetViaMethod(
disableMethod, patConstructor, paramAsHolder));
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
index 0370e458bcf..2ea4457fba4 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/hide/method/ActionParameterHiddenFacetViaMethodFactory.java
@@ -42,8 +42,8 @@ public ActionParameterHiddenFacetViaMethodFactory(final MetaModelContext mmc) {
protected void onSearchResult(
final FacetedMethodParameter paramAsHolder,
final ParamSupportingMethodSearchResult searchResult) {
- var hideMethod = searchResult.getSupportingMethod();
- var patConstructor = searchResult.getPatConstructor();
+ var hideMethod = searchResult.supportingMethod();
+ var patConstructor = searchResult.patConstructor();
addFacet(
new ActionParameterHiddenFacetViaMethod(
hideMethod, patConstructor, paramAsHolder));
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java
index bfde77e9f62..261d66983f7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java
@@ -66,7 +66,7 @@ public final void process(final ProcessMethodContext processMethodContext) {
var searchRequest = searchRefiner
.apply(
- ParameterSupport.ParamSupportingMethodSearchRequest.builder()
+ ParameterSupport.ParamSupportingMethodSearchRequest.builder()
.processMethodContext(processMethodContext)
.paramIndexToMethodNameProviders(methodNameCandidates)
// default, can be overwritten
@@ -75,8 +75,8 @@ public final void process(final ProcessMethodContext processMethodContext) {
.build();
ParameterSupport.findParamSupportingMethods(searchRequest, searchResult -> {
- processMethodContext.removeMethod(searchResult.getSupportingMethod());
- var paramIndex = searchResult.getParamIndex();
+ processMethodContext.removeMethod(searchResult.supportingMethod());
+ var paramIndex = searchResult.paramIndex();
// add facets directly to parameters, not to actions
var paramAsHolder = parameters.getElseFail(paramIndex);
onSearchResult(paramAsHolder, searchResult);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
index ada25750d30..965fd8bce54 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/param/validate/method/ActionParameterValidationFacetViaMethodFactory.java
@@ -46,8 +46,8 @@ public ActionParameterValidationFacetViaMethodFactory(final MetaModelContext mmc
protected void onSearchResult(
final FacetedMethodParameter paramAsHolder,
final ParamSupportingMethodSearchResult searchResult) {
- var validateMethod = searchResult.getSupportingMethod();
- var patConstructor = searchResult.getPatConstructor();
+ var validateMethod = searchResult.supportingMethod();
+ var patConstructor = searchResult.patConstructor();
addFacet(
new ActionParameterValidationFacetViaMethod(
validateMethod, patConstructor, paramAsHolder));