From 0cf1c230d4c17555f9cb24f5feb663d0dde991a8 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 18 Aug 2023 01:41:54 -0700
Subject: [PATCH] Upgrade to bld 1.7.1

---
 .idea/misc.xml                                |   5 +
 README.md                                     |   2 +-
 config/pmd.xml                                |   1 -
 examples/lib/bld/bld-wrapper.properties       |   6 +-
 lib/bld/bld-wrapper.properties                |   8 +-
 .../propertyfile/PropertyFileBuild.java       |   8 +-
 .../bld/extension/propertyfile/EntryBase.java | 153 +++++++++---------
 .../propertyfile/PropertyFileUtils.java       |  22 ++-
 .../propertyfile/PropertyFileUtilsTest.java   |  18 +--
 9 files changed, 113 insertions(+), 110 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 02a2553..0c58f2f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <pattern value="rife.bld.extension.propertyFile.Entry" method="defaultValue" />
@@ -11,6 +12,10 @@
     <pattern value="rife.bld.extension.propertyfile.EntryDate" method="delete" />
     <pattern value="rife.bld.extension.propertyfile.EntryDate" />
     <pattern value="rife.bld.extension.propertyfile.EntryInt" method="delete" />
+    <pattern value="rife.bld.extension.propertyfile.PropertyFileBuild" method="jacoco" />
+    <pattern value="rife.bld.extension.propertyfile.PropertyFileBuild" method="pmd" />
+    <pattern value="rife.bld.extension.propertyfile.PropertyFileOperation" method="fromProject" />
+    <pattern value="rife.bld.extension.propertyfile.PropertyFileOperation" />
   </component>
   <component name="PDMPlugin">
     <option name="customRuleSets">
