You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/21 18:00:25 UTC
[isis] 01/02: ISIS-2264: removes Gsoc2013.legacyParamDetails config
property
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit bdd9e3ecf299e31b3cc76ecfed7a70c80343665f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 21 17:50:13 2020 +0000
ISIS-2264: removes Gsoc2013.legacyParamDetails config property
---
.../apache/isis/core/config/IsisConfiguration.java | 12 -----------
.../domainobjects/ObjectActionReprRenderer.java | 23 ++++++----------------
2 files changed, 6 insertions(+), 29 deletions(-)
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 cf0a7fa..781889d 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
@@ -1988,18 +1988,6 @@ public class IsisConfiguration {
*/
@javax.validation.constraints.Pattern(regexp="^http[s]?://[^:]+?(:\\d+)?/([^/]+/)*$")
private Optional<String> baseUri = Optional.empty();
-
- @Deprecated
- private final Gsoc2013 gsoc2013 = new Gsoc2013();
- @Deprecated
- @Data
- public static class Gsoc2013 {
- /**
- * @deprecated
- */
- @Deprecated
- private boolean legacyParamDetails = false;
- }
}
private final Wicket wicket = new Wicket();
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
index 80aee16..1cbe96d 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
@@ -140,24 +140,13 @@ public class ObjectActionReprRenderer extends AbstractObjectMemberReprRenderer<O
// ///////////////////////////////////////////////////
private ObjectActionReprRenderer addParameterDetails() {
- boolean gsoc2013 = getResourceContext().getConfiguration().getViewer().getRestfulobjects().getGsoc2013().isLegacyParamDetails();
- if(gsoc2013) {
- final List<Object> parameters = _Lists.newArrayList();
- for (int i = 0; i < objectMember.getParameterCount(); i++) {
- final ObjectActionParameter param = objectMember.getParameters().getElseFail(i);
- final Object paramDetails = paramDetails(param, getInteractionInitiatedBy());
- parameters.add(paramDetails);
- }
- representation.mapPut("parameters", parameters);
- } else {
- final Map<String,Object> parameters = _Maps.newLinkedHashMap();
- for (int i = 0; i < objectMember.getParameterCount(); i++) {
- final ObjectActionParameter param = objectMember.getParameters().getElseFail(i);
- final Object paramDetails = paramDetails(param, getInteractionInitiatedBy());
- parameters.put(param.getId(), paramDetails);
- }
- representation.mapPut("parameters", parameters);
+ final Map<String,Object> parameters = _Maps.newLinkedHashMap();
+ for (int i = 0; i < objectMember.getParameterCount(); i++) {
+ final ObjectActionParameter param = objectMember.getParameters().getElseFail(i);
+ final Object paramDetails = paramDetails(param, getInteractionInitiatedBy());
+ parameters.put(param.getId(), paramDetails);
}
+ representation.mapPut("parameters", parameters);
return this;
}