[brooklyn-server] branch master updated: Encode stream type in the link as UTF-8

[iuliana]

This is an automated email from the ASF dual-hosted git repository.

iuliana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 774e686  Encode stream type in the link as UTF-8
     new 4379e7e  Merge pull request #1246 from algairim/rest-resources-fixes
774e686 is described below

commit 774e686a08dfc53297fbbb56912bded64a434b1c
Author: Mykola Mandra <mykola.man...@cloudsoft.io>
AuthorDate: Fri Sep 3 20:46:46 2021 +0100

    Encode stream type in the link as UTF-8
    
    Signed-off-by: Mykola Mandra <mykola.man...@cloudsoft.io>
---
 .../main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
 
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
index b9c91e9..05cba9e 100644
--- 
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
+++ 
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
@@ -28,6 +28,7 @@ import java.util.Map;
 
 import javax.annotation.Nullable;
 
+import org.apache.brooklyn.util.text.StringEscapes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.brooklyn.api.entity.Entity;
@@ -108,7 +109,7 @@ public class TaskTransformer {
                 metadata.add("size", stream.streamSize.get());
                 metadata.add("sizeText", 
Strings.makeSizeString(stream.streamSize.get()));
             }
-            String link = selfLink+"/stream/"+stream.streamType;
+            String link = selfLink + "/stream/" + 
StringEscapes.escapeHtmlFormUrl(stream.streamType).replaceAll("\\+", "%20");
             streams.put(stream.streamType, new LinkWithMetadata(link, 
metadata));
         }