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:24 UTC
[isis] branch master updated (31f13fc -> d8c7fa7)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 31f13fc ISIS-2158: fixes smoketests config (after IsisConfig. has changed)
new bdd9e3e ISIS-2264: removes Gsoc2013.legacyParamDetails config property
new d8c7fa7 ISIS-2264: reverts impl in Favicon since Optional is not serializable.
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:
.../apache/isis/core/config/IsisConfiguration.java | 12 -----------
.../domainobjects/ObjectActionReprRenderer.java | 23 ++++++---------------
.../ui/components/widgets/favicon/Favicon.java | 24 ++++++++++++++--------
3 files changed, 21 insertions(+), 38 deletions(-)
[isis] 01/02: ISIS-2264: removes Gsoc2013.legacyParamDetails config
property
Posted by da...@apache.org.
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;
}
[isis] 02/02: ISIS-2264: reverts impl in Favicon since Optional is
not serializable.
Posted by da...@apache.org.
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 d8c7fa77b467cf8f55d20a61b2764891797a6021
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jan 21 17:58:25 2020 +0000
ISIS-2264: reverts impl in Favicon since Optional is not serializable.
---
.../ui/components/widgets/favicon/Favicon.java | 24 ++++++++++++++--------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
index 998f9e4..7315336 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
@@ -39,12 +39,11 @@ public class Favicon extends WebComponent {
@Inject private transient IsisConfiguration isisConfiguration;
@Inject private transient WebAppContextPath webAppContextPath;
- private Optional<String> url = Optional.empty();
- private Optional<String> contentType = Optional.empty();
-
+ private String url = null;
+ private String contentType = null;
+
public Favicon(String id) {
super(id);
-
}
@Override
@@ -55,20 +54,27 @@ public class Favicon extends WebComponent {
url = isisConfiguration.getViewer().getWicket().getApplication().getFaviconUrl()
.filter(x -> !Strings.isEmpty(x))
- .map(webAppContextPath::prependContextPathIfLocal);
+ .map(webAppContextPath::prependContextPathIfLocal)
+ .orElse(null);
contentType = isisConfiguration.getViewer().getWicket().getApplication().getFaviconContentType()
- .filter(x -> !Strings.isEmpty(x));
+ .filter(x -> !Strings.isEmpty(x))
+ .orElse(null);;
}
- setVisible(url.isPresent());
+ setVisible(url != null);
}
@Override
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
- url.ifPresent(url -> tag.put("href", url));
- contentType.ifPresent(contentType -> tag.put("type", contentType));
+ if(url != null) {
+ tag.put("href", url);
+ }
+ if(contentType != null) {
+ tag.put("type", contentType);
+ }
+
}
}