Added unicode support.

README.md

@@ -34,7 +34,7 @@ This project provides a set of template renderers.
 - **rife.render.Uncapitalize**
   - Un-capitalizes a template value.
 - **rife.render.Uppercase**
-  - Convert a template value to uppercase.
+  - Converts a template value to uppercase.
 - **rife.render.Year**
   - Renders the current year.
 
@@ -49,7 +49,7 @@ All rendered can be used at follows:
 or
 
 ```
-{{v render:rife.render.RendererName:valueId}}
+{{v render:rife.render.RendererName:valueId/}}
 ```
 
 For example, to capitalize a template `foo` value:

lib/src/main/java/rife2/render/Capitalize.java

@@ -19,8 +19,7 @@ package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;
-
+import rife.tools.Localization;
-import java.util.Locale;
 
 /**
  * <p>Capitalizes a template value.</p>
@@ -29,7 +28,7 @@ import java.util.Locale;
  *
  * <pre>
  *   &lt;!--v render:rife.render.Capitalize:valueId/--&gt;
- *   {{v render:rife.render.Capitalize:valueId}}
+ *   {{v render:rife.render.Capitalize:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -41,9 +40,9 @@ public class Capitalize implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             var value = template.getValue(differentiator);
-            return value.substring(0, 1).toUpperCase(Locale.getDefault()) + value.substring(1);
+            return value.substring(0, 1).toUpperCase(Localization.getLocale()) + value.substring(1);
         } else {
             return "";
         }

lib/src/main/java/rife2/render/EncodeBase64.java

@@ -30,7 +30,7 @@ import java.nio.charset.StandardCharsets;
  *
  * <pre>
  *   &lt;!--v render:rife.render.EncodeBase64:valueId/--&gt;
- *   {{v render:rife.render.EncodeBase64:valueId}}
+ *   {{v render:rife.render.EncodeBase64:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -43,7 +43,7 @@ public class EncodeBase64 implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return StringUtils.encodeBase64(template.getValue(differentiator).getBytes(StandardCharsets.UTF_8));
         } else {
             return "";

lib/src/main/java/rife2/render/EncodeHtml.java

@@ -28,7 +28,7 @@ import rife.tools.StringUtils;
  *
  * <pre>
  *   &lt;!--v render:rife.render.EncodeHtml:valueId/--&gt;
- *   {{v render:rife.render.EncodeHtml:valueId}}
+ *   {{v render:rife.render.EncodeHtml:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -41,7 +41,7 @@ public class EncodeHtml implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return StringUtils.encodeHtml(template.getValue(differentiator));
         } else {
             return "";

lib/src/main/java/rife2/render/EncodeHtmlEntities.java

@@ -27,7 +27,7 @@ import rife.template.ValueRenderer;
  *
  * <pre>
  *   &lt;!--v render:rife.render.EncodeHtmlEntities:valueId/--&gt;
- *   {{v render:rife.render.EncodeHtmlEntities:valueId}}
+ *   {{v render:rife.render.EncodeHtmlEntities:valueId/}}
  * </pre>
  *
  * <p>For example {@code john@doe.com} would be encoded to:</p>
@@ -59,7 +59,7 @@ public class EncodeHtmlEntities implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return toHtmlEntities(template.getValue(differentiator));
         } else {
             return "";

lib/src/main/java/rife2/render/EncodeJson.java

@@ -28,7 +28,7 @@ import rife.tools.StringUtils;
  *
  * <pre>
  *   &lt;!--v render:rife.render.EncodeJson:valueId/--&gt;
- *   {{v render:rife.render.EncodeJson:valueId}}
+ *   {{v render:rife.render.EncodeJson:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -41,7 +41,7 @@ public class EncodeJson implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return StringUtils.encodeJson(template.getValue(differentiator));
         } else {
             return "";

lib/src/main/java/rife2/render/EncodeQp.java

@@ -19,8 +19,7 @@ package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;
-
+import rife.tools.Localization;
-import java.util.Locale;
 
 /**
  * <p>Converts a template value to a quoted-printable string.</p>
@@ -29,7 +28,7 @@ import java.util.Locale;
  *
  * <pre>
  *   &lt;!--v render:rife.render.EncodeQp:valueId/--&gt;
- *   {{v render:rife.render.EncodeQp:valueId}}
+ *   {{v render:rife.render.EncodeQp:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -65,7 +64,7 @@ public class EncodeQp implements ValueRenderer {
                     buff.append('0');
                 }
 
-                buff.append(hex.toUpperCase(Locale.getDefault()));
+                buff.append(hex.toUpperCase(Localization.getLocale()));
             }
         }
 
@@ -77,7 +76,7 @@ public class EncodeQp implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return toQuotedPrintable(template.getValue(differentiator));
         } else {
             return "";

lib/src/main/java/rife2/render/EncodeUnicode.java

@@ -28,7 +28,7 @@ import rife.tools.StringUtils;
  *
  * <pre>
  *   &lt;!--v render:rife.render.EncodeUnicode:valueId/--&gt;
- *   {{v render:rife.render.EncodeUnicode:valueId}}
+ *   {{v render:rife.render.EncodeUnicode:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -41,7 +41,7 @@ public class EncodeUnicode implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return StringUtils.encodeUnicode(template.getValue(differentiator));
         } else {
             return "";

lib/src/main/java/rife2/render/EncodeUrl.java

@@ -28,7 +28,7 @@ import rife.tools.StringUtils;
  *
  * <pre>
  *   &lt;!--v render:rife.render.EncodeUrl:valueId/--&gt;
- *   {{v render:rife.render.EncodeUrl:valueId}}
+ *   {{v render:rife.render.EncodeUrl:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -41,7 +41,7 @@ public class EncodeUrl implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return StringUtils.encodeUrl(template.getValue(differentiator));
         } else {
             return "";

lib/src/main/java/rife2/render/EncodeXml.java

@@ -28,7 +28,7 @@ import rife.tools.StringUtils;
  *
  * <pre>
  *   &lt;!--v render:rife.render.EncodeXml:valueId/--&gt;
- *   {{v render:rife.render.EncodeXml:valueId}}
+ *   {{v render:rife.render.EncodeXml:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -41,7 +41,7 @@ public class EncodeXml implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return StringUtils.encodeXml(template.getValue(differentiator));
         } else {
             return "";

lib/src/main/java/rife2/render/Lowercase.java

@@ -19,8 +19,7 @@ package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;
-
+import rife.tools.Localization;
-import java.util.Locale;
 
 /**
  * <p>Converts a template value to lowercase.</p>
@@ -29,7 +28,7 @@ import java.util.Locale;
  *
  * <pre>
  *   &lt;!--v render:rife.render.Lowercase:valueId/--&gt;
- *   {{v render:rife.render.Lowercase:valueId}}
+ *   {{v render:rife.render.Lowercase:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -41,8 +40,8 @@ public class Lowercase implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
-            return template.getValue(differentiator).toLowerCase(Locale.getDefault());
+            return template.getValue(differentiator).toLowerCase(Localization.getLocale());
         } else {
             return "";
         }

lib/src/main/java/rife2/render/Rot13.java

@@ -27,7 +27,7 @@ import rife.template.ValueRenderer;
  *
  * <pre>
  *   &lt;!--v render:rife.render.Rot13:valueId/--&gt;
- *   {{v render:rife.render.Rot13:valueId}}
+ *   {{v render:rife.render.Rot13:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -77,7 +77,7 @@ public class Rot13 implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return rot13(template.getValue(differentiator));
         } else {
             return "";

lib/src/main/java/rife2/render/SwapCase.java

@@ -27,7 +27,7 @@ import rife.template.ValueRenderer;
  *
  * <pre>
  *   &lt;!--v render:rife.render.SwapCase:valueId/--&gt;
- *   {{v render:rife.render.SwapCase:valueId}}
+ *   {{v render:rife.render.SwapCase:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -36,34 +36,32 @@ import rife.template.ValueRenderer;
 public class SwapCase implements ValueRenderer {
     /**
      * Swaps the case of a String.
-     * @param s the String to swap the case of
+     *
+     * @param src the String to swap the case of
      * @return the modified String or null
      */
