JCLOUDS-1630: Handle URI template properly with opened curve bracket (#…

…199)

Co-authored-by: Maksim_Hadalau <Maksim_Hadalau@epam.com>

core/src/main/java/org/jclouds/http/UriTemplates.java

@@ -38,6 +38,11 @@ public static String expand(String template, Map<String, ?> variables) {
          return template.toString(); // skip expansion if there's no valid variables set. ex. {a} is the first valid
       checkNotNull(variables, "variables for %s", template);
 
+      // if no variables provided - return template as is
+      if (variables.isEmpty()) {
+         return template;
+      }
+
       boolean inVar = false;
       StringBuilder var = new StringBuilder();
       StringBuilder builder = new StringBuilder();
@@ -72,6 +77,12 @@ public static String expand(String template, Map<String, ?> variables) {
                builder.append(c);
          }
       }
+
+      // if variables provided but, curve bracket is not closed - append remaining to the result
+      if (inVar) {
+         builder.append('{').append(var);
+      }
+
       return builder.toString();
    }
 }

core/src/test/java/org/jclouds/http/UriTemplatesTest.java

@@ -55,4 +55,11 @@ public void testMissingParamProceeds() {
    public void testJson() {
       assertEquals(expand("{\"key\":\"{variable}\"}", ImmutableMap.of("variable", "value")), "{\"key\":\"value\"}");
    }
+
+   public void testExpandWithOpenedCurveBracket() {
+      assertEquals(expand("/repos/folder with { brackets in a key", ImmutableMap.of()),
+              "/repos/folder with { brackets in a key");
+      assertEquals(expand("/repos/folder with {foo", ImmutableMap.of("foo", "var")),
+              "/repos/folder with {foo");
+   }
 }