diff --git a/README.md b/README.md
index aee2439..2649957 100755
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
-[![bld](https://img.shields.io/badge/1.7.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![bld](https://img.shields.io/badge/1.7.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-property-file/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-property-file)
 [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-property-file/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-property-file)
 [![GitHub CI](https://github.com/rife2/bld-property-file/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-property-file/actions/workflows/bld.yml)
diff --git a/config/pmd.xml b/config/pmd.xml
index 3dc68dc..41ca08b 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -26,7 +26,6 @@
         <exclude name="ClassNamingConventions"/>
         <exclude name="ConfusingTernary"/>
         <exclude name="CommentDefaultAccessModifier"/>
-        <exclude name="DefaultPackage"/>
         <exclude name="FieldNamingConventions"/>
         <exclude name="LocalVariableCouldBeFinal"/>
         <exclude name="LongVariable"/>
diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties
index c789840..affc4fc 100644
--- a/examples/lib/bld/bld-wrapper.properties
+++ b/examples/lib/bld/bld-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Apr 02 10:32:44 PDT 2023
-bld.extension=com.uwyn.rife2:bld-property-file:0.9.2-SNAPSHOT
-bld.repositories=MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
+bld.extension=com.uwyn.rife2:bld-property-file:0.9.2
+bld.repositories=RIFE2_SNAPSHOTS,RIFE2_RELEASES,MAVEN_CENTRAL
 bld.downloadExtensionSources=true
 bld.downloadLocation=
-bld.version=1.7.0
\ No newline at end of file
+bld.version=1.7.1
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 0c65266..20ccfbf 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,7 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.1-SNAPSHOT
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.0-SNAPSHOT
-bld.repositories=MAVEN_LOCAL,RIFE2_SNAPSHOTS,MAVEN_CENTRAL,RIFE2_RELEASES
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.2
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.0
+bld.repositories=RIFE2_SNAPSHOTS,RIFE2_RELEASES,MAVEN_CENTRAL
 bld.downloadLocation=
-bld.version=1.7.0
+bld.version=1.7.1
diff --git a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java
index 37a58fe..9f62b68 100644
--- a/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java
+++ b/src/bld/java/rife/bld/extension/propertyfile/PropertyFileBuild.java
@@ -21,17 +21,17 @@ public class PropertyFileBuild extends Project {
     public PropertyFileBuild() {
         pkg = "rife.bld.extension";
         name = "bld-property-file";
-        version = version(0, 9, 2, "SNAPSHOT");
+        version = version(0, 9, 2);
 
         javaRelease = 17;
         downloadSources = true;
         autoDownloadPurge = true;
         repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
 
-        var rife2 = version(1,7,0);
+        var rife2 = version(1, 7, 0);
         scope(compile)
                 .include(dependency("com.uwyn.rife2", "rife2", rife2))
-                .include(dependency("com.uwyn.rife2", "bld", rife2));
+                .include(dependency("com.uwyn.rife2", "bld", version(1, 7, 1)));
         scope(test)
                 .include(dependency("org.jsoup", "jsoup", version(1, 16, 1)))
                 .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 0)))
@@ -76,7 +76,7 @@ public class PropertyFileBuild extends Project {
     }
 
     @BuildCommand(summary = "Runs PMD analysis")
-    public void pmd() throws Exception {
+    public void pmd() {
         new PmdOperation()
                 .fromProject(this)
                 .failOnViolation(true)
diff --git a/src/main/java/rife/bld/extension/propertyfile/EntryBase.java b/src/main/java/rife/bld/extension/propertyfile/EntryBase.java
index 1cadf1c..3c7733e 100644
--- a/src/main/java/rife/bld/extension/propertyfile/EntryBase.java
+++ b/src/main/java/rife/bld/extension/propertyfile/EntryBase.java
@@ -26,6 +26,7 @@ import java.util.function.IntFunction;
  * @author <a href="https://github.com/gbevin">Geert Bevin</a>
  * @since 1.0
  */
+@SuppressWarnings("PMD.DataClass")
 public class EntryBase {
     private IntFunction<Integer> calc;
     private Object defaultValue;
@@ -53,13 +54,6 @@ public class EntryBase {
         return calc;
     }
 
-    /**
-     * Sets the calculation function.
-     */
-    protected void setCalc(IntFunction<Integer> calc) {
-        this.calc = calc;
-    }
-
     /**
      * Returns the default value.
      */
@@ -67,15 +61,6 @@ public class EntryBase {
         return defaultValue;
     }
 
-    /**
-     * 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;
-    }
-
     /**
      * Returns the key of the {@link java.util.Properties property}.
      */
@@ -83,15 +68,6 @@ public class EntryBase {
         return key;
     }
 
-    /**
-     * 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;
-    }
-
     /**
      * Returns the modify function.
      */
@@ -99,13 +75,6 @@ public class EntryBase {
         return modify;
     }
 
-    /**
-     * Sets the modify function.
-     */
-    protected void setModify(BiFunction<String, String, String> modify) {
-        this.modify = modify;
-    }
-
     /**
      * Returns the value to be used in the {@link #modify} function.
      */
@@ -113,15 +82,6 @@ public class EntryBase {
         return modifyValue;
     }
 
-    /**
-     * Sets the modify value.
-     *
-     * @param value the modify value.
-     */
-    protected void setModifyValue(String value) {
-        this.modifyValue = value;
-    }
-
     /**
      * Returns the new value to set the {@link java.util.Properties property)} to.
      */
@@ -129,15 +89,6 @@ public class EntryBase {
         return newValue;
     }
 
-    /**
-     * Sets a new value for {@link java.util.Properties property}.
-     *
-     * @param newValue the new value
-     */
-    public void setNewValue(Object newValue) {
-        this.newValue = newValue;
-    }
-
     /**
      * Returns the pattern.
      */
@@ -145,16 +96,6 @@ public class EntryBase {
         return pattern;
     }
 
-    /**
-     * Sets the {@link java.text.DecimalFormat DecimalFormat} or {@link java.time.format.DateTimeFormatter DateTimeFormatter}
-     * pattern to be used with {@link EntryDate} or {@link EntryInt} respectively.
-     *
-     * @param pattern the pattern
-     */
-    protected void setPattern(String pattern) {
-        this.pattern = pattern;
-    }
-
     /**
      * Returns the {@link EntryDate.Units unit}.
      */
@@ -162,15 +103,6 @@ public class EntryBase {
         return unit;
     }
 
-    /**
-     * 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;
-    }
-
     /**
      * Returns {@code true} if the {@link java.util.Properties property} is to be deleted.
      */
@@ -178,13 +110,6 @@ public class EntryBase {
         return isDelete;
     }
 
-    /**
-     * Sets whether the {@link java.util.Properties property} should be deleted.
-     */
-    protected void setDelete(boolean delete) {
-        isDelete = delete;
-    }
-
     /**
      * Sets the key of the {@link java.util.Properties property}.
      *
@@ -196,6 +121,45 @@ public class EntryBase {
         return this;
     }
 
+    /**
+     * Sets the calculation function.
+     */
+    protected void setCalc(IntFunction<Integer> calc) {
+        this.calc = calc;
+    }
+
+    /**
+     * Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.
+     *
+     * @param defaultValue the default value
+     */
+    protected void setDefaultValue(Object defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    /**
+     * Sets whether the {@link java.util.Properties property} should be deleted.
+     */
+    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.
+     */
+    protected void setModify(BiFunction<String, String, String> modify) {
+        this.modify = modify;
+    }
+
     /**
      * Sets the modify function.
      *
@@ -205,4 +169,41 @@ public class EntryBase {
         this.modifyValue = value;
         this.modify = modify;
     }
+
+    /**
+     * Sets the modify value.
+     *
+     * @param value the modify value.
+     */
+    protected void setModifyValue(String value) {
+        this.modifyValue = value;
+    }
+
+    /**
+     * Sets a new value for {@link java.util.Properties property}.
+     *
+     * @param newValue the new value
+     */
+    public void setNewValue(Object newValue) {
+        this.newValue = newValue;
+    }
+
+    /**
+     * Sets the {@link java.text.DecimalFormat DecimalFormat} or {@link java.time.format.DateTimeFormatter DateTimeFormatter}
+     * pattern to be used with {@link EntryDate} or {@link EntryInt} respectively.
+     *
+     * @param pattern the pattern
+     */
+    protected void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    /**
+     * Sets the {@link EntryDate.Units unit} value to apply to calculations.
+     *
+     * @param unit the {@link EntryDate.Units unit}
+     */
+    protected void setUnit(EntryDate.Units unit) {
+        this.unit = unit;
+    }
 }
diff --git a/src/main/java/rife/bld/extension/propertyfile/PropertyFileUtils.java b/src/main/java/rife/bld/extension/propertyfile/PropertyFileUtils.java
index 9dbb1b0..6feddb8 100644
--- a/src/main/java/rife/bld/extension/propertyfile/PropertyFileUtils.java
+++ b/src/main/java/rife/bld/extension/propertyfile/PropertyFileUtils.java
@@ -25,7 +25,6 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Properties;
@@ -95,11 +94,11 @@ public final class PropertyFileUtils {
      * @param p       the {@link Properties property}
      * @param entry   the {@link Entry} containing the {@link Properties property} edits
      */
-    @SuppressWarnings("PMD.SignatureDeclareThrowsException")
+    @SuppressWarnings({"PMD.SignatureDeclareThrowsException", "PMD.ExceptionAsFlowControl"})
     public static boolean processDate(String command, Properties p, EntryDate entry, boolean failOnWarning)
             throws Exception {
         var success = true;
-        var value = PropertyFileUtils.currentValue(null, entry.getDefaultValue(),
+        var value = currentValue(null, entry.getDefaultValue(),
                 entry.getNewValue());
 
         var pattern = entry.getPattern();
@@ -159,19 +158,19 @@ public final class PropertyFileUtils {
                 } else if (value instanceof ZonedDateTime) {
                     if (offset != 0) {
                         if (unit == EntryDate.Units.DAY) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.DAYS);
+                            value = ((ZonedDateTime) value).plusDays(offset);
                         } else if (unit == EntryDate.Units.MONTH) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.MONTHS);
+                            value = ((ZonedDateTime) value).plusMonths(offset);
                         } else if (unit == EntryDate.Units.WEEK) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.WEEKS);
+                            value = ((ZonedDateTime) value).plusWeeks(offset);
                         } else if (unit == EntryDate.Units.YEAR) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.YEARS);
+                            value = ((ZonedDateTime) value).plusYears(offset);
                         } else if (unit == EntryDate.Units.SECOND) {
                             value = ((ZonedDateTime) value).plusSeconds(offset);
                         } else if (unit == EntryDate.Units.MINUTE) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.MINUTES);
+                            value = ((ZonedDateTime) value).plusMinutes(offset);
                         } else if (unit == EntryDate.Units.HOUR) {
-                            value = ((ZonedDateTime) value).plus(offset, ChronoUnit.HOURS);
+                            value = ((ZonedDateTime) value).plusHours(offset);
                         }
                     }
                     parsedValue = dtf.format((ZonedDateTime) value);
