.idea/misc.xml

@@ -17,33 +17,6 @@
     <pattern value="rife2.render.Year" />
     <pattern value="rife2.render.EncodeBase64" />
     <pattern value="rife2.render.EncodeUnicode" />
-    <pattern value="rife.render.Capitalize" />
-    <pattern value="rife.render.EncodeBase64" />
-    <pattern value="rife.render.EncodeHtml" />
-    <pattern value="rife.render.EncodeHtmlEntities" />
-    <pattern value="rife.render.EncodeJson" />
-    <pattern value="rife.render.EncodeQp" />
-    <pattern value="rife.render.EncodeUnicode" />
-    <pattern value="rife.render.EncodeUrl" />
-    <pattern value="rife.render.EncodeXml" />
-    <pattern value="rife.render.ValueBean" method="getValue" />
-    <pattern value="rife.render.Lowercase" />
-    <pattern value="rife.render.Rot13" />
-    <pattern value="rife.render.SwapCase" />
-    <pattern value="rife.render.TestDateTime" />
-    <pattern value="rife.render.TestEncode" />
-    <pattern value="rife.render.Trim" />
-    <pattern value="rife.render.Uncapitalize" />
-    <pattern value="rife.render.Uppercase" />
-    <pattern value="rife.render.Year" />
-    <pattern value="rife.render.ValueBean" method="setValue" />
-    <pattern value="rife.render.TestDateTime" method="testDateIso" />
-    <pattern value="rife.render.TestDateTime" method="testDateTimeIso" />
-    <pattern value="rife.render.TestDateTime" method="testDateTimeRfc2822" />
-    <pattern value="rife.render.TestEncode" method="testEncodeUrl" />
-    <pattern value="rife.render.TestDateTime" method="testTimeIso" />
-    <pattern value="rife.render.TestDateTime" method="testYear" />
-    <pattern value="rife.render.ValueBean" />
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="PDMPlugin">

README.md

@@ -7,12 +7,6 @@ This project provides a set of template renderers.
 
 - **rife.render.Capitalize**
   - Capitalizes a template value.
-- **rife.render.DateIso**
-  - Renders the current date in ISO 8061 format.
-- **rife.render.DateTimeIso**
-  - Renders the current date and time in ISO 8061 format.
-- **rife.render.DateTimeRfc2822**
-  - Renders the current date and time in RFC 2822 format.
 - **rife.render.EncodeBase64**
   - Encodes a template value to Base64.
 - **rife.render.EncodeHtml**
@@ -35,8 +29,6 @@ This project provides a set of template renderers.
   - Translates a template value to/from ROT13.
 - **rife.render.SwapCase**
   - Swap case of a template value.
-- **rife.render.TimeIso**
-  - Renders the current time in ISO 8061 format.
 - **rife.render.Trim**
   - Removes leading and trailing whitespace from a template value.
 - **rife.render.Uncapitalize**

lib/build.gradle.kts

