Merge pull request #208 from Smarteon/encodespace

Encode URL whitespace
Smarteon · Nov 2, 2023 · a0c08b2 · a0c08b2
2 parents 3bbedd3 + 617c3f3
commit a0c08b2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/main/java/cz/smarteon/loxone/LoxoneHttp.java b/src/main/java/cz/smarteon/loxone/LoxoneHttp.java
@@ -21,6 +21,8 @@ public class LoxoneHttp {
 
     private static final Logger LOG = LoggerFactory.getLogger(LoxoneHttp.class);
     private static final int MAX_REDIRECTS = 5;
+    private static final String URL_WHITESPACE = " ";
+    private static final String ENCODED_URL_WHITESPACE = "%20";
 
     // temporarily relaxed visibility to allow deprecated LoxoneAuth constructor
     @SuppressWarnings("checkstyle:VisibilityModifier")
@@ -109,7 +111,7 @@ <T> T get(URL url, Command.Type type, Map<String, String> properties, Class<T> r
 
     private URL urlFromCommand(String command) {
         try {
-            return endpoint.httpUrl(command);
+            return endpoint.httpUrl(command.replace(URL_WHITESPACE, ENCODED_URL_WHITESPACE));
         } catch (MalformedURLException e) {
             throw new IllegalArgumentException("Command " + command + " produces malformed URL");
         }

diff --git a/src/test/kotlin/LoxoneHttpTest.kt b/src/test/kotlin/LoxoneHttpTest.kt
@@ -72,4 +72,29 @@ class LoxoneHttpTest {
             get { loxoneHttp.lastUrl }.isEqualTo(URL(finalLocation))
         }
     }
+
+    @Test
+    fun `should encode whitespace`() {
+        onRequest()
+            .havingMethodEqualTo("GET")
+            .havingPathEqualTo("/test%20whitespace")
+            .respond()
+            .withStatus(200)
+            .withBody("\"testString\"")
+
+        expectThat(
+            loxoneHttp.get(
+                Command(
+                    "/test whitespace",
+                    Command.Type.JSON,
+                    String::class.java,
+                    true,
+                    false,
+                    MiniserverType.KNOWN
+                )
+            )
+        ) {
+            isEqualTo("testString")
+        }
+    }
 }