Merge #749 from remote-tracking branch 'origin/705-fixUrlencode'

Author: dr0i

metamorph/src/main/java/org/metafacture/metamorph/functions/URLEncode.java

@@ -34,7 +34,7 @@
  */
 public final class URLEncode extends AbstractSimpleStatelessFunction {
     private String safeChars = ".-*_";
-    private Boolean plusForSpace = true;
+    private boolean plusForSpace = true;
     private PercentEscaper percentEscaper = new PercentEscaper(safeChars, plusForSpace);
 
     /**
@@ -68,7 +68,7 @@ public void setSafeChars(final String safeChars) {
      *
      * @param plusForSpace true if space character " " should be converted into a plus sign "+"
      */
-    public void setPlusForSpace(final Boolean plusForSpace) {
+    public void setPlusForSpace(final boolean plusForSpace) {
         this.plusForSpace = plusForSpace;
         percentEscaper = new PercentEscaper(safeChars, plusForSpace);
     }

metamorph/src/test/java/org/metafacture/metamorph/TestMetamorphBasics.java

@@ -854,4 +854,38 @@ public void shouldAllowTreatingEntityEndEventsAsLiterals() {
         );
     }
 
+    @Test
+    public void shouldUrlencodeWithEscapeSpaceAsPlusAsDefault() {
+        TestHelpers.assertMorph(receiver,
+                "<rules>" +
+                "  <data source='d' >" +
+                "    <urlencode />" +
+                "  </data>" +
+                "</rules>",
+                i -> {
+                    i.literal("d", "café ");
+                },
+                o -> {
+                    o.get().literal("d", "caf%C3%A9+");
+                }
+        );
+    }
+
+    @Test
+    public void shouldUrlencodeAndNotEscapingSpaceAsPlus() {
+        TestHelpers.assertMorph(receiver,
+            "<rules>" +
+                "  <data source='d' >" +
+                "    <urlencode plusforspace='false' />" +
+                "  </data>" +
+                "</rules>",
+            i -> {
+                i.literal("d", "café ");
+            },
+            o -> {
+                o.get().literal("d", "caf%C3%A9%20");
+            }
+        );
+    }
+
 }