rife2/rife2-template-renderers
rife2/rife2-template-renderers
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added RenderUtils and more tests.

Browse source
This commit is contained in:
Erik C. Thauvin 2023-03-15 12:05:39 -07:00
parent 0da0e43aa5
commit d7659f4052
24 changed files with 148 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/src/main/java/rife/render/Capitalize.java
View file

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

7
lib/src/main/java/rife/render/EncodeBase64.java
View file

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

6
lib/src/main/java/rife/render/EncodeHtml.java
View file

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

6
lib/src/main/java/rife/render/EncodeHtmlEntities.java
View file

@ -59,10 +59,6 @@ public class EncodeHtmlEntities implements ValueRenderer {
*/
@Override
public String render(Template template, String valueId, String differentiator) {
if (template.hasValueId(differentiator)) {
return toHtmlEntities(template.getValue(differentiator));
} else {
return "";
}
return toHtmlEntities(RenderUtils.fetchValue(template, differentiator));
}
}

6
lib/src/main/java/rife/render/EncodeJson.java
View file

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

6
lib/src/main/java/rife/render/EncodeQp.java
View file

@ -76,10 +76,6 @@ public class EncodeQp implements ValueRenderer {
*/
@Override
public String render(Template template, String valueId, String differentiator) {
if (template.hasValueId(differentiator)) {
return toQuotedPrintable(template.getValue(differentiator));
} else {
return "";
}
return toQuotedPrintable(RenderUtils.fetchValue(template, differentiator));
}
}

6
lib/src/main/java/rife/render/EncodeUnicode.java
View file

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

10
lib/src/main/java/rife/render/EncodeUrl.java
View file

@ -41,14 +41,6 @@ public class EncodeUrl implements ValueRenderer {
*/
@Override
public String render(Template template, String valueId, String differentiator) {
String value;
if (template.hasValueId(differentiator)) {
value = template.getValue(differentiator);
} else if (template.hasAttribute(differentiator)) {
value = template.getAttribute(differentiator).toString();
} else {
return "";
}
return StringUtils.encodeUrl(value);
return StringUtils.encodeUrl(RenderUtils.fetchValue(template, differentiator));
}
}

6
lib/src/main/java/rife/render/EncodeXml.java
View file

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

6
lib/src/main/java/rife/render/Lowercase.java
View file

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

48
lib/src/main/java/rife/render/RenderUtils.java Normal file
View file

@ -0,0 +1,48 @@
/*
* Copyright 2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package rife.render;
import rife.template.Template;
import rife.tools.Convert;
/**
* Collection of utility-type methods commonly used by the renderers.
*/
public final class RenderUtils {
private RenderUtils() {
// no-op
}
/**
* 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);
}
}

6
lib/src/main/java/rife/render/Rot13.java
View file

@ -77,10 +77,6 @@ public class Rot13 implements ValueRenderer {
*/
@Override
public String render(Template template, String valueId, String differentiator) {
if (template.hasValueId(differentiator)) {
return rot13(template.getValue(differentiator));
} else {
return "";
}
return rot13(RenderUtils.fetchValue(template, differentiator));
}
}

6
lib/src/main/java/rife/render/SwapCase.java
View file

@ -70,10 +70,6 @@ public class SwapCase implements ValueRenderer {
*/
@Override
public String render(Template template, String valueId, String differentiator) {
if (template.hasValueId(differentiator)) {
return swapCase(template.getValue(differentiator));
} else {
return "";
}
return swapCase(RenderUtils.fetchValue(template, differentiator));
}
}

6
lib/src/main/java/rife/render/Trim.java
View file

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

8
lib/src/main/java/rife/render/Uncapitalize.java
View file

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

6
lib/src/main/java/rife/render/Uppercase.java
View file

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