Compare commits

...

51 commits

Author SHA1 Message Date
8f405448d2
Version 0.9.9 2025-03-28 11:42:07 -07:00
9e6ac15b75
Bump PMD extension from 1.2.1 to 1.2.2 2025-03-28 11:41:48 -07:00
ec09c06b3d
Add compile and delete steps for examples 2025-03-25 21:14:06 -07:00
17742ad075
Add OS matrix for Ubuntu, Windows and macOS 2025-03-25 21:08:30 -07:00
6139eb8245
JDK 24 2025-03-18 23:40:21 -07:00
3eab7e7b5e
Cleanup copyright template 2025-03-18 12:37:40 -07:00
0218439665
Bump Jsoup to version 1.19.1 2025-03-18 12:36:41 -07:00
0ddf538af9
Bump Junit to version 5.12.1 2025-03-18 12:36:18 -07:00
ee124c567e
Bump PMD extension to version 1.2.1 2025-03-18 12:35:29 -07:00
33c3e22861
Add generic installation instructions 2025-03-18 12:34:41 -07:00
3b5b2596ea
Update copyright 2025-02-25 10:36:01 -08:00
cc755c7b1e
0.9.9-SNAPSHOT 2025-02-25 10:36:00 -08:00
ca4ba41e21
Bump bld to version 2.2.1 2025-02-25 10:34:33 -08:00
7637f90bc5
Bump JUnit to version 5.12.0 2025-02-25 10:34:12 -08:00
7af0b06d14
Update pages actions to latest versions 2025-02-25 10:33:23 -08:00
75abe7c657
Version 0.9.8 2025-01-14 11:12:42 -08:00
4571ce9767
Update copyright for 2025 2025-01-13 23:48:18 -08:00
d27869df5d
Bumped bld to version 2.2.0 2025-01-13 22:16:56 -08:00
3758df5080
Bumped PMD extension to version 1.1.10 2025-01-13 22:16:06 -08:00
4162c64ab9
Fixed date test 2024-12-28 22:47:35 -08:00
69a431e6ab
Bumped PMD extension to version 1.1.9 2024-12-28 18:10:12 -08:00
daf45f674c
Bumped Jsoup to version 1.18.3 2024-12-28 18:09:51 -08:00
94efbbf7df
Bumped JUnit to version 5.11.4 2024-12-28 18:09:16 -08:00
f8cceedc35
Minor cleanups 2024-10-27 17:23:38 -07:00
77b9ea0f61
Updated dependencies
Bumped JUnit version to 5.11.3
Bumped PMD extension version to 1.1.7
Bumped JDK to version 23 (GitHub CI Workflow)
2024-10-27 17:23:09 -07:00
4fa6ec6306
Added GitHub repository 2024-10-27 17:22:32 -07:00
592a269ec8
Added soft assertions 2024-10-27 17:21:24 -07:00
791db7f890
Version 0.9.7 2024-08-30 14:42:49 -07:00
ade7898516
Bumped bld to version 2.1.0 2024-08-29 22:02:18 -07:00
2600e74be7
Cleaned up API to match bld operations aand options APIs 2024-08-28 14:47:14 -07:00
15034b4363
Bumped JUnit to version 5.11.0 2024-08-28 14:45:44 -07:00
2c796a1260
Version 0.9.6 2024-07-28 22:12:54 -07:00
c1774e61ab
Bumped bld to version 2.0.1 2024-07-28 22:12:27 -07:00
7714e1028c
Bumped to bld version 2.0.0-SNAPSHOT 2024-07-22 20:28:37 -07:00
accf0d638a
Cleaned up examples 2024-07-16 16:18:10 -07:00
fb75d12740
Added pattern option for String-based entries 2024-07-16 16:09:21 -07:00
23540cbc8e
Converted EntryBase to a generic abstract class 2024-07-16 16:08:21 -07:00
dacacbab56
Updated dependencies
Cleanup GitHub workflow
2024-07-16 16:02:21 -07:00
b8cd4925a3
Added tests for operation 2024-06-23 10:47:49 -07:00
bd27eac071
Minor code cleanup 2024-06-23 10:47:18 -07:00
3db6ca026d
Removed argument from safeDelete() 2024-06-23 10:46:17 -07:00
f2eeb1f1f9
Added build command values 2024-06-23 10:43:25 -07:00
09cdfea6b8
Bumped PMD extension to version 1.1.0 2024-06-22 23:39:49 -07:00
2b5f29a016
Bumped to version 0.9.6-SNAPSHOT 2024-05-09 21:27:55 -07:00
375c4a70e2
Bumped JaCoCo extension to version 0.9.5 2024-05-09 21:27:03 -07:00
2df3714d7a
Bumped PMD extension to version 0.9.9 2024-05-09 21:26:23 -07:00
6faaa0aa57
Bumped bld to version 1.9.1 2024-05-09 21:25:04 -07:00
1a2362d511
Added JDK 22 to CI 2024-03-21 13:46:11 -07:00
95147aa7da Bumped to bld 1.9.0 2024-02-26 10:42:13 -08:00
d315ebc551 Bumped JUnit versions 2024-02-25 18:53:41 -08:00
ea19c6b822 Improved Visual Studio Code support 2024-02-25 18:53:27 -08:00
36 changed files with 688 additions and 626 deletions

View file

@ -4,29 +4,48 @@ on: [ push, pull_request, workflow_dispatch ]
jobs:
build-bld-project:
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ 17, 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
run: chmod +x bld
- name: Download the dependencies
- name: Download dependencies [examples]
working-directory: examples
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

View file

@ -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

6
.idea/bld.xml generated Normal file
View file

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

View file