@@ -204,7 +203,7 @@ public final class PropertyFileUtils {
         int intValue = 0;
         try {
             var fmt = new DecimalFormat(entry.getPattern());
-            var value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
+            var value = currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
                     entry.getNewValue());
 
             if (value != null) {
@@ -231,8 +230,7 @@ public final class PropertyFileUtils {
      * @param entry the {@link Entry} containing the {@link Properties property} edits
      */
     public static boolean processString(Properties p, Entry entry) {
-        var value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
-                entry.getNewValue());
+        var value = currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(), entry.getNewValue());
 
         p.setProperty(entry.getKey(), String.valueOf(value));
 
diff --git a/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java b/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java
index 7a7fa4a..56ef198 100644
--- a/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java
+++ b/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java
@@ -26,10 +26,10 @@ import java.util.Calendar;
 import java.util.Date;
 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;
-import static rife.bld.extension.propertyfile.Calc.SUB;
+import static org.assertj.core.api.Assertions.assertThat; // NOPMD
+import static org.assertj.core.api.Assertions.assertThatCode; // NOPMD
+import static rife.bld.extension.propertyfile.Calc.ADD; // NOPMD
+import static rife.bld.extension.propertyfile.Calc.SUB; // NOPMD
 
 /**
  * PropertyFileUtilsTest class
@@ -42,16 +42,16 @@ class PropertyFileUtilsTest {
     final static Properties p = new Properties();
     final static String t = "test";
 
-    public EntryDate newEntryDate() {
-        p.clear();
-        return new EntryDate("adate").pattern("D");
-    }
-
     public Entry newEntry() {
         p.clear();
         return new Entry("version.major").set("1");
     }
 
+    public EntryDate newEntryDate() {
+        p.clear();
+        return new EntryDate("adate").pattern("D");
+    }
+
     public EntryInt newEntryInt() {
         p.clear();
         return new EntryInt("version.patch");