@@ -25,7 +25,6 @@ dependencies {
 
 	testImplementation(platform("org.junit:junit-bom:5.9.2"))
 	testImplementation("org.junit.jupiter:junit-jupiter")
-    testImplementation("org.assertj:assertj-core:3.24.2")
 }
 
 configurations {

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

@@ -1,55 +0,0 @@
-/*
- *  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.template.ValueRenderer;
-import rife.tools.Localization;
-
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-
-/**
- * <p>Return the current date in ISO 8601 format.</p>
- *
- * <p>Usage:</p>
- *
- * <pre>
- *   &lt;!--v render:rife.render.DateIso/--&gt;
- *   {{v render:rife.render.DateIso}}
- * </pre>
- *
- * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
- * @since 1.0
- */
-public class DateIso implements ValueRenderer {
-    /**
-     * ISO 8601 date and time formatter.
-     */
-    static public final DateTimeFormatter iso8601Formatter =
-            DateTimeFormatter.ofPattern("yyyy-MM-dd").withLocale(Localization.getLocale());
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String render(Template template, String valueId, String differentiator) {
-        return ZonedDateTime.now().format(iso8601Formatter);
-    }
-}

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

@@ -1,54 +0,0 @@
-/*
- *  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.template.ValueRenderer;
-import rife.tools.Localization;
-
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-
-/**
- * <p>Return the current date and time in ISO 8601 format.</p>
- *
- * <p>Usage:</p>
- *
- * <pre>
- *   &lt;!--v render:rife.render.DateTimeIso/--&gt;
- *   {{v render:rife.render.DateTimeIso}}
- * </pre>
- *
- * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
- * @since 1.0
- */
-public class DateTimeIso implements ValueRenderer {
-    /**
-     * ISO 8601 date and time formatter.
-     */
-    static public final DateTimeFormatter iso8601Formatter =
-            DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXXXX").withLocale(Localization.getLocale());
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String render(Template template, String valueId, String differentiator) {
-        return ZonedDateTime.now().format(iso8601Formatter);
-    }
-}

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

@@ -1,54 +0,0 @@
-/*
- *  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.template.ValueRenderer;
-import rife.tools.Localization;
-
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-
-/**
- * <p>Return the current date and time in RFC 2822 format.</p>
- *
- * <p>Usage:</p>
- *
- * <pre>
- *   &lt;!--v render:rife.render.DateTimeRfc2822/--&gt;
- *   {{v render:rife.render.DateTimeRfc2822}}
- * </pre>
- *
- * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
- * @since 1.0
- */
-public class DateTimeRfc2822 implements ValueRenderer {
-    /**
-     * RFC 2822 date and time formatter.
-     */
-    static public final DateTimeFormatter rfc2822Formatter =
-            DateTimeFormatter.ofPattern("EEE, d MMM yyyy HH:mm:ss zzz").withLocale(Localization.getLocale());
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String render(Template template, String valueId, String differentiator) {
-        return ZonedDateTime.now().format(rfc2822Formatter);
-    }
-}

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

@@ -1,54 +0,0 @@
-/*
- *  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.template.ValueRenderer;
-import rife.tools.Localization;
-
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-
-/**
- * <p>Return the current time in ISO 8601 format.</p>
- *
- * <p>Usage:</p>
- *
- * <pre>
- *   &lt;!--v render:rife.render.TimeIso/--&gt;
- *   {{v render:rife.render.TimeIso}}
- * </pre>
- *
- * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
- * @since 1.0
- */
-public class TimeIso implements ValueRenderer {
-    /**
-     * ISO 8601 time formatter.
-     */
-    static public final DateTimeFormatter iso8601Formatter =
-            DateTimeFormatter.ofPattern("HH:mm:ss").withLocale(Localization.getLocale());
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String render(Template template, String valueId, String differentiator) {
-        return ZonedDateTime.now().format(iso8601Formatter);
-    }
-}

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;
@@ -40,7 +40,6 @@ public class SwapCase implements ValueRenderer {
      * @param src the String to swap the case of
      * @return the modified String or null
      */
-    @SuppressWarnings("PMD.AvoidReassigningLoopVariables")
     public static String swapCase(final String src) {
         if (src == null || src.isEmpty()) {
             return src;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

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

@@ -15,7 +15,7 @@
  *
  */
 
-package rife.render;
+package rife2.render;
 
 import rife.template.Template;
 import rife.template.ValueRenderer;

lib/src/test/java/rife/render/TestDateTime.java

@@ -1,57 +0,0 @@
-/*
- *  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 org.junit.jupiter.api.Test;
-import rife.template.TemplateFactory;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-
-class TestDateTime {
-    @Test
-    void testDateIso() {
-        var t = TemplateFactory.HTML.get("dateIso");
-        assertThatCode(() -> DateIso.iso8601Formatter.parse(t.getContent())).doesNotThrowAnyException();
-    }
-
-    @Test
-    void testDateTimeIso() {
-        var t = TemplateFactory.HTML.get("dateTimeIso");
-        assertThatCode(() -> DateTimeIso.iso8601Formatter.parse(t.getContent())).doesNotThrowAnyException();
-    }
-
-    @Test
-    void testDateTimeRfc2822() {
-        var t = TemplateFactory.HTML.get("dateTimeRfc2822");
-        assertThatCode(() -> DateTimeRfc2822.rfc2822Formatter.parse(t.getContent())).doesNotThrowAnyException();
-    }
-
-    @Test
-    void testTimeIso() {
-        var t = TemplateFactory.HTML.get("timeIso");
-        assertThatCode(() -> TimeIso.iso8601Formatter.parse(t.getContent())).doesNotThrowAnyException();
-    }
-
-    @Test
-    void testYear() {
-        var t = TemplateFactory.HTML.get("year");
-        var year = java.time.Year.now().toString();
-        assertThat(t.getContent()).isEqualTo(year + "<br>\n" + year);
-    }
-}

lib/src/test/java/rife/render/TestEncode.java

@@ -1,34 +0,0 @@
-/*
- *  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 org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import rife.template.TemplateFactory;
-
-import static org.assertj.core.api.Assertions.assertThat;
-class TestEncode {
-    @Disabled("Until renderer can access beans")
-    @Test
-    void testEncodeUrl() {
-        var t = TemplateFactory.HTML.get("encodeUrl");
-        t.setBean(new ValueBean("a test &"));
-        var encodedValue = "a%20test%20%26";
-        assertThat(t.getContent()).isEqualTo(encodedValue + "<br>\n" + encodedValue);
-    }
-}

lib/src/test/java/rife/render/ValueBean.java

@@ -1,34 +0,0 @@
-/*
- *  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;
-
-public class ValueBean {
-    private String value;
-
-    ValueBean(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

lib/src/test/resources/templates/dateIso.html

@@ -1 +0,0 @@
-{{v render:rife.render.DateIso/}}

lib/src/test/resources/templates/dateTimeIso.html

@@ -1 +0,0 @@
-{{v render:rife.render.DateTimeIso/}}

lib/src/test/resources/templates/dateTimeRfc2822.html

@@ -1 +0,0 @@
-{{v render:rife.render.DateTimeRfc2822/}}

lib/src/test/resources/templates/encodeUrl.html

@@ -1,2 +0,0 @@
-}<!--v render:rife.render.EncodeUrl:value/--><br>
-{{v render:rife.render.EncodeUrl:value/}}

lib/src/test/resources/templates/timeIso.html

@@ -1 +0,0 @@
-{{v render:rife.render.TimeIso/}}

lib/src/test/resources/templates/year.html

@@ -1,2 +0,0 @@
-<!--v render:rife.render.Year/--><br>
-{{v render:rife.render.Year/}}