Return the current date in ISO 8601 format.
- * - *Usage:
- * - *- * <!--v render:rife.render.DateIso/--> - * {{v render:rife.render.DateIso}} - *- * - * @author Erik C. Thauvin - * @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); - } -} diff --git a/lib/src/main/java/rife/render/DateTimeIso.java b/lib/src/main/java/rife/render/DateTimeIso.java deleted file mode 100644 index 23dbb45..0000000 --- a/lib/src/main/java/rife/render/DateTimeIso.java +++ /dev/null @@ -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; - -/** - *
Return the current date and time in ISO 8601 format.
- * - *Usage:
- * - *- * <!--v render:rife.render.DateTimeIso/--> - * {{v render:rife.render.DateTimeIso}} - *- * - * @author Erik C. Thauvin - * @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); - } -} diff --git a/lib/src/main/java/rife/render/DateTimeRfc2822.java b/lib/src/main/java/rife/render/DateTimeRfc2822.java deleted file mode 100644 index 551828f..0000000 --- a/lib/src/main/java/rife/render/DateTimeRfc2822.java +++ /dev/null @@ -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; - -/** - *
Return the current date and time in RFC 2822 format.
- * - *Usage:
- * - *- * <!--v render:rife.render.DateTimeRfc2822/--> - * {{v render:rife.render.DateTimeRfc2822}} - *- * - * @author Erik C. Thauvin - * @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); - } -} diff --git a/lib/src/main/java/rife/render/TimeIso.java b/lib/src/main/java/rife/render/TimeIso.java deleted file mode 100644 index 191cfc9..0000000 --- a/lib/src/main/java/rife/render/TimeIso.java +++ /dev/null @@ -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; - -/** - *
Return the current time in ISO 8601 format.
- * - *Usage:
- * - *- * <!--v render:rife.render.TimeIso/--> - * {{v render:rife.render.TimeIso}} - *- * - * @author Erik C. Thauvin - * @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); - } -} diff --git a/lib/src/main/java/rife/render/Capitalize.java b/lib/src/main/java/rife2/render/Capitalize.java similarity index 98% rename from lib/src/main/java/rife/render/Capitalize.java rename to lib/src/main/java/rife2/render/Capitalize.java index a2e838f..71f007e 100644 --- a/lib/src/main/java/rife/render/Capitalize.java +++ b/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; diff --git a/lib/src/main/java/rife/render/EncodeBase64.java b/lib/src/main/java/rife2/render/EncodeBase64.java similarity index 98% rename from lib/src/main/java/rife/render/EncodeBase64.java rename to lib/src/main/java/rife2/render/EncodeBase64.java index 4b495fd..b47fbc8 100644 --- a/lib/src/main/java/rife/render/EncodeBase64.java +++ b/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; diff --git a/lib/src/main/java/rife/render/EncodeHtml.java b/lib/src/main/java/rife2/render/EncodeHtml.java similarity index 98% rename from lib/src/main/java/rife/render/EncodeHtml.java rename to lib/src/main/java/rife2/render/EncodeHtml.java index 1194c45..90b0bb8 100644 --- a/lib/src/main/java/rife/render/EncodeHtml.java +++ b/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; diff --git a/lib/src/main/java/rife/render/EncodeHtmlEntities.java b/lib/src/main/java/rife2/render/EncodeHtmlEntities.java similarity index 98% rename from lib/src/main/java/rife/render/EncodeHtmlEntities.java rename to lib/src/main/java/rife2/render/EncodeHtmlEntities.java index 42fad25..459c3b0 100644 --- a/lib/src/main/java/rife/render/EncodeHtmlEntities.java +++ b/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; diff --git a/lib/src/main/java/rife/render/EncodeJson.java b/lib/src/main/java/rife2/render/EncodeJson.java similarity index 98% rename from lib/src/main/java/rife/render/EncodeJson.java rename to lib/src/main/java/rife2/render/EncodeJson.java index e9eed9c..1820d0f 100644 --- a/lib/src/main/java/rife/render/EncodeJson.java +++ b/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; diff --git a/lib/src/main/java/rife/render/EncodeQp.java b/lib/src/main/java/rife2/render/EncodeQp.java similarity index 99% rename from lib/src/main/java/rife/render/EncodeQp.java rename to lib/src/main/java/rife2/render/EncodeQp.java index ccff9a2..70241db 100644 --- a/lib/src/main/java/rife/render/EncodeQp.java +++ b/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; diff --git a/lib/src/main/java/rife/render/EncodeUnicode.java b/lib/src/main/java/rife2/render/EncodeUnicode.java similarity index 98% rename from lib/src/main/java/rife/render/EncodeUnicode.java rename to lib/src/main/java/rife2/render/EncodeUnicode.java index 938b580..2b08365 100644 --- a/lib/src/main/java/rife/render/EncodeUnicode.java +++ b/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; diff --git a/lib/src/main/java/rife/render/EncodeUrl.java b/lib/src/main/java/rife2/render/EncodeUrl.java similarity index 98% rename from lib/src/main/java/rife/render/EncodeUrl.java rename to lib/src/main/java/rife2/render/EncodeUrl.java index 05e3f85..0eb0f0b 100644 --- a/lib/src/main/java/rife/render/EncodeUrl.java +++ b/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; diff --git a/lib/src/main/java/rife/render/EncodeXml.java b/lib/src/main/java/rife2/render/EncodeXml.java similarity index 98% rename from lib/src/main/java/rife/render/EncodeXml.java rename to lib/src/main/java/rife2/render/EncodeXml.java index 7e1dd48..51d4802 100644 --- a/lib/src/main/java/rife/render/EncodeXml.java +++ b/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; diff --git a/lib/src/main/java/rife/render/Lowercase.java b/lib/src/main/java/rife2/render/Lowercase.java similarity index 98% rename from lib/src/main/java/rife/render/Lowercase.java rename to lib/src/main/java/rife2/render/Lowercase.java index b4de6bd..f98a268 100644 --- a/lib/src/main/java/rife/render/Lowercase.java +++ b/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; diff --git a/lib/src/main/java/rife/render/Rot13.java b/lib/src/main/java/rife2/render/Rot13.java similarity index 99% rename from lib/src/main/java/rife/render/Rot13.java rename to lib/src/main/java/rife2/render/Rot13.java index e7ce2b9..cad83e4 100644 --- a/lib/src/main/java/rife/render/Rot13.java +++ b/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; diff --git a/lib/src/main/java/rife/render/SwapCase.java b/lib/src/main/java/rife2/render/SwapCase.java similarity index 96% rename from lib/src/main/java/rife/render/SwapCase.java rename to lib/src/main/java/rife2/render/SwapCase.java index f534915..3759a02 100644 --- a/lib/src/main/java/rife/render/SwapCase.java +++ b/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; diff --git a/lib/src/main/java/rife/render/Trim.java b/lib/src/main/java/rife2/render/Trim.java similarity index 98% rename from lib/src/main/java/rife/render/Trim.java rename to lib/src/main/java/rife2/render/Trim.java index 985b102..b2738b2 100644 --- a/lib/src/main/java/rife/render/Trim.java +++ b/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; diff --git a/lib/src/main/java/rife/render/Uncapitalize.java b/lib/src/main/java/rife2/render/Uncapitalize.java similarity index 98% rename from lib/src/main/java/rife/render/Uncapitalize.java rename to lib/src/main/java/rife2/render/Uncapitalize.java index 45682fb..9428299 100644 --- a/lib/src/main/java/rife/render/Uncapitalize.java +++ b/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; diff --git a/lib/src/main/java/rife/render/Uppercase.java b/lib/src/main/java/rife2/render/Uppercase.java similarity index 98% rename from lib/src/main/java/rife/render/Uppercase.java rename to lib/src/main/java/rife2/render/Uppercase.java index 7101db7..839bb1e 100644 --- a/lib/src/main/java/rife/render/Uppercase.java +++ b/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; diff --git a/lib/src/main/java/rife/render/Year.java b/lib/src/main/java/rife2/render/Year.java similarity index 98% rename from lib/src/main/java/rife/render/Year.java rename to lib/src/main/java/rife2/render/Year.java index adc21ca..d37cd31 100644 --- a/lib/src/main/java/rife/render/Year.java +++ b/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; diff --git a/lib/src/test/java/rife/render/TestDateTime.java b/lib/src/test/java/rife/render/TestDateTime.java deleted file mode 100644 index 6d7e538..0000000 --- a/lib/src/test/java/rife/render/TestDateTime.java +++ /dev/null @@ -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 + "