From 4460e98f6733e9b05db5377b6ca35c6de74443fd Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 17 Mar 2023 06:53:21 -0700 Subject: [PATCH] Switched to getValueOrAttribute() --- lib/src/main/java/rife/render/Capitalize.java | 2 +- .../main/java/rife/render/EncodeBase64.java | 2 +- lib/src/main/java/rife/render/EncodeHtml.java | 2 +- .../java/rife/render/EncodeHtmlEntities.java | 2 +- lib/src/main/java/rife/render/EncodeJs.java | 2 +- lib/src/main/java/rife/render/EncodeJson.java | 2 +- lib/src/main/java/rife/render/EncodeQp.java | 2 +- .../main/java/rife/render/EncodeUnicode.java | 2 +- lib/src/main/java/rife/render/EncodeUrl.java | 2 +- lib/src/main/java/rife/render/EncodeXml.java | 2 +- .../java/rife/render/FormatCreditCard.java | 2 +- lib/src/main/java/rife/render/Lowercase.java | 2 +- .../main/java/rife/render/RenderUtils.java | 20 ------------------- lib/src/main/java/rife/render/Rot13.java | 2 +- lib/src/main/java/rife/render/ShortenUrl.java | 2 +- lib/src/main/java/rife/render/SwapCase.java | 2 +- lib/src/main/java/rife/render/Trim.java | 2 +- .../main/java/rife/render/Uncapitalize.java | 2 +- lib/src/main/java/rife/render/Uppercase.java | 2 +- 19 files changed, 18 insertions(+), 38 deletions(-) diff --git a/lib/src/main/java/rife/render/Capitalize.java b/lib/src/main/java/rife/render/Capitalize.java index 2b9a925..a1ae346 100644 --- a/lib/src/main/java/rife/render/Capitalize.java +++ b/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); } } diff --git a/lib/src/main/java/rife/render/EncodeBase64.java b/lib/src/main/java/rife/render/EncodeBase64.java index 997897a..2b2557f 100644 --- a/lib/src/main/java/rife/render/EncodeBase64.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/EncodeHtml.java b/lib/src/main/java/rife/render/EncodeHtml.java index 3490e5e..5943075 100644 --- a/lib/src/main/java/rife/render/EncodeHtml.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/EncodeHtmlEntities.java b/lib/src/main/java/rife/render/EncodeHtmlEntities.java index 5837a02..f6e3fac 100644 --- a/lib/src/main/java/rife/render/EncodeHtmlEntities.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/EncodeJs.java b/lib/src/main/java/rife/render/EncodeJs.java index 4076ae9..2d6e37a 100644 --- a/lib/src/main/java/rife/render/EncodeJs.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/EncodeJson.java b/lib/src/main/java/rife/render/EncodeJson.java index 668f02e..cd10f83 100644 --- a/lib/src/main/java/rife/render/EncodeJson.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/EncodeQp.java b/lib/src/main/java/rife/render/EncodeQp.java index 325b207..13cbf7e 100644 --- a/lib/src/main/java/rife/render/EncodeQp.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/EncodeUnicode.java b/lib/src/main/java/rife/render/EncodeUnicode.java index a95ae2a..44233d2 100644 --- a/lib/src/main/java/rife/render/EncodeUnicode.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/EncodeUrl.java b/lib/src/main/java/rife/render/EncodeUrl.java index 0aa3fd6..0d87a51 100644 --- a/lib/src/main/java/rife/render/EncodeUrl.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/EncodeXml.java b/lib/src/main/java/rife/render/EncodeXml.java index 069f5ee..0b2bae4 100644 --- a/lib/src/main/java/rife/render/EncodeXml.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/FormatCreditCard.java b/lib/src/main/java/rife/render/FormatCreditCard.java index c7f6f89..a3b2173 100644 --- a/lib/src/main/java/rife/render/FormatCreditCard.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/Lowercase.java b/lib/src/main/java/rife/render/Lowercase.java index 73a0ac0..853c2c5 100644 --- a/lib/src/main/java/rife/render/Lowercase.java +++ b/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()); } } diff --git a/lib/src/main/java/rife/render/RenderUtils.java b/lib/src/main/java/rife/render/RenderUtils.java index ffd0dd2..eb8b869 100644 --- a/lib/src/main/java/rife/render/RenderUtils.java +++ b/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. diff --git a/lib/src/main/java/rife/render/Rot13.java b/lib/src/main/java/rife/render/Rot13.java index 93d7831..7dab950 100644 --- a/lib/src/main/java/rife/render/Rot13.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/ShortenUrl.java b/lib/src/main/java/rife/render/ShortenUrl.java index 8340cc8..7b259bf 100644 --- a/lib/src/main/java/rife/render/ShortenUrl.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/SwapCase.java b/lib/src/main/java/rife/render/SwapCase.java index f417c0a..787689f 100644 --- a/lib/src/main/java/rife/render/SwapCase.java +++ b/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)); } } diff --git a/lib/src/main/java/rife/render/Trim.java b/lib/src/main/java/rife/render/Trim.java index d16fb63..220adda 100644 --- a/lib/src/main/java/rife/render/Trim.java +++ b/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(); } } diff --git a/lib/src/main/java/rife/render/Uncapitalize.java b/lib/src/main/java/rife/render/Uncapitalize.java index 408c7c1..10ded1c 100644 --- a/lib/src/main/java/rife/render/Uncapitalize.java +++ b/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); } } diff --git a/lib/src/main/java/rife/render/Uppercase.java b/lib/src/main/java/rife/render/Uppercase.java index 95c00c1..098e5f0 100644 --- a/lib/src/main/java/rife/render/Uppercase.java +++ b/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()); } }