You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2018/11/20 10:15:09 UTC
[1/2] brooklyn-server git commit: when editting it is useful to know
the source URL
Repository: brooklyn-server
Updated Branches:
refs/heads/master d0897b2db -> 57e7b1ac3
when editting it is useful to know the source URL
this includes that in the payload if different
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/44b6e540
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/44b6e540
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/44b6e540
Branch: refs/heads/master
Commit: 44b6e540986a4ee26b47c075b7ebfe66585208fc
Parents: d0897b2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Nov 16 14:34:39 2018 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Nov 16 14:37:01 2018 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/rest/transform/TypeTransformer.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/44b6e540/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java
index e8bfb50..2796acd 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TypeTransformer.java
@@ -23,6 +23,7 @@ import static org.apache.brooklyn.rest.util.WebResourceUtils.serviceUriBuilder;
import java.net.URI;
import java.util.Collections;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -87,7 +88,11 @@ public class TypeTransformer {
result.setExtraField("template", true);
}
if (item.getIconUrl()!=null) {
- result.setIconUrl(tidyIconLink(b, item, item.getIconUrl(), ub));
+ String tidiedUrl = tidyIconLink(b, item, item.getIconUrl(), ub);
+ result.setIconUrl(tidiedUrl);
+ if (!Objects.equals(item.getIconUrl(), tidiedUrl)) {
+ result.setExtraField("iconUrlSource", item.getIconUrl());
+ }
}
if (detail) {
[2/2] brooklyn-server git commit: This closes #1016
Posted by al...@apache.org.
This closes #1016
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/57e7b1ac
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/57e7b1ac
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/57e7b1ac
Branch: refs/heads/master
Commit: 57e7b1ac31fba27ad3650b61702d1e8262af9a33
Parents: d0897b2 44b6e54
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 20 10:14:54 2018 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 20 10:14:54 2018 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/rest/transform/TypeTransformer.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------