-    public static String swapCase(String s) {
+    public static String swapCase(final String src) {
-        if (s == null || s.isEmpty()) {
+        if (src == null || src.isEmpty()) {
-            return s;
+            return src;
         }
 
-        var buffer = s.toCharArray();
+        int offset = 0;
-        var whitespace = true;
+        var len = src.length();
-
+        var buff = new int[len];
-        for (var i = 0; i < buffer.length; i++) {
+        for (var i = 0; i < len; ) {
-            var ch = buffer[i];
+            int newCodePoint;
-            if (Character.isUpperCase(ch) || Character.isTitleCase(ch)) {
+            var curCodePoint = src.codePointAt(i);
-                buffer[i] = Character.toLowerCase(ch);
+            if (Character.isUpperCase(curCodePoint) || Character.isTitleCase(curCodePoint)) {
-                whitespace = false;
+                newCodePoint = Character.toLowerCase(curCodePoint);
-            } else if (Character.isLowerCase(ch)) {
+            } else if (Character.isLowerCase(curCodePoint)) {
-                if (whitespace) {
+                newCodePoint = Character.toUpperCase(curCodePoint);
-                    buffer[i] = Character.toTitleCase(ch);
-                    whitespace = false;
-                } else {
-                    buffer[i] = Character.toUpperCase(ch);
-                }
             } else {
-                whitespace = Character.isWhitespace(ch);
+                newCodePoint = curCodePoint;
             }
+            buff[offset++] = newCodePoint;
+            i += Character.charCount(newCodePoint);
         }
-        return new String(buffer);
+        return new String(buff, 0, offset);
     }
 
     /**
@@ -71,7 +69,7 @@ public class SwapCase implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return swapCase(template.getValue(differentiator));
         } else {
             return "";

lib/src/main/java/rife2/render/Trim.java

@@ -27,7 +27,7 @@ import rife.template.ValueRenderer;
  *
  * <pre>
  *   &lt;!--v render:rife.render.Trim:valueId/--&gt;
- *   {{v render:rife.render.Trim:valueId}}
+ *   {{v render:rife.render.Trim:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -39,7 +39,7 @@ public class Trim implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             return template.getValue(differentiator).trim();
         } else {
             return "";

lib/src/main/java/rife2/render/Uncapitalize.java

@@ -19,8 +19,7 @@ package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;
-
+import rife.tools.Localization;
-import java.util.Locale;
 
 /**
  * <p>Un-capitalizes a template value.</p>
@@ -29,7 +28,7 @@ import java.util.Locale;
  *
  * <pre>
  *   &lt;!--v render:rife.render.Uncapitalize:valueId/--&gt;
- *   {{v render:rife.render.Uncapitalize:valueId}}
+ *   {{v render:rife.render.Uncapitalize:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -41,9 +40,9 @@ public class Uncapitalize implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
             var value = template.getValue(differentiator);
-            return value.substring(0, 1).toLowerCase(Locale.getDefault()) + value.substring(1);
+            return value.substring(0, 1).toLowerCase(Localization.getLocale()) + value.substring(1);
         } else {
             return "";
         }

lib/src/main/java/rife2/render/Uppercase.java

@@ -19,8 +19,7 @@ package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;
-
+import rife.tools.Localization;
-import java.util.Locale;
 
 /**
  * <p>Convert a template value to uppercase.</p>
@@ -29,7 +28,7 @@ import java.util.Locale;
  *
  * <pre>
  *   &lt;!--v render:rife.render.Uppercase:valueId/--&gt;
- *   {{v render:rife.render.Uppercase:valueId}}
+ *   {{v render:rife.render.Uppercase:valueId/}}
  * </pre>
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
@@ -41,8 +40,8 @@ public class Uppercase implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        if (differentiator != null && !differentiator.isBlank() && template.hasValueId(differentiator)) {
+        if (template.hasValueId(differentiator)) {
-            return template.getValue(differentiator).toUpperCase(Locale.getDefault());
+            return template.getValue(differentiator).toUpperCase(Localization.getLocale());
         } else {
             return "";
         }