From c048859c1d6f9b5904a455dccfad6027bf5627bc Mon Sep 17 00:00:00 2001
From: Geert Bevin <gbevin@uwyn.com>
Date: Tue, 14 Mar 2023 08:00:47 -0400
Subject: [PATCH] Minor tweaks

---
 README.md                                              | 2 +-
 lib/src/main/java/rife2/render/Capitalize.java         | 4 ++--
 lib/src/main/java/rife2/render/EncodeBase64.java       | 4 ++--
 lib/src/main/java/rife2/render/EncodeHtml.java         | 4 ++--
 lib/src/main/java/rife2/render/EncodeHtmlEntities.java | 4 ++--
 lib/src/main/java/rife2/render/EncodeJson.java         | 4 ++--
 lib/src/main/java/rife2/render/EncodeQp.java           | 4 ++--
 lib/src/main/java/rife2/render/EncodeUnicode.java      | 4 ++--
 lib/src/main/java/rife2/render/EncodeUrl.java          | 4 ++--
 lib/src/main/java/rife2/render/EncodeXml.java          | 4 ++--
 lib/src/main/java/rife2/render/Lowercase.java          | 4 ++--
 lib/src/main/java/rife2/render/Rot13.java              | 4 ++--
 lib/src/main/java/rife2/render/SwapCase.java           | 4 ++--
 lib/src/main/java/rife2/render/Trim.java               | 4 ++--
 lib/src/main/java/rife2/render/Uncapitalize.java       | 4 ++--
 lib/src/main/java/rife2/render/Uppercase.java          | 4 ++--
 16 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 1948916..fbc5258 100644
--- a/README.md
+++ b/README.md
@@ -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:
diff --git a/lib/src/main/java/rife2/render/Capitalize.java b/lib/src/main/java/rife2/render/Capitalize.java
index 8ddef91..f186397 100644
--- a/lib/src/main/java/rife2/render/Capitalize.java
+++ b/lib/src/main/java/rife2/render/Capitalize.java
@@ -29,7 +29,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,7 +41,7 @@ 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);
         } else {
diff --git a/lib/src/main/java/rife2/render/EncodeBase64.java b/lib/src/main/java/rife2/render/EncodeBase64.java
index ebaa745..b47fbc8 100644
--- a/lib/src/main/java/rife2/render/EncodeBase64.java
+++ b/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 "";
diff --git a/lib/src/main/java/rife2/render/EncodeHtml.java b/lib/src/main/java/rife2/render/EncodeHtml.java
index 0141c4f..90b0bb8 100644
--- a/lib/src/main/java/rife2/render/EncodeHtml.java
+++ b/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 "";
diff --git a/lib/src/main/java/rife2/render/EncodeHtmlEntities.java b/lib/src/main/java/rife2/render/EncodeHtmlEntities.java
index 01fef1d..459c3b0 100644
--- a/lib/src/main/java/rife2/render/EncodeHtmlEntities.java
+++ b/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 "";
diff --git a/lib/src/main/java/rife2/render/EncodeJson.java b/lib/src/main/java/rife2/render/EncodeJson.java
index c80f150..1820d0f 100644
--- a/lib/src/main/java/rife2/render/EncodeJson.java
+++ b/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 "";
diff --git a/lib/src/main/java/rife2/render/EncodeQp.java b/lib/src/main/java/rife2/render/EncodeQp.java
index b902db4..85637c5 100644
--- a/lib/src/main/java/rife2/render/EncodeQp.java
+++ b/lib/src/main/java/rife2/render/EncodeQp.java
@@ -29,7 +29,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>
@@ -77,7 +77,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 "";
diff --git a/lib/src/main/java/rife2/render/EncodeUnicode.java b/lib/src/main/java/rife2/render/EncodeUnicode.java
index b2a734e..2b08365 100644
--- a/lib/src/main/java/rife2/render/EncodeUnicode.java
+++ b/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 "";
diff --git a/lib/src/main/java/rife2/render/EncodeUrl.java b/lib/src/main/java/rife2/render/EncodeUrl.java
index 408ce5a..0eb0f0b 100644
--- a/lib/src/main/java/rife2/render/EncodeUrl.java
+++ b/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 "";
diff --git a/lib/src/main/java/rife2/render/EncodeXml.java b/lib/src/main/java/rife2/render/EncodeXml.java
index 05a5abf..51d4802 100644
--- a/lib/src/main/java/rife2/render/EncodeXml.java
+++ b/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 "";
diff --git a/lib/src/main/java/rife2/render/Lowercase.java b/lib/src/main/java/rife2/render/Lowercase.java
index c2e0195..ea09983 100644
--- a/lib/src/main/java/rife2/render/Lowercase.java
+++ b/lib/src/main/java/rife2/render/Lowercase.java
@@ -29,7 +29,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,7 +41,7 @@ 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());
         } else {
             return "";
diff --git a/lib/src/main/java/rife2/render/Rot13.java b/lib/src/main/java/rife2/render/Rot13.java
index 3f9823c..cad83e4 100644
--- a/lib/src/main/java/rife2/render/Rot13.java
+++ b/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 "";
diff --git a/lib/src/main/java/rife2/render/SwapCase.java b/lib/src/main/java/rife2/render/SwapCase.java
index 745446c..5ad6202 100644
--- a/lib/src/main/java/rife2/render/SwapCase.java
+++ b/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>
@@ -71,7 +71,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 "";
diff --git a/lib/src/main/java/rife2/render/Trim.java b/lib/src/main/java/rife2/render/Trim.java
index 3cbac05..b2738b2 100644
--- a/lib/src/main/java/rife2/render/Trim.java
+++ b/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 "";
diff --git a/lib/src/main/java/rife2/render/Uncapitalize.java b/lib/src/main/java/rife2/render/Uncapitalize.java
index 46e36a1..9a9f45a 100644
--- a/lib/src/main/java/rife2/render/Uncapitalize.java
+++ b/lib/src/main/java/rife2/render/Uncapitalize.java
@@ -29,7 +29,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,7 +41,7 @@ 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);
         } else {
diff --git a/lib/src/main/java/rife2/render/Uppercase.java b/lib/src/main/java/rife2/render/Uppercase.java
index 57613e3..6a5a6c4 100644
--- a/lib/src/main/java/rife2/render/Uppercase.java
+++ b/lib/src/main/java/rife2/render/Uppercase.java
@@ -29,7 +29,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,7 +41,7 @@ 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());
         } else {
             return "";