@ -1,6 +1,6 @@
<component name="CopyrightManager">
<copyright>
<option name="notice" value="Copyright 2023-Copyright &amp;#36;today.yearamp;#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>

13
.idea/icon.svg generated Normal file
View file

@ -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>

After

Width:  |  Height:  |  Size: 2.4 KiB

View file

@ -2,12 +2,12 @@
<library name="bld">
<CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0.jar!/" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0-sources.jar!/" />
<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!/" />

View file

@ -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="false" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
</library>
</component>

View file

@ -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="false" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
</library>
</component>

View file

@ -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="false" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
</library>
</component>

6
.vscode/launch.json vendored
View file

@ -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",

10
.vscode/settings.json vendored
View file

@ -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}bld-1.7.0-SNAPSHOT.jar",
"lib/compile/*.jar",
"lib/runtime/*.jar",
"lib/test/*.jar"
"${HOME}/.bld/dist/bld-2.2.1.jar",
"lib/**/*.jar"
]
}

View file

@ -2,14 +2,22 @@
[![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/1.8.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
[![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)
To install, please refer to the [extensions documentation](https://github.com/rife2/bld/wiki/Extensions).
To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file:
To create or modifying [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:
```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
@ -69,12 +77,13 @@ 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. |
| `set()` | The value to set the property to, regardless of its previous value. |
| 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())` |
| `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

View file

@ -7,9 +7,9 @@
<!-- BEST PRACTICES -->
<rule ref="category/java/bestpractices.xml">
<exclude name="AvoidPrintStackTrace"/>
<exclude name="JUnit4TestShouldUseTestAnnotation"/>
<exclude name="JUnitTestContainsTooManyAsserts"/>
<exclude name="GuardLogStatement"/>
<exclude name="UnitTestContainsTooManyAsserts"/>
<exclude name="UnitTestShouldUseTestAnnotation"/>
</rule>
<rule ref="category/java/bestpractices.xml/MissingOverride">
@ -24,8 +24,8 @@
<rule ref="category/java/codestyle.xml">
<exclude name="AtLeastOneConstructor"/>
<exclude name="ClassNamingConventions"/>
<exclude name="ConfusingTernary"/>
<exclude name="CommentDefaultAccessModifier"/>
<exclude name="ConfusingTernary"/>
<exclude name="FieldNamingConventions"/>
<exclude name="LocalVariableCouldBeFinal"/>
<exclude name="LongVariable"/>
@ -35,8 +35,15 @@
<exclude name="ShortClassName"/>
<exclude name="ShortMethodName"/>
<exclude name="ShortVariable"/>
<exclude name="UselessParentheses"/>
<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 -->
@ -46,8 +53,6 @@
<exclude name="AvoidUncheckedExceptionsInSignatures"/>
<exclude name="CognitiveComplexity"/>
<exclude name="CyclomaticComplexity"/>
<exclude name="ExcessiveClassLength"/>
<exclude name="ExcessiveMethodLength"/>
<exclude name="ExcessiveParameterList"/>
<exclude name="ExcessivePublicCount"/>
<exclude name="GodClass"/>

View file

@ -2,12 +2,12 @@
<library name="bld">
<CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0.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$/.bld/dist/bld-1.8.0-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" />

View file

@ -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="false" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
</library>
</component>

View file

@ -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="false" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
</library>
</component>

View file

@ -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="false" type="SOURCES" />
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
<jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
</library>
</component>

View file

@ -1,19 +1,6 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "java",
"name": "PropertyFileExampleBuild",
"request": "launch",
"mainClass": "com.example.PropertyFileExampleBuild",
"projectName": "examples_dbdc9d4b"
},
{
"type": "java",
"name": "Run Main",
"request": "launch",
"mainClass": "com.example.PropertyFileExampleMain"
},
{
"type": "java",
"name": "Run Tests",

View file

@ -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}bld-1.7.0.jar",
"lib/compile/*.jar",
"lib/runtime/*.jar",
"lib/test/*.jar"
"${HOME}/.bld/dist/bld-2.2.1.jar",
"lib/**/*.jar"
]
}

View file

@ -3,3 +3,18 @@
```console
./bld compile run
```
# Update Version Properties
```console
./bld update-major run
./bld update-minor run
./bld update-patch run
./bld update-release run
```
# Delete Version Properties
```console
./bld delete-version run
```

Binary file not shown.

View file

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

View file

@ -35,20 +35,22 @@ public class PropertyFileExampleBuild extends Project {
version = version(0, 1, 0);
javaRelease = 17;
downloadSources = true;
autoDownloadPurge = true;
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1)));
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
.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()
.fromProject(this)
@ -64,7 +66,7 @@ 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()
.fromProject(this)
@ -80,7 +82,7 @@ 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()
.fromProject(this)
@ -96,7 +98,7 @@ 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()
.fromProject(this)
@ -105,10 +107,11 @@ public class PropertyFileExampleBuild extends Project {
.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()
.fromProject(this)

View file

@ -1,6 +1,7 @@
#
#Sun Oct 22 14:31:42 PDT 2023
release=beta.20231022143142
version.major=1
version.minor=0
version.patch=1
#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

Binary file not shown.

View file

@ -1,7 +1,6 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.5
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.2
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.downloadLocation=
bld.version=1.8.0
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

View file

@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 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.
@ -18,17 +18,14 @@ package rife.bld.extension.propertyfile;
import rife.bld.BuildCommand;
import rife.bld.Project;
import rife.bld.extension.JacocoReportOperation;
import rife.bld.extension.PmdOperation;
import rife.bld.publish.PublishDeveloper;
import rife.bld.publish.PublishLicense;
import rife.bld.publish.PublishScm;
import java.io.IOException;
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.Repository.*;
import static rife.bld.dependencies.Scope.compile;
import static rife.bld.dependencies.Scope.test;
import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;
@ -37,19 +34,19 @@ public class PropertyFileBuild extends Project {
public PropertyFileBuild() {
pkg = "rife.bld.extension";
name = "bld-property-file";
version = version(0, 9, 4);
version = version(0, 9, 9);
javaRelease = 17;
downloadSources = true;
autoDownloadPurge = true;
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
scope(compile)
.include(dependency("com.uwyn.rife2", "bld", version(1, 8, 0)));
.include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1)));
scope(test)
.include(dependency("org.jsoup", "jsoup", version(1, 17, 2)))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1)))
.include(dependency("org.jsoup", "jsoup", version(1, 19, 1)))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)))
.include(dependency("org.assertj:assertj-joda-time:2.2.0"));
javadocOperation()
@ -61,6 +58,7 @@ public class PropertyFileBuild extends Project {
publishOperation()
.repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2"))
.repository(repository("github"))
.info()
.groupId("com.uwyn.rife2")
.artifactId("bld-property-file")
@ -82,7 +80,7 @@ public class PropertyFileBuild extends Project {
.license(
new PublishLicense()
.name("The Apache License, Version 2.0")
.url("http://www.apache.org/licenses/LICENSE-2.0.txt")
.url("https://www.apache.org/licenses/LICENSE-2.0.txt")
)
.scm(
new PublishScm().connection("scm:git:https://github.com/rife2/bld-property-file.git")
@ -96,15 +94,8 @@ public class PropertyFileBuild extends Project {
new PropertyFileBuild().start(args);
}
@BuildCommand(summary = "Generates JaCoCo Reports")
public void jacoco() throws IOException {
new JacocoReportOperation()
.fromProject(this)
.execute();
}
@BuildCommand(summary = "Runs PMD analysis")
public void pmd() {
public void pmd() throws Exception {
new PmdOperation()
.fromProject(this)
.failOnViolation(true)

View file

@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 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.

View file

@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 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,62 +25,59 @@ 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_;
/**
* Instantiates a new Entry.
* Creates a new {@link Entry entry}.
*
* @param key the key
* @param key the required property key
*/
public Entry(String key) {
super(key);
}
/**
* <p>Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.</p>
* Returns the modify function.
*
* @param defaultValue the default value
* @return the entry
* @return the modify function
*/
@SuppressWarnings("unused")
public Entry defaultValue(Object defaultValue) {
setDefaultValue(defaultValue);
return this;
protected BiFunction<String, String, String> modify() {
return modify_;
}
/**
* Sets the {@link Entry entry} up for deletion.
* Sets the modify function.
*
* @return the entry
*/
public Entry delete() {
setDelete(true);
return this;
}
/**
* Creates a new {@link Entry entry}.
*
* @param modify the modification function
* @return the entry
* @param modify the modify function
*/
public Entry modify(BiFunction<String, String, String> modify) {
setModify(modify);
modify_ = modify;
return this;
}
/**
* Creates a new {@link Entry entry}.
* Sets the modify function.
*
* @param value the value to perform a modification with
* @param modify the modification function
* @return the entry
* @param modify the modify function
*/
public Entry modify(String value, BiFunction<String, String, String> modify) {
setModifyValue(value);
setModify(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.
*
@ -88,7 +85,7 @@ public class Entry extends EntryBase {
* @return the entry
*/
public Entry set(Object s) {
setNewValue(s);
newValue(s);
return this;
}
}

View file

@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 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,17 +25,14 @@ import java.util.function.IntFunction;
* @author <a href="https://github.com/gbevin">Geert Bevin</a>
* @since 1.0
*/
@SuppressWarnings("PMD.DataClass")
public class EntryBase {
private IntFunction<Integer> calc;
private Object defaultValue;
private boolean isDelete;
private String key;
private BiFunction<String, String, String> modify;
private String modifyValue = "";
private Object newValue;
private String pattern = "";
private EntryDate.Units unit = EntryDate.Units.DAY;
@SuppressWarnings({"unchecked", "PMD.AbstractClassWithoutAbstractMethod"})
public abstract class EntryBase<T> {
private IntFunction<Integer> calc_;
private Object defaultValue_;
private boolean isDelete_;
private String key_;
private Object newValue_;
private Object pattern_;
/**
* Creates a new {@link EntryBase entry}.
@ -44,7 +40,7 @@ public class EntryBase {
* @param key the required property key
*/
public EntryBase(String key) {
this.key = key;
key_ = key;
}
/**
@ -52,8 +48,18 @@ public class EntryBase {
*
* @return the calc function
*/
protected IntFunction<Integer> getCalc() {
return calc;
protected IntFunction<Integer> calc() {
return calc_;
}
/**
* Sets the calculation function.
*
* @param calc the calc function
*/
public T calc(IntFunction<Integer> calc) {
calc_ = calc;
return (T) this;
}
/**
@ -61,62 +67,26 @@ public class EntryBase {
*
* @return the default value
*/
protected Object getDefaultValue() {
return defaultValue;
protected Object defaultValue() {
return defaultValue_;
}
/**
* Returns the key of the {@link java.util.Properties property}.
* Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.
*
* @return the key
* @param defaultValue the default value
*/
protected String getKey() {
return key;
public T defaultValue(Object defaultValue) {
defaultValue_ = defaultValue;
return (T) this;
}
/**
* Returns the modify function.
*
* @return the modify function
* Indicates that the {@link java.util.Properties property} is to be deleted.
*/
protected BiFunction<String, String, String> getModify() {
return modify;
}
/**
* Returns the value to be used in the {@link #modify} function.
*
* @return the modify value
*/
protected String getModifyValue() {
return modifyValue;
}
/**
* Returns the new value to set the {@link java.util.Properties property)} to.
*
* @return the new value
*/
public Object getNewValue() {
return newValue;
}
/**
* Returns the pattern.
*
* @return the pattern
*/
protected String getPattern() {
return pattern;
}
/**
* Returns the {@link EntryDate.Units unit}.
*
* @return the unit
*/
protected EntryDate.Units getUnit() {
return unit;
public T delete() {
isDelete_ = true;
return (T) this;
}
/**
@ -125,7 +95,16 @@ public class EntryBase {
* @return {@code true} or {@code false}
*/
protected boolean isDelete() {
return isDelete;
return isDelete_;
}
/**
* Returns the key of the {@link java.util.Properties property}.
*
* @return the key
*/
protected String key() {
return key_;
}
/**
@ -134,75 +113,18 @@ public class EntryBase {
* @param key the {@link java.util.Properties property} key
* @return this instance
*/
@SuppressWarnings("unused")
public EntryBase key(String key) {
setKey(key);
return this;
public T key(String key) {
key_ = key;
return (T) this;
}
/**
* Sets the calculation function.
* Returns the new value to set the {@link java.util.Properties property)} to.
*
* @param calc the calc function
* @return the new value
*/
protected void setCalc(IntFunction<Integer> calc) {
this.calc = calc;
}
/**
* Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.
*
* @param defaultValue the default value
*/
protected void setDefaultValue(Object defaultValue) {
this.defaultValue = defaultValue;
}
/**
* Sets whether the {@link java.util.Properties property} should be deleted.
*
* @param delete {@code true} or {@code false}
*/
protected void setDelete(boolean delete) {
isDelete = delete;
}
/**
* Sets the key of the {@link java.util.Properties property}.
*
* @param key the {@link java.util.Properties property} key
*/
protected void setKey(String key) {
this.key = key;
}
/**
* Sets the modify function.
*
* @param modify 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
* @param modify the modify function
*/
protected void setModify(String value, BiFunction<String, String, String> modify) {
this.modifyValue = value;
this.modify = modify;
}
/**
* Sets the modify value.
*
* @param value the modify value.
*/
protected void setModifyValue(String value) {
this.modifyValue = value;
protected Object newValue() {
return newValue_;
}
/**
@ -210,26 +132,26 @@ public class EntryBase {
*
* @param newValue the new value
*/
public void setNewValue(Object newValue) {
this.newValue = newValue;
protected void newValue(Object newValue) {
newValue_ = newValue;
}
/**
* Sets the {@link java.text.DecimalFormat DecimalFormat} or {@link java.time.format.DateTimeFormatter DateTimeFormatter}
* pattern to be used with {@link EntryDate} or {@link EntryInt} respectively.
* Returns the pattern.
*
* @return the pattern
*/
protected Object pattern() {
return pattern_;
}
/**
* Sets the {@link java.util.Formatter} pattern.
*
* @param pattern the pattern
*/
protected void setPattern(String pattern) {
this.pattern = pattern;
}
/**
* Sets the {@link EntryDate.Units unit} value to apply to calculations.
*
* @param unit the {@link EntryDate.Units unit}
*/
protected void setUnit(EntryDate.Units unit) {
this.unit = unit;
public T pattern(Object pattern) {
pattern_ = pattern;
return (T) this;
}
}

View file

@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 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,46 +38,23 @@ public class EntryDate extends EntryBase {
super(key);
}
/**
* Creates a new {@link EntryDate entry}.
*
* @param calc the calculation function
* @return this instance
*/
public EntryDate calc(IntFunction<Integer> calc) {
setCalc(calc);
return this;
}
/**
* Sets the {@link EntryDate entry} up for deletion.
*
* @return this instance
*/
public EntryDate delete() {
setDelete(true);
return this;
}
/**
* Sets the new {@link java.util.Properties property} value to now.
*
* @return this instance
*/
public EntryDate now() {
setNewValue("now");
newValue("now");
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.
* Sets the {@link java.time.format.DateTimeFormatter DateTimeFormatter} pattern.
*
* @param pattern the pattern
* @return this instance
*/
public EntryDate pattern(String pattern) {
setPattern(pattern);
super.pattern(pattern);
return this;
}
@ -87,7 +65,7 @@ public class EntryDate extends EntryBase {
* @return this instance
*/
public EntryDate set(Instant instant) {
setNewValue(instant);
newValue(instant);
return this;
}
@ -98,7 +76,7 @@ public class EntryDate extends EntryBase {
* @return this instance
*/
public EntryDate set(LocalDate date) {
setNewValue(date);
newValue(date);
return this;
}
@ -109,7 +87,7 @@ public class EntryDate extends EntryBase {
* @return this instance
*/
public EntryDate set(LocalDateTime date) {
setNewValue(date);
newValue(date);
return this;
}
@ -120,7 +98,7 @@ public class EntryDate extends EntryBase {
* @return this instance
*/
public EntryDate set(ZonedDateTime date) {
setNewValue(date);
newValue(date);
return this;
}
@ -131,7 +109,7 @@ public class EntryDate extends EntryBase {
* @return this instance
*/
public EntryDate set(LocalTime time) {
setNewValue(time);
newValue(time);
return this;
}
@ -142,7 +120,7 @@ public class EntryDate extends EntryBase {
* @return this instance
*/
public EntryDate set(Calendar cal) {
setNewValue(cal);
newValue(cal);
return this;
}
@ -153,10 +131,19 @@ public class EntryDate extends EntryBase {
* @return this instance
*/
public EntryDate set(Date date) {
setNewValue(date);
newValue(date);
return this;
}
/**
* Returns the {@link EntryDate.Units unit}.
*
* @return the unit
*/
public EntryDate.Units unit() {
return unit_;
}
/**
* Sets the {@link Units unit} value to apply to calculations for {@link EntryDate}.
*
@ -164,7 +151,7 @@ public class EntryDate extends EntryBase {
* @return this instance
*/
public EntryDate unit(Units unit) {
setUnit(unit);
unit_ = unit;
return this;
}

View file

@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 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
*/
@ -35,35 +33,12 @@ public class EntryInt extends EntryBase {
}
/**
* Creates a new {@link EntryInt entry}.
* Sets the {@link java.text.DecimalFormat DecimalFormat} pattern.
*
* @param calc the calculation function.
* @return this instance
* @param pattern the pattern
*/
public EntryInt calc(IntFunction<Integer> calc) {
setCalc(calc);
return this;
}
/**
* Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.
*
* @param defaultValue the default value
* @return this instance
*/
@SuppressWarnings("unused")
public EntryInt defaultValue(Object defaultValue) {
setDefaultValue(defaultValue);
return this;
}
/**
* Sets the {@link EntryInt entry} up for deletion.
*
* @return this instance
*/
public EntryInt delete() {
setDelete(true);
public EntryInt pattern(String pattern) {
super.pattern(pattern);
return this;
}
@ -74,7 +49,7 @@ public class EntryInt extends EntryBase {
* @return this instance
*/
public EntryInt set(int i) {
setNewValue(i);
newValue(i);
return this;
}
}

View file

@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 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.
@ -18,11 +18,15 @@ package rife.bld.extension.propertyfile;
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,11 +35,12 @@ import java.util.Properties;
* @since 1.0
*/
public class PropertyFileOperation extends AbstractOperation<PropertyFileOperation> {
private final List<EntryBase> entries = new ArrayList<>();
private String comment = "";
private boolean failOnWarning;
private File file;
private BaseProject project;
private static final Logger LOGGER = Logger.getLogger(PropertyFileOperation.class.getName());
private final List<EntryBase<?>> entries_ = new ArrayList<>();
private String comment_ = "";
private boolean failOnWarning_;
private File file_;
private BaseProject project_;
/**
* Sets the comment to be inserted at the top of the {@link java.util.Properties} file.
@ -43,9 +48,8 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
* @param comment the header comment
* @return this instance
*/
@SuppressWarnings("unused")
public PropertyFileOperation comment(String comment) {
this.comment = comment;
comment_ = comment;
return this;
}
@ -56,9 +60,8 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
* @param entry the {@link Entry entry}
* @return this instance
*/
@SuppressWarnings("unused")
public PropertyFileOperation entry(EntryBase entry) {
entries.add(entry);
public PropertyFileOperation entry(EntryBase<?> entry) {
entries_.add(entry);
return this;
}
@ -67,38 +70,49 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
*/
@Override
public void execute() throws Exception {
var commandName = project.getCurrentCommandName();
var properties = new Properties();
var success = false;
if (project_ == null) {
if (LOGGER.isLoggable(Level.SEVERE) && !silent()) {
LOGGER.log(Level.SEVERE, "A project is required");
}
throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
}
if (file == null) {
PropertyFileUtils.warn(commandName, "A properties file must be specified.");
var commandName = project_.getCurrentCommandName();
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) {
if (entry.getKey().isBlank()) {
PropertyFileUtils.warn(commandName, "An entry key must specified.");
for (var entry : entries_) {
if (entry.key().isBlank()) {
warn(commandName, "An entry key must specified.");
} else {
var key = entry.getKey();
Object value = entry.getNewValue();
Object defaultValue = entry.getDefaultValue();
var key = entry.key();
Object value = entry.newValue();
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) {
success = PropertyFileUtils.processDate(commandName, properties, (EntryDate) entry, failOnWarning);
} else if (entry instanceof EntryInt) {
success = PropertyFileUtils.processInt(commandName, properties, (EntryInt) entry, failOnWarning);
} else {
success = PropertyFileUtils.processString(properties, (Entry) entry);
try {
if (entry instanceof EntryDate) {
PropertyFileUtils.processDate(properties, (EntryDate) entry);
} else if (entry instanceof EntryInt) {
PropertyFileUtils.processInt(properties, (EntryInt) entry);
} else {
PropertyFileUtils.processString(properties, (Entry) entry);
}
} catch (IllegalArgumentException e) {
warn(commandName, e.getMessage());
}
}
}
@ -106,7 +120,7 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
}
if (success) {
PropertyFileUtils.saveProperties(file, comment, properties);
PropertyFileUtils.saveProperties(file_, comment_, properties);
}
}
@ -116,9 +130,8 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
* @param failOnWarning if set to {@code true}, the execution will fail on any warnings.
* @return this instance
*/
@SuppressWarnings("unused")
public PropertyFileOperation failOnWarning(boolean failOnWarning) {
this.failOnWarning = failOnWarning;
failOnWarning_ = failOnWarning;
return this;
}
@ -128,9 +141,8 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
* @param file the file to be edited
* @return this instance
*/
@SuppressWarnings("unused")
public PropertyFileOperation file(File file) {
this.file = file;
file_ = file;
return this;
}
@ -140,10 +152,27 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
* @param file the file to be edited
* @return this instance
*/
@SuppressWarnings("unused")
public PropertyFileOperation file(String file) {
this.file = new File(file);
return this;
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());
}
/**
@ -153,7 +182,27 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
* @return this instance
*/
public PropertyFileOperation fromProject(BaseProject project) {
this.project = 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);
}
}
}
}

View file

@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 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;
@ -38,7 +39,7 @@ 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
@ -69,167 +70,153 @@ public final class PropertyFileUtils {
* @param file the file location
* @param p the {@link Properties properties} to load into.
* @return the boolean
* @throws Exception the exception
* @throws ExitStatusException if an error occurred
*/
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
public static boolean loadProperties(String command, File file, Properties p) throws Exception {
public static boolean loadProperties(String command, File file, Properties p, boolean silent)
throws ExitStatusException {
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);
warn(command, "Could not load properties file: " + ioe.getMessage(), true, silent);
success = false;
}
}
} else {
warn(command, "Please specify the properties file location.");
warn(command, "Please specify the properties file location.", true, silent);
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 command the issuing command
* @param p the {@link Properties property}
* @param entry the {@link Entry} containing the {@link Properties property} edits
* @param failOnWarning the fail on warning
* @return the boolean
* @throws Exception the exception
* @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.SignatureDeclareThrowsException", "PMD.ExceptionAsFlowControl"})
public static boolean processDate(String command, Properties p, EntryDate entry, boolean failOnWarning)
throws Exception {
var success = true;
var value = currentValue(null, entry.getDefaultValue(),
entry.getNewValue());
@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 pattern = entry.getPattern();
String parsedValue = String.valueOf(value);
var dateValue = String.valueOf(currentValue);
if (pattern != null && !pattern.isBlank()) {
var offset = 0;
if (entry.getCalc() != null) {
offset = entry.getCalc().apply(offset);
if (entry.calc() != null) {
offset = entry.calc().apply(offset);
}
var dtf = DateTimeFormatter.ofPattern(pattern);
var unit = entry.getUnit();
var unit = entry.unit();
try {
if (value instanceof String) {
if ("now".equalsIgnoreCase((String) value)) {
value = ZonedDateTime.now();
if (currentValue instanceof String) {
if ("now".equalsIgnoreCase((String) currentValue)) {
currentValue = 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());
} 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 (value instanceof LocalDate) {
if (currentValue instanceof LocalDate) {
if (offset != 0) {
if (unit == EntryDate.Units.DAY) {
value = ((LocalDate) value).plusDays(offset);
currentValue = ((LocalDate) currentValue).plusDays(offset);
} else if (unit == EntryDate.Units.MONTH) {
value = ((LocalDate) value).plusMonths(offset);
currentValue = ((LocalDate) currentValue).plusMonths(offset);
} else if (unit == EntryDate.Units.WEEK) {
value = ((LocalDate) value).plusWeeks(offset);
currentValue = ((LocalDate) currentValue).plusWeeks(offset);
} else if (unit == EntryDate.Units.YEAR) {
value = ((LocalDate) value).plusYears(offset);
currentValue = ((LocalDate) currentValue).plusYears(offset);
}
}
parsedValue = dtf.format((LocalDate) value);
} else if (value instanceof LocalTime) {
dateValue = dtf.format((LocalDate) currentValue);
} else if (currentValue instanceof LocalTime) {
if (offset != 0) {
if (unit == EntryDate.Units.SECOND) {
value = ((LocalTime) value).plusSeconds(offset);
currentValue = ((LocalTime) currentValue).plusSeconds(offset);
} else if (unit == EntryDate.Units.MINUTE) {
value = ((LocalTime) value).plusMinutes(offset);
currentValue = ((LocalTime) currentValue).plusMinutes(offset);
} else if (unit == EntryDate.Units.HOUR) {
value = ((LocalTime) value).plusHours(offset);
currentValue = ((LocalTime) currentValue).plusHours(offset);
}
}
parsedValue = dtf.format((LocalTime) value);
} else if (value instanceof ZonedDateTime) {
dateValue = dtf.format((LocalTime) currentValue);
} else if (currentValue instanceof ZonedDateTime) {
if (offset != 0) {
if (unit == EntryDate.Units.DAY) {
value = ((ZonedDateTime) value).plusDays(offset);
currentValue = ((ZonedDateTime) currentValue).plusDays(offset);
} else if (unit == EntryDate.Units.MONTH) {
value = ((ZonedDateTime) value).plusMonths(offset);
currentValue = ((ZonedDateTime) currentValue).plusMonths(offset);
} else if (unit == EntryDate.Units.WEEK) {
value = ((ZonedDateTime) value).plusWeeks(offset);
currentValue = ((ZonedDateTime) currentValue).plusWeeks(offset);
} else if (unit == EntryDate.Units.YEAR) {
value = ((ZonedDateTime) value).plusYears(offset);
currentValue = ((ZonedDateTime) currentValue).plusYears(offset);
} else if (unit == EntryDate.Units.SECOND) {
value = ((ZonedDateTime) value).plusSeconds(offset);
currentValue = ((ZonedDateTime) currentValue).plusSeconds(offset);
} else if (unit == EntryDate.Units.MINUTE) {
value = ((ZonedDateTime) value).plusMinutes(offset);
currentValue = ((ZonedDateTime) currentValue).plusMinutes(offset);
} else if (unit == EntryDate.Units.HOUR) {
value = ((ZonedDateTime) value).plusHours(offset);
currentValue = ((ZonedDateTime) currentValue).plusHours(offset);
}
}
parsedValue = dtf.format((ZonedDateTime) value);
dateValue = dtf.format((ZonedDateTime) currentValue);
}
} catch (DateTimeException dte) {
warn(command, "Non-date value for \"" + entry.getKey() + "\" --> " + dte.getMessage(),
dte, failOnWarning);
success = false;
throw new IllegalArgumentException(
"Non-date value for \"" + entry.key() + "\" --> " + dte.getMessage(), dte);
}
}
if (success) {
p.setProperty(entry.getKey(), parsedValue);
}
return success;
p.setProperty(entry.key(), dateValue);
}
/**
* Processes an integer {@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
* @param failOnWarning the fail on warning
* @return the boolean
* @throws Exception the exception
* @param p the {@link Properties property}
* @param entry the {@link Entry} containing the {@link Properties property} edits
* @throws NumberFormatException if a parsing error occurs
*/
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
public static boolean processInt(String command, Properties p, EntryInt entry, boolean failOnWarning)
throws Exception {
var success = true;
public static void processInt(Properties p, EntryInt entry) throws IllegalArgumentException {
int intValue = 0;
try {
var fmt = new DecimalFormat(entry.getPattern());
var value = currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
entry.getNewValue());
var fmt = new DecimalFormat(objectToString(entry.pattern()));
var currentValue = currentValue(p.getProperty(entry.key()), entry.defaultValue(), entry.newValue());
if (value != null) {
intValue = fmt.parse(String.valueOf(value)).intValue();
if (currentValue != null) {
intValue = fmt.parse(String.valueOf(currentValue)).intValue();
}
if (entry.getCalc() != null) {
intValue = entry.getCalc().apply(intValue);
if (entry.calc() != null) {
intValue = entry.calc().apply(intValue);
}
p.setProperty(entry.getKey(), fmt.format(intValue));
p.setProperty(entry.key(), fmt.format(intValue));
} catch (NumberFormatException | ParseException e) {
warn(command, "Non-integer value for \"" + entry.getKey() + "\" --> " + e.getMessage(), e,
failOnWarning);
success = false;
throw new IllegalArgumentException(
"Non-integer value for \"" + entry.key() + "\" --> " + e.getMessage(), e);
}
return success;
}
/**
@ -237,18 +224,16 @@ public final class PropertyFileUtils {
*
* @param p the {@link Properties property}
* @param entry the {@link Entry} containing the {@link Properties property} edits
* @return the boolean
*/
public static boolean processString(Properties p, Entry entry) {
var value = currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(), entry.getNewValue());
public static void processString(Properties p, Entry entry) {
var currentValue = currentValue(p.getProperty(entry.key()), entry.defaultValue(), entry.newValue());
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) {
p.setProperty(entry.getKey(), entry.getModify().apply(p.getProperty(entry.getKey()), entry.getModifyValue()));
if (entry.modify() != null && entry.modifyValue() != null) {
var modify = entry.modify().apply(p.getProperty(entry.key()), entry.modifyValue());
p.setProperty(entry.key(), String.format(modify, entry.pattern()));
}
return true;
}
/**
@ -262,20 +247,8 @@ public final class PropertyFileUtils {
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) {
throw new IIOException("An IO error occurred while saving the Properties file: " + file, ioe);
}
}
/**
* 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);
} catch (IOException ioe) {
throw new IOException("An IO error occurred while saving the Properties file: " + file, ioe);
}
}
@ -284,17 +257,20 @@ public final class PropertyFileUtils {
*
* @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}
* @throws Exception the exception
* @throws ExitStatusException if a {@link Level#SEVERE} exception occurs
*/
@SuppressWarnings({"PMD.SignatureDeclareThrowsException"})
static void warn(String command, String message, Exception e, boolean failOnWarning) throws Exception {
static void warn(String command, String message, boolean failOnWarning, boolean silent)
throws ExitStatusException {
if (failOnWarning) {
LOGGER.log(Level.SEVERE, '[' + command + "] " + message, e);
throw e;
if (LOGGER.isLoggable(Level.SEVERE) && !silent) {
LOGGER.log(Level.SEVERE, '[' + command + "] " + message);
}
throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
} else {
warn(command, message);
if (LOGGER.isLoggable(Level.WARNING) && !silent) {
LOGGER.warning('[' + command + "] " + message);
}
}
}
}

View file

@ -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);
}
}

View file

@ -1,5 +1,5 @@
/*
* Copyright 2023-2024 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,19 +17,19 @@
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;
import java.util.Properties;
import static org.assertj.core.api.Assertions.assertThat; // NOPMD
import static org.assertj.core.api.Assertions.assertThatCode; // NOPMD
import static rife.bld.extension.propertyfile.Calc.ADD; // NOPMD
import static rife.bld.extension.propertyfile.Calc.SUB; // NOPMD
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static rife.bld.extension.propertyfile.Calc.ADD;
import static rife.bld.extension.propertyfile.Calc.SUB;
/**
* PropertyFileUtilsTest class
@ -37,8 +37,8 @@ import static rife.bld.extension.propertyfile.Calc.SUB; // NOPMD
* @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
* @since 1.0
*/
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
class PropertyFileUtilsTest {
final static int dayOfYear = LocalDate.now().getDayOfYear();
final static Properties p = new Properties();
final static String t = "test";
@ -49,7 +49,7 @@ class PropertyFileUtilsTest {
public EntryDate newEntryDate() {
p.clear();
return new EntryDate("adate").pattern("D");
return new EntryDate("aDate").pattern("D");
}
public EntryInt newEntryInt() {
@ -58,42 +58,41 @@ class PropertyFileUtilsTest {
}
@Test
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
void parseDateSub() throws Exception {
var entryDate = newEntryDate();
entryDate.setCalc(SUB);
PropertyFileUtils.processDate(t, p, entryDate.now(), true);
assertThat(p.getProperty(entryDate.getKey())).as("processDate(now-3)").isEqualTo(String.valueOf(dayOfYear - 1));
void parseDateSub() {
var entryDate = newEntryDate().calc(SUB);
PropertyFileUtils.processDate(p, entryDate.now());
assertThat(p.getProperty(entryDate.key())).as("processDate(now-3)").isEqualTo(String.valueOf(
LocalDateTime.now().minusDays(1).getDayOfYear()));
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.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.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.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.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.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.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));
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
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
void parseIntSubTest() throws Exception {
var entryInt = newEntryInt();
entryInt.calc(SUB);
entryInt.setPattern("0000");
PropertyFileUtils.processInt(t, p, entryInt.defaultValue("0017"), true);
assertThat(p.getProperty(entryInt.getKey())).as("sub(0017)").isEqualTo("0016");
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(t, p, entryInt.set(16).calc(v -> v - 3), true);
assertThat(p.getProperty(entryInt.getKey())).as("sub(16)-3").isEqualTo("0013");
PropertyFileUtils.processInt(p, entryInt.set(16).calc(v -> v - 3));
assertThat(p.getProperty(entryInt.key())).as("sub(16)-3").isEqualTo("0013");
}
@Test
@ -102,119 +101,122 @@ class PropertyFileUtilsTest {
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(),
entry.getNewValue())).isEqualTo("1-foo");
assertThat(p.getProperty(entry.key())).as(String.format("processString(%s, %s)", entry.key(),
entry.newValue())).isEqualTo("1-foo");
}
@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 parseStringCat() {
var entry = newEntry();
entry.set(t).setModify("-foo", String::concat);
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.getKey())).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
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).setModify("T", (v, s) -> v.replace("t", s));
entry.set(t).modify("T", (v, s) -> v.replace("t", s));
PropertyFileUtils.processString(p, entry);
assertThat(p.getProperty(entry.getKey())).as("replace(t -> T)").isEqualTo("TesT");
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
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
void parseTimeTest() throws Exception {
void parseTimeTest() {
var entry = new EntryDate("time").pattern("m");
var time = LocalTime.now();
entry.setCalc(ADD);
PropertyFileUtils.processDate(t, p, entry.set(time).unit(EntryDate.Units.MINUTE), true);
assertThat(p.getProperty(entry.getKey())).as("processDate(now+1)")
entry.calc(ADD);
PropertyFileUtils.processDate(p, entry.set(time).unit(EntryDate.Units.MINUTE));
assertThat(p.getProperty(entry.key())).as("processDate(now+1)")
.isEqualTo(String.valueOf(time.plusMinutes(1).getMinute()));
entry.setCalc(SUB);
PropertyFileUtils.processDate(t, p, entry.set(time).unit(EntryDate.Units.HOUR).pattern("H"), true);
assertThat(p.getProperty(entry.getKey())).as("processDate(now+1)")
entry.calc(SUB);
PropertyFileUtils.processDate(p, entry.set(time).unit(EntryDate.Units.HOUR).pattern("H"));
assertThat(p.getProperty(entry.key())).as("processDate(now+1)")
.isEqualTo(String.valueOf(time.minusHours(1).getHour()));
}
@Test
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
void processDateAddTest() throws Exception {
void processDateAddTest() {
var entryDate = newEntryDate();
entryDate.setCalc(ADD);
PropertyFileUtils.processDate(t, p, entryDate.now(), true);
assertThat(p.getProperty(entryDate.getKey())).as("processDate(now+1)").isEqualTo(String.valueOf(dayOfYear + 1));
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(t, p, entryDate.now().calc(v -> v + 3), true);
assertThat(p.getProperty(entryDate.getKey())).as("processDate(now+3)").isEqualTo(String.valueOf(dayOfYear + 3));
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.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));
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(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));
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.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));
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
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
void processIntAddTest() throws Exception {
var entryInt = newEntryInt();
entryInt.calc(ADD);
entryInt.setDefaultValue("-1");
PropertyFileUtils.processInt(t, p, entryInt, true);
assertThat(p.getProperty(entryInt.getKey())).as("add(-1)").isEqualTo("0");
void processIntAddTest() {
var entryInt = newEntryInt().calc(ADD).defaultValue("-1");
PropertyFileUtils.processInt(p, entryInt);
assertThat(p.getProperty(entryInt.key())).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.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.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.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(t, p, entryInt, true);
assertThat(p.getProperty(entryInt.getKey())).as("add(0015)+2").isEqualTo("0017");
PropertyFileUtils.processInt(p, entryInt);
assertThat(p.getProperty(entryInt.key())).as("add(0015)+2").isEqualTo("0017");
}
@Test
@ -222,18 +224,17 @@ class PropertyFileUtilsTest {
var entry = newEntry();
PropertyFileUtils.processString(p, entry);
assertThat(entry.getNewValue()).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
.isEqualTo(p.getProperty(entry.getKey()));
assertThat(entry.newValue()).as(String.format("processString(%s, %s)", entry.key(), entry.newValue()))
.isEqualTo(p.getProperty(entry.key()));
entry.setKey("version.minor");
entry.key("version.minor");
PropertyFileUtils.processString(p, entry.set(0));
assertThat(entry.getNewValue().toString()).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
.isEqualTo(p.getProperty(entry.getKey()));
assertThat(entry.newValue().toString()).as(String.format("processString(%s, %s)", entry.key(), entry.newValue()))
.isEqualTo(p.getProperty(entry.key()));
}
@Test
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
void savePropertiesTest() throws Exception {
var p = new Properties();
var test = "test";
@ -245,13 +246,22 @@ class PropertyFileUtilsTest {
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(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";
@ -267,9 +277,9 @@ class PropertyFileUtilsTest {
@Test
void testWarn() {
assertThatCode(() -> PropertyFileUtils.warn("command", "message", new IOException(t), true))
.hasMessage(t).isInstanceOf(IOException.class);
assertThatCode(() -> PropertyFileUtils.warn("command", t, new Exception(t), false))
assertThatCode(() -> PropertyFileUtils.warn("command", "message", true, false))
.isInstanceOf(ExitStatusException.class);
assertThatCode(() -> PropertyFileUtils.warn("command", t, false, false))
.as("failOnWarning = false").doesNotThrowAnyException();
}
}