Switched to getValueOrAttribute()

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

@@ -40,7 +40,7 @@ public class Capitalize implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        var value = RenderUtils.fetchValue(template, differentiator);
+        var value = template.getValueOrAttribute(differentiator);
         return value.substring(0, 1).toUpperCase(Localization.getLocale()) + value.substring(1);
     }
 }

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

@@ -43,7 +43,7 @@ public class EncodeBase64 implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return StringUtils.encodeBase64(RenderUtils.fetchValue(template, differentiator)
+        return StringUtils.encodeBase64(template.getValueOrAttribute(differentiator)
                 .getBytes(StandardCharsets.UTF_8));
     }
 }

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

@@ -41,6 +41,6 @@ public class EncodeHtml implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return StringUtils.encodeHtml(RenderUtils.fetchValue(template, differentiator));
+        return StringUtils.encodeHtml(template.getValueOrAttribute(differentiator));
     }
 }

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

@@ -43,6 +43,6 @@ public class EncodeHtmlEntities implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return RenderUtils.toHtmlEntities(RenderUtils.fetchValue(template, differentiator));
+        return RenderUtils.toHtmlEntities(template.getValueOrAttribute(differentiator));
     }
 }

lib/src/main/java/rife/render/EncodeJs.java

@@ -41,6 +41,6 @@ public class EncodeJs implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return RenderUtils.encodeJS(RenderUtils.fetchValue(template, differentiator));
+        return RenderUtils.encodeJS(template.getValueOrAttribute(differentiator));
     }
 }

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

@@ -41,6 +41,6 @@ public class EncodeJson implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return StringUtils.encodeJson(RenderUtils.fetchValue(template, differentiator));
+        return StringUtils.encodeJson(template.getValueOrAttribute(differentiator));
     }
 }

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

@@ -39,6 +39,6 @@ public class EncodeQp implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return RenderUtils.toQuotedPrintable(RenderUtils.fetchValue(template, differentiator));
+        return RenderUtils.toQuotedPrintable(template.getValueOrAttribute(differentiator));
     }
 }

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

@@ -41,6 +41,6 @@ public class EncodeUnicode implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return StringUtils.encodeUnicode(RenderUtils.fetchValue(template, differentiator));
+        return StringUtils.encodeUnicode(template.getValueOrAttribute(differentiator));
     }
 }

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

@@ -41,6 +41,6 @@ public class EncodeUrl implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return StringUtils.encodeUrl(RenderUtils.fetchValue(template, differentiator));
+        return StringUtils.encodeUrl(template.getValueOrAttribute(differentiator));
     }
 }

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

@@ -41,6 +41,6 @@ public class EncodeXml implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return StringUtils.encodeXml(RenderUtils.fetchValue(template, differentiator));
+        return StringUtils.encodeXml(template.getValueOrAttribute(differentiator));
     }
 }

lib/src/main/java/rife/render/FormatCreditCard.java

@@ -39,6 +39,6 @@ public class FormatCreditCard implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return RenderUtils.formatCreditCard(RenderUtils.fetchValue(template, differentiator));
+        return RenderUtils.formatCreditCard(template.getValueOrAttribute(differentiator));
     }
 }

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

@@ -40,6 +40,6 @@ public class Lowercase implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return RenderUtils.fetchValue(template, differentiator).toLowerCase(Localization.getLocale());
+        return template.getValueOrAttribute(differentiator).toLowerCase(Localization.getLocale());
     }
 }

lib/src/main/java/rife/render/RenderUtils.java

@@ -17,8 +17,6 @@
 
 package rife.render;
 
-import rife.template.Template;
-import rife.tools.Convert;
 import rife.tools.Localization;
 import rife.tools.StringUtils;
 
@@ -78,24 +76,6 @@ public final class RenderUtils {
         return sb.toString();
     }
 
-    /**
-     * Fetches the specified value from a template or template's attribute.
-     *
-     * @param template the template
-     * @param valueId  the ID of the value to fetch
-     * @return the fetched value.
-     */
-    public static String fetchValue(Template template, String valueId) {
-        Object value = null;
-        if (template.hasValueId(valueId)) {
-            value = template.getValue(valueId);
-        }
-        if (value == null && template.hasAttribute(valueId)) {
-            value = template.getAttribute(valueId);
-        }
-        return Convert.toString(value);
-    }
-
     /**
      * Returns the last 4 digits a credit card number. The number must satisfy the Luhn algorithm.
      * Non-digits are stripped from the number.

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

@@ -39,6 +39,6 @@ public class Rot13 implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return RenderUtils.rot13(RenderUtils.fetchValue(template, differentiator));
+        return RenderUtils.rot13(template.getValueOrAttribute(differentiator));
     }
 }

lib/src/main/java/rife/render/ShortenUrl.java

@@ -41,6 +41,6 @@ public class ShortenUrl implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return RenderUtils.shortenUrl(RenderUtils.fetchValue(template, differentiator));
+        return RenderUtils.shortenUrl(template.getValueOrAttribute(differentiator));
     }
 }

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

@@ -40,6 +40,6 @@ public class SwapCase implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return RenderUtils.swapCase(RenderUtils.fetchValue(template, differentiator));
+        return RenderUtils.swapCase(template.getValueOrAttribute(differentiator));
     }
 }

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

@@ -39,6 +39,6 @@ public class Trim implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return RenderUtils.fetchValue(template, differentiator).trim();
+        return template.getValueOrAttribute(differentiator).trim();
     }
 }

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

@@ -40,7 +40,7 @@ public class Uncapitalize implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        var value = RenderUtils.fetchValue(template, differentiator);
+        var value = template.getValueOrAttribute(differentiator);
         return value.substring(0, 1).toLowerCase(Localization.getLocale()) + value.substring(1);
     }
 }

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

@@ -40,6 +40,6 @@ public class Uppercase implements ValueRenderer {
      */
     @Override
     public String render(Template template, String valueId, String differentiator) {
-        return RenderUtils.fetchValue(template, differentiator).toUpperCase(Localization.getLocale());
+        return template.getValueOrAttribute(differentiator).toUpperCase(Localization.getLocale());
     }
 }