Version 0.9.9

Bumped JUnit version to 5.11.3
Bumped PMD extension version to 1.1.7
Bumped JDK to version 23 (GitHub CI Workflow)

.github/workflows/bld.yml

@@ -3,30 +3,49 @@ name: bld-ci
 on: [ push, pull_request, workflow_dispatch ]
 
 jobs:
-  build-gradle-project:
+  build-bld-project:
-    runs-on: ubuntu-latest
-
     strategy:
       matrix:
-        java-version: [ 17, 19, 20 ]
+        java-version: [ 17, 21, 24 ]
+        kotlin-version: [ 1.9.25, 2.0.21, 2.1.20 ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout source repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
+          distribution: "zulu"
           java-version: ${{ matrix.java-version }}
 
-      - name: Grant execute permission for bld
+      - name: Download dependencies [examples]
-        run: chmod +x bld
+        working-directory: examples
-
-      - name: Download the dependencies
         run: ./bld download
 
-      - name: Run tests with bld
+      - name: Compile run [examples]
+        working-directory: examples
+        run: ./bld compile run
+
+      - name: Update version properties and run [examples]
+        working-directory: examples
+        run: |
+          ./bld update-major run
+          ./bld update-minor run
+          ./bld update-patch run
+          ./bld update-release run
+
+      - name: Delete version properties and run [examples]
+        working-directory: examples
+        run: ./bld delete-version run
+
+      - name: Download dependencies
+        run: ./bld download
+
+      - name: Run tests
         run: ./bld compile test

.github/workflows/pages.yml

@@ -30,14 +30,14 @@ jobs:
 
     steps:
       - name: Checkout source repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
+          distribution: "zulu"
           java-version: 17
 
       - name: Build Javadocs
@@ -47,11 +47,11 @@ jobs:
         uses: actions/configure-pages@v3
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           # Upload generated Javadocs repository
-          path: 'build/javadoc/'
+          path: "build/javadoc/"
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

.idea/bld.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="BldConfiguration">
+    <events />
+  </component>
+</project>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Erik's Code Style" />
+  </state>
+</component>

.idea/copyright/Apache_License.xml

@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value=" Copyright &amp;#36;today.year the original author or authors.&#10; &#10; Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;  you may not use this file except in compliance with the License.&#10;  You may obtain a copy of the License at&#10; &#10;      https://www.apache.org/licenses/LICENSE-2.0&#10; &#10; Unless required by applicable law or agreed to in writing, software&#10; distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10; See the License for the specific language governing permissions and&#10; limitations under the License." />
+    <option name="notice" value="Copyright 2023-&amp;#36;today.year the original author or authors.&#10; &#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;    https://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
     <option name="myName" value="Apache License" />
   </copyright>
 </component>

.idea/icon.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 179 108" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(1,0,0,1,-210.511,-96.3382)">
+        <g transform="matrix(1,0,0,1,-23.3386,-649.816)">
+            <g transform="matrix(0.221288,0,0,0.24,73.9536,390.254)">
+                <path d="M722.568,1482.92L722.568,1921.1L808.968,1921.1L808.968,1888.7C822.168,1907.9 846.168,1930.1 893.568,1930.1C933.168,1930.1 961.968,1917.5 985.368,1893.5C1012.97,1865.9 1027.37,1827.5 1027.37,1786.1C1027.37,1741.7 1011.17,1705.1 985.368,1680.5C961.968,1658.3 928.968,1644.5 892.368,1644.5C862.968,1644.5 830.568,1654.1 808.968,1683.5L808.968,1482.92L722.568,1482.92ZM871.368,1718.9C888.768,1718.9 903.768,1723.7 917.568,1736.9C930.168,1748.9 938.568,1766.3 938.568,1787.9C938.568,1807.7 930.168,1825.1 917.568,1837.1C904.368,1849.7 887.568,1855.7 872.568,1855.7C856.368,1855.7 837.168,1849.1 823.368,1835.9C813.168,1826.3 803.568,1810.1 803.568,1787.9C803.568,1765.1 812.568,1749.5 822.768,1738.7C836.568,1724.3 852.768,1718.9 871.368,1718.9Z" style="fill:rgb(35,146,255);fill-rule:nonzero;"/>
+                <rect x="1083.77" y="1482.92" width="86.4" height="438.182" style="fill:rgb(250,144,82);fill-rule:nonzero;"/>
+                <path d="M1531.37,1482.92L1444.97,1482.92L1444.97,1683.5C1423.37,1654.1 1390.97,1644.5 1361.57,1644.5C1324.97,1644.5 1291.97,1658.3 1268.57,1680.5C1242.77,1705.1 1226.57,1741.7 1226.57,1786.1C1226.57,1827.5 1240.97,1865.9 1268.57,1893.5C1291.97,1917.5 1320.77,1930.1 1360.37,1930.1C1407.77,1930.1 1431.77,1907.9 1444.97,1888.7L1444.97,1921.1L1531.37,1921.1L1531.37,1482.92ZM1382.57,1718.9C1401.17,1718.9 1417.37,1724.3 1431.17,1738.7C1441.37,1749.5 1450.37,1765.1 1450.37,1787.9C1450.37,1810.1 1440.77,1826.3 1430.57,1835.9C1416.77,1849.1 1397.57,1855.7 1381.37,1855.7C1366.37,1855.7 1349.57,1849.7 1336.37,1837.1C1323.77,1825.1 1315.37,1807.7 1315.37,1787.9C1315.37,1766.3 1323.77,1748.9 1336.37,1736.9C1350.17,1723.7 1365.17,1718.9 1382.57,1718.9Z" style="fill:rgb(35,146,255);fill-rule:nonzero;"/>
+            </g>
+        </g>
+    </g>
+</svg>

.idea/intellij-javadocs-4.0.1.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaDocConfiguration">
+    <GENERAL>
+      <MODE>UPDATE</MODE>
+      <OVERRIDDEN_METHODS>false</OVERRIDDEN_METHODS>
+      <SPLITTED_CLASS_NAME>true</SPLITTED_CLASS_NAME>
+      <LEVELS>
+        <LEVEL>METHOD</LEVEL>
+        <LEVEL>FIELD</LEVEL>
+        <LEVEL>TYPE</LEVEL>
+      </LEVELS>
+      <VISIBILITIES>
+        <VISIBILITY>PUBLIC</VISIBILITY>
+        <VISIBILITY>DEFAULT</VISIBILITY>
+        <VISIBILITY>PROTECTED</VISIBILITY>
+      </VISIBILITIES>
+    </GENERAL>
+    <TEMPLATES>
+      <CLASSES>
+        <CLASS>
+          <KEY>^.*(public|protected|private)*.+interface\s+\w+.*</KEY>
+          <VALUE>/**\n
+ * The interface ${name}.\n
+&lt;#if element.typeParameters?has_content&gt;        * \n
+&lt;/#if&gt;&lt;#list element.typeParameters as typeParameter&gt;        * @param &lt;${typeParameter.name}&gt; the type parameter\n
+&lt;/#list&gt; */</VALUE>
+        </CLASS>
+        <CLASS>
+          <KEY>^.*(public|protected|private)*.+enum\s+\w+.*</KEY>
+          <VALUE>/**\n
+ * The enum ${name}.\n
+ */</VALUE>
+        </CLASS>
+        <CLASS>
+          <KEY>^.*(public|protected|private)*.+class\s+\w+.*</KEY>
+          <VALUE>/**\n
+ * The type ${name}.\n
+&lt;#if element.typeParameters?has_content&gt;        * \n
+&lt;/#if&gt;&lt;#list element.typeParameters as typeParameter&gt;        * @param &lt;${typeParameter.name}&gt; the type parameter\n
+&lt;/#list&gt; */</VALUE>
+        </CLASS>
+        <CLASS>
+          <KEY>.+</KEY>
+          <VALUE>/**\n
+ * The type ${name}.\n
+ */</VALUE>
+        </CLASS>
+      </CLASSES>
+      <CONSTRUCTORS>
+        <CONSTRUCTOR>
+          <KEY>.+</KEY>
+          <VALUE>/**\n
+ * Instantiates a new ${name}.\n
+&lt;#if element.parameterList.parameters?has_content&gt;         *\n
+&lt;/#if&gt;&lt;#list element.parameterList.parameters as parameter&gt;         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
+&lt;/#list&gt;&lt;#if element.throwsList.referenceElements?has_content&gt;         *\n
+&lt;/#if&gt;&lt;#list element.throwsList.referenceElements as exception&gt;         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
+&lt;/#list&gt; */</VALUE>
+        </CONSTRUCTOR>
+      </CONSTRUCTORS>
+      <METHODS>
+        <METHOD>
+          <KEY>^.*(public|protected|private)*\s*.*(\w(\s*&lt;.+&gt;)*)+\s+get\w+\s*\(.*\).+</KEY>
+          <VALUE>/**\n
+ * Gets ${partName}.\n
+&lt;#if element.typeParameters?has_content&gt;         * \n
+&lt;/#if&gt;&lt;#list element.typeParameters as typeParameter&gt;         * @param &lt;${typeParameter.name}&gt; the type parameter\n
+&lt;/#list&gt;&lt;#if element.parameterList.parameters?has_content&gt;         *\n
+&lt;/#if&gt;&lt;#list element.parameterList.parameters as parameter&gt;         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
+&lt;/#list&gt;&lt;#if isNotVoid&gt;         *\n
+         * @return the ${partName}\n
+&lt;/#if&gt;&lt;#if element.throwsList.referenceElements?has_content&gt;         *\n
+&lt;/#if&gt;&lt;#list element.throwsList.referenceElements as exception&gt;         * @throws ${exception.referenceName} if an error occurs\n
+&lt;/#list&gt; */</VALUE>
+        </METHOD>
+        <METHOD>
+          <KEY>^.*(public|protected|private)*\s*.*(void|\w(\s*&lt;.+&gt;)*)+\s+set\w+\s*\(.*\).+</KEY>
+          <VALUE>/**\n
+ * Sets ${partName}.\n
+&lt;#if element.typeParameters?has_content&gt;         * \n
+&lt;/#if&gt;&lt;#list element.typeParameters as typeParameter&gt;         * @param &lt;${typeParameter.name}&gt; the type parameter\n
+&lt;/#list&gt;&lt;#if element.parameterList.parameters?has_content&gt;         *\n
+&lt;/#if&gt;&lt;#list element.parameterList.parameters as parameter&gt;         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
+&lt;/#list&gt;&lt;#if isNotVoid&gt;         *\n
+         * @return the ${partName}\n
+&lt;/#if&gt;&lt;#if element.throwsList.referenceElements?has_content&gt;         *\n
+&lt;/#if&gt;&lt;#list element.throwsList.referenceElements as exception&gt;         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
+&lt;/#list&gt; */</VALUE>
+        </METHOD>
+        <METHOD>
+          <KEY>^.*((public\s+static)|(static\s+public))\s+void\s+main\s*\(\s*String\s*(\[\s*\]|\.\.\.)\s+\w+\s*\).+</KEY>
+          <VALUE>/**\n
+ * The entry point of application.\n
+
+     &lt;#if element.parameterList.parameters?has_content&gt;         *\n
+&lt;/#if&gt;     * @param ${element.parameterList.parameters[0].name} the input arguments\n
+&lt;#if element.throwsList.referenceElements?has_content&gt;         *\n
+&lt;/#if&gt;&lt;#list element.throwsList.referenceElements as exception&gt;         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
+&lt;/#list&gt; */</VALUE>
+        </METHOD>
+        <METHOD>
+          <KEY>.+</KEY>
+          <VALUE>/**\n
+ * ${name}&lt;#if isNotVoid&gt; ${return}&lt;/#if&gt;.\n
+&lt;#if element.typeParameters?has_content&gt;         * \n
+&lt;/#if&gt;&lt;#list element.typeParameters as typeParameter&gt;         * @param &lt;${typeParameter.name}&gt; the type parameter\n
+&lt;/#list&gt;&lt;#if element.parameterList.parameters?has_content&gt;         *\n
+&lt;/#if&gt;&lt;#list element.parameterList.parameters as parameter&gt;         * @param ${parameter.name} the ${paramNames[parameter.name]}\n
+&lt;/#list&gt;&lt;#if isNotVoid&gt;         *\n
+         * @return the ${return}\n
+&lt;/#if&gt;&lt;#if element.throwsList.referenceElements?has_content&gt;         *\n
+&lt;/#if&gt;&lt;#list element.throwsList.referenceElements as exception&gt;         * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n
+&lt;/#list&gt; */</VALUE>
+        </METHOD>
+      </METHODS>
+      <FIELDS>
+        <FIELD>
+          <KEY>^.*(public|protected|private)*.+static.*(\w\s\w)+.+</KEY>
+          <VALUE>/**\n
+ * The constant ${element.getName()}.\n
+ */</VALUE>
+        </FIELD>
+        <FIELD>
+          <KEY>^.*(public|protected|private)*.*(\w\s\w)+.+</KEY>
+          <VALUE>/**\n
+    &lt;#if element.parent.isInterface()&gt;        * The constant ${element.getName()}.\n
+&lt;#else&gt;        * The ${name}.\n
+&lt;/#if&gt; */</VALUE>
+        </FIELD>
+        <FIELD>
+          <KEY>.+</KEY>
+          <VALUE>/**\n
+    &lt;#if element.parent.isEnum()&gt;        *${name} ${typeName}.\n
+&lt;#else&gt;        * The ${name}.\n
+&lt;/#if&gt;*/</VALUE>
+        </FIELD>
+      </FIELDS>
+    </TEMPLATES>
+  </component>
+</project>

.idea/libraries/bld.xml

@@ -2,11 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.17.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.17-sources.jar!/" />
+      <root url="file://$PROJECT_DIR$/lib/bld" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

.idea/libraries/compile.xml

@@ -7,7 +7,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/compile" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
   </library>
 </component>

.idea/libraries/runtime.xml

@@ -7,7 +7,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/runtime" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
   </library>
 </component>

.idea/libraries/test.xml

@@ -7,7 +7,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/test" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
   </library>
 </component>

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <pattern value="rife.bld.extension.propertyFile.Entry" method="defaultValue" />
@@ -12,6 +11,10 @@
     <pattern value="rife.bld.extension.propertyfile.EntryDate" method="delete" />
     <pattern value="rife.bld.extension.propertyfile.EntryDate" />
     <pattern value="rife.bld.extension.propertyfile.EntryInt" method="delete" />
+    <pattern value="rife.bld.extension.propertyfile.PropertyFileBuild" method="jacoco" />
+    <pattern value="rife.bld.extension.propertyfile.PropertyFileBuild" method="pmd" />
+    <pattern value="rife.bld.extension.propertyfile.PropertyFileOperation" method="fromProject" />
+    <pattern value="rife.bld.extension.propertyfile.PropertyFileOperation" />
   </component>
   <component name="PDMPlugin">
     <option name="skipTestSources" value="false" />

.vscode/launch.json

@@ -1,12 +1,6 @@
 {
     "version": "0.2.0",
     "configurations": [
-        {
-            "type": "java",
-            "name": "Run Main",
-            "request": "launch",
-            "mainClass": "rife.bld.extension.propertyfile.PropertyFileOperation"
-        },
         {
             "type": "java",
             "name": "Run Tests",

.vscode/settings.json

@@ -3,13 +3,13 @@
         "src/main/java",
         "src/main/resources",
         "src/test/java",
-        "src/bld/java"
+        "src/test/resources",
+        "src/bld/java",
+        "src/bld/resources"
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.rife2/dist/rife2-1.5.17.jar",
+        "${HOME}/.bld/dist/bld-2.2.1.jar",
-        "lib/compile/*.jar",
+        "lib/**/*.jar"
-        "lib/runtime/*.jar",
-        "lib/test/*.jar"
     ]
 }

README.md

@@ -1,17 +1,29 @@
-# [Bld](https://github.com/rife2/rife2/wiki/What-Is-Bld) Extension to Create or Modify Properties Files
+# [bld](https://rife2.com/bld) Extension to Create or Modify Properties Files
 
-[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause)
+[![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
+[![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-property-file/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-property-file)
 [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-property-file/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-property-file)
 [![GitHub CI](https://github.com/rife2/bld-property-file/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-property-file/actions/workflows/bld.yml)
 
-An extension for creating or modifying [property files](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html) with [bld](https://github.com/rife2/rife2/wiki/What-Is-Bld). It is inspired by the [ant PropertyFile task](https://ant.apache.org/manual/Tasks/propertyfile.html).
+To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file:
+
+```properties
+bld.extension-property-file=com.uwyn.rife2:bld-property-file
+```
+
+For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation.
+
+## Create or Modify Property Files
+
+To create or modify [property files](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html) with [bld](https://rife2.com/bld), add the follwing to your build file:
 
 ```java
 @BuildCommand
 public void updateMajor() throws Exception {
-    new PropertyFileOperation(this)
+    new PropertyFileOperation()
+            .fromProject(this)
             .file("version.properties")
             .entry(new EntryInt("version.major").defaultValue(0).calc(ADD))
             .entry(new EntryInt("version.minor").set(0))
@@ -20,6 +32,7 @@ public void updateMajor() throws Exception {
             .execute();
 }
 ```
+
 Invoking the `updateMajor` command, will create the `version.propertees`file:
 
 ```sh
@@ -65,10 +78,11 @@ The [PropertyFileOperation](https://rife2.github.io/bld-property-file/rife/bld/e
 The [Entry](https://rife2.github.io/bld-property-file/rife/bld/extension/propertyfile/Entry.html) class is used to specify modifications to a [String property](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html).
 
 | Function         | Description/Example                                                                                                                               |
-|:-----------------|:--------------------------------------------------------------------------------------------------------|
+|:-----------------|:--------------------------------------------------------------------------------------------------------------------------------------------------|
 | `defaultValue()` | The value to be used if the property doesn't exist.                                                                                               |
 | `delete()`       | Delete the property.                                                                                                                              |
-| `modify()`       | `modify("-foo", String::concat)`<br/>`modify("-foo", (v, s) -> v + s)`<br/>`modify((v, s) -> v.trim())` | Modify an entry value.                     |
+| `modify()`       | `modify("-foo", String::concat)`<br/>`modify("-foo", (v, s) -> v + s)`<br/>`modify((v, s) -> v.trim())`                                           |
+| `pattern()`      | If present, will parse the value as a [Formatter](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Formatter.html) pattern. |
 | `set()`          | The value to set the property to, regardless of its previous value.                                                                               |
 
 ## EntryDate
@@ -110,3 +124,5 @@ The [EntryInt](https://rife2.github.io/bld-property-file/rife/bld/extension/prop
 | `delete()`       | Delete the property.                                                                                                                                               |
 | `pattern()`      | If present, will parse the value as a [DecimalFormat](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/text/DecimalFormat.html) pattern.          |
 | `set()`          | The [integer value](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html) to set the property to, regardless of its previous value. |
+
+It is inspired by the [ant PropertyFile task](https://ant.apache.org/manual/Tasks/propertyfile.html).

config/pmd.xml

@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<ruleset name="erik"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+    <description>Erik's Ruleset</description>
+    <!-- BEST PRACTICES -->
+    <rule ref="category/java/bestpractices.xml">
+        <exclude name="AvoidPrintStackTrace"/>
+        <exclude name="GuardLogStatement"/>
+        <exclude name="UnitTestContainsTooManyAsserts"/>
+        <exclude name="UnitTestShouldUseTestAnnotation"/>
+    </rule>
+
+    <rule ref="category/java/bestpractices.xml/MissingOverride">
+        <properties>
+            <property name="violationSuppressXPath"
+                      value="//MethodDeclaration[@Name='hashCode' or @Name='equals' or @Name='toString']"/>
+        </properties>
+    </rule>
+
+
+    <!-- CODE STYLE -->
+    <rule ref="category/java/codestyle.xml">
+        <exclude name="AtLeastOneConstructor"/>
+        <exclude name="ClassNamingConventions"/>
+        <exclude name="CommentDefaultAccessModifier"/>
+        <exclude name="ConfusingTernary"/>
+        <exclude name="FieldNamingConventions"/>
+        <exclude name="LocalVariableCouldBeFinal"/>
+        <exclude name="LongVariable"/>
+        <exclude name="MethodArgumentCouldBeFinal"/>
+        <exclude name="OnlyOneReturn"/>
+        <exclude name="PackageCase"/>
+        <exclude name="ShortClassName"/>
+        <exclude name="ShortMethodName"/>
+        <exclude name="ShortVariable"/>
+        <exclude name="UseExplicitTypes"/>
+        <exclude name="UseUnderscoresInNumericLiterals"/>
+        <exclude name="UselessParentheses"/>
+    </rule>
+
+    <rule ref="category/java/codestyle.xml/UnnecessaryImport">
+        <properties>
+            <property name="violationSuppressRegex" value="Unused (static|.*\.\*).*"/>
+        </properties>
+    </rule>
+
+    <!-- DESIGN -->
+    <rule ref="category/java/design.xml">
+        <exclude name="AvoidCatchingGenericException"/>
+        <exclude name="AvoidDeeplyNestedIfStmts"/>
+        <exclude name="AvoidUncheckedExceptionsInSignatures"/>
+        <exclude name="CognitiveComplexity"/>
+        <exclude name="CyclomaticComplexity"/>
+        <exclude name="ExcessiveParameterList"/>
+        <exclude name="ExcessivePublicCount"/>
+        <exclude name="GodClass"/>
+        <exclude name="LawOfDemeter"/>
+        <exclude name="LoosePackageCoupling"/>
+        <exclude name="NPathComplexity"/>
+        <exclude name="NcssCount"/>
+        <exclude name="TooManyFields"/>
+        <exclude name="TooManyMethods"/>
+        <exclude name="UseObjectForClearerAPI"/>
+    </rule>
+
+    <!-- DOCUMENTATION -->
+    <rule ref="category/java/documentation.xml">
+        <exclude name="CommentRequired"/>
+        <exclude name="CommentSize"/>
+    </rule>
+
+    <!-- ERROR PRONE -->
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="AssignmentInOperand"/>
+        <exclude name="AvoidCatchingNPE"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
+        <exclude name="AvoidFieldNameMatchingTypeName"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="NullAssignment"/>
+    </rule>
+
+    <rule ref="category/java/errorprone.xml/AssignmentInOperand">
+        <properties>
+            <property name="allowWhile" value="true"/>
+            <property name="allowFor" value="true"/>
+            <property name="allowIf" value="true"/>
+        </properties>
+    </rule>
+    <rule ref="category/java/errorprone.xml/AvoidDuplicateLiterals">
+        <properties>
+            <property name="skipAnnotations" value="true"/>
+        </properties>
+    </rule>
+
+    <!-- MULTITHREADING -->
+    <rule ref="category/java/multithreading.xml">
+    </rule>
+
+    <!-- PERFORMANCE -->
+    <rule ref="category/java/performance.xml">
+    </rule>
+
+    <!-- SECURITY -->
+    <rule ref="category/java/security.xml">
+    </rule>
+</ruleset>

examples/.idea/libraries/bld.xml

@@ -2,12 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.17.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
       <root url="file://$PROJECT_DIR$/lib/bld" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.17-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1-sources.jar!/" />
       <root url="file://$PROJECT_DIR$/lib/bld" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" />

examples/.idea/libraries/compile.xml

@@ -7,7 +7,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/compile" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
   </library>
 </component>

examples/.idea/libraries/runtime.xml

@@ -7,7 +7,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/runtime" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
   </library>
 </component>

examples/.idea/libraries/test.xml

@@ -7,7 +7,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/test" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
   </library>
 </component>

examples/.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <list size="1">

examples/.vscode/launch.json

@@ -1,12 +1,6 @@
 {
     "version": "0.2.0",
     "configurations": [
-        {
-            "type": "java",
-            "name": "Run Main",
-            "request": "launch",
-            "mainClass": "com.example.PropertyFileExampleMain"
-        },
         {
             "type": "java",
             "name": "Run Tests",
@@ -18,7 +12,8 @@
                 "--disable-banner",
                 "--disable-ansi-colors",
                 "--exclude-engine=junit-platform-suite",
-                "--exclude-engine=junit-vintage"]
+                "--exclude-engine=junit-vintage"
+            ]
         }
     ]
 }

examples/.vscode/settings.json

@@ -3,13 +3,13 @@
         "src/main/java",
         "src/main/resources",
         "src/test/java",
-        "src/bld/java"
+        "src/test/resources",
+        "src/bld/java",
+        "src/bld/resources"
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.rife2/dist/rife2-1.5.17.jar",
+        "${HOME}/.bld/dist/bld-2.2.1.jar",
-        "lib/compile/*.jar",
+        "lib/**/*.jar"
-        "lib/runtime/*.jar",
-        "lib/test/*.jar"
     ]
 }

examples/README.md

@@ -1,57 +1,20 @@
-# [Bld Property File](https://github.com/rife2/bld-property-file) Extension Examples
+# Compile and Run Example
 
-## Compile
+```console
-
+./bld compile run
-First make sure the project up-to-date and compiled:
-
-```shell
-./bld download compile
-```
-## Run
-
-To run the examples, issue one of the following command or combination there off.
-
-```shell
-./bld updateMajor run
-./bld updateMinor run
-./bld updatePatch run
-./bld updateRelease run
-```
-Upon execution, the `version.properties` file will be created and displayed:
-
-```shell
-./bld updateMajor run
 ```
 
-```text
+# Update Version Properties
-+---------------------------+
+
-| version.properties        |
+```console
-+---------------------------+
+./bld update-major run
-#
+./bld update-minor run
-#Sun Apr 02 23:51:39 PDT 2023
+./bld update-patch run
-build.date=2023-04-02
+./bld update-release run
-version.major=1
-version.minor=0
-version.patch=0
 ```
 
-Subsequent commands will reflect the modifications to the
+# Delete Version Properties
-`version.major`, `version.minor` or `version.patch` properties:
 
-```shell
+```console
-./bld upatePatch run
+./bld delete-version run
 ```
-
-```text
-+---------------------------+
-| version.properties        |
-+---------------------------+
-#
-#Sun Apr 02 23:55:09 PDT 2023
-build.date=2023-04-02
-version.major=1
-version.minor=0
-version.patch=10
-```
-
-[View the Examples Build](https://github.com/rife2/bld-property-file/blob/master/examples/src/bld/java/com/example/PropertyFileExampleBuild.java)

examples/lib/bld/bld-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Apr 02 10:32:44 PDT 2023
-bld.extension=com.uwyn.rife2:bld-property-file:0.9.1
-bld.repositories=MAVEN_LOCAL,RIFE2
 bld.downloadExtensionSources=true
-rife2.downloadLocation=
+bld.downloadLocation=
-rife2.version=1.5.17
+bld.extension=com.uwyn.rife2:bld-property-file:0.9.9
+bld.repositories=MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
+bld.version=2.2.1

examples/src/bld/java/com/example/PropertyFileExampleBuild.java

@@ -10,9 +10,21 @@ import rife.bld.extension.propertyfile.PropertyFileOperation;
 import java.util.List;
 
 import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
+import static rife.bld.dependencies.Repository.RIFE2_RELEASES;
 import static rife.bld.dependencies.Scope.test;
 import static rife.bld.extension.propertyfile.Calc.ADD;
 
+/**
+ * Example build.
+ *
+ * <ul style="list-style-type:none">
+ *     <li>./bld updateMajor run</li>
+ *     <li>./bld updateMinor run</li>
+ *     <li>./bld updatePath run</li>
+ *     <li>./bld updateRelease run</li>
+ *     <li>./bld deleteVersion run</li>
+ * </ul>
+ */
 public class PropertyFileExampleBuild extends Project {
     final EntryDate buildDateEntry = new EntryDate("build.date").now().pattern("yyyy-MM-dd");
 
@@ -22,21 +34,26 @@ public class PropertyFileExampleBuild extends Project {
         mainClass = "com.example.PropertyFileExampleMain";
         version = version(0, 1, 0);
 
+        javaRelease = 17;
+
         downloadSources = true;
         autoDownloadPurge = true;
-        repositories = List.of(MAVEN_CENTRAL);
+
+        repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
+
         scope(test)
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2)));
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)));
     }
 
     public static void main(String[] args) {
         new PropertyFileExampleBuild().start(args);
     }
 
-    @BuildCommand(summary = "Updates major version")
+    @BuildCommand(value = "update-major", summary = "Updates major version")
     public void updateMajor() throws Exception {
-        new PropertyFileOperation(this)
+        new PropertyFileOperation()
+                .fromProject(this)
                 .file("version.properties")
                 // set the major version to 1 if it doesn't exist, increase by 1
                 .entry(new EntryInt("version.major").defaultValue(0).calc(ADD))
@@ -49,9 +66,10 @@ public class PropertyFileExampleBuild extends Project {
                 .execute();
     }
 
-    @BuildCommand(summary = "Updates minor version")
+    @BuildCommand(value = "update-minor", summary = "Updates minor version")
     public void updateMinor() throws Exception {
-        new PropertyFileOperation(this)
+        new PropertyFileOperation()
+                .fromProject(this)
                 .file("version.properties")
                 // set the major version to 1 if it doesn't exist
                 .entry(new EntryInt("version.major").defaultValue(1))
@@ -64,9 +82,10 @@ public class PropertyFileExampleBuild extends Project {
                 .execute();
     }
 
-    @BuildCommand(summary = "Updates patch version")
+    @BuildCommand(value = "update-patch", summary = "Updates patch version")
     public void updatePatch() throws Exception {
-        new PropertyFileOperation(this)
+        new PropertyFileOperation()
+                .fromProject(this)
                 .file("version.properties")
                 // set the major version to 1 if it doesn't exist
                 .entry(new EntryInt("version.major").defaultValue(1))
@@ -79,20 +98,23 @@ public class PropertyFileExampleBuild extends Project {
                 .execute();
     }
 
-    @BuildCommand(summary = "Updates the release")
+    @BuildCommand(value = "update-release", summary = "Updates the release")
     public void updateRelease() throws Exception {
-        new PropertyFileOperation(this)
+        new PropertyFileOperation()
+                .fromProject(this)
                 .file("version.properties")
                 // set the release to current date/time
                 .entry(new EntryDate("release").now().pattern("yyyyMMddHHmmss"))
                 // prepend 'beta.' to the release
                 .entry(new Entry("release").modify("beta.", (v, s) -> s + v))
+                .entry(buildDateEntry)
                 .execute();
     }
 
-    @BuildCommand(summary = "Delete version properties")
+    @BuildCommand(value = "delete-version", summary = "Delete version properties")
     public void deleteVersion() throws Exception {
-        new PropertyFileOperation(this)
+        new PropertyFileOperation()
+                .fromProject(this)
                 .file("version.properties")
                 .entry(new Entry("version.major").delete())
                 .entry(new Entry("version.minor").delete())

examples/version.properties

@@ -0,0 +1,7 @@
+#
+#Mon Jan 13 22:23:02 PST 2025
+build.date=2025-01-13
+release=beta.20250113222132
+version.major=3
+version.minor=1
+version.patch=20

lib/bld/bld-wrapper.properties

@@ -1,2 +1,6 @@
-#Sat Apr 01 10:09:33 PDT 2023
+bld.downloadExtensionJavadoc=false
-rife2.version=1.5.17
+bld.downloadExtensionSources=true
+bld.downloadLocation=
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.2
+bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
+bld.version=2.2.1

src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java

@@ -1,8 +1,25 @@
+/*
+ * Copyright 2023-2025 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.bld.extension.propertyfile;
 
+import rife.bld.BuildCommand;
 import rife.bld.Project;
+import rife.bld.extension.PmdOperation;
 import rife.bld.publish.PublishDeveloper;
-import rife.bld.publish.PublishInfo;
 import rife.bld.publish.PublishLicense;
 import rife.bld.publish.PublishScm;
 
@@ -17,44 +34,72 @@ public class PropertyFileBuild extends Project {
     public PropertyFileBuild() {
         pkg = "rife.bld.extension";
         name = "bld-property-file";
-        version = version(0, 9, 1);
+        version = version(0, 9, 9);
-        javadocOptions
-                .docLint(NO_MISSING)
-                .link("https://rife2.github.io/rife2/");
-        publishRepository = version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2");
-//        publishRepository = MAVEN_LOCAL;
-        publishInfo = new PublishInfo()
-                .groupId("com.uwyn.rife2")
-                .artifactId("bld-property-file")
-                .description("bld Extension to Create or Modify Properties Files")
-                .url("https://github.com/rife2/bld-property-file")
-                .developer(new PublishDeveloper().id("ethauvin").name("Erik C. Thauvin").email("erik@thauvin.net")
-                        .url("https://erik.thauvin.net/"))
-                .developer(new PublishDeveloper().id("gbevin").name("Geert Bevin").email("gbevin@uwyn.com")
-                        .url("https://github.com/gbevin"))
-                .license(new PublishLicense().name("The Apache License, Version 2.0")
-                        .url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
-                .scm(new PublishScm().connection("scm:git:https://github.com/rife2/bld-property-file.git")
-                        .developerConnection("scm:git:git@github.com:rife2/bld-property-file.git")
-                        .url("https://github.com/rife2/bld-property-file"))
-                .signKey(property("sign.key"))
-                .signPassphrase(property("sign.passphrase"));
 
         javaRelease = 17;
         downloadSources = true;
         autoDownloadPurge = true;
-        repositories = List.of(MAVEN_CENTRAL, RIFE2);
+        repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
 
         scope(compile)
-                .include(dependency("com.uwyn.rife2", "rife2", version(1, 5, 17)));
+                .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1)));
         scope(test)
-                .include(dependency("org.jsoup", "jsoup", version(1, 15, 4)))
+                .include(dependency("org.jsoup", "jsoup", version(1, 19, 1)))
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)))
                 .include(dependency("org.assertj:assertj-joda-time:2.2.0"));
+
+        javadocOperation()
+                .javadocOptions()
+                .author()
+                .docLint(NO_MISSING)
+                .link("https://rife2.github.io/bld/")
+                .link("https://rife2.github.io/rife2/");
+
+        publishOperation()
+                .repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2"))
+                .repository(repository("github"))
+                .info()
+                .groupId("com.uwyn.rife2")
+                .artifactId("bld-property-file")
+                .description("bld Extension to Create or Modify Properties Files")
+                .url("https://github.com/rife2/bld-property-file")
+                .developer(
+                        new PublishDeveloper().id("ethauvin")
+                                .name("Erik C. Thauvin")
+                                .email("erik@thauvin.net")
+                                .url("https://erik.thauvin.net/")
+                )
+                .developer(
+                        new PublishDeveloper()
+                                .id("gbevin")
+                                .name("Geert Bevin")
+                                .email("gbevin@uwyn.com")
+                                .url("https://github.com/gbevin")
+                )
+                .license(
+                        new PublishLicense()
+                                .name("The Apache License, Version 2.0")
+                                .url("https://www.apache.org/licenses/LICENSE-2.0.txt")
+                )
+                .scm(
+                        new PublishScm().connection("scm:git:https://github.com/rife2/bld-property-file.git")
+                                .developerConnection("scm:git:git@github.com:rife2/bld-property-file.git")
+                                .url("https://github.com/rife2/bld-property-file"))
+                .signKey(property("sign.key"))
+                .signPassphrase(property("sign.passphrase"));
     }
 
     public static void main(String[] args) {
         new PropertyFileBuild().start(args);
     }
+
+    @BuildCommand(summary = "Runs PMD analysis")
+    public void pmd() throws Exception {
+        new PmdOperation()
+                .fromProject(this)
+                .failOnViolation(true)
+                .ruleSets("config/pmd.xml")
+                .execute();
+    }
 }

src/main/java/rife/bld/extension/propertyfile/Calc.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -26,13 +26,25 @@ import java.util.function.IntFunction;
  * @since 1.0
  */
 public final class Calc {
+    /**
+     * The add function.
+     */
     public static final IntFunction<Integer> ADD = Calc::add;
+    /**
+     * The sub function.
+     */
     public static final IntFunction<Integer> SUB = Calc::sub;
 
+
+    private Calc() {
+        // no-op
+    }
+
     /**
      * Adds {@code 1} to the value.
      *
      * @param v the value
+     * @return the new value
      */
     public static Integer add(int v) {
         return v + 1;
@@ -42,6 +54,7 @@ public final class Calc {
      * Subtracts {@code 1} to the value.
      *
      * @param v the value
+     * @return the new value
      */
     public static Integer sub(int v) {
         return v - 1;

src/main/java/rife/bld/extension/propertyfile/Entry.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -25,59 +25,67 @@ import java.util.function.BiFunction;
  * @author <a href="https://github.com/gbevin">Geert Bevin</a>
  * @since 1.0
  */
-public class Entry extends EntryBase {
+public class Entry extends EntryBase<Entry> {
+    private String modifyValue_ = "";
+    private BiFunction<String, String, String> modify_;
+
+    /**
+     * Creates a new {@link Entry entry}.
+     *
+     * @param key the required property key
+     */
     public Entry(String key) {
         super(key);
     }
 
+    /**
+     * Returns the modify function.
+     *
+     * @return the modify function
+     */
+    protected BiFunction<String, String, String> modify() {
+        return modify_;
+    }
+
+    /**
+     * Sets the modify function.
+     *
+     * @param modify the modify function
+     */
+    public Entry modify(BiFunction<String, String, String> modify) {
+        modify_ = modify;
+        return this;
+    }
+
+    /**
+     * Sets the modify function.
+     *
+     * @param value  the value to perform a modification with
+     * @param modify the modify function
+     */
+    public Entry modify(String value, BiFunction<String, String, String> modify) {
+        modifyValue_ = value;
+        modify_ = modify;
+        return this;
+    }
+
+    /**
+     * Returns the value to be used in the {@link #modify_} function.
+     *
+     * @return the modify value
+     */
+    protected String modifyValue() {
+        return modifyValue_;
+    }
+
     /**
      * Sets the new {@link java.util.Properties property} value.
      *
      * @param s The new value
+     * @return the entry
      */
     public Entry set(Object s) {
-        setNewValue(s);
+        newValue(s);
-        return this;
-    }
-
-    /**
-     * <p>Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.</p>
-     *
-     * @param defaultValue the default value
-     */
-    @SuppressWarnings("unused")
-    public Entry defaultValue(Object defaultValue) {
-        setDefaultValue(defaultValue);
-        return this;
-    }
-
-    /**
-     * Creates a new {@link Entry entry}.
-     *
-     * @param value  the value to perform a modification with
-     * @param modify the modification function
-     */
-    public Entry modify(String value, BiFunction<String, String, String> modify) {
-        setModifyValue(value);
-        setModify(modify);
-        return this;
-    }
-
-    /**
-     * Creates a new {@link Entry entry}.
-     *
-     * @param modify the modification function
-     */
-    public Entry modify(BiFunction<String, String, String> modify) {
-        setModify(modify);
-        return this;
-    }
-
-    /**
-     * Sets the {@link Entry entry} up for deletion.
-     */
-    public Entry delete() {
-        setDelete(true);
         return this;
     }
 }

src/main/java/rife/bld/extension/propertyfile/EntryBase.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -16,7 +16,6 @@
 
 package rife.bld.extension.propertyfile;
 
-import java.util.function.BiFunction;
 import java.util.function.IntFunction;
 
 /**
@@ -26,16 +25,14 @@ import java.util.function.IntFunction;
  * @author <a href="https://github.com/gbevin">Geert Bevin</a>
  * @since 1.0
  */
-public class EntryBase {
+@SuppressWarnings({"unchecked", "PMD.AbstractClassWithoutAbstractMethod"})
-    private String key;
+public abstract class EntryBase<T> {
-    private Object defaultValue;
+    private IntFunction<Integer> calc_;
-    private Object newValue;
+    private Object defaultValue_;
-    private String modifyValue = "";
+    private boolean isDelete_;
-    private boolean isDelete;
+    private String key_;
-    private String pattern = "";
+    private Object newValue_;
-    private EntryDate.Units unit = EntryDate.Units.DAY;
+    private Object pattern_;
-    private IntFunction<Integer> calc;
-    private BiFunction<String, String, String> modify;
 
     /**
      * Creates a new {@link EntryBase entry}.
@@ -43,98 +40,35 @@ public class EntryBase {
      * @param key the required property key
      */
     public EntryBase(String key) {
-        this.key = key;
+        key_ = key;
-    }
-
-    /**
-     * Returns the value to be used in the {@link #modify} function.
-     */
-    protected String getModifyValue() {
-        return modifyValue;
-    }
-
-    /**
-     * Sets the modify value.
-     *
-     * @param value the modify value.
-     */
-    protected void setModifyValue(String value) {
-        this.modifyValue = value;
-    }
-
-    /**
-     * Returns the modify function.
-     */
-    protected BiFunction<String, String, String> getModify() {
-        return modify;
-    }
-
-    /**
-     * Sets the modify function.
-     */
-    protected void setModify(BiFunction<String, String, String> modify) {
-        this.modify = modify;
-    }
-
-    /**
-     * Sets the modify function.
-     *
-     * @param value the value to perform a modification with
-     */
-    protected void setModify(String value, BiFunction<String, String, String> modify) {
-        this.modifyValue = value;
-        this.modify = modify;
-    }
-
-    /**
-     * Returns {@code true} if the {@link java.util.Properties property} is to be deleted.
-     */
-    protected boolean isDelete() {
-        return isDelete;
-    }
-
-    /**
-     * Sets whether the {@link java.util.Properties property} should be deleted.
-     */
-    protected void setDelete(boolean delete) {
-        isDelete = delete;
     }
 
     /**
      * Returns the calculation function.
+     *
+     * @return the calc function
      */
-    protected IntFunction<Integer> getCalc() {
+    protected IntFunction<Integer> calc() {
-        return calc;
+        return calc_;
     }
 
     /**
      * Sets the calculation function.
-     */
-    protected void setCalc(IntFunction<Integer> calc) {
-        this.calc = calc;
-    }
-
-    /**
-     * Returns the key of the {@link java.util.Properties property}.
-     */
-    protected String getKey() {
-        return key;
-    }
-
-    /**
-     * Sets the key of the {@link java.util.Properties property}.
      *
-     * @param key the {@link java.util.Properties property} key
+     * @param calc the calc function
      */
-    protected void setKey(String key) {
+    public T calc(IntFunction<Integer> calc) {
-        this.key = key;
+        calc_ = calc;
+        return (T) this;
     }
 
     /**
      * Returns the default value.
+     *
+     * @return the default value
      */
-    protected Object getDefaultValue() {
+    protected Object defaultValue() {
-        return defaultValue;
+        return defaultValue_;
     }
 
     /**
@@ -142,59 +76,55 @@ public class EntryBase {
      *
      * @param defaultValue the default value
      */
-    protected void setDefaultValue(Object defaultValue) {
+    public T defaultValue(Object defaultValue) {
-        this.defaultValue = defaultValue;
+        defaultValue_ = defaultValue;
+        return (T) this;
     }
 
     /**
-     * Returns the pattern.
+     * Indicates that the {@link java.util.Properties property} is to be deleted.
      */
-    protected String getPattern() {
+    public T delete() {
-        return pattern;
+        isDelete_ = true;
+        return (T) this;
     }
 
     /**
-     * Sets the {@link java.text.DecimalFormat DecimalFormat} or {@link java.time.format.DateTimeFormatter DateTimeFormatter}
+     * Returns {@code true} if the {@link java.util.Properties property} is to be deleted.
-     * pattern to be used with {@link EntryDate} or {@link EntryInt} respectively.
      *
-     * @param pattern the pattern
+     * @return {@code true} or {@code false}
      */
-    protected void setPattern(String pattern) {
+    protected boolean isDelete() {
-        this.pattern = pattern;
+        return isDelete_;
     }
 
     /**
-     * Returns the {@link EntryDate.Units unit}.
+     * Returns the key of the {@link java.util.Properties property}.
-     */
-    protected EntryDate.Units getUnit() {
-        return unit;
-    }
-
-    /**
-     * Sets the {@link EntryDate.Units unit} value to apply to calculations.
      *
-     * @param unit the {@link EntryDate.Units unit}
+     * @return the key
      */
-    protected void setUnit(EntryDate.Units unit) {
+    protected String key() {
-        this.unit = unit;
+        return key_;
     }
 
     /**
      * Sets the key of the {@link java.util.Properties property}.
      *
      * @param key the {@link java.util.Properties property} key
+     * @return this instance
      */
-    @SuppressWarnings("unused")
+    public T key(String key) {
-    public EntryBase key(String key) {
+        key_ = key;
-        setKey(key);
+        return (T) this;
-        return this;
     }
 
     /**
      * Returns the new value to set the {@link java.util.Properties property)} to.
+     *
+     * @return the new value
      */
-    public Object getNewValue() {
+    protected Object newValue() {
-        return newValue;
+        return newValue_;
     }
 
     /**
@@ -202,7 +132,26 @@ public class EntryBase {
      *
      * @param newValue the new value
      */
-    public void setNewValue(Object newValue) {
+    protected void newValue(Object newValue) {
-        this.newValue = newValue;
+        newValue_ = newValue;
+    }
+
+    /**
+     * Returns the pattern.
+     *
+     * @return the pattern
+     */
+    protected Object pattern() {
+        return pattern_;
+    }
+
+    /**
+     * Sets the {@link java.util.Formatter} pattern.
+     *
+     * @param pattern the pattern
+     */
+    public T pattern(Object pattern) {
+        pattern_ = pattern;
+        return (T) this;
     }
 }

src/main/java/rife/bld/extension/propertyfile/EntryDate.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -19,7 +19,6 @@ package rife.bld.extension.propertyfile;
 import java.time.*;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.function.IntFunction;
 
 /**
  * Declares the modifications to be made to a {@link java.util.Properties Date-based property}.
@@ -27,9 +26,11 @@ import java.util.function.IntFunction;
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
  * @since 1.0
  */
-public class EntryDate extends EntryBase {
+public class EntryDate extends EntryBase<EntryDate> {
+    private EntryDate.Units unit_ = EntryDate.Units.DAY;
+
     /**
-     * Creates a new date {@link Entry entry}.
+     * Creates a new {@link EntryDate entry}.
      *
      * @param key the required property key
      */
@@ -37,13 +38,34 @@ public class EntryDate extends EntryBase {
         super(key);
     }
 
+    /**
+     * Sets the new {@link java.util.Properties property} value to now.
+     *
+     * @return this instance
+     */
+    public EntryDate now() {
+        newValue("now");
+        return this;
+    }
+
+    /**
+     * Sets the {@link java.time.format.DateTimeFormatter DateTimeFormatter} pattern.
+     *
+     * @param pattern the pattern
+     */
+    public EntryDate pattern(String pattern) {
+        super.pattern(pattern);
+        return this;
+    }
+
     /**
      * Sets the new {@link java.util.Properties property} value to an {@link Instant}
      *
      * @param instant the {@link Instant} to set the value to
+     * @return this instance
      */
     public EntryDate set(Instant instant) {
-        setNewValue(instant);
+        newValue(instant);
         return this;
     }
 
@@ -51,9 +73,10 @@ public class EntryDate extends EntryBase {
      * Sets the new {@link java.util.Properties property} value to a {@link LocalDate}
      *
      * @param date the {@link LocalDate} to set the value to
+     * @return this instance
      */
     public EntryDate set(LocalDate date) {
-        setNewValue(date);
+        newValue(date);
         return this;
     }
 
@@ -61,9 +84,10 @@ public class EntryDate extends EntryBase {
      * Sets the new {@link java.util.Properties property} value to a {@link LocalDateTime}
      *
      * @param date the {@link LocalDateTime} to set the value to
+     * @return this instance
      */
     public EntryDate set(LocalDateTime date) {
-        setNewValue(date);
+        newValue(date);
         return this;
     }
 
@@ -71,9 +95,10 @@ public class EntryDate extends EntryBase {
      * Sets the new {@link java.util.Properties property} value to a {@link ZonedDateTime}
      *
      * @param date the {@link ZonedDateTime} to set the value to
+     * @return this instance
      */
     public EntryDate set(ZonedDateTime date) {
-        setNewValue(date);
+        newValue(date);
         return this;
     }
 
@@ -81,9 +106,10 @@ public class EntryDate extends EntryBase {
      * Sets the new {@link java.util.Properties property} value to a {@link LocalTime}
      *
      * @param time the {@link LocalTime} to set the value to
+     * @return this instance
      */
     public EntryDate set(LocalTime time) {
-        setNewValue(time);
+        newValue(time);
         return this;
     }
 
@@ -91,9 +117,10 @@ public class EntryDate extends EntryBase {
      * Sets the new {@link java.util.Properties property} value to a {@link Calendar}
      *
      * @param cal the {@link Calendar} to set the value to
+     * @return this instance
      */
     public EntryDate set(Calendar cal) {
-        setNewValue(cal);
+        newValue(cal);
         return this;
     }
 
@@ -101,56 +128,30 @@ public class EntryDate extends EntryBase {
      * Sets the new {@link java.util.Properties property} value to a {@link Date}
      *
      * @param date the {@link Date} to set the value to
+     * @return this instance
      */
     public EntryDate set(Date date) {
-        setNewValue(date);
+        newValue(date);
         return this;
     }
 
     /**
-     * Sets the new {@link java.util.Properties property} value to now.
+     * Returns the {@link EntryDate.Units unit}.
-     */
-    public EntryDate now() {
-        setNewValue("now");
-        return this;
-    }
-
-    /**
-     * Creates a new {@link EntryDate entry}.
      *
-     * @param calc the calculation function
+     * @return the unit
      */
-    public EntryDate calc(IntFunction<Integer> calc) {
+    public EntryDate.Units unit() {
-        setCalc(calc);
+        return unit_;
-        return this;
-    }
-
-    /**
-     * Sets the pattern for {@link EntryInt} and {@link EntryDate} to{@link java.text.DecimalFormat DecimalFormat} and
-     * {@link java.time.format.DateTimeFormatter DateTimeFormatter} respectively.
-     *
-     * @param pattern the pattern
-     */
-    public EntryDate pattern(String pattern) {
-        setPattern(pattern);
-        return this;
     }
 
     /**
      * Sets the {@link Units unit} value to apply to calculations for {@link EntryDate}.
      *
      * @param unit the {@link Units unit}
+     * @return this instance
      */
     public EntryDate unit(Units unit) {
-        setUnit(unit);
+        unit_ = unit;
-        return this;
-    }
-
-    /**
-     * Sets the {@link EntryDate entry} up for deletion.
-     */
-    public EntryDate delete() {
-        setDelete(true);
         return this;
     }
 
@@ -168,6 +169,33 @@ public class EntryDate extends EntryBase {
      * </uL>
      */
     public enum Units {
-        SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, YEAR
+        /**
+         * Second units.
+         */
+        SECOND,
+        /**
+         * Minute units.
+         */
+        MINUTE,
+        /**
+         * Hour units.
+         */
+        HOUR,
+        /**
+         * Day units.
+         */
+        DAY,
+        /**
+         * Week units.
+         */
+        WEEK,
+        /**
+         * Month units.
+         */
+        MONTH,
+        /**
+         * Year units.
+         */
+        YEAR
     }
 }

src/main/java/rife/bld/extension/propertyfile/EntryInt.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -16,17 +16,15 @@
 
 package rife.bld.extension.propertyfile;
 
-import java.util.function.IntFunction;
-
 /**
  * Declares the modifications to be made to an {@link java.util.Properties Integer-based property}.
  *
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
  * @since 1.0
  */
-public class EntryInt extends EntryBase {
+public class EntryInt extends EntryBase<EntryInt> {
     /**
-     * Creates a new date {@link Entry entry}.
+     * Creates a new {@link EntryInt entry}.
      *
      * @param key the required property key
      */
@@ -34,42 +32,24 @@ public class EntryInt extends EntryBase {
         super(key);
     }
 
+    /**
+     * Sets the {@link java.text.DecimalFormat DecimalFormat} pattern.
+     *
+     * @param pattern the pattern
+     */
+    public EntryInt pattern(String pattern) {
+        super.pattern(pattern);
+        return this;
+    }
+
     /**
      * Sets the new {@link java.util.Properties property} value to an integer.
      *
      * @param i The integer to set the value to
+     * @return this instance
      */
     public EntryInt set(int i) {
-        setNewValue(i);
+        newValue(i);
-        return this;
-    }
-
-    /**
-     * Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.
-     *
-     * @param defaultValue the default value
-     */
-    @SuppressWarnings("unused")
-    public EntryInt defaultValue(Object defaultValue) {
-        setDefaultValue(defaultValue);
-        return this;
-    }
-
-    /**
-     * Creates a new {@link EntryInt entry}.
-     *
-     * @param calc the calculation function.
-     */
-    public EntryInt calc(IntFunction<Integer> calc) {
-        setCalc(calc);
-        return this;
-    }
-
-    /**
-     * Sets the {@link EntryInt entry} up for deletion.
-     */
-    public EntryInt delete() {
-        setDelete(true);
         return this;
     }
 }

src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -16,13 +16,17 @@
 
 package rife.bld.extension.propertyfile;
 
-import rife.bld.Project;
+import rife.bld.BaseProject;
 import rife.bld.operations.AbstractOperation;
+import rife.bld.operations.exceptions.ExitStatusException;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Creates or applies edits to a {@link Properties Properties} file.
@@ -31,14 +35,22 @@ import java.util.Properties;
  * @since 1.0
  */
 public class PropertyFileOperation extends AbstractOperation<PropertyFileOperation> {
-    private final List<EntryBase> entries = new ArrayList<>();
+    private static final Logger LOGGER = Logger.getLogger(PropertyFileOperation.class.getName());
-    private final Project project;
+    private final List<EntryBase<?>> entries_ = new ArrayList<>();
-    private File file;
+    private String comment_ = "";
-    private String comment = "";
+    private boolean failOnWarning_;
-    private boolean failOnWarning;
+    private File file_;
+    private BaseProject project_;
 
-    public PropertyFileOperation(Project project) {
+    /**
-        this.project = project;
+     * Sets the comment to be inserted at the top of the {@link java.util.Properties} file.
+     *
+     * @param comment the header comment
+     * @return this instance
+     */
+    public PropertyFileOperation comment(String comment) {
+        comment_ = comment;
+        return this;
     }
 
     /**
@@ -46,54 +58,10 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
      * file.
      *
      * @param entry the {@link Entry entry}
+     * @return this instance
      */
-    @SuppressWarnings("unused")
+    public PropertyFileOperation entry(EntryBase<?> entry) {
-    public PropertyFileOperation entry(EntryBase entry) {
+        entries_.add(entry);
-        entries.add(entry);
-        return this;
-    }
-
-    /**
-     * Sets the location of the {@link java.util.Properties} file to be edited.
-     *
-     * @param file the file to be edited
-     */
-    @SuppressWarnings("unused")
-    public PropertyFileOperation file(String file) {
-        this.file = new File(file);
-        return this;
-    }
-
-    /**
-     * Sets the location of the {@link java.util.Properties} file to be edited.
-     *
-     * @param file the file to be edited
-     */
-    @SuppressWarnings("unused")
-    public PropertyFileOperation file(File file) {
-        this.file = file;
-        return this;
-    }
-
-    /**
-     * Sets the {@link #execute() execution} to return a failure on any warnings.
-     *
-     * @param failOnWarning if set to {@code true}, the execution will fail on any warnings.
-     */
-    @SuppressWarnings("unused")
-    public PropertyFileOperation failOnWarning(boolean failOnWarning) {
-        this.failOnWarning = failOnWarning;
-        return this;
-    }
-
-    /**
-     * Sets the comment to be inserted at the top of the {@link java.util.Properties} file.
-     *
-     * @param comment the header comment
-     */
-    @SuppressWarnings("unused")
-    public PropertyFileOperation comment(String comment) {
-        this.comment = comment;
         return this;
     }
 
@@ -102,45 +70,139 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
      */
     @Override
     public void execute() throws Exception {
-        var commandName = project.getCurrentCommandName();
+        if (project_ == null) {
-        var properties = new Properties();
+            if (LOGGER.isLoggable(Level.SEVERE) && !silent()) {
-        var success = false;
+                LOGGER.log(Level.SEVERE, "A project is required");
+            }
+            throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
+        }
 
-        if (file == null) {
+        var commandName = project_.getCurrentCommandName();
-            PropertyFileUtils.warn(commandName, "A properties file must be specified.");
+        var properties = new Properties();
+        var success = true;
+
+        if (file_ == null) {
+            warn(commandName, "A properties file must be specified.");
         } else {
-            success = PropertyFileUtils.loadProperties(commandName, file, properties);
+            success = PropertyFileUtils.loadProperties(commandName, file_, properties, silent());
         }
 
         if (success) {
-            for (var entry : entries) {
+            for (var entry : entries_) {
-                if (entry.getKey().isBlank()) {
+                if (entry.key().isBlank()) {
-                    PropertyFileUtils.warn(commandName, "An entry key must specified.");
+                    warn(commandName, "An entry key must specified.");
                 } else {
-                    var key = entry.getKey();
+                    var key = entry.key();
-                    Object value = entry.getNewValue();
+                    Object value = entry.newValue();
-                    Object defaultValue = entry.getDefaultValue();
+                    Object defaultValue = entry.defaultValue();
                     var p = properties.getProperty(key);
                     if (entry.isDelete()) {
                         properties.remove(key);
                     } else if ((value == null || String.valueOf(value).isBlank())
                             && (defaultValue == null || String.valueOf(defaultValue).isBlank())
                             && (p == null || p.isBlank())) {
-                        PropertyFileUtils.warn(commandName, "An entry must be set or have a default value: " + key);
+                        warn(commandName, "An entry must be set or have a default value: " + key);
                     } else {
-                        if (entry instanceof EntryDate)
+                        try {
-                            success = PropertyFileUtils.processDate(commandName, properties, (EntryDate) entry, failOnWarning);
+                            if (entry instanceof EntryDate) {
-                        else if (entry instanceof EntryInt)
+                                PropertyFileUtils.processDate(properties, (EntryDate) entry);
-                            success = PropertyFileUtils.processInt(commandName, properties, (EntryInt) entry, failOnWarning);
+                            } else if (entry instanceof EntryInt) {
-                        else
+                                PropertyFileUtils.processInt(properties, (EntryInt) entry);
-                            success = PropertyFileUtils.processString(properties, (Entry) entry);
+                            } else {
+                                PropertyFileUtils.processString(properties, (Entry) entry);
+                            }
+                        } catch (IllegalArgumentException e) {
+                            warn(commandName, e.getMessage());
+                        }
                     }
                 }
             }
         }
 
         if (success) {
-            PropertyFileUtils.saveProperties(file, comment, properties);
+            PropertyFileUtils.saveProperties(file_, comment_, properties);
+        }
+    }
+
+    /**
+     * Sets the {@link #execute() execution} to return a failure on any warnings.
+     *
+     * @param failOnWarning if set to {@code true}, the execution will fail on any warnings.
+     * @return this instance
+     */
+    public PropertyFileOperation failOnWarning(boolean failOnWarning) {
+        failOnWarning_ = failOnWarning;
+        return this;
+    }
+
+    /**
+     * Sets the location of the {@link java.util.Properties} file to be edited.
+     *
+     * @param file the file to be edited
+     * @return this instance
+     */
+    public PropertyFileOperation file(File file) {
+        file_ = file;
+        return this;
+    }
+
+    /**
+     * Sets the location of the {@link java.util.Properties} file to be edited.
+     *
+     * @param file the file to be edited
+     * @return this instance
+     */
+    public PropertyFileOperation file(String file) {
+        return file(new File(file));
+    }
+
+    /**
+     * Retrieves the location of the {@link java.util.Properties} file to be edited.
+     *
+     * @return the properties file
+     */
+    public File file() {
+        return file_;
+    }
+
+    /**
+     * Sets the location of the {@link java.util.Properties} file to be edited.
+     *
+     * @param file the file to be edited
+     * @return this instance
+     */
+    public PropertyFileOperation file(Path file) {
+        return file(file.toFile());
+    }
+
+    /**
+     * Creates a new operation.
+     *
+     * @param project the project
+     * @return this instance
+     */
+    public PropertyFileOperation fromProject(BaseProject project) {
+        project_ = project;
+        return this;
+    }
+
+    /**
+     * Logs a warning.
+     *
+     * @param command The command name
+     * @param message the message log
+     * @throws ExitStatusException if a {@link Level#SEVERE} exception occurs
+     */
+    private void warn(String command, String message) throws ExitStatusException {
+        if (failOnWarning_) {
+            if (LOGGER.isLoggable(Level.SEVERE) && !silent()) {
+                LOGGER.log(Level.SEVERE, '[' + command + "] " + message);
+                throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
+            }
+        } else {
+            if (LOGGER.isLoggable(Level.WARNING) && !silent()) {
+                LOGGER.warning('[' + command + "] " + message);
+            }
         }
     }
 }

src/main/java/rife/bld/extension/propertyfile/PropertyFileUtils.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -16,7 +16,8 @@
 
 package rife.bld.extension.propertyfile;
 
-import javax.imageio.IIOException;
+import rife.bld.operations.exceptions.ExitStatusException;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -25,7 +26,6 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Properties;
@@ -39,119 +39,19 @@ import java.util.logging.Logger;
  * @since 1.0
  */
 public final class PropertyFileUtils {
-    private final static Logger LOGGER = Logger.getLogger(PropertyFileUtils.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(PropertyFileUtils.class.getName());
 
     private PropertyFileUtils() {
         // no-op
     }
 
-    /**
-     * Processes a date {@link Properties property}.
-     *
-     * @param command the issuing command
-     * @param p       the {@link Properties property}
-     * @param entry   the {@link Entry} containing the {@link Properties property} edits
-     */
-    public static boolean processDate(String command, Properties p, EntryDate entry, boolean failOnWarning)
-            throws Exception {
-        var success = true;
-        var value = PropertyFileUtils.currentValue(null, entry.getDefaultValue(),
-                entry.getNewValue());
-
-        var pattern = entry.getPattern();
-
-        String parsedValue = String.valueOf(value);
-        if (pattern != null && !pattern.isBlank()) {
-            var offset = 0;
-
-            if (entry.getCalc() != null) {
-                offset = entry.getCalc().apply(offset);
-            }
-
-            var dtf = DateTimeFormatter.ofPattern(pattern);
-            var unit = entry.getUnit();
-
-            try {
-                if (value instanceof String) {
-                    if ("now".equalsIgnoreCase((String) value)) {
-                        value = ZonedDateTime.now();
-                    } else {
-                        throw new DateTimeException("Excepted: Calendar, Date or java.time.");
-                    }
-                } else if (value instanceof LocalDateTime) {
-                    value = ((LocalDateTime) value).atZone(ZoneId.systemDefault());
-                } else if (value instanceof Date) {
-                    value = ((Date) value).toInstant().atZone(ZoneId.systemDefault());
-                } else if (value instanceof Calendar) {
-                    value = ((Calendar) value).toInstant().atZone(ZoneId.systemDefault());
-                } else if (value instanceof Instant) {
-                    value = ((Instant) value).atZone(ZoneId.systemDefault());
-                }
-
-                if (value instanceof LocalDate) {
-                    if (offset != 0) {
-                        if (unit == EntryDate.Units.DAY) {
-                            value = ((LocalDate) value).plusDays(offset);
-                        } else if (unit == EntryDate.Units.MONTH) {
-                            value = ((LocalDate) value).plusMonths(offset);
-                        } else if (unit == EntryDate.Units.WEEK) {
-                            value = ((LocalDate) value).plusWeeks(offset);
-                        } else if (unit == EntryDate.Units.YEAR) {
-                            value = ((LocalDate) value).plusYears(offset);
-                        }
-                    }
-                    parsedValue = dtf.format((LocalDate) value);
-                } else if (value instanceof LocalTime) {
-                    if (offset != 0) {
-                        if (unit == EntryDate.Units.SECOND) {
-                            value = ((LocalTime) value).plusSeconds(offset);
-                        } else if (unit == EntryDate.Units.MINUTE) {
-                            value = ((LocalTime) value).plusMinutes(offset);
-                        } else if (unit == EntryDate.Units.HOUR) {
-                            value = ((LocalTime) value).plusHours(offset);
-                        }
-                    }
-                    parsedValue = dtf.format((LocalTime) value);
-                } else if (value instanceof ZonedDateTime) {
-                    if (offset != 0) {
-                        if (unit == EntryDate.Units.DAY) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.DAYS);
-                        } else if (unit == EntryDate.Units.MONTH) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.MONTHS);
-                        } else if (unit == EntryDate.Units.WEEK) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.WEEKS);
-                        } else if (unit == EntryDate.Units.YEAR) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.YEARS);
-                        } else if (unit == EntryDate.Units.SECOND) {
-                            value = ((ZonedDateTime) value).plusSeconds(offset);
-                        } else if (unit == EntryDate.Units.MINUTE) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.MINUTES);
-                        } else if (unit == EntryDate.Units.HOUR) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.HOURS);
-                        }
-                    }
-                    parsedValue = dtf.format((ZonedDateTime) value);
-                }
-            } catch (DateTimeException dte) {
-                warn(command, "Non-date value for \"" + entry.getKey() + "\" --> " + dte.getMessage(),
-                        dte, failOnWarning);
-                success = false;
-            }
-        }
-
-        if (success) {
-            p.setProperty(entry.getKey(), parsedValue);
-        }
-
-        return success;
-    }
-
     /**
      * Returns the new value, value or default value depending on which is specified.
      *
      * @param value        the value
-     * @param newValue     the new value
      * @param defaultValue the default value
+     * @param newValue     the new value
+     * @return the object
      */
     public static Object currentValue(String value, Object defaultValue, Object newValue) {
         if (newValue != null) {
@@ -164,109 +64,176 @@ public final class PropertyFileUtils {
     }
 
     /**
-     * Processes an integer {@link Properties property}.
+     * Loads a {@link Properties properties} file.
      *
      * @param command the issuing command
-     * @param p       the {@link Properties property}
+     * @param file    the file location
-     * @param entry   the {@link Entry} containing the {@link Properties property} edits
+     * @param p       the {@link Properties properties} to load into.
+     * @return the boolean
+     * @throws ExitStatusException if an error occurred
      */
-    public static boolean processInt(String command, Properties p, EntryInt entry, boolean failOnWarning)
+    public static boolean loadProperties(String command, File file, Properties p, boolean silent)
-            throws Exception {
+            throws ExitStatusException {
-        var success = true;
+        boolean success = true;
-        int intValue = 0;
+        if (file != null) {
-        try {
+            if (file.exists()) {
-            var fmt = new DecimalFormat(entry.getPattern());
+                try (var propStream = Files.newInputStream(file.toPath(), StandardOpenOption.READ)) {
-            var value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
+                    p.load(propStream);
-                    entry.getNewValue());
+                } catch (IOException ioe) {
-
+                    warn(command, "Could not load properties file: " + ioe.getMessage(), true, silent);
-            if (value != null) {
+                    success = false;
-                intValue = fmt.parse(String.valueOf(value)).intValue();
+                }
-            }
+            }
-
+        } else {
-            if (entry.getCalc() != null) {
+            warn(command, "Please specify the properties file location.", true, silent);
-                intValue = entry.getCalc().apply(intValue);
-            }
-            p.setProperty(entry.getKey(), fmt.format(intValue));
-        } catch (NumberFormatException | ParseException e) {
-            warn(command, "Non-integer value for \"" + entry.getKey() + "\" --> " + e.getMessage(), e,
-                    failOnWarning);
             success = false;
         }
-
         return success;
     }
 
+    private static String objectToString(Object o) {
+        if (o == null) {
+            return "";
+        } else {
+            return String.valueOf(o);
+        }
+    }
+
+    /**
+     * Processes a date {@link Properties property}.
+     *
+     * @param p     the {@link Properties property}
+     * @param entry the {@link Entry} containing the {@link Properties property} edits
+     * @throws DateTimeException if a parsing error occurs
+     */
+    @SuppressWarnings("PMD.ExceptionAsFlowControl")
+    public static void processDate(Properties p, EntryDate entry) throws IllegalArgumentException {
+        var currentValue = currentValue(null, entry.defaultValue(), entry.newValue());
+        var pattern = objectToString(entry.pattern());
+
+        var dateValue = String.valueOf(currentValue);
+        if (pattern != null && !pattern.isBlank()) {
+            var offset = 0;
+
+            if (entry.calc() != null) {
+                offset = entry.calc().apply(offset);
+            }
+
+            var dtf = DateTimeFormatter.ofPattern(pattern);
+            var unit = entry.unit();
+
+            try {
+                if (currentValue instanceof String) {
+                    if ("now".equalsIgnoreCase((String) currentValue)) {
+                        currentValue = ZonedDateTime.now();
+                    } else {
+                        throw new DateTimeException("Excepted: Calendar, Date or java.time.");
+                    }
+                } else if (currentValue instanceof LocalDateTime) {
+                    currentValue = ((LocalDateTime) currentValue).atZone(ZoneId.systemDefault());
+                } else if (currentValue instanceof Date) {
+                    currentValue = ((Date) currentValue).toInstant().atZone(ZoneId.systemDefault());
+                } else if (currentValue instanceof Calendar) {
+                    currentValue = ((Calendar) currentValue).toInstant().atZone(ZoneId.systemDefault());
+                } else if (currentValue instanceof Instant) {
+                    currentValue = ((Instant) currentValue).atZone(ZoneId.systemDefault());
+                }
+
+                if (currentValue instanceof LocalDate) {
+                    if (offset != 0) {
+                        if (unit == EntryDate.Units.DAY) {
+                            currentValue = ((LocalDate) currentValue).plusDays(offset);
+                        } else if (unit == EntryDate.Units.MONTH) {
+                            currentValue = ((LocalDate) currentValue).plusMonths(offset);
+                        } else if (unit == EntryDate.Units.WEEK) {
+                            currentValue = ((LocalDate) currentValue).plusWeeks(offset);
+                        } else if (unit == EntryDate.Units.YEAR) {
+                            currentValue = ((LocalDate) currentValue).plusYears(offset);
+                        }
+                    }
+                    dateValue = dtf.format((LocalDate) currentValue);
+                } else if (currentValue instanceof LocalTime) {
+                    if (offset != 0) {
+                        if (unit == EntryDate.Units.SECOND) {
+                            currentValue = ((LocalTime) currentValue).plusSeconds(offset);
+                        } else if (unit == EntryDate.Units.MINUTE) {
+                            currentValue = ((LocalTime) currentValue).plusMinutes(offset);
+                        } else if (unit == EntryDate.Units.HOUR) {
+                            currentValue = ((LocalTime) currentValue).plusHours(offset);
+                        }
+                    }
+                    dateValue = dtf.format((LocalTime) currentValue);
+                } else if (currentValue instanceof ZonedDateTime) {
+                    if (offset != 0) {
+                        if (unit == EntryDate.Units.DAY) {
+                            currentValue = ((ZonedDateTime) currentValue).plusDays(offset);
+                        } else if (unit == EntryDate.Units.MONTH) {
+                            currentValue = ((ZonedDateTime) currentValue).plusMonths(offset);
+                        } else if (unit == EntryDate.Units.WEEK) {
+                            currentValue = ((ZonedDateTime) currentValue).plusWeeks(offset);
+                        } else if (unit == EntryDate.Units.YEAR) {
+                            currentValue = ((ZonedDateTime) currentValue).plusYears(offset);
+                        } else if (unit == EntryDate.Units.SECOND) {
+                            currentValue = ((ZonedDateTime) currentValue).plusSeconds(offset);
+                        } else if (unit == EntryDate.Units.MINUTE) {
+                            currentValue = ((ZonedDateTime) currentValue).plusMinutes(offset);
+                        } else if (unit == EntryDate.Units.HOUR) {
+                            currentValue = ((ZonedDateTime) currentValue).plusHours(offset);
+                        }
+                    }
+                    dateValue = dtf.format((ZonedDateTime) currentValue);
+                }
+            } catch (DateTimeException dte) {
+                throw new IllegalArgumentException(
+                        "Non-date value for \"" + entry.key() + "\" --> " + dte.getMessage(), dte);
+            }
+        }
+        p.setProperty(entry.key(), dateValue);
+    }
+
+    /**
+     * Processes an integer {@link Properties property}.
+     *
+     * @param p     the {@link Properties property}
+     * @param entry the {@link Entry} containing the {@link Properties property} edits
+     * @throws NumberFormatException if a parsing error occurs
+     */
+    public static void processInt(Properties p, EntryInt entry) throws IllegalArgumentException {
+        int intValue = 0;
+        try {
+            var fmt = new DecimalFormat(objectToString(entry.pattern()));
+            var currentValue = currentValue(p.getProperty(entry.key()), entry.defaultValue(), entry.newValue());
+
+            if (currentValue != null) {
+                intValue = fmt.parse(String.valueOf(currentValue)).intValue();
+            }
+
+            if (entry.calc() != null) {
+                intValue = entry.calc().apply(intValue);
+            }
+
+            p.setProperty(entry.key(), fmt.format(intValue));
+        } catch (NumberFormatException | ParseException e) {
+            throw new IllegalArgumentException(
+                    "Non-integer value for \"" + entry.key() + "\" --> " + e.getMessage(), e);
+        }
+    }
+
     /**
      * Processes a string {@link Properties property}.
      *
      * @param p     the {@link Properties property}
      * @param entry the {@link Entry} containing the {@link Properties property} edits
      */
-    public static boolean processString(Properties p, Entry entry) {
+    public static void processString(Properties p, Entry entry) {
-        var value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
+        var currentValue = currentValue(p.getProperty(entry.key()), entry.defaultValue(), entry.newValue());
-                entry.getNewValue());
 
-        p.setProperty(entry.getKey(), String.valueOf(value));
+        p.setProperty(entry.key(), String.format(String.valueOf(currentValue), entry.pattern()));
 
-        if (entry.getModify() != null && entry.getModifyValue() != null) {
+        if (entry.modify() != null && entry.modifyValue() != null) {
-            p.setProperty(entry.getKey(), entry.getModify().apply(p.getProperty(entry.getKey()), entry.getModifyValue()));
+            var modify = entry.modify().apply(p.getProperty(entry.key()), entry.modifyValue());
+            p.setProperty(entry.key(), String.format(modify, entry.pattern()));
         }
-
-        return true;
-    }
-
-    /**
-     * Logs a warning.
-     *
-     * @param command the issuing command
-     * @param message the message to log
-     */
-    static void warn(String command, String message) {
-        if (LOGGER.isLoggable(Level.WARNING)) {
-            LOGGER.warning('[' + command + "] " + message);
-        }
-    }
-
-    /**
-     * Logs a warning.
-     *
-     * @param command       The command name
-     * @param message       the message log
-     * @param e             the related exception
-     * @param failOnWarning logs and throws exception if set to {@code true}
-     */
-    static void warn(String command, String message, Exception e, boolean failOnWarning) throws Exception {
-        if (failOnWarning) {
-            LOGGER.log(Level.SEVERE, '[' + command + "] " + message, e);
-            throw e;
-        } else {
-            warn(command, message);
-        }
-    }
-
-    /**
-     * Loads a {@link Properties properties} file.
-     *
-     * @param command the issuing command
-     * @param file    the file location
-     * @param p       the {@link Properties properties} to load into.
-     */
-    public static boolean loadProperties(String command, File file, Properties p) throws Exception {
-        boolean success = true;
-        if (file != null) {
-            if (file.exists()) {
-                try (var propStream = Files.newInputStream(file.toPath(), StandardOpenOption.READ)) {
-                    p.load(propStream);
-                } catch (IOException ioe) {
-                    warn(command, "Could not load properties file: " + ioe.getMessage(), ioe, true);
-                    success = false;
-                }
-            }
-        } else {
-            warn(command, "Please specify the properties file location.");
-            success = false;
-        }
-        return success;
     }
 
     /**
@@ -275,12 +242,35 @@ public final class PropertyFileUtils {
      * @param file    the file location
      * @param comment the header comment
      * @param p       the {@link Properties} to save into the file
+     * @throws IOException the io exception
      */
     public static void saveProperties(File file, String comment, Properties p) throws IOException {
         try (var output = Files.newOutputStream(file.toPath())) {
             p.store(output, comment);
-        } catch (IIOException ioe) {
+        } catch (IOException ioe) {
-            throw new IIOException("An IO error occurred while saving the Properties file: " + file, ioe);
+            throw new IOException("An IO error occurred while saving the Properties file: " + file, ioe);
+        }
+    }
+
+    /**
+     * Logs a warning.
+     *
+     * @param command       The command name
+     * @param message       the message log
+     * @param failOnWarning logs and throws exception if set to {@code true}
+     * @throws ExitStatusException if a {@link Level#SEVERE} exception occurs
+     */
+    static void warn(String command, String message, boolean failOnWarning, boolean silent)
+            throws ExitStatusException {
+        if (failOnWarning) {
+            if (LOGGER.isLoggable(Level.SEVERE) && !silent) {
+                LOGGER.log(Level.SEVERE, '[' + command + "] " + message);
+            }
+            throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
+        } else {
+            if (LOGGER.isLoggable(Level.WARNING) && !silent) {
+                LOGGER.warning('[' + command + "] " + message);
+            }
         }
     }
 }

src/test/java/rife/bld/extension/propertyfile/PropertyFileOperationTest.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright 2023-2025 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.bld.extension.propertyfile;
+
+import org.assertj.core.api.AutoCloseableSoftAssertions;
+import org.junit.jupiter.api.Test;
+import rife.bld.Project;
+import rife.bld.operations.exceptions.ExitStatusException;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static rife.bld.extension.propertyfile.Calc.ADD;
+
+class PropertyFileOperationTest {
+    @Test
+    @SuppressWarnings("PMD.AvoidDuplicateLiterals")
+    void testExecute() throws Exception {
+        var tmpFile = File.createTempFile("property-file-", "properties");
+        tmpFile.deleteOnExit();
+
+        new PropertyFileOperation()
+                .fromProject(new Project())
+                .file(tmpFile)
+                .comment("This is a comment")
+                .failOnWarning(true)
+                .entry(new EntryInt("version.major").defaultValue(0).calc(ADD))
+                .entry(new EntryInt("version.minor").set(0))
+                .entry(new EntryInt("version.patch").set(0))
+                .entry(new EntryDate("build.date").now().pattern("yyyy-MM-dd"))
+                .execute();
+
+        var p = new Properties();
+        p.load(Files.newInputStream(tmpFile.toPath()));
+
+        try (var softly = new AutoCloseableSoftAssertions()) {
+            softly.assertThat(p.getProperty("version.major")).as("major").isEqualTo("1");
+            softly.assertThat(p.getProperty("version.minor")).as("minor").isEqualTo("0");
+            softly.assertThat(p.getProperty("version.patch")).as("patch").isEqualTo("0");
+            softly.assertThat(p.getProperty("build.date")).as("date")
+                    .isEqualTo(LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE));
+        }
+
+        new PropertyFileOperation()
+                .fromProject(new Project())
+                .file(tmpFile.getAbsolutePath())
+                .entry(new EntryInt("version.major").calc(c -> c + 2))
+                .execute();
+
+        p.load(Files.newInputStream(tmpFile.toPath()));
+        assertThat(p.getProperty("version.major")).as("major+2").isEqualTo("3");
+
+        new PropertyFileOperation()
+                .fromProject(new Project())
+                .file(tmpFile)
+                .entry(new EntryInt("build.date").delete())
+                .execute();
+
+        p.clear();
+        p.load(Files.newInputStream(tmpFile.toPath()));
+
+        assertThat(p.getProperty("build.date")).as("dalete build.date").isNull();
+        assertThat(p).as("version keys").containsKeys("version.major", "version.minor", "version.patch");
+    }
+
+    @Test
+    void testExecuteNoProject() {
+        var op = new PropertyFileOperation();
+        assertThatCode(op::execute).isInstanceOf(ExitStatusException.class);
+    }
+
+    @Test
+    void testFile() {
+        var foo = new File("foo");
+
+        var op = new PropertyFileOperation().file("foo");
+        assertThat(op.file()).as("as string").isEqualTo(foo);
+
+        op = new PropertyFileOperation().file(foo);
+        assertThat(op.file()).as("as file").isEqualTo(foo);
+
+        op = new PropertyFileOperation().file(foo.toPath());
+        assertThat(op.file()).as("as path").isEqualTo(foo);
+    }
+}

src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 the original author or authors.
+ * Copyright 2023-2025 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.
@@ -17,10 +17,10 @@
 package rife.bld.extension.propertyfile;
 
 import org.junit.jupiter.api.Test;
+import rife.bld.operations.exceptions.ExitStatusException;
 import rife.tools.Localization;
 
 import java.io.File;
-import java.io.IOException;
 import java.time.*;
 import java.util.Calendar;
 import java.util.Date;
@@ -37,178 +37,231 @@ import static rife.bld.extension.propertyfile.Calc.SUB;
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
  * @since 1.0
  */
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 class PropertyFileUtilsTest {
-    final Properties p = new Properties();
+    final static Properties p = new Properties();
-    final Entry entry = new Entry("version.major").set("1");
+    final static String t = "test";
-    final EntryDate entryDate = new EntryDate("adate").pattern("D");
-    final EntryInt entryInt = new EntryInt("version.patch");
-    final int dayOfYear = LocalDate.now().getDayOfYear();
-    final String t = "test";
 
-    @Test
+    public Entry newEntry() {
-    void processStringTest() {
+        p.clear();
-        PropertyFileUtils.processString(p, entry);
+        return new Entry("version.major").set("1");
+    }
 
-        assertThat(entry.getNewValue()).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
+    public EntryDate newEntryDate() {
-                .isEqualTo(p.getProperty(entry.getKey()));
+        p.clear();
+        return new EntryDate("aDate").pattern("D");
+    }
 
-        entry.setKey("version.minor");
+    public EntryInt newEntryInt() {
-
+        p.clear();
-        PropertyFileUtils.processString(p, entry.set(0));
+        return new EntryInt("version.patch");
-        assertThat(entry.getNewValue().toString()).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
-                .isEqualTo(p.getProperty(entry.getKey()));
     }
 
     @Test
-    void testWarn() {
+    void parseDateSub() {
-        assertThatCode(() -> PropertyFileUtils.warn("command", "message", new IOException(t), true))
+        var entryDate = newEntryDate().calc(SUB);
-                .hasMessage(t).isInstanceOf(IOException.class);
+        PropertyFileUtils.processDate(p, entryDate.now());
-        assertThatCode(() -> PropertyFileUtils.warn("command", t, new Exception(t), false))
+        assertThat(p.getProperty(entryDate.key())).as("processDate(now-3)").isEqualTo(String.valueOf(
-                .as("failOnWarning = false").doesNotThrowAnyException();
+                LocalDateTime.now().minusDays(1).getDayOfYear()));
+
+        entryDate.calc(v -> v - 2);
+        PropertyFileUtils.processDate(p, entryDate.now());
+        assertThat(p.getProperty(entryDate.key())).as("processDate(now-2)").isEqualTo(String.valueOf(
+                LocalDateTime.now().minusDays(2).getDayOfYear()));
+
+        entryDate.calc(SUB);
+        PropertyFileUtils.processDate(p, entryDate.set(new Date()));
+        assertThat(p.getProperty(entryDate.key())).as("processDate(date-1)").isEqualTo(String.valueOf(
+                LocalDateTime.now().minusDays(1).getDayOfYear()));
+
+        entryDate.calc(v -> v - 2);
+        PropertyFileUtils.processDate(p, entryDate.set(Calendar.getInstance()));
+        assertThat(p.getProperty(entryDate.key())).as("processDate(cal-2)").isEqualTo(String.valueOf(
+                LocalDateTime.now().minusDays(2).getDayOfYear()));
+
+        entryDate.calc(v -> v - 3);
+        PropertyFileUtils.processDate(p, entryDate.set(LocalDate.now()));
+        assertThat(p.getProperty(entryDate.key())).as("processDate(LocalDate-3)").isEqualTo(String.valueOf(
+                LocalDateTime.now().minusDays(3).getDayOfYear()));
     }
 
     @Test
+    void parseIntSubTest() {
+        var entryInt = newEntryInt().calc(SUB).pattern("0000");
+        PropertyFileUtils.processInt(p, entryInt.defaultValue("0017"));
+        assertThat(p.getProperty(entryInt.key())).as("sub(0017)").isEqualTo("0016");
+
+        PropertyFileUtils.processInt(p, entryInt.set(16).calc(v -> v - 3));
+        assertThat(p.getProperty(entryInt.key())).as("sub(16)-3").isEqualTo("0013");
+    }
+
+    @Test
+    @SuppressWarnings("PMD.AvoidDuplicateLiterals")
     void parseStringAppend() {
+        var entry = newEntry();
+        PropertyFileUtils.processString(p, entry.set(1));
         PropertyFileUtils.processString(p, entry.modify("-foo", String::concat));
-        assertThat(p.getProperty(entry.getKey())).as(String.format("processString(%s, %s)", entry.getKey(),
+        assertThat(p.getProperty(entry.key())).as(String.format("processString(%s, %s)", entry.key(),
-                entry.getNewValue())).isEqualTo("1-foo");
+                entry.newValue())).isEqualTo("1-foo");
-    }
-
-    @Test
-    void parseStringPrepend() {
-        PropertyFileUtils.processString(p, entry.modify("foo-", (v, s) -> s + v));
-        assertThat(p.getProperty(entry.getKey())).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
-                .isEqualTo("foo-1");
     }
 
     @Test
     void parseStringCap() {
+        var entry = newEntry();
         PropertyFileUtils.processString(p, entry.set(t).modify("", (v, s) -> v.toUpperCase(Localization.getLocale())));
-        assertThat(p.getProperty(entry.getKey())).as("capitalize").isEqualTo(t.toUpperCase(Localization.getLocale()));
+        assertThat(p.getProperty(entry.key())).as("capitalize").isEqualTo(t.toUpperCase(Localization.getLocale()));
-
-    }
-
-    @Test
-    void parseStringReplace() {
-        entry.set(t).setModify("T", (v, s) -> v.replace("t", s));
-        PropertyFileUtils.processString(p, entry);
-        assertThat(p.getProperty(entry.getKey())).as("replace(t -> T)").isEqualTo("TesT");
 
     }
 
     @Test
     void parseStringCat() {
-        entry.set(t).setModify("-foo", String::concat);
+        var entry = newEntry();
+        entry.set(t).modify("-foo", String::concat);
         PropertyFileUtils.processString(p, entry);
-        assertThat(p.getProperty(entry.getKey())).as("replace").isEqualTo(t + "-foo");
+        assertThat(p.getProperty(entry.key())).as("replace").isEqualTo(t + "-foo");
+    }
+
+    @Test
+    void parseStringFormat() {
+        var entry = new Entry("foo").set("%.2f").pattern(3.14159f);
+        PropertyFileUtils.processString(p, entry);
+        assertThat(p.getProperty(entry.key())).as("format").isEqualTo("3.14");
+    }
+
+
+    @Test
+    void parseStringPrepend() {
+        var entry = newEntry();
+        PropertyFileUtils.processString(p, entry.set(1));
+        PropertyFileUtils.processString(p, entry.modify("foo-", (v, s) -> s + v));
+        assertThat(p.getProperty(entry.key())).as(String.format("processString(%s, %s)", entry.key(), entry.newValue()))
+                .isEqualTo("foo-1");
+    }
+
+    @Test
+    void parseStringReplace() {
+        var entry = newEntry();
+        entry.set(t).modify("T", (v, s) -> v.replace("t", s));
+        PropertyFileUtils.processString(p, entry);
+        assertThat(p.getProperty(entry.key())).as("replace(t -> T)").isEqualTo("TesT");
     }
 
     @Test
     void parseStringSub() {
+        var entry = newEntry();
         PropertyFileUtils.processString(p, entry.set(t).modify((v, s) -> v.substring(1)));
-        assertThat(p.getProperty(entry.getKey())).as("substring(1)").isEqualTo(t.substring(1));
+        assertThat(p.getProperty(entry.key())).as("substring(1)").isEqualTo(t.substring(1));
     }
 
     @Test
-    void processIntAddTest() throws Exception {
+    void parseTimeTest() {
-        entryInt.calc(ADD);
-        entryInt.setDefaultValue("-1");
-        PropertyFileUtils.processInt(t, p, entryInt, true);
-        assertThat(p.getProperty(entryInt.getKey())).as("add(-1)").isEqualTo("0");
-
-        entryInt.setKey("anint");
-        entryInt.setDefaultValue("0");
-        PropertyFileUtils.processInt(t, p, entryInt, true);
-        assertThat(p.getProperty(entryInt.getKey())).as("add(0)").isEqualTo("1");
-        PropertyFileUtils.processInt(t, p, entryInt, true);
-        assertThat(p.getProperty(entryInt.getKey())).as("add(1)").isEqualTo("2");
-
-        entryInt.setKey("formatted.int");
-        entryInt.setDefaultValue("0013");
-        entryInt.setPattern("0000");
-        PropertyFileUtils.processInt(t, p, entryInt, true);
-        assertThat(p.getProperty(entryInt.getKey())).as("add(0013)").isEqualTo("0014");
-        PropertyFileUtils.processInt(t, p, entryInt, true);
-        assertThat(p.getProperty(entryInt.getKey())).as("add(0014)").isEqualTo("0015");
-
-        entryInt.calc(v -> v + 2);
-        PropertyFileUtils.processInt(t, p, entryInt, true);
-        assertThat(p.getProperty(entryInt.getKey())).as("add(0015)+2").isEqualTo("0017");
-    }
-
-    @Test
-    void parseIntSubTest() throws Exception {
-        entryInt.calc(SUB);
-        entryInt.setPattern("0000");
-        PropertyFileUtils.processInt(t, p, entryInt.defaultValue("0017"), true);
-        assertThat(p.getProperty(entryInt.getKey())).as("sub(0017)").isEqualTo("0016");
-
-        PropertyFileUtils.processInt(t, p, entryInt.set(16).calc(v -> v - 3), true);
-        assertThat(p.getProperty(entryInt.getKey())).as("sub(16)-3").isEqualTo("0013");
-    }
-
-    @Test
-    void processDateAddTest() throws Exception {
-        entryDate.setCalc(ADD);
-        PropertyFileUtils.processDate(t, p, entryDate.now(), true);
-        assertThat(p.getProperty(entryDate.getKey())).as("processDate(now+1)").isEqualTo(String.valueOf(dayOfYear + 1));
-
-        PropertyFileUtils.processDate(t, p, entryDate.now().calc(v -> v + 3), true);
-        assertThat(p.getProperty(entryDate.getKey())).as("processDate(now+3)").isEqualTo(String.valueOf(dayOfYear + 3));
-
-        entryDate.setCalc(ADD);
-        PropertyFileUtils.processDate(t, p, entryDate.set(ZonedDateTime.now()), true);
-        assertThat(p.getProperty(entryDate.getKey())).as("processDate(ZonedDateTime+1)")
-                .isEqualTo(String.valueOf(dayOfYear + 1));
-
-        PropertyFileUtils.processDate(t, p, entryDate.set(Instant.now()).calc(v -> v + 2), true);
-        assertThat(p.getProperty(entryDate.getKey())).as("processDate(Instant+2)").isEqualTo(String.valueOf(dayOfYear + 2));
-
-        entryDate.setCalc(v -> v + 3);
-        PropertyFileUtils.processDate(t, p, entryDate.set(LocalDateTime.now()), true);
-        assertThat(p.getProperty(entryDate.getKey())).as("processDate(LocalDteTime+2)").isEqualTo(String.valueOf(dayOfYear + 3));
-    }
-
-    @Test
-    void parseDateSub() throws Exception {
-        entryDate.setCalc(SUB);
-        PropertyFileUtils.processDate(t, p, entryDate.now(), true);
-        assertThat(p.getProperty(entryDate.getKey())).as("processDate(now-3)").isEqualTo(String.valueOf(dayOfYear - 1));
-
-        entryDate.setCalc(v -> v - 2);
-        PropertyFileUtils.processDate(t, p, entryDate.now(), true);
-        assertThat(p.getProperty(entryDate.getKey())).as("processDate(now-2)").isEqualTo(String.valueOf(dayOfYear - 2));
-
-        entryDate.setCalc(SUB);
-        PropertyFileUtils.processDate(t, p, entryDate.set(new Date()), true);
-        assertThat(p.getProperty(entryDate.getKey())).as("processDate(date-1)").isEqualTo(String.valueOf(dayOfYear - 1));
-
-        entryDate.setCalc(v -> v - 2);
-        PropertyFileUtils.processDate(t, p, entryDate.set(Calendar.getInstance()), true);
-        assertThat(p.getProperty(entryDate.getKey())).as("processDate(cal-2)").isEqualTo(String.valueOf(dayOfYear - 2));
-
-        entryDate.setCalc(v -> v - 3);
-        PropertyFileUtils.processDate(t, p, entryDate.set(LocalDate.now()),
-                true);
-        assertThat(p.getProperty(entryDate.getKey())).as("processDate(LocalDate-3)").isEqualTo(String.valueOf(dayOfYear - 3));
-    }
-
-    @Test
-    void parseTimeTest() throws Exception {
         var entry = new EntryDate("time").pattern("m");
         var time = LocalTime.now();
 
-        entry.setCalc(ADD);
+        entry.calc(ADD);
-        PropertyFileUtils.processDate(t, p, entry.set(time).unit(EntryDate.Units.MINUTE), true);
+        PropertyFileUtils.processDate(p, entry.set(time).unit(EntryDate.Units.MINUTE));
-        assertThat(p.getProperty(entry.getKey())).as("processDate(now+1)")
+        assertThat(p.getProperty(entry.key())).as("processDate(now+1)")
                 .isEqualTo(String.valueOf(time.plusMinutes(1).getMinute()));
 
-        entry.setCalc(SUB);
+        entry.calc(SUB);
-        PropertyFileUtils.processDate(t, p, entry.set(time).unit(EntryDate.Units.HOUR).pattern("H"), true);
+        PropertyFileUtils.processDate(p, entry.set(time).unit(EntryDate.Units.HOUR).pattern("H"));
-        assertThat(p.getProperty(entry.getKey())).as("processDate(now+1)")
+        assertThat(p.getProperty(entry.key())).as("processDate(now+1)")
                 .isEqualTo(String.valueOf(time.minusHours(1).getHour()));
     }
 
+    @Test
+    void processDateAddTest() {
+        var entryDate = newEntryDate();
+        entryDate.calc(ADD);
+        PropertyFileUtils.processDate(p, entryDate.now());
+        assertThat(p.getProperty(entryDate.key())).as("processDate(now+1)").isEqualTo(String.valueOf(
+                LocalDateTime.now().plusDays(1).getDayOfYear()));
+
+        PropertyFileUtils.processDate(p, entryDate.now().calc(v -> v + 3));
+        assertThat(p.getProperty(entryDate.key())).as("processDate(now+3)").isEqualTo(String.valueOf(
+                LocalDateTime.now().plusDays(3).getDayOfYear()));
+
+        entryDate.calc(ADD);
+        PropertyFileUtils.processDate(p, entryDate.set(ZonedDateTime.now()));
+        assertThat(p.getProperty(entryDate.key())).as("processDate(ZonedDateTime+1)")
+                .isEqualTo(String.valueOf(LocalDateTime.now().plusDays(1).getDayOfYear()));
+
+        PropertyFileUtils.processDate(p, entryDate.set(Instant.now()).calc(v -> v + 2));
+        assertThat(p.getProperty(entryDate.key())).as("processDate(Instant+2)").isEqualTo(String.valueOf(
+                LocalDateTime.now().plusDays(2).getDayOfYear()));
+
+        entryDate.calc(v -> v + 3);
+        PropertyFileUtils.processDate(p, entryDate.set(LocalDateTime.now()));
+        assertThat(p.getProperty(entryDate.key())).as("processDate(LocalDteTime+2)")
+                .isEqualTo(String.valueOf(LocalDateTime.now().plusDays(3).getDayOfYear()));
+    }
+
+    @Test
+    void processIntAddTest() {
+        var entryInt = newEntryInt().calc(ADD).defaultValue("-1");
+        PropertyFileUtils.processInt(p, entryInt);
+        assertThat(p.getProperty(entryInt.key())).as("add(-1)").isEqualTo("0");
+
+        entryInt.key("anInt").defaultValue("0");
+        PropertyFileUtils.processInt(p, entryInt);
+        assertThat(p.getProperty(entryInt.key())).as("add(0)").isEqualTo("1");
+        PropertyFileUtils.processInt(p, entryInt);
+        assertThat(p.getProperty(entryInt.key())).as("add(1)").isEqualTo("2");
+
+        entryInt.key("formatted.int").defaultValue("0013").pattern("0000");
+        PropertyFileUtils.processInt(p, entryInt);
+        assertThat(p.getProperty(entryInt.key())).as("add(0013)").isEqualTo("0014");
+        PropertyFileUtils.processInt(p, entryInt);
+        assertThat(p.getProperty(entryInt.key())).as("add(0014)").isEqualTo("0015");
+
+        entryInt.calc(v -> v + 2);
+        PropertyFileUtils.processInt(p, entryInt);
+        assertThat(p.getProperty(entryInt.key())).as("add(0015)+2").isEqualTo("0017");
+    }
+
+    @Test
+    void processStringTest() {
+        var entry = newEntry();
+        PropertyFileUtils.processString(p, entry);
+
+        assertThat(entry.newValue()).as(String.format("processString(%s, %s)", entry.key(), entry.newValue()))
+                .isEqualTo(p.getProperty(entry.key()));
+
+        entry.key("version.minor");
+
+        PropertyFileUtils.processString(p, entry.set(0));
+        assertThat(entry.newValue().toString()).as(String.format("processString(%s, %s)", entry.key(), entry.newValue()))
+                .isEqualTo(p.getProperty(entry.key()));
+    }
+
+    @Test
+    void savePropertiesTest() throws Exception {
+        var p = new Properties();
+        var test = "test";
+
+        p.put(test, test);
+
+        var tmp = File.createTempFile(test, ".properties");
+
+        assertThatCode(() -> PropertyFileUtils.saveProperties(tmp, "Generated file - do not modify!", p))
+                .as("save properties").doesNotThrowAnyException();
+
+        assertThat(PropertyFileUtils.loadProperties(t, tmp, p, false)).as("load properties").isTrue();
+
+        assertThat(p.getProperty(test)).as("read property").isEqualTo(test);
+
+        tmp.deleteOnExit();
+    }
+
+    @Test
+    void testChangeKey() {
+        var entry = new Entry("foo").key("bar");
+        assertThat(entry.key()).isEqualTo("bar");
+
+        entry.key("foo");
+        assertThat(entry.key()).isEqualTo("foo");
+    }
+
     @Test
     void testCurrentValue() {
         var value = "value";
@@ -223,21 +276,10 @@ class PropertyFileUtilsTest {
     }
 
     @Test
-    void savePropertiesTest() throws Exception {
+    void testWarn() {
-        var p = new Properties();
+        assertThatCode(() -> PropertyFileUtils.warn("command", "message", true, false))
-        var test = "test";
+                .isInstanceOf(ExitStatusException.class);
-
+        assertThatCode(() -> PropertyFileUtils.warn("command", t, false, false))
-        p.put(test, test);
+                .as("failOnWarning = false").doesNotThrowAnyException();
-
-        var tmp = File.createTempFile(test, ".properties");
-
-        assertThatCode(() -> PropertyFileUtils.saveProperties(tmp, "Generated file - do not modify!", p))
-                .as("save properties").doesNotThrowAnyException();
-
-        assertThat(PropertyFileUtils.loadProperties(t, tmp, p)).as("load properties").isTrue();
-
-        assertThat(p.getProperty(test)).as("read property").isEqualTo(test);
-
-        tmp.deleteOnExit();
     }
 }