Compare commits
48 commits
Author | SHA1 | Date | |
---|---|---|---|
8f405448d2 | |||
9e6ac15b75 | |||
ec09c06b3d | |||
17742ad075 | |||
6139eb8245 | |||
3eab7e7b5e | |||
0218439665 | |||
0ddf538af9 | |||
ee124c567e | |||
33c3e22861 | |||
3b5b2596ea | |||
cc755c7b1e | |||
ca4ba41e21 | |||
7637f90bc5 | |||
7af0b06d14 | |||
75abe7c657 | |||
4571ce9767 | |||
d27869df5d | |||
3758df5080 | |||
4162c64ab9 | |||
69a431e6ab | |||
daf45f674c | |||
94efbbf7df | |||
f8cceedc35 | |||
77b9ea0f61 | |||
4fa6ec6306 | |||
592a269ec8 | |||
791db7f890 | |||
ade7898516 | |||
2600e74be7 | |||
15034b4363 | |||
2c796a1260 | |||
c1774e61ab | |||
7714e1028c | |||
accf0d638a | |||
fb75d12740 | |||
23540cbc8e | |||
dacacbab56 | |||
b8cd4925a3 | |||
bd27eac071 | |||
3db6ca026d | |||
f2eeb1f1f9 | |||
09cdfea6b8 | |||
2b5f29a016 | |||
375c4a70e2 | |||
2df3714d7a | |||
6faaa0aa57 | |||
1a2362d511 |
34 changed files with 677 additions and 598 deletions
41
.github/workflows/bld.yml
vendored
41
.github/workflows/bld.yml
vendored
|
@ -4,29 +4,48 @@ on: [ push, pull_request, workflow_dispatch ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-bld-project:
|
build-bld-project:
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
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:
|
steps:
|
||||||
- name: Checkout source repository
|
- name: Checkout source repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up JDK ${{ matrix.java-version }}
|
- name: Set up JDK ${{ matrix.java-version }}
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: "zulu"
|
||||||
java-version: ${{ matrix.java-version }}
|
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
|
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
|
run: ./bld compile test
|
12
.github/workflows/pages.yml
vendored
12
.github/workflows/pages.yml
vendored
|
@ -30,14 +30,14 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout source repository
|
- name: Checkout source repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up JDK 17
|
- name: Set up JDK 17
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: "zulu"
|
||||||
java-version: 17
|
java-version: 17
|
||||||
|
|
||||||
- name: Build Javadocs
|
- name: Build Javadocs
|
||||||
|
@ -47,11 +47,11 @@ jobs:
|
||||||
uses: actions/configure-pages@v3
|
uses: actions/configure-pages@v3
|
||||||
|
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
uses: actions/upload-pages-artifact@v1
|
uses: actions/upload-pages-artifact@v3
|
||||||
with:
|
with:
|
||||||
# Upload generated Javadocs repository
|
# Upload generated Javadocs repository
|
||||||
path: 'build/javadoc/'
|
path: "build/javadoc/"
|
||||||
|
|
||||||
- name: Deploy to GitHub Pages
|
- name: Deploy to GitHub Pages
|
||||||
id: deployment
|
id: deployment
|
||||||
uses: actions/deploy-pages@v1
|
uses: actions/deploy-pages@v4
|
||||||
|
|
6
.idea/bld.xml
generated
Normal file
6
.idea/bld.xml
generated
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="BldConfiguration">
|
||||||
|
<events />
|
||||||
|
</component>
|
||||||
|
</project>
|
2
.idea/copyright/Apache_License.xml
generated
2
.idea/copyright/Apache_License.xml
generated
|
@ -1,6 +1,6 @@
|
||||||
<component name="CopyrightManager">
|
<component name="CopyrightManager">
|
||||||
<copyright>
|
<copyright>
|
||||||
<option name="notice" value="Copyright 2023-Copyright &#36;today.yearamp;#36;today.year 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." />
|
<option name="notice" value="Copyright 2023-&#36;today.year 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." />
|
||||||
<option name="myName" value="Apache License" />
|
<option name="myName" value="Apache License" />
|
||||||
</copyright>
|
</copyright>
|
||||||
</component>
|
</component>
|
13
.idea/icon.svg
generated
Normal file
13
.idea/icon.svg
generated
Normal 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 |
4
.idea/libraries/bld.xml
generated
4
.idea/libraries/bld.xml
generated
|
@ -2,12 +2,12 @@
|
||||||
<library name="bld">
|
<library name="bld">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||||
<root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0.jar!/" />
|
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||||
<root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0-sources.jar!/" />
|
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1-sources.jar!/" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<excluded>
|
<excluded>
|
||||||
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
|
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
|
||||||
|
|
4
.idea/libraries/compile.xml
generated
4
.idea/libraries/compile.xml
generated
|
@ -7,7 +7,7 @@
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
</SOURCES>
|
</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>
|
</library>
|
||||||
</component>
|
</component>
|
4
.idea/libraries/runtime.xml
generated
4
.idea/libraries/runtime.xml
generated
|
@ -7,7 +7,7 @@
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/runtime" />
|
<root url="file://$PROJECT_DIR$/lib/runtime" />
|
||||||
</SOURCES>
|
</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>
|
</library>
|
||||||
</component>
|
</component>
|
4
.idea/libraries/test.xml
generated
4
.idea/libraries/test.xml
generated
|
@ -7,7 +7,7 @@
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
</SOURCES>
|
</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>
|
</library>
|
||||||
</component>
|
</component>
|
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
|
@ -9,7 +9,7 @@
|
||||||
],
|
],
|
||||||
"java.configuration.updateBuildConfiguration": "automatic",
|
"java.configuration.updateBuildConfiguration": "automatic",
|
||||||
"java.project.referencedLibraries": [
|
"java.project.referencedLibraries": [
|
||||||
"${HOME}/.bld/dist/bld-1.9.0.jar",
|
"${HOME}/.bld/dist/bld-2.2.1.jar",
|
||||||
"lib/**/*.jar"
|
"lib/**/*.jar"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
27
README.md
27
README.md
|
@ -2,14 +2,22 @@
|
||||||
|
|
||||||
[](https://opensource.org/licenses/Apache-2.0)
|
[](https://opensource.org/licenses/Apache-2.0)
|
||||||
[](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
|
[](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
|
||||||
[](https://rife2.com/bld)
|
[](https://rife2.com/bld)
|
||||||
[](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-property-file)
|
[](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-property-file)
|
||||||
[](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-property-file)
|
[](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-property-file)
|
||||||
[](https://github.com/rife2/bld-property-file/actions/workflows/bld.yml)
|
[](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
|
```java
|
||||||
@BuildCommand
|
@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).
|
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 |
|
| Function | Description/Example |
|
||||||
|:-----------------|:--------------------------------------------------------------------------------------------------------|
|
|:-----------------|:--------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
| `defaultValue()` | The value to be used if the property doesn't exist. |
|
| `defaultValue()` | The value to be used if the property doesn't exist. |
|
||||||
| `delete()` | Delete the property. |
|
| `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())` |
|
||||||
| `set()` | The value to set the property to, regardless of its previous value. |
|
| `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
|
## EntryDate
|
||||||
|
|
||||||
|
|
|
@ -7,9 +7,9 @@
|
||||||
<!-- BEST PRACTICES -->
|
<!-- BEST PRACTICES -->
|
||||||
<rule ref="category/java/bestpractices.xml">
|
<rule ref="category/java/bestpractices.xml">
|
||||||
<exclude name="AvoidPrintStackTrace"/>
|
<exclude name="AvoidPrintStackTrace"/>
|
||||||
<exclude name="JUnit4TestShouldUseTestAnnotation"/>
|
|
||||||
<exclude name="JUnitTestContainsTooManyAsserts"/>
|
|
||||||
<exclude name="GuardLogStatement"/>
|
<exclude name="GuardLogStatement"/>
|
||||||
|
<exclude name="UnitTestContainsTooManyAsserts"/>
|
||||||
|
<exclude name="UnitTestShouldUseTestAnnotation"/>
|
||||||
</rule>
|
</rule>
|
||||||
|
|
||||||
<rule ref="category/java/bestpractices.xml/MissingOverride">
|
<rule ref="category/java/bestpractices.xml/MissingOverride">
|
||||||
|
@ -24,8 +24,8 @@
|
||||||
<rule ref="category/java/codestyle.xml">
|
<rule ref="category/java/codestyle.xml">
|
||||||
<exclude name="AtLeastOneConstructor"/>
|
<exclude name="AtLeastOneConstructor"/>
|
||||||
<exclude name="ClassNamingConventions"/>
|
<exclude name="ClassNamingConventions"/>
|
||||||
<exclude name="ConfusingTernary"/>
|
|
||||||
<exclude name="CommentDefaultAccessModifier"/>
|
<exclude name="CommentDefaultAccessModifier"/>
|
||||||
|
<exclude name="ConfusingTernary"/>
|
||||||
<exclude name="FieldNamingConventions"/>
|
<exclude name="FieldNamingConventions"/>
|
||||||
<exclude name="LocalVariableCouldBeFinal"/>
|
<exclude name="LocalVariableCouldBeFinal"/>
|
||||||
<exclude name="LongVariable"/>
|
<exclude name="LongVariable"/>
|
||||||
|
@ -35,8 +35,15 @@
|
||||||
<exclude name="ShortClassName"/>
|
<exclude name="ShortClassName"/>
|
||||||
<exclude name="ShortMethodName"/>
|
<exclude name="ShortMethodName"/>
|
||||||
<exclude name="ShortVariable"/>
|
<exclude name="ShortVariable"/>
|
||||||
<exclude name="UselessParentheses"/>
|
<exclude name="UseExplicitTypes"/>
|
||||||
<exclude name="UseUnderscoresInNumericLiterals"/>
|
<exclude name="UseUnderscoresInNumericLiterals"/>
|
||||||
|
<exclude name="UselessParentheses"/>
|
||||||
|
</rule>
|
||||||
|
|
||||||
|
<rule ref="category/java/codestyle.xml/UnnecessaryImport">
|
||||||
|
<properties>
|
||||||
|
<property name="violationSuppressRegex" value="Unused (static|.*\.\*).*"/>
|
||||||
|
</properties>
|
||||||
</rule>
|
</rule>
|
||||||
|
|
||||||
<!-- DESIGN -->
|
<!-- DESIGN -->
|
||||||
|
@ -46,8 +53,6 @@
|
||||||
<exclude name="AvoidUncheckedExceptionsInSignatures"/>
|
<exclude name="AvoidUncheckedExceptionsInSignatures"/>
|
||||||
<exclude name="CognitiveComplexity"/>
|
<exclude name="CognitiveComplexity"/>
|
||||||
<exclude name="CyclomaticComplexity"/>
|
<exclude name="CyclomaticComplexity"/>
|
||||||
<exclude name="ExcessiveClassLength"/>
|
|
||||||
<exclude name="ExcessiveMethodLength"/>
|
|
||||||
<exclude name="ExcessiveParameterList"/>
|
<exclude name="ExcessiveParameterList"/>
|
||||||
<exclude name="ExcessivePublicCount"/>
|
<exclude name="ExcessivePublicCount"/>
|
||||||
<exclude name="GodClass"/>
|
<exclude name="GodClass"/>
|
||||||
|
|
4
examples/.idea/libraries/bld.xml
generated
4
examples/.idea/libraries/bld.xml
generated
|
@ -2,12 +2,12 @@
|
||||||
<library name="bld">
|
<library name="bld">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||||
<root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0.jar!/" />
|
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
|
||||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0-sources.jar!/" />
|
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1-sources.jar!/" />
|
||||||
<root url="file://$PROJECT_DIR$/lib/bld" />
|
<root url="file://$PROJECT_DIR$/lib/bld" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
<jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" />
|
<jarDirectory url="file://$PROJECT_DIR$/lib/bld" recursive="false" />
|
||||||
|
|
4
examples/.idea/libraries/compile.xml
generated
4
examples/.idea/libraries/compile.xml
generated
|
@ -7,7 +7,7 @@
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/compile" />
|
<root url="file://$PROJECT_DIR$/lib/compile" />
|
||||||
</SOURCES>
|
</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>
|
</library>
|
||||||
</component>
|
</component>
|
4
examples/.idea/libraries/runtime.xml
generated
4
examples/.idea/libraries/runtime.xml
generated
|
@ -7,7 +7,7 @@
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/runtime" />
|
<root url="file://$PROJECT_DIR$/lib/runtime" />
|
||||||
</SOURCES>
|
</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>
|
</library>
|
||||||
</component>
|
</component>
|
4
examples/.idea/libraries/test.xml
generated
4
examples/.idea/libraries/test.xml
generated
|
@ -7,7 +7,7 @@
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
<root url="file://$PROJECT_DIR$/lib/test" />
|
<root url="file://$PROJECT_DIR$/lib/test" />
|
||||||
</SOURCES>
|
</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>
|
</library>
|
||||||
</component>
|
</component>
|
2
examples/.vscode/settings.json
vendored
2
examples/.vscode/settings.json
vendored
|
@ -9,7 +9,7 @@
|
||||||
],
|
],
|
||||||
"java.configuration.updateBuildConfiguration": "automatic",
|
"java.configuration.updateBuildConfiguration": "automatic",
|
||||||
"java.project.referencedLibraries": [
|
"java.project.referencedLibraries": [
|
||||||
"${HOME}/.bld/dist/bld-1.9.0.jar",
|
"${HOME}/.bld/dist/bld-2.2.1.jar",
|
||||||
"lib/**/*.jar"
|
"lib/**/*.jar"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,3 +3,18 @@
|
||||||
```console
|
```console
|
||||||
./bld compile run
|
./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.
|
@ -1,6 +1,6 @@
|
||||||
#Sun Apr 02 10:32:44 PDT 2023
|
#Sun Apr 02 10:32:44 PDT 2023
|
||||||
bld.extension=com.uwyn.rife2:bld-property-file:0.9.5
|
|
||||||
bld.repositories=MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
|
|
||||||
bld.downloadExtensionSources=true
|
bld.downloadExtensionSources=true
|
||||||
bld.downloadLocation=
|
bld.downloadLocation=
|
||||||
bld.version=1.9.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
|
||||||
|
|
|
@ -42,15 +42,15 @@ public class PropertyFileExampleBuild extends Project {
|
||||||
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
|
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
|
||||||
|
|
||||||
scope(test)
|
scope(test)
|
||||||
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
|
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
|
||||||
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)));
|
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
new PropertyFileExampleBuild().start(args);
|
new PropertyFileExampleBuild().start(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
@BuildCommand(summary = "Updates major version")
|
@BuildCommand(value = "update-major", summary = "Updates major version")
|
||||||
public void updateMajor() throws Exception {
|
public void updateMajor() throws Exception {
|
||||||
new PropertyFileOperation()
|
new PropertyFileOperation()
|
||||||
.fromProject(this)
|
.fromProject(this)
|
||||||
|
@ -66,7 +66,7 @@ public class PropertyFileExampleBuild extends Project {
|
||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
@BuildCommand(summary = "Updates minor version")
|
@BuildCommand(value = "update-minor", summary = "Updates minor version")
|
||||||
public void updateMinor() throws Exception {
|
public void updateMinor() throws Exception {
|
||||||
new PropertyFileOperation()
|
new PropertyFileOperation()
|
||||||
.fromProject(this)
|
.fromProject(this)
|
||||||
|
@ -82,7 +82,7 @@ public class PropertyFileExampleBuild extends Project {
|
||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
@BuildCommand(summary = "Updates patch version")
|
@BuildCommand(value = "update-patch", summary = "Updates patch version")
|
||||||
public void updatePatch() throws Exception {
|
public void updatePatch() throws Exception {
|
||||||
new PropertyFileOperation()
|
new PropertyFileOperation()
|
||||||
.fromProject(this)
|
.fromProject(this)
|
||||||
|
@ -98,7 +98,7 @@ public class PropertyFileExampleBuild extends Project {
|
||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
@BuildCommand(summary = "Updates the release")
|
@BuildCommand(value = "update-release", summary = "Updates the release")
|
||||||
public void updateRelease() throws Exception {
|
public void updateRelease() throws Exception {
|
||||||
new PropertyFileOperation()
|
new PropertyFileOperation()
|
||||||
.fromProject(this)
|
.fromProject(this)
|
||||||
|
@ -107,10 +107,11 @@ public class PropertyFileExampleBuild extends Project {
|
||||||
.entry(new EntryDate("release").now().pattern("yyyyMMddHHmmss"))
|
.entry(new EntryDate("release").now().pattern("yyyyMMddHHmmss"))
|
||||||
// prepend 'beta.' to the release
|
// prepend 'beta.' to the release
|
||||||
.entry(new Entry("release").modify("beta.", (v, s) -> s + v))
|
.entry(new Entry("release").modify("beta.", (v, s) -> s + v))
|
||||||
|
.entry(buildDateEntry)
|
||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
@BuildCommand(summary = "Delete version properties")
|
@BuildCommand(value = "delete-version", summary = "Delete version properties")
|
||||||
public void deleteVersion() throws Exception {
|
public void deleteVersion() throws Exception {
|
||||||
new PropertyFileOperation()
|
new PropertyFileOperation()
|
||||||
.fromProject(this)
|
.fromProject(this)
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#
|
#
|
||||||
#Sun Oct 22 14:31:42 PDT 2023
|
#Mon Jan 13 22:23:02 PST 2025
|
||||||
release=beta.20231022143142
|
build.date=2025-01-13
|
||||||
version.major=1
|
release=beta.20250113222132
|
||||||
version.minor=0
|
version.major=3
|
||||||
version.patch=1
|
version.minor=1
|
||||||
|
version.patch=20
|
||||||
|
|
Binary file not shown.
|
@ -1,7 +1,6 @@
|
||||||
bld.downloadExtensionJavadoc=false
|
bld.downloadExtensionJavadoc=false
|
||||||
bld.downloadExtensionSources=true
|
bld.downloadExtensionSources=true
|
||||||
bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.7
|
|
||||||
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.3
|
|
||||||
bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
|
|
||||||
bld.downloadLocation=
|
bld.downloadLocation=
|
||||||
bld.version=1.9.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
|
||||||
|
|
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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.BuildCommand;
|
||||||
import rife.bld.Project;
|
import rife.bld.Project;
|
||||||
import rife.bld.extension.JacocoReportOperation;
|
|
||||||
import rife.bld.extension.PmdOperation;
|
import rife.bld.extension.PmdOperation;
|
||||||
import rife.bld.publish.PublishDeveloper;
|
import rife.bld.publish.PublishDeveloper;
|
||||||
import rife.bld.publish.PublishLicense;
|
import rife.bld.publish.PublishLicense;
|
||||||
import rife.bld.publish.PublishScm;
|
import rife.bld.publish.PublishScm;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
|
import static rife.bld.dependencies.Repository.*;
|
||||||
import static rife.bld.dependencies.Repository.RIFE2_RELEASES;
|
|
||||||
import static rife.bld.dependencies.Scope.compile;
|
import static rife.bld.dependencies.Scope.compile;
|
||||||
import static rife.bld.dependencies.Scope.test;
|
import static rife.bld.dependencies.Scope.test;
|
||||||
import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;
|
import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;
|
||||||
|
@ -37,19 +34,19 @@ public class PropertyFileBuild extends Project {
|
||||||
public PropertyFileBuild() {
|
public PropertyFileBuild() {
|
||||||
pkg = "rife.bld.extension";
|
pkg = "rife.bld.extension";
|
||||||
name = "bld-property-file";
|
name = "bld-property-file";
|
||||||
version = version(0, 9, 5);
|
version = version(0, 9, 9);
|
||||||
|
|
||||||
javaRelease = 17;
|
javaRelease = 17;
|
||||||
downloadSources = true;
|
downloadSources = true;
|
||||||
autoDownloadPurge = true;
|
autoDownloadPurge = true;
|
||||||
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
|
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
|
||||||
|
|
||||||
scope(compile)
|
scope(compile)
|
||||||
.include(dependency("com.uwyn.rife2", "bld", version(1, 9, 0)));
|
.include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1)));
|
||||||
scope(test)
|
scope(test)
|
||||||
.include(dependency("org.jsoup", "jsoup", version(1, 17, 2)))
|
.include(dependency("org.jsoup", "jsoup", version(1, 19, 1)))
|
||||||
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
|
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
|
||||||
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)))
|
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)))
|
||||||
.include(dependency("org.assertj:assertj-joda-time:2.2.0"));
|
.include(dependency("org.assertj:assertj-joda-time:2.2.0"));
|
||||||
|
|
||||||
javadocOperation()
|
javadocOperation()
|
||||||
|
@ -61,6 +58,7 @@ public class PropertyFileBuild extends Project {
|
||||||
|
|
||||||
publishOperation()
|
publishOperation()
|
||||||
.repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2"))
|
.repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2"))
|
||||||
|
.repository(repository("github"))
|
||||||
.info()
|
.info()
|
||||||
.groupId("com.uwyn.rife2")
|
.groupId("com.uwyn.rife2")
|
||||||
.artifactId("bld-property-file")
|
.artifactId("bld-property-file")
|
||||||
|
@ -82,7 +80,7 @@ public class PropertyFileBuild extends Project {
|
||||||
.license(
|
.license(
|
||||||
new PublishLicense()
|
new PublishLicense()
|
||||||
.name("The Apache License, Version 2.0")
|
.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(
|
.scm(
|
||||||
new PublishScm().connection("scm:git:https://github.com/rife2/bld-property-file.git")
|
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);
|
new PropertyFileBuild().start(args);
|
||||||
}
|
}
|
||||||
|
|
||||||
@BuildCommand(summary = "Generates JaCoCo Reports")
|
|
||||||
public void jacoco() throws IOException {
|
|
||||||
new JacocoReportOperation()
|
|
||||||
.fromProject(this)
|
|
||||||
.execute();
|
|
||||||
}
|
|
||||||
|
|
||||||
@BuildCommand(summary = "Runs PMD analysis")
|
@BuildCommand(summary = "Runs PMD analysis")
|
||||||
public void pmd() {
|
public void pmd() throws Exception {
|
||||||
new PmdOperation()
|
new PmdOperation()
|
||||||
.fromProject(this)
|
.fromProject(this)
|
||||||
.failOnViolation(true)
|
.failOnViolation(true)
|
||||||
|
|
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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>
|
* @author <a href="https://github.com/gbevin">Geert Bevin</a>
|
||||||
* @since 1.0
|
* @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) {
|
public Entry(String key) {
|
||||||
super(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 modify function
|
||||||
* @return the entry
|
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unused")
|
protected BiFunction<String, String, String> modify() {
|
||||||
public Entry defaultValue(Object defaultValue) {
|
return modify_;
|
||||||
setDefaultValue(defaultValue);
|
|
||||||
return this;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the {@link Entry entry} up for deletion.
|
* Sets the modify function.
|
||||||
*
|
*
|
||||||
* @return the entry
|
* @param modify the modify function
|
||||||
*/
|
|
||||||
public Entry delete() {
|
|
||||||
setDelete(true);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new {@link Entry entry}.
|
|
||||||
*
|
|
||||||
* @param modify the modification function
|
|
||||||
* @return the entry
|
|
||||||
*/
|
*/
|
||||||
public Entry modify(BiFunction<String, String, String> modify) {
|
public Entry modify(BiFunction<String, String, String> modify) {
|
||||||
setModify(modify);
|
modify_ = modify;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new {@link Entry entry}.
|
* Sets the modify function.
|
||||||
*
|
*
|
||||||
* @param value the value to perform a modification with
|
* @param value the value to perform a modification with
|
||||||
* @param modify the modification function
|
* @param modify the modify function
|
||||||
* @return the entry
|
|
||||||
*/
|
*/
|
||||||
public Entry modify(String value, BiFunction<String, String, String> modify) {
|
public Entry modify(String value, BiFunction<String, String, String> modify) {
|
||||||
setModifyValue(value);
|
modifyValue_ = value;
|
||||||
setModify(modify);
|
modify_ = modify;
|
||||||
return this;
|
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.
|
* Sets the new {@link java.util.Properties property} value.
|
||||||
*
|
*
|
||||||
|
@ -88,7 +85,7 @@ public class Entry extends EntryBase {
|
||||||
* @return the entry
|
* @return the entry
|
||||||
*/
|
*/
|
||||||
public Entry set(Object s) {
|
public Entry set(Object s) {
|
||||||
setNewValue(s);
|
newValue(s);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
package rife.bld.extension.propertyfile;
|
package rife.bld.extension.propertyfile;
|
||||||
|
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import java.util.function.IntFunction;
|
import java.util.function.IntFunction;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -26,17 +25,14 @@ import java.util.function.IntFunction;
|
||||||
* @author <a href="https://github.com/gbevin">Geert Bevin</a>
|
* @author <a href="https://github.com/gbevin">Geert Bevin</a>
|
||||||
* @since 1.0
|
* @since 1.0
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("PMD.DataClass")
|
@SuppressWarnings({"unchecked", "PMD.AbstractClassWithoutAbstractMethod"})
|
||||||
public class EntryBase {
|
public abstract class EntryBase<T> {
|
||||||
private IntFunction<Integer> calc;
|
private IntFunction<Integer> calc_;
|
||||||
private Object defaultValue;
|
private Object defaultValue_;
|
||||||
private boolean isDelete;
|
private boolean isDelete_;
|
||||||
private String key;
|
private String key_;
|
||||||
private BiFunction<String, String, String> modify;
|
private Object newValue_;
|
||||||
private String modifyValue = "";
|
private Object pattern_;
|
||||||
private Object newValue;
|
|
||||||
private String pattern = "";
|
|
||||||
private EntryDate.Units unit = EntryDate.Units.DAY;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new {@link EntryBase entry}.
|
* Creates a new {@link EntryBase entry}.
|
||||||
|
@ -44,7 +40,7 @@ public class EntryBase {
|
||||||
* @param key the required property key
|
* @param key the required property key
|
||||||
*/
|
*/
|
||||||
public EntryBase(String key) {
|
public EntryBase(String key) {
|
||||||
this.key = key;
|
key_ = key;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -52,8 +48,18 @@ public class EntryBase {
|
||||||
*
|
*
|
||||||
* @return the calc function
|
* @return the calc function
|
||||||
*/
|
*/
|
||||||
protected IntFunction<Integer> getCalc() {
|
protected IntFunction<Integer> calc() {
|
||||||
return 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
|
* @return the default value
|
||||||
*/
|
*/
|
||||||
protected Object getDefaultValue() {
|
protected Object defaultValue() {
|
||||||
return 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() {
|
public T defaultValue(Object defaultValue) {
|
||||||
return key;
|
defaultValue_ = defaultValue;
|
||||||
|
return (T) this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the modify function.
|
* Indicates that the {@link java.util.Properties property} is to be deleted.
|
||||||
*
|
|
||||||
* @return the modify function
|
|
||||||
*/
|
*/
|
||||||
protected BiFunction<String, String, String> getModify() {
|
public T delete() {
|
||||||
return modify;
|
isDelete_ = true;
|
||||||
}
|
return (T) this;
|
||||||
|
|
||||||
/**
|
|
||||||
* 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -125,7 +95,16 @@ public class EntryBase {
|
||||||
* @return {@code true} or {@code false}
|
* @return {@code true} or {@code false}
|
||||||
*/
|
*/
|
||||||
protected boolean isDelete() {
|
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
|
* @param key the {@link java.util.Properties property} key
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unused")
|
public T key(String key) {
|
||||||
public EntryBase key(String key) {
|
key_ = key;
|
||||||
setKey(key);
|
return (T) this;
|
||||||
return 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) {
|
protected Object newValue() {
|
||||||
this.calc = calc;
|
return newValue_;
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -210,26 +132,26 @@ public class EntryBase {
|
||||||
*
|
*
|
||||||
* @param newValue the new value
|
* @param newValue the new value
|
||||||
*/
|
*/
|
||||||
public void setNewValue(Object newValue) {
|
protected void newValue(Object newValue) {
|
||||||
this.newValue = newValue;
|
newValue_ = newValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the {@link java.text.DecimalFormat DecimalFormat} or {@link java.time.format.DateTimeFormatter DateTimeFormatter}
|
* Returns the pattern.
|
||||||
* pattern to be used with {@link EntryDate} or {@link EntryInt} respectively.
|
*
|
||||||
|
* @return the pattern
|
||||||
|
*/
|
||||||
|
protected Object pattern() {
|
||||||
|
return pattern_;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the {@link java.util.Formatter} pattern.
|
||||||
*
|
*
|
||||||
* @param pattern the pattern
|
* @param pattern the pattern
|
||||||
*/
|
*/
|
||||||
protected void setPattern(String pattern) {
|
public T pattern(Object pattern) {
|
||||||
this.pattern = pattern;
|
pattern_ = pattern;
|
||||||
}
|
return (T) this;
|
||||||
|
|
||||||
/**
|
|
||||||
* 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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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.time.*;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.function.IntFunction;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Declares the modifications to be made to a {@link java.util.Properties Date-based property}.
|
* 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>
|
* @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
|
||||||
* @since 1.0
|
* @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
|
* @param key the required property key
|
||||||
*/
|
*/
|
||||||
|
@ -37,46 +38,23 @@ public class EntryDate extends EntryBase {
|
||||||
super(key);
|
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.
|
* Sets the new {@link java.util.Properties property} value to now.
|
||||||
*
|
*
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public EntryDate now() {
|
public EntryDate now() {
|
||||||
setNewValue("now");
|
newValue("now");
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the pattern for {@link EntryInt} and {@link EntryDate} to{@link java.text.DecimalFormat DecimalFormat} and
|
* Sets the {@link java.time.format.DateTimeFormatter DateTimeFormatter} pattern.
|
||||||
* {@link java.time.format.DateTimeFormatter DateTimeFormatter} respectively.
|
|
||||||
*
|
*
|
||||||
* @param pattern the pattern
|
* @param pattern the pattern
|
||||||
* @return this instance
|
|
||||||
*/
|
*/
|
||||||
public EntryDate pattern(String pattern) {
|
public EntryDate pattern(String pattern) {
|
||||||
setPattern(pattern);
|
super.pattern(pattern);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,7 +65,7 @@ public class EntryDate extends EntryBase {
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public EntryDate set(Instant instant) {
|
public EntryDate set(Instant instant) {
|
||||||
setNewValue(instant);
|
newValue(instant);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,7 +76,7 @@ public class EntryDate extends EntryBase {
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public EntryDate set(LocalDate date) {
|
public EntryDate set(LocalDate date) {
|
||||||
setNewValue(date);
|
newValue(date);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -109,7 +87,7 @@ public class EntryDate extends EntryBase {
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public EntryDate set(LocalDateTime date) {
|
public EntryDate set(LocalDateTime date) {
|
||||||
setNewValue(date);
|
newValue(date);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,7 +98,7 @@ public class EntryDate extends EntryBase {
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public EntryDate set(ZonedDateTime date) {
|
public EntryDate set(ZonedDateTime date) {
|
||||||
setNewValue(date);
|
newValue(date);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -131,7 +109,7 @@ public class EntryDate extends EntryBase {
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public EntryDate set(LocalTime time) {
|
public EntryDate set(LocalTime time) {
|
||||||
setNewValue(time);
|
newValue(time);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -142,7 +120,7 @@ public class EntryDate extends EntryBase {
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public EntryDate set(Calendar cal) {
|
public EntryDate set(Calendar cal) {
|
||||||
setNewValue(cal);
|
newValue(cal);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -153,10 +131,19 @@ public class EntryDate extends EntryBase {
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public EntryDate set(Date date) {
|
public EntryDate set(Date date) {
|
||||||
setNewValue(date);
|
newValue(date);
|
||||||
return this;
|
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}.
|
* 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
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public EntryDate unit(Units unit) {
|
public EntryDate unit(Units unit) {
|
||||||
setUnit(unit);
|
unit_ = unit;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -16,17 +16,15 @@
|
||||||
|
|
||||||
package rife.bld.extension.propertyfile;
|
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}.
|
* 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>
|
* @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
|
||||||
* @since 1.0
|
* @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
|
* @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.
|
* @param pattern the pattern
|
||||||
* @return this instance
|
|
||||||
*/
|
*/
|
||||||
public EntryInt calc(IntFunction<Integer> calc) {
|
public EntryInt pattern(String pattern) {
|
||||||
setCalc(calc);
|
super.pattern(pattern);
|
||||||
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);
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,7 +49,7 @@ public class EntryInt extends EntryBase {
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public EntryInt set(int i) {
|
public EntryInt set(int i) {
|
||||||
setNewValue(i);
|
newValue(i);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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.BaseProject;
|
||||||
import rife.bld.operations.AbstractOperation;
|
import rife.bld.operations.AbstractOperation;
|
||||||
|
import rife.bld.operations.exceptions.ExitStatusException;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates or applies edits to a {@link Properties Properties} file.
|
* Creates or applies edits to a {@link Properties Properties} file.
|
||||||
|
@ -31,11 +35,12 @@ import java.util.Properties;
|
||||||
* @since 1.0
|
* @since 1.0
|
||||||
*/
|
*/
|
||||||
public class PropertyFileOperation extends AbstractOperation<PropertyFileOperation> {
|
public class PropertyFileOperation extends AbstractOperation<PropertyFileOperation> {
|
||||||
private final List<EntryBase> entries = new ArrayList<>();
|
private static final Logger LOGGER = Logger.getLogger(PropertyFileOperation.class.getName());
|
||||||
private String comment = "";
|
private final List<EntryBase<?>> entries_ = new ArrayList<>();
|
||||||
private boolean failOnWarning;
|
private String comment_ = "";
|
||||||
private File file;
|
private boolean failOnWarning_;
|
||||||
private BaseProject project;
|
private File file_;
|
||||||
|
private BaseProject project_;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the comment to be inserted at the top of the {@link java.util.Properties} file.
|
* 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
|
* @param comment the header comment
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unused")
|
|
||||||
public PropertyFileOperation comment(String comment) {
|
public PropertyFileOperation comment(String comment) {
|
||||||
this.comment = comment;
|
comment_ = comment;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,9 +60,8 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
|
||||||
* @param entry the {@link Entry entry}
|
* @param entry the {@link Entry entry}
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unused")
|
public PropertyFileOperation entry(EntryBase<?> entry) {
|
||||||
public PropertyFileOperation entry(EntryBase entry) {
|
entries_.add(entry);
|
||||||
entries.add(entry);
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -67,38 +70,49 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void execute() throws Exception {
|
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 {
|
} else {
|
||||||
success = PropertyFileUtils.loadProperties(commandName, file, properties);
|
success = PropertyFileUtils.loadProperties(commandName, file_, properties, silent());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (success) {
|
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 {
|
} 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);
|
var p = properties.getProperty(key);
|
||||||
if (entry.isDelete()) {
|
if (entry.isDelete()) {
|
||||||
properties.remove(key);
|
properties.remove(key);
|
||||||
} else if ((value == null || String.valueOf(value).isBlank())
|
} else if ((value == null || String.valueOf(value).isBlank())
|
||||||
&& (defaultValue == null || String.valueOf(defaultValue).isBlank())
|
&& (defaultValue == null || String.valueOf(defaultValue).isBlank())
|
||||||
&& (p == null || p.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 {
|
} 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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -106,7 +120,7 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
|
||||||
}
|
}
|
||||||
|
|
||||||
if (success) {
|
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.
|
* @param failOnWarning if set to {@code true}, the execution will fail on any warnings.
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unused")
|
|
||||||
public PropertyFileOperation failOnWarning(boolean failOnWarning) {
|
public PropertyFileOperation failOnWarning(boolean failOnWarning) {
|
||||||
this.failOnWarning = failOnWarning;
|
failOnWarning_ = failOnWarning;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -128,9 +141,8 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
|
||||||
* @param file the file to be edited
|
* @param file the file to be edited
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unused")
|
|
||||||
public PropertyFileOperation file(File file) {
|
public PropertyFileOperation file(File file) {
|
||||||
this.file = file;
|
file_ = file;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -140,10 +152,27 @@ public class PropertyFileOperation extends AbstractOperation<PropertyFileOperati
|
||||||
* @param file the file to be edited
|
* @param file the file to be edited
|
||||||
* @return this instance
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unused")
|
|
||||||
public PropertyFileOperation file(String file) {
|
public PropertyFileOperation file(String file) {
|
||||||
this.file = new File(file);
|
return file(new File(file));
|
||||||
return this;
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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
|
* @return this instance
|
||||||
*/
|
*/
|
||||||
public PropertyFileOperation fromProject(BaseProject project) {
|
public PropertyFileOperation fromProject(BaseProject project) {
|
||||||
this.project = project;
|
project_ = project;
|
||||||
return this;
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -16,7 +16,8 @@
|
||||||
|
|
||||||
package rife.bld.extension.propertyfile;
|
package rife.bld.extension.propertyfile;
|
||||||
|
|
||||||
import javax.imageio.IIOException;
|
import rife.bld.operations.exceptions.ExitStatusException;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
@ -38,7 +39,7 @@ import java.util.logging.Logger;
|
||||||
* @since 1.0
|
* @since 1.0
|
||||||
*/
|
*/
|
||||||
public final class PropertyFileUtils {
|
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() {
|
private PropertyFileUtils() {
|
||||||
// no-op
|
// no-op
|
||||||
|
@ -69,167 +70,153 @@ public final class PropertyFileUtils {
|
||||||
* @param file the file location
|
* @param file the file location
|
||||||
* @param p the {@link Properties properties} to load into.
|
* @param p the {@link Properties properties} to load into.
|
||||||
* @return the boolean
|
* @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, boolean silent)
|
||||||
public static boolean loadProperties(String command, File file, Properties p) throws Exception {
|
throws ExitStatusException {
|
||||||
boolean success = true;
|
boolean success = true;
|
||||||
if (file != null) {
|
if (file != null) {
|
||||||
if (file.exists()) {
|
if (file.exists()) {
|
||||||
try (var propStream = Files.newInputStream(file.toPath(), StandardOpenOption.READ)) {
|
try (var propStream = Files.newInputStream(file.toPath(), StandardOpenOption.READ)) {
|
||||||
p.load(propStream);
|
p.load(propStream);
|
||||||
} catch (IOException ioe) {
|
} 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;
|
success = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
warn(command, "Please specify the properties file location.");
|
warn(command, "Please specify the properties file location.", true, silent);
|
||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static String objectToString(Object o) {
|
||||||
|
if (o == null) {
|
||||||
|
return "";
|
||||||
|
} else {
|
||||||
|
return String.valueOf(o);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Processes a date {@link Properties property}.
|
* Processes a date {@link Properties property}.
|
||||||
*
|
*
|
||||||
* @param command the issuing command
|
* @param p the {@link Properties property}
|
||||||
* @param p the {@link Properties property}
|
* @param entry the {@link Entry} containing the {@link Properties property} edits
|
||||||
* @param entry the {@link Entry} containing the {@link Properties property} edits
|
* @throws DateTimeException if a parsing error occurs
|
||||||
* @param failOnWarning the fail on warning
|
|
||||||
* @return the boolean
|
|
||||||
* @throws Exception the exception
|
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings({"PMD.SignatureDeclareThrowsException", "PMD.ExceptionAsFlowControl"})
|
@SuppressWarnings("PMD.ExceptionAsFlowControl")
|
||||||
public static boolean processDate(String command, Properties p, EntryDate entry, boolean failOnWarning)
|
public static void processDate(Properties p, EntryDate entry) throws IllegalArgumentException {
|
||||||
throws Exception {
|
var currentValue = currentValue(null, entry.defaultValue(), entry.newValue());
|
||||||
var success = true;
|
var pattern = objectToString(entry.pattern());
|
||||||
var value = currentValue(null, entry.getDefaultValue(),
|
|
||||||
entry.getNewValue());
|
|
||||||
|
|
||||||
var pattern = entry.getPattern();
|
var dateValue = String.valueOf(currentValue);
|
||||||
|
|
||||||
String parsedValue = String.valueOf(value);
|
|
||||||
if (pattern != null && !pattern.isBlank()) {
|
if (pattern != null && !pattern.isBlank()) {
|
||||||
var offset = 0;
|
var offset = 0;
|
||||||
|
|
||||||
if (entry.getCalc() != null) {
|
if (entry.calc() != null) {
|
||||||
offset = entry.getCalc().apply(offset);
|
offset = entry.calc().apply(offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
var dtf = DateTimeFormatter.ofPattern(pattern);
|
var dtf = DateTimeFormatter.ofPattern(pattern);
|
||||||
var unit = entry.getUnit();
|
var unit = entry.unit();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (value instanceof String) {
|
if (currentValue instanceof String) {
|
||||||
if ("now".equalsIgnoreCase((String) value)) {
|
if ("now".equalsIgnoreCase((String) currentValue)) {
|
||||||
value = ZonedDateTime.now();
|
currentValue = ZonedDateTime.now();
|
||||||
} else {
|
} else {
|
||||||
throw new DateTimeException("Excepted: Calendar, Date or java.time.");
|
throw new DateTimeException("Excepted: Calendar, Date or java.time.");
|
||||||
}
|
}
|
||||||
} else if (value instanceof LocalDateTime) {
|
} else if (currentValue instanceof LocalDateTime) {
|
||||||
value = ((LocalDateTime) value).atZone(ZoneId.systemDefault());
|
currentValue = ((LocalDateTime) currentValue).atZone(ZoneId.systemDefault());
|
||||||
} else if (value instanceof Date) {
|
} else if (currentValue instanceof Date) {
|
||||||
value = ((Date) value).toInstant().atZone(ZoneId.systemDefault());
|
currentValue = ((Date) currentValue).toInstant().atZone(ZoneId.systemDefault());
|
||||||
} else if (value instanceof Calendar) {
|
} else if (currentValue instanceof Calendar) {
|
||||||
value = ((Calendar) value).toInstant().atZone(ZoneId.systemDefault());
|
currentValue = ((Calendar) currentValue).toInstant().atZone(ZoneId.systemDefault());
|
||||||
} else if (value instanceof Instant) {
|
} else if (currentValue instanceof Instant) {
|
||||||
value = ((Instant) value).atZone(ZoneId.systemDefault());
|
currentValue = ((Instant) currentValue).atZone(ZoneId.systemDefault());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value instanceof LocalDate) {
|
if (currentValue instanceof LocalDate) {
|
||||||
if (offset != 0) {
|
if (offset != 0) {
|
||||||
if (unit == EntryDate.Units.DAY) {
|
if (unit == EntryDate.Units.DAY) {
|
||||||
value = ((LocalDate) value).plusDays(offset);
|
currentValue = ((LocalDate) currentValue).plusDays(offset);
|
||||||
} else if (unit == EntryDate.Units.MONTH) {
|
} else if (unit == EntryDate.Units.MONTH) {
|
||||||
value = ((LocalDate) value).plusMonths(offset);
|
currentValue = ((LocalDate) currentValue).plusMonths(offset);
|
||||||
} else if (unit == EntryDate.Units.WEEK) {
|
} else if (unit == EntryDate.Units.WEEK) {
|
||||||
value = ((LocalDate) value).plusWeeks(offset);
|
currentValue = ((LocalDate) currentValue).plusWeeks(offset);
|
||||||
} else if (unit == EntryDate.Units.YEAR) {
|
} else if (unit == EntryDate.Units.YEAR) {
|
||||||
value = ((LocalDate) value).plusYears(offset);
|
currentValue = ((LocalDate) currentValue).plusYears(offset);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
parsedValue = dtf.format((LocalDate) value);
|
dateValue = dtf.format((LocalDate) currentValue);
|
||||||
} else if (value instanceof LocalTime) {
|
} else if (currentValue instanceof LocalTime) {
|
||||||
if (offset != 0) {
|
if (offset != 0) {
|
||||||
if (unit == EntryDate.Units.SECOND) {
|
if (unit == EntryDate.Units.SECOND) {
|
||||||
value = ((LocalTime) value).plusSeconds(offset);
|
currentValue = ((LocalTime) currentValue).plusSeconds(offset);
|
||||||
} else if (unit == EntryDate.Units.MINUTE) {
|
} else if (unit == EntryDate.Units.MINUTE) {
|
||||||
value = ((LocalTime) value).plusMinutes(offset);
|
currentValue = ((LocalTime) currentValue).plusMinutes(offset);
|
||||||
} else if (unit == EntryDate.Units.HOUR) {
|
} else if (unit == EntryDate.Units.HOUR) {
|
||||||
value = ((LocalTime) value).plusHours(offset);
|
currentValue = ((LocalTime) currentValue).plusHours(offset);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
parsedValue = dtf.format((LocalTime) value);
|
dateValue = dtf.format((LocalTime) currentValue);
|
||||||
} else if (value instanceof ZonedDateTime) {
|
} else if (currentValue instanceof ZonedDateTime) {
|
||||||
if (offset != 0) {
|
if (offset != 0) {
|
||||||
if (unit == EntryDate.Units.DAY) {
|
if (unit == EntryDate.Units.DAY) {
|
||||||
value = ((ZonedDateTime) value).plusDays(offset);
|
currentValue = ((ZonedDateTime) currentValue).plusDays(offset);
|
||||||
} else if (unit == EntryDate.Units.MONTH) {
|
} else if (unit == EntryDate.Units.MONTH) {
|
||||||
value = ((ZonedDateTime) value).plusMonths(offset);
|
currentValue = ((ZonedDateTime) currentValue).plusMonths(offset);
|
||||||
} else if (unit == EntryDate.Units.WEEK) {
|
} else if (unit == EntryDate.Units.WEEK) {
|
||||||
value = ((ZonedDateTime) value).plusWeeks(offset);
|
currentValue = ((ZonedDateTime) currentValue).plusWeeks(offset);
|
||||||
} else if (unit == EntryDate.Units.YEAR) {
|
} else if (unit == EntryDate.Units.YEAR) {
|
||||||
value = ((ZonedDateTime) value).plusYears(offset);
|
currentValue = ((ZonedDateTime) currentValue).plusYears(offset);
|
||||||
} else if (unit == EntryDate.Units.SECOND) {
|
} else if (unit == EntryDate.Units.SECOND) {
|
||||||
value = ((ZonedDateTime) value).plusSeconds(offset);
|
currentValue = ((ZonedDateTime) currentValue).plusSeconds(offset);
|
||||||
} else if (unit == EntryDate.Units.MINUTE) {
|
} else if (unit == EntryDate.Units.MINUTE) {
|
||||||
value = ((ZonedDateTime) value).plusMinutes(offset);
|
currentValue = ((ZonedDateTime) currentValue).plusMinutes(offset);
|
||||||
} else if (unit == EntryDate.Units.HOUR) {
|
} 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) {
|
} catch (DateTimeException dte) {
|
||||||
warn(command, "Non-date value for \"" + entry.getKey() + "\" --> " + dte.getMessage(),
|
throw new IllegalArgumentException(
|
||||||
dte, failOnWarning);
|
"Non-date value for \"" + entry.key() + "\" --> " + dte.getMessage(), dte);
|
||||||
success = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
p.setProperty(entry.key(), dateValue);
|
||||||
if (success) {
|
|
||||||
p.setProperty(entry.getKey(), parsedValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
return success;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Processes an integer {@link Properties property}.
|
* Processes an integer {@link Properties property}.
|
||||||
*
|
*
|
||||||
* @param command the issuing command
|
* @param p the {@link Properties property}
|
||||||
* @param p the {@link Properties property}
|
* @param entry the {@link Entry} containing the {@link Properties property} edits
|
||||||
* @param entry the {@link Entry} containing the {@link Properties property} edits
|
* @throws NumberFormatException if a parsing error occurs
|
||||||
* @param failOnWarning the fail on warning
|
|
||||||
* @return the boolean
|
|
||||||
* @throws Exception the exception
|
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
|
public static void processInt(Properties p, EntryInt entry) throws IllegalArgumentException {
|
||||||
public static boolean processInt(String command, Properties p, EntryInt entry, boolean failOnWarning)
|
|
||||||
throws Exception {
|
|
||||||
var success = true;
|
|
||||||
int intValue = 0;
|
int intValue = 0;
|
||||||
try {
|
try {
|
||||||
var fmt = new DecimalFormat(entry.getPattern());
|
var fmt = new DecimalFormat(objectToString(entry.pattern()));
|
||||||
var value = currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
|
var currentValue = currentValue(p.getProperty(entry.key()), entry.defaultValue(), entry.newValue());
|
||||||
entry.getNewValue());
|
|
||||||
|
|
||||||
if (value != null) {
|
if (currentValue != null) {
|
||||||
intValue = fmt.parse(String.valueOf(value)).intValue();
|
intValue = fmt.parse(String.valueOf(currentValue)).intValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (entry.getCalc() != null) {
|
if (entry.calc() != null) {
|
||||||
intValue = entry.getCalc().apply(intValue);
|
intValue = entry.calc().apply(intValue);
|
||||||
}
|
}
|
||||||
p.setProperty(entry.getKey(), fmt.format(intValue));
|
|
||||||
|
p.setProperty(entry.key(), fmt.format(intValue));
|
||||||
} catch (NumberFormatException | ParseException e) {
|
} catch (NumberFormatException | ParseException e) {
|
||||||
warn(command, "Non-integer value for \"" + entry.getKey() + "\" --> " + e.getMessage(), e,
|
throw new IllegalArgumentException(
|
||||||
failOnWarning);
|
"Non-integer value for \"" + entry.key() + "\" --> " + e.getMessage(), e);
|
||||||
success = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return success;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -237,18 +224,16 @@ public final class PropertyFileUtils {
|
||||||
*
|
*
|
||||||
* @param p the {@link Properties property}
|
* @param p the {@link Properties property}
|
||||||
* @param entry the {@link Entry} containing the {@link Properties property} edits
|
* @param entry the {@link Entry} containing the {@link Properties property} edits
|
||||||
* @return the boolean
|
|
||||||
*/
|
*/
|
||||||
public static boolean processString(Properties p, Entry entry) {
|
public static void processString(Properties p, Entry entry) {
|
||||||
var value = currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(), entry.getNewValue());
|
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) {
|
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -262,20 +247,8 @@ public final class PropertyFileUtils {
|
||||||
public static void saveProperties(File file, String comment, Properties p) throws IOException {
|
public static void saveProperties(File file, String comment, Properties p) throws IOException {
|
||||||
try (var output = Files.newOutputStream(file.toPath())) {
|
try (var output = Files.newOutputStream(file.toPath())) {
|
||||||
p.store(output, comment);
|
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 issuing command
|
|
||||||
* @param message the message to log
|
|
||||||
*/
|
|
||||||
static void warn(String command, String message) {
|
|
||||||
if (LOGGER.isLoggable(Level.WARNING)) {
|
|
||||||
LOGGER.warning('[' + command + "] " + message);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -284,17 +257,20 @@ public final class PropertyFileUtils {
|
||||||
*
|
*
|
||||||
* @param command The command name
|
* @param command The command name
|
||||||
* @param message the message log
|
* @param message the message log
|
||||||
* @param e the related exception
|
|
||||||
* @param failOnWarning logs and throws exception if set to {@code true}
|
* @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, boolean failOnWarning, boolean silent)
|
||||||
static void warn(String command, String message, Exception e, boolean failOnWarning) throws Exception {
|
throws ExitStatusException {
|
||||||
if (failOnWarning) {
|
if (failOnWarning) {
|
||||||
LOGGER.log(Level.SEVERE, '[' + command + "] " + message, e);
|
if (LOGGER.isLoggable(Level.SEVERE) && !silent) {
|
||||||
throw e;
|
LOGGER.log(Level.SEVERE, '[' + command + "] " + message);
|
||||||
|
}
|
||||||
|
throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
|
||||||
} else {
|
} else {
|
||||||
warn(command, message);
|
if (LOGGER.isLoggable(Level.WARNING) && !silent) {
|
||||||
|
LOGGER.warning('[' + command + "] " + message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -17,19 +17,19 @@
|
||||||
package rife.bld.extension.propertyfile;
|
package rife.bld.extension.propertyfile;
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
import rife.bld.operations.exceptions.ExitStatusException;
|
||||||
import rife.tools.Localization;
|
import rife.tools.Localization;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
|
||||||
import java.time.*;
|
import java.time.*;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat; // NOPMD
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.assertj.core.api.Assertions.assertThatCode; // NOPMD
|
import static org.assertj.core.api.Assertions.assertThatCode;
|
||||||
import static rife.bld.extension.propertyfile.Calc.ADD; // NOPMD
|
import static rife.bld.extension.propertyfile.Calc.ADD;
|
||||||
import static rife.bld.extension.propertyfile.Calc.SUB; // NOPMD
|
import static rife.bld.extension.propertyfile.Calc.SUB;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PropertyFileUtilsTest class
|
* 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>
|
* @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
|
||||||
* @since 1.0
|
* @since 1.0
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
|
||||||
class PropertyFileUtilsTest {
|
class PropertyFileUtilsTest {
|
||||||
final static int dayOfYear = LocalDate.now().getDayOfYear();
|
|
||||||
final static Properties p = new Properties();
|
final static Properties p = new Properties();
|
||||||
final static String t = "test";
|
final static String t = "test";
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ class PropertyFileUtilsTest {
|
||||||
|
|
||||||
public EntryDate newEntryDate() {
|
public EntryDate newEntryDate() {
|
||||||
p.clear();
|
p.clear();
|
||||||
return new EntryDate("adate").pattern("D");
|
return new EntryDate("aDate").pattern("D");
|
||||||
}
|
}
|
||||||
|
|
||||||
public EntryInt newEntryInt() {
|
public EntryInt newEntryInt() {
|
||||||
|
@ -58,42 +58,41 @@ class PropertyFileUtilsTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
|
void parseDateSub() {
|
||||||
void parseDateSub() throws Exception {
|
var entryDate = newEntryDate().calc(SUB);
|
||||||
var entryDate = newEntryDate();
|
PropertyFileUtils.processDate(p, entryDate.now());
|
||||||
entryDate.setCalc(SUB);
|
assertThat(p.getProperty(entryDate.key())).as("processDate(now-3)").isEqualTo(String.valueOf(
|
||||||
PropertyFileUtils.processDate(t, p, entryDate.now(), true);
|
LocalDateTime.now().minusDays(1).getDayOfYear()));
|
||||||
assertThat(p.getProperty(entryDate.getKey())).as("processDate(now-3)").isEqualTo(String.valueOf(dayOfYear - 1));
|
|
||||||
|
|
||||||
entryDate.setCalc(v -> v - 2);
|
entryDate.calc(v -> v - 2);
|
||||||
PropertyFileUtils.processDate(t, p, entryDate.now(), true);
|
PropertyFileUtils.processDate(p, entryDate.now());
|
||||||
assertThat(p.getProperty(entryDate.getKey())).as("processDate(now-2)").isEqualTo(String.valueOf(dayOfYear - 2));
|
assertThat(p.getProperty(entryDate.key())).as("processDate(now-2)").isEqualTo(String.valueOf(
|
||||||
|
LocalDateTime.now().minusDays(2).getDayOfYear()));
|
||||||
|
|
||||||
entryDate.setCalc(SUB);
|
entryDate.calc(SUB);
|
||||||
PropertyFileUtils.processDate(t, p, entryDate.set(new Date()), true);
|
PropertyFileUtils.processDate(p, entryDate.set(new Date()));
|
||||||
assertThat(p.getProperty(entryDate.getKey())).as("processDate(date-1)").isEqualTo(String.valueOf(dayOfYear - 1));
|
assertThat(p.getProperty(entryDate.key())).as("processDate(date-1)").isEqualTo(String.valueOf(
|
||||||
|
LocalDateTime.now().minusDays(1).getDayOfYear()));
|
||||||
|
|
||||||
entryDate.setCalc(v -> v - 2);
|
entryDate.calc(v -> v - 2);
|
||||||
PropertyFileUtils.processDate(t, p, entryDate.set(Calendar.getInstance()), true);
|
PropertyFileUtils.processDate(p, entryDate.set(Calendar.getInstance()));
|
||||||
assertThat(p.getProperty(entryDate.getKey())).as("processDate(cal-2)").isEqualTo(String.valueOf(dayOfYear - 2));
|
assertThat(p.getProperty(entryDate.key())).as("processDate(cal-2)").isEqualTo(String.valueOf(
|
||||||
|
LocalDateTime.now().minusDays(2).getDayOfYear()));
|
||||||
|
|
||||||
entryDate.setCalc(v -> v - 3);
|
entryDate.calc(v -> v - 3);
|
||||||
PropertyFileUtils.processDate(t, p, entryDate.set(LocalDate.now()),
|
PropertyFileUtils.processDate(p, entryDate.set(LocalDate.now()));
|
||||||
true);
|
assertThat(p.getProperty(entryDate.key())).as("processDate(LocalDate-3)").isEqualTo(String.valueOf(
|
||||||
assertThat(p.getProperty(entryDate.getKey())).as("processDate(LocalDate-3)").isEqualTo(String.valueOf(dayOfYear - 3));
|
LocalDateTime.now().minusDays(3).getDayOfYear()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
|
void parseIntSubTest() {
|
||||||
void parseIntSubTest() throws Exception {
|
var entryInt = newEntryInt().calc(SUB).pattern("0000");
|
||||||
var entryInt = newEntryInt();
|
PropertyFileUtils.processInt(p, entryInt.defaultValue("0017"));
|
||||||
entryInt.calc(SUB);
|
assertThat(p.getProperty(entryInt.key())).as("sub(0017)").isEqualTo("0016");
|
||||||
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);
|
PropertyFileUtils.processInt(p, entryInt.set(16).calc(v -> v - 3));
|
||||||
assertThat(p.getProperty(entryInt.getKey())).as("sub(16)-3").isEqualTo("0013");
|
assertThat(p.getProperty(entryInt.key())).as("sub(16)-3").isEqualTo("0013");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -102,119 +101,122 @@ class PropertyFileUtilsTest {
|
||||||
var entry = newEntry();
|
var entry = newEntry();
|
||||||
PropertyFileUtils.processString(p, entry.set(1));
|
PropertyFileUtils.processString(p, entry.set(1));
|
||||||
PropertyFileUtils.processString(p, entry.modify("-foo", String::concat));
|
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
|
@Test
|
||||||
void parseStringCap() {
|
void parseStringCap() {
|
||||||
var entry = newEntry();
|
var entry = newEntry();
|
||||||
PropertyFileUtils.processString(p, entry.set(t).modify("", (v, s) -> v.toUpperCase(Localization.getLocale())));
|
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
|
@Test
|
||||||
void parseStringCat() {
|
void parseStringCat() {
|
||||||
var entry = newEntry();
|
var entry = newEntry();
|
||||||
entry.set(t).setModify("-foo", String::concat);
|
entry.set(t).modify("-foo", String::concat);
|
||||||
PropertyFileUtils.processString(p, entry);
|
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
|
@Test
|
||||||
void parseStringPrepend() {
|
void parseStringPrepend() {
|
||||||
var entry = newEntry();
|
var entry = newEntry();
|
||||||
PropertyFileUtils.processString(p, entry.set(1));
|
PropertyFileUtils.processString(p, entry.set(1));
|
||||||
PropertyFileUtils.processString(p, entry.modify("foo-", (v, s) -> s + v));
|
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");
|
.isEqualTo("foo-1");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void parseStringReplace() {
|
void parseStringReplace() {
|
||||||
var entry = newEntry();
|
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);
|
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
|
@Test
|
||||||
void parseStringSub() {
|
void parseStringSub() {
|
||||||
var entry = newEntry();
|
var entry = newEntry();
|
||||||
PropertyFileUtils.processString(p, entry.set(t).modify((v, s) -> v.substring(1)));
|
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
|
@Test
|
||||||
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
|
void parseTimeTest() {
|
||||||
void parseTimeTest() throws Exception {
|
|
||||||
var entry = new EntryDate("time").pattern("m");
|
var entry = new EntryDate("time").pattern("m");
|
||||||
var time = LocalTime.now();
|
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()));
|
.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()));
|
.isEqualTo(String.valueOf(time.minusHours(1).getHour()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
|
void processDateAddTest() {
|
||||||
void processDateAddTest() throws Exception {
|
|
||||||
var entryDate = newEntryDate();
|
var entryDate = newEntryDate();
|
||||||
entryDate.setCalc(ADD);
|
entryDate.calc(ADD);
|
||||||
PropertyFileUtils.processDate(t, p, entryDate.now(), true);
|
PropertyFileUtils.processDate(p, entryDate.now());
|
||||||
assertThat(p.getProperty(entryDate.getKey())).as("processDate(now+1)").isEqualTo(String.valueOf(dayOfYear + 1));
|
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);
|
PropertyFileUtils.processDate(p, entryDate.now().calc(v -> v + 3));
|
||||||
assertThat(p.getProperty(entryDate.getKey())).as("processDate(now+3)").isEqualTo(String.valueOf(dayOfYear + 3));
|
assertThat(p.getProperty(entryDate.key())).as("processDate(now+3)").isEqualTo(String.valueOf(
|
||||||
|
LocalDateTime.now().plusDays(3).getDayOfYear()));
|
||||||
|
|
||||||
entryDate.setCalc(ADD);
|
entryDate.calc(ADD);
|
||||||
PropertyFileUtils.processDate(t, p, entryDate.set(ZonedDateTime.now()), true);
|
PropertyFileUtils.processDate(p, entryDate.set(ZonedDateTime.now()));
|
||||||
assertThat(p.getProperty(entryDate.getKey())).as("processDate(ZonedDateTime+1)")
|
assertThat(p.getProperty(entryDate.key())).as("processDate(ZonedDateTime+1)")
|
||||||
.isEqualTo(String.valueOf(dayOfYear + 1));
|
.isEqualTo(String.valueOf(LocalDateTime.now().plusDays(1).getDayOfYear()));
|
||||||
|
|
||||||
PropertyFileUtils.processDate(t, p, entryDate.set(Instant.now()).calc(v -> v + 2), true);
|
PropertyFileUtils.processDate(p, entryDate.set(Instant.now()).calc(v -> v + 2));
|
||||||
assertThat(p.getProperty(entryDate.getKey())).as("processDate(Instant+2)").isEqualTo(String.valueOf(dayOfYear + 2));
|
assertThat(p.getProperty(entryDate.key())).as("processDate(Instant+2)").isEqualTo(String.valueOf(
|
||||||
|
LocalDateTime.now().plusDays(2).getDayOfYear()));
|
||||||
|
|
||||||
entryDate.setCalc(v -> v + 3);
|
entryDate.calc(v -> v + 3);
|
||||||
PropertyFileUtils.processDate(t, p, entryDate.set(LocalDateTime.now()), true);
|
PropertyFileUtils.processDate(p, entryDate.set(LocalDateTime.now()));
|
||||||
assertThat(p.getProperty(entryDate.getKey())).as("processDate(LocalDteTime+2)").isEqualTo(String.valueOf(dayOfYear + 3));
|
assertThat(p.getProperty(entryDate.key())).as("processDate(LocalDteTime+2)")
|
||||||
|
.isEqualTo(String.valueOf(LocalDateTime.now().plusDays(3).getDayOfYear()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
|
void processIntAddTest() {
|
||||||
void processIntAddTest() throws Exception {
|
var entryInt = newEntryInt().calc(ADD).defaultValue("-1");
|
||||||
var entryInt = newEntryInt();
|
PropertyFileUtils.processInt(p, entryInt);
|
||||||
entryInt.calc(ADD);
|
assertThat(p.getProperty(entryInt.key())).as("add(-1)").isEqualTo("0");
|
||||||
entryInt.setDefaultValue("-1");
|
|
||||||
PropertyFileUtils.processInt(t, p, entryInt, true);
|
|
||||||
assertThat(p.getProperty(entryInt.getKey())).as("add(-1)").isEqualTo("0");
|
|
||||||
|
|
||||||
entryInt.setKey("anint");
|
entryInt.key("anInt").defaultValue("0");
|
||||||
entryInt.setDefaultValue("0");
|
PropertyFileUtils.processInt(p, entryInt);
|
||||||
PropertyFileUtils.processInt(t, p, entryInt, true);
|
assertThat(p.getProperty(entryInt.key())).as("add(0)").isEqualTo("1");
|
||||||
assertThat(p.getProperty(entryInt.getKey())).as("add(0)").isEqualTo("1");
|
PropertyFileUtils.processInt(p, entryInt);
|
||||||
PropertyFileUtils.processInt(t, p, entryInt, true);
|
assertThat(p.getProperty(entryInt.key())).as("add(1)").isEqualTo("2");
|
||||||
assertThat(p.getProperty(entryInt.getKey())).as("add(1)").isEqualTo("2");
|
|
||||||
|
|
||||||
entryInt.setKey("formatted.int");
|
entryInt.key("formatted.int").defaultValue("0013").pattern("0000");
|
||||||
entryInt.setDefaultValue("0013");
|
PropertyFileUtils.processInt(p, entryInt);
|
||||||
entryInt.setPattern("0000");
|
assertThat(p.getProperty(entryInt.key())).as("add(0013)").isEqualTo("0014");
|
||||||
PropertyFileUtils.processInt(t, p, entryInt, true);
|
PropertyFileUtils.processInt(p, entryInt);
|
||||||
assertThat(p.getProperty(entryInt.getKey())).as("add(0013)").isEqualTo("0014");
|
assertThat(p.getProperty(entryInt.key())).as("add(0014)").isEqualTo("0015");
|
||||||
PropertyFileUtils.processInt(t, p, entryInt, true);
|
|
||||||
assertThat(p.getProperty(entryInt.getKey())).as("add(0014)").isEqualTo("0015");
|
|
||||||
|
|
||||||
entryInt.calc(v -> v + 2);
|
entryInt.calc(v -> v + 2);
|
||||||
PropertyFileUtils.processInt(t, p, entryInt, true);
|
PropertyFileUtils.processInt(p, entryInt);
|
||||||
assertThat(p.getProperty(entryInt.getKey())).as("add(0015)+2").isEqualTo("0017");
|
assertThat(p.getProperty(entryInt.key())).as("add(0015)+2").isEqualTo("0017");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -222,18 +224,17 @@ class PropertyFileUtilsTest {
|
||||||
var entry = newEntry();
|
var entry = newEntry();
|
||||||
PropertyFileUtils.processString(p, entry);
|
PropertyFileUtils.processString(p, entry);
|
||||||
|
|
||||||
assertThat(entry.getNewValue()).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
|
assertThat(entry.newValue()).as(String.format("processString(%s, %s)", entry.key(), entry.newValue()))
|
||||||
.isEqualTo(p.getProperty(entry.getKey()));
|
.isEqualTo(p.getProperty(entry.key()));
|
||||||
|
|
||||||
entry.setKey("version.minor");
|
entry.key("version.minor");
|
||||||
|
|
||||||
PropertyFileUtils.processString(p, entry.set(0));
|
PropertyFileUtils.processString(p, entry.set(0));
|
||||||
assertThat(entry.getNewValue().toString()).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
|
assertThat(entry.newValue().toString()).as(String.format("processString(%s, %s)", entry.key(), entry.newValue()))
|
||||||
.isEqualTo(p.getProperty(entry.getKey()));
|
.isEqualTo(p.getProperty(entry.key()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
|
|
||||||
void savePropertiesTest() throws Exception {
|
void savePropertiesTest() throws Exception {
|
||||||
var p = new Properties();
|
var p = new Properties();
|
||||||
var test = "test";
|
var test = "test";
|
||||||
|
@ -245,13 +246,22 @@ class PropertyFileUtilsTest {
|
||||||
assertThatCode(() -> PropertyFileUtils.saveProperties(tmp, "Generated file - do not modify!", p))
|
assertThatCode(() -> PropertyFileUtils.saveProperties(tmp, "Generated file - do not modify!", p))
|
||||||
.as("save properties").doesNotThrowAnyException();
|
.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);
|
assertThat(p.getProperty(test)).as("read property").isEqualTo(test);
|
||||||
|
|
||||||
tmp.deleteOnExit();
|
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
|
@Test
|
||||||
void testCurrentValue() {
|
void testCurrentValue() {
|
||||||
var value = "value";
|
var value = "value";
|
||||||
|
@ -267,9 +277,9 @@ class PropertyFileUtilsTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testWarn() {
|
void testWarn() {
|
||||||
assertThatCode(() -> PropertyFileUtils.warn("command", "message", new IOException(t), true))
|
assertThatCode(() -> PropertyFileUtils.warn("command", "message", true, false))
|
||||||
.hasMessage(t).isInstanceOf(IOException.class);
|
.isInstanceOf(ExitStatusException.class);
|
||||||
assertThatCode(() -> PropertyFileUtils.warn("command", t, new Exception(t), false))
|
assertThatCode(() -> PropertyFileUtils.warn("command", t, false, false))
|
||||||
.as("failOnWarning = false").doesNotThrowAnyException();
|
.as("failOnWarning = false").doesNotThrowAnyException();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue