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/04/28 06:59:26 UTC
[isis] branch master updated: ISIS-3020: cheat sheet update
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 0eab9ebdfa ISIS-3020: cheat sheet update
0eab9ebdfa is described below
commit 0eab9ebdfa0e1fb18ab26e5f60596a3017b91ac6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 28 08:59:18 2022 +0200
ISIS-3020: cheat sheet update
- also removing deprecated config option
---
.../resources/attachments/IsisCheatSheet.odt | Bin 40083 -> 74352 bytes
.../resources/attachments/IsisCheatSheet.pdf | Bin 121229 -> 121363 bytes
.../apache/isis/core/config/IsisConfiguration.java | 25 +--------------------
...ActionParameterSupportFacetFactoryAbstract.java | 13 +----------
4 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/antora/components/docs/modules/resources/attachments/IsisCheatSheet.odt b/antora/components/docs/modules/resources/attachments/IsisCheatSheet.odt
index fc90bcfc00..07b6074df9 100644
Binary files a/antora/components/docs/modules/resources/attachments/IsisCheatSheet.odt and b/antora/components/docs/modules/resources/attachments/IsisCheatSheet.odt differ
diff --git a/antora/components/docs/modules/resources/attachments/IsisCheatSheet.pdf b/antora/components/docs/modules/resources/attachments/IsisCheatSheet.pdf
index 7d3586699a..bda67109a2 100644
Binary files a/antora/components/docs/modules/resources/attachments/IsisCheatSheet.pdf and b/antora/components/docs/modules/resources/attachments/IsisCheatSheet.pdf differ
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 59a29d53a2..83a6af05aa 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -1395,30 +1395,6 @@ public class IsisConfiguration {
*/
private boolean allowDeprecated = true;
- /**
- * If set, then checks that the supports <code>hideXxx</code> and <code>disableXxx</code> methods for
- * actions do not have take parameters.
- *
- * <p>
- * Historically, the programming model allowed these methods to accept the same number of
- * parameters as the action method to which they relate, the rationale being for similarity with
- * the <code>validateXxx</code> method. However, since these parameters serve no function, the
- * programming model has been simplified so that these supporting methods are discovered if they
- * have exactly no parameters.
- * </p>
- *
- * <p>
- * Note that this aspect of the programming model relates to the <code>hideXxx</code> and
- * <code>disableXxx</code> supporting methods that relate to the entire method. Do not confuse
- * these with the <code>hideNXxx</code> and <code>disableNXxx</code> supporting methods, which
- * relate to the N-th parameter, and allow up to N-1 parameters to be passed in (allowing the Nth
- * parameter to be dynamically hidden or disabled).
- * </p>
- * @deprecated this option is ignored by the framework, behavior is now fixated to noParamsOnly = true
- */
- @Deprecated(forRemoval = true, since = "2.0.0-M7")
- private boolean noParamsOnly = true;
-
/**
* Whether to validate that any actions that accept action parameters have either a corresponding
* choices or auto-complete for that action parameter, or are associated with a collection of the
@@ -1486,6 +1462,7 @@ public class IsisConfiguration {
*/
private boolean variablesClause = true;
}
+
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java
index 59b11b3114..5419dec8d8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/support/ActionParameterSupportFacetFactoryAbstract.java
@@ -73,11 +73,7 @@ extends MemberAndPropertySupportFacetFactoryAbstract {
ParameterSupport.ParamSupportingMethodSearchRequest.builder()
.processMethodContext(processMethodContext)
.paramIndexToMethodNameProviders(methodNameCandidates)
- .searchAlgorithms(EnumSet.of(
- SearchAlgorithm.PAT,
- isMultivariateParameterSupportEnabled()
- ? SearchAlgorithm.SWEEP
- : SearchAlgorithm.SINGLEARG_BEING_PARAMTYPE))
+ .searchAlgorithms(EnumSet.of(SearchAlgorithm.PAT, SearchAlgorithm.SWEEP))
.returnTypePattern(memberSupportPrefix.getSupportMethodReturnType()))
.build();
@@ -95,12 +91,5 @@ extends MemberAndPropertySupportFacetFactoryAbstract {
FacetedMethodParameter paramAsHolder,
ParamSupportingMethodSearchResult searchResult);
- // -- HELPER
-
- /** Always enabled, unless explicitly disabled via environment variable
- * {@code MULTIVARIATE_PARAMETER_SUPPORT=false}. */
- private boolean isMultivariateParameterSupportEnabled() {
- return !"false".equalsIgnoreCase(System.getenv("MULTIVARIATE_PARAMETER_SUPPORT"));
- }
}