modify) {
- modifyValue_ = value;
- modify_ = modify;
- return this;
- }
-
- /**
- * Returns the value to be used in the {@link #modify_} function.
- *
- * @return the modify value
- */
- protected String modifyValue() {
- return modifyValue_;
- }
-
/**
* Sets the new {@link java.util.Properties property} value.
*
* @param s The new value
- * @return the entry
*/
public Entry set(Object s) {
- newValue(s);
+ setNewValue(s);
+ return this;
+ }
+
+ /**
+ * Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.
+ *
+ * @param defaultValue the default value
+ */
+ @SuppressWarnings("unused")
+ public Entry defaultValue(Object defaultValue) {
+ setDefaultValue(defaultValue);
+ return this;
+ }
+
+ /**
+ * Creates a new {@link Entry entry}.
+ *
+ * @param value the value to perform a modification with
+ * @param modify the modification function
+ */
+ public Entry modify(String value, BiFunction modify) {
+ setModifyValue(value);
+ setModify(modify);
+ return this;
+ }
+
+ /**
+ * Creates a new {@link Entry entry}.
+ *
+ * @param modify the modification function
+ */
+ public Entry modify(BiFunction modify) {
+ setModify(modify);
+ return this;
+ }
+
+ /**
+ * Sets the {@link Entry entry} up for deletion.
+ */
+ public Entry delete() {
+ setDelete(true);
return this;
}
}
diff --git a/src/main/java/rife/bld/extension/propertyfile/EntryBase.java b/src/main/java/rife/bld/extension/propertyfile/EntryBase.java
index ff9f05e..ba9edc7 100644
--- a/src/main/java/rife/bld/extension/propertyfile/EntryBase.java
+++ b/src/main/java/rife/bld/extension/propertyfile/EntryBase.java
@@ -1,21 +1,22 @@
/*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
+ * 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.
+ * 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 java.util.function.BiFunction;
import java.util.function.IntFunction;
/**
@@ -25,14 +26,16 @@ import java.util.function.IntFunction;
* @author Geert Bevin
* @since 1.0
*/
-@SuppressWarnings({"unchecked", "PMD.AbstractClassWithoutAbstractMethod"})
-public abstract class EntryBase {
- private IntFunction calc_;
- private Object defaultValue_;
- private boolean isDelete_;
- private String key_;
- private Object newValue_;
- private Object pattern_;
+public class EntryBase {
+ private String key;
+ private Object defaultValue;
+ private Object newValue;
+ private String modifyValue = "";
+ private boolean isDelete;
+ private String pattern = "";
+ private EntryDate.Units unit = EntryDate.Units.DAY;
+ private IntFunction calc;
+ private BiFunction modify;
/**
* Creates a new {@link EntryBase entry}.
@@ -40,35 +43,98 @@ public abstract class EntryBase {
* @param key the required property key
*/
public EntryBase(String key) {
- key_ = key;
+ this.key = key;
+ }
+
+ /**
+ * Returns the value to be used in the {@link #modify} function.
+ */
+ protected String getModifyValue() {
+ return modifyValue;
+ }
+
+ /**
+ * Sets the modify value.
+ *
+ * @param value the modify value.
+ */
+ protected void setModifyValue(String value) {
+ this.modifyValue = value;
+ }
+
+ /**
+ * Returns the modify function.
+ */
+ protected BiFunction getModify() {
+ return modify;
+ }
+
+ /**
+ * Sets the modify function.
+ */
+ protected void setModify(BiFunction modify) {
+ this.modify = modify;
+ }
+
+ /**
+ * Sets the modify function.
+ *
+ * @param value the value to perform a modification with
+ */
+ protected void setModify(String value, BiFunction modify) {
+ this.modifyValue = value;
+ this.modify = modify;
+ }
+
+ /**
+ * Returns {@code true} if the {@link java.util.Properties property} is to be deleted.
+ */
+ protected boolean isDelete() {
+ return isDelete;
+ }
+
+ /**
+ * Sets whether the {@link java.util.Properties property} should be deleted.
+ */
+ protected void setDelete(boolean delete) {
+ isDelete = delete;
}
/**
* Returns the calculation function.
- *
- * @return the calc function
*/
- protected IntFunction calc() {
- return calc_;
+ protected IntFunction getCalc() {
+ return calc;
}
/**
* Sets the calculation function.
- *
- * @param calc the calc function
*/
- public T calc(IntFunction calc) {
- calc_ = calc;
- return (T) this;
+ protected void setCalc(IntFunction calc) {
+ this.calc = calc;
+ }
+
+ /**
+ * Returns the key of the {@link java.util.Properties property}.
+ */
+ protected String getKey() {
+ return key;
+ }
+
+ /**
+ * Sets the key of the {@link java.util.Properties property}.
+ *
+ * @param key the {@link java.util.Properties property} key
+ */
+ protected void setKey(String key) {
+ this.key = key;
}
/**
* Returns the default value.
- *
- * @return the default value
*/
- protected Object defaultValue() {
- return defaultValue_;
+ protected Object getDefaultValue() {
+ return defaultValue;
}
/**
@@ -76,55 +142,59 @@ public abstract class EntryBase {
*
* @param defaultValue the default value
*/
- public T defaultValue(Object defaultValue) {
- defaultValue_ = defaultValue;
- return (T) this;
+ protected void setDefaultValue(Object defaultValue) {
+ this.defaultValue = defaultValue;
}
/**
- * Indicates that the {@link java.util.Properties property} is to be deleted.
+ * Returns the pattern.
*/
- public T delete() {
- isDelete_ = true;
- return (T) this;
+ protected String getPattern() {
+ return pattern;
}
/**
- * Returns {@code true} if the {@link java.util.Properties property} is to be deleted.
+ * 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.
*
- * @return {@code true} or {@code false}
+ * @param pattern the pattern
*/
- protected boolean isDelete() {
- return isDelete_;
+ protected void setPattern(String pattern) {
+ this.pattern = pattern;
}
/**
- * Returns the key of the {@link java.util.Properties property}.
- *
- * @return the key
+ * Returns the {@link EntryDate.Units unit}.
*/
- protected String key() {
- return key_;
+ protected EntryDate.Units getUnit() {
+ 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;
}
/**
* Sets the key of the {@link java.util.Properties property}.
*
* @param key the {@link java.util.Properties property} key
- * @return this instance
*/
- public T key(String key) {
- key_ = key;
- return (T) this;
+ @SuppressWarnings("unused")
+ public EntryBase key(String key) {
+ setKey(key);
+ return this;
}
/**
* Returns the new value to set the {@link java.util.Properties property)} to.
- *
- * @return the new value
*/
- protected Object newValue() {
- return newValue_;
+ public Object getNewValue() {
+ return newValue;
}
/**
@@ -132,26 +202,7 @@ public abstract class EntryBase {
*
* @param newValue the new value
*/
- protected void newValue(Object newValue) {
- newValue_ = newValue;
- }
-
- /**
- * Returns the pattern.
- *
- * @return the pattern
- */
- protected Object pattern() {
- return pattern_;
- }
-
- /**
- * Sets the {@link java.util.Formatter} pattern.
- *
- * @param pattern the pattern
- */
- public T pattern(Object pattern) {
- pattern_ = pattern;
- return (T) this;
+ public void setNewValue(Object newValue) {
+ this.newValue = newValue;
}
}
diff --git a/src/main/java/rife/bld/extension/propertyfile/EntryDate.java b/src/main/java/rife/bld/extension/propertyfile/EntryDate.java
index 8990119..3522f47 100644
--- a/src/main/java/rife/bld/extension/propertyfile/EntryDate.java
+++ b/src/main/java/rife/bld/extension/propertyfile/EntryDate.java
@@ -1,17 +1,17 @@
/*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
+ * 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.
+ * 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;
@@ -19,6 +19,7 @@ package rife.bld.extension.propertyfile;
import java.time.*;
import java.util.Calendar;
import java.util.Date;
+import java.util.function.IntFunction;
/**
* Declares the modifications to be made to a {@link java.util.Properties Date-based property}.
@@ -26,11 +27,9 @@ import java.util.Date;
* @author Erik C. Thauvin
* @since 1.0
*/
-public class EntryDate extends EntryBase {
- private EntryDate.Units unit_ = EntryDate.Units.DAY;
-
+public class EntryDate extends EntryBase {
/**
- * Creates a new {@link EntryDate entry}.
+ * Creates a new date {@link Entry entry}.
*
* @param key the required property key
*/
@@ -38,34 +37,13 @@ public class EntryDate extends EntryBase {
super(key);
}
- /**
- * Sets the new {@link java.util.Properties property} value to now.
- *
- * @return this instance
- */
- public EntryDate now() {
- newValue("now");
- return this;
- }
-
- /**
- * Sets the {@link java.time.format.DateTimeFormatter DateTimeFormatter} pattern.
- *
- * @param pattern the pattern
- */
- public EntryDate pattern(String pattern) {
- super.pattern(pattern);
- return this;
- }
-
/**
* Sets the new {@link java.util.Properties property} value to an {@link Instant}
*
* @param instant the {@link Instant} to set the value to
- * @return this instance
*/
public EntryDate set(Instant instant) {
- newValue(instant);
+ setNewValue(instant);
return this;
}
@@ -73,10 +51,9 @@ public class EntryDate extends EntryBase {
* Sets the new {@link java.util.Properties property} value to a {@link LocalDate}
*
* @param date the {@link LocalDate} to set the value to
- * @return this instance
*/
public EntryDate set(LocalDate date) {
- newValue(date);
+ setNewValue(date);
return this;
}
@@ -84,10 +61,9 @@ public class EntryDate extends EntryBase {
* Sets the new {@link java.util.Properties property} value to a {@link LocalDateTime}
*
* @param date the {@link LocalDateTime} to set the value to
- * @return this instance
*/
public EntryDate set(LocalDateTime date) {
- newValue(date);
+ setNewValue(date);
return this;
}
@@ -95,10 +71,9 @@ public class EntryDate extends EntryBase {
* Sets the new {@link java.util.Properties property} value to a {@link ZonedDateTime}
*
* @param date the {@link ZonedDateTime} to set the value to
- * @return this instance
*/
public EntryDate set(ZonedDateTime date) {
- newValue(date);
+ setNewValue(date);
return this;
}
@@ -106,10 +81,9 @@ public class EntryDate extends EntryBase {
* Sets the new {@link java.util.Properties property} value to a {@link LocalTime}
*
* @param time the {@link LocalTime} to set the value to
- * @return this instance
*/
public EntryDate set(LocalTime time) {
- newValue(time);
+ setNewValue(time);
return this;
}
@@ -117,10 +91,9 @@ public class EntryDate extends EntryBase {
* Sets the new {@link java.util.Properties property} value to a {@link Calendar}
*
* @param cal the {@link Calendar} to set the value to
- * @return this instance
*/
public EntryDate set(Calendar cal) {
- newValue(cal);
+ setNewValue(cal);
return this;
}
@@ -128,30 +101,56 @@ public class EntryDate extends EntryBase {
* Sets the new {@link java.util.Properties property} value to a {@link Date}
*
* @param date the {@link Date} to set the value to
- * @return this instance
*/
public EntryDate set(Date date) {
- newValue(date);
+ setNewValue(date);
return this;
}
/**
- * Returns the {@link EntryDate.Units unit}.
- *
- * @return the unit
+ * Sets the new {@link java.util.Properties property} value to now.
*/
- public EntryDate.Units unit() {
- return unit_;
+ public EntryDate now() {
+ setNewValue("now");
+ return this;
+ }
+
+ /**
+ * Creates a new {@link EntryDate entry}.
+ *
+ * @param calc the calculation function
+ */
+ public EntryDate calc(IntFunction calc) {
+ setCalc(calc);
+ return this;
+ }
+
+ /**
+ * Sets the pattern for {@link EntryInt} and {@link EntryDate} to{@link java.text.DecimalFormat DecimalFormat} and
+ * {@link java.time.format.DateTimeFormatter DateTimeFormatter} respectively.
+ *
+ * @param pattern the pattern
+ */
+ public EntryDate pattern(String pattern) {
+ setPattern(pattern);
+ return this;
}
/**
* Sets the {@link Units unit} value to apply to calculations for {@link EntryDate}.
*
* @param unit the {@link Units unit}
- * @return this instance
*/
public EntryDate unit(Units unit) {
- unit_ = unit;
+ setUnit(unit);
+ return this;
+ }
+
+ /**
+ * Sets the {@link EntryDate entry} up for deletion.
+ */
+ public EntryDate delete() {
+ setDelete(true);
return this;
}
@@ -169,33 +168,6 @@ public class EntryDate extends EntryBase {
*
*/
public enum Units {
- /**
- * Second units.
- */
- SECOND,
- /**
- * Minute units.
- */
- MINUTE,
- /**
- * Hour units.
- */
- HOUR,
- /**
- * Day units.
- */
- DAY,
- /**
- * Week units.
- */
- WEEK,
- /**
- * Month units.
- */
- MONTH,
- /**
- * Year units.
- */
- YEAR
+ SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, YEAR
}
}
diff --git a/src/main/java/rife/bld/extension/propertyfile/EntryInt.java b/src/main/java/rife/bld/extension/propertyfile/EntryInt.java
index b2e0e91..f2001ef 100644
--- a/src/main/java/rife/bld/extension/propertyfile/EntryInt.java
+++ b/src/main/java/rife/bld/extension/propertyfile/EntryInt.java
@@ -1,30 +1,32 @@
/*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
+ * 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.
+ * 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 java.util.function.IntFunction;
+
/**
* Declares the modifications to be made to an {@link java.util.Properties Integer-based property}.
*
* @author Erik C. Thauvin
* @since 1.0
*/
-public class EntryInt extends EntryBase {
+public class EntryInt extends EntryBase {
/**
- * Creates a new {@link EntryInt entry}.
+ * Creates a new date {@link Entry entry}.
*
* @param key the required property key
*/
@@ -33,23 +35,41 @@ public class EntryInt extends EntryBase {
}
/**
- * Sets the {@link java.text.DecimalFormat DecimalFormat} pattern.
+ * Sets the new {@link java.util.Properties property} value to an integer.
*
- * @param pattern the pattern
+ * @param i The integer to set the value to
*/
- public EntryInt pattern(String pattern) {
- super.pattern(pattern);
+ public EntryInt set(int i) {
+ setNewValue(i);
return this;
}
/**
- * Sets the new {@link java.util.Properties property} value to an integer.
+ * Sets the initial value to set the {@link java.util.Properties property} to, if not already defined.
*
- * @param i The integer to set the value to
- * @return this instance
+ * @param defaultValue the default value
*/
- public EntryInt set(int i) {
- newValue(i);
+ @SuppressWarnings("unused")
+ public EntryInt defaultValue(Object defaultValue) {
+ setDefaultValue(defaultValue);
+ return this;
+ }
+
+ /**
+ * Creates a new {@link EntryInt entry}.
+ *
+ * @param calc the calculation function.
+ */
+ public EntryInt calc(IntFunction calc) {
+ setCalc(calc);
+ return this;
+ }
+
+ /**
+ * Sets the {@link EntryInt entry} up for deletion.
+ */
+ public EntryInt delete() {
+ setDelete(true);
return this;
}
}
diff --git a/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java b/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java
index f51b288..77cc22b 100644
--- a/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java
+++ b/src/main/java/rife/bld/extension/propertyfile/PropertyFileOperation.java
@@ -1,32 +1,28 @@
/*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package rife.bld.extension.propertyfile;
-import rife.bld.BaseProject;
+import rife.bld.Project;
import rife.bld.operations.AbstractOperation;
-import rife.bld.operations.exceptions.ExitStatusException;
import java.io.File;
-import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
* Creates or applies edits to a {@link Properties Properties} file.
@@ -35,22 +31,14 @@ import java.util.logging.Logger;
* @since 1.0
*/
public class PropertyFileOperation extends AbstractOperation {
- private static final Logger LOGGER = Logger.getLogger(PropertyFileOperation.class.getName());
- private final List> entries_ = new ArrayList<>();
- private String comment_ = "";
- private boolean failOnWarning_;
- private File file_;
- private BaseProject project_;
+ private final List entries = new ArrayList<>();
+ private final Project project;
+ private File file;
+ private String comment = "";
+ private boolean failOnWarning;
- /**
- * Sets the comment to be inserted at the top of the {@link java.util.Properties} file.
- *
- * @param comment the header comment
- * @return this instance
- */
- public PropertyFileOperation comment(String comment) {
- comment_ = comment;
- return this;
+ public PropertyFileOperation(Project project) {
+ this.project = project;
}
/**
@@ -58,10 +46,54 @@ public class PropertyFileOperation extends AbstractOperation entry) {
- entries_.add(entry);
+ @SuppressWarnings("unused")
+ public PropertyFileOperation entry(EntryBase entry) {
+ entries.add(entry);
+ return this;
+ }
+
+ /**
+ * Sets the location of the {@link java.util.Properties} file to be edited.
+ *
+ * @param file the file to be edited
+ */
+ @SuppressWarnings("unused")
+ public PropertyFileOperation file(String file) {
+ this.file = new File(file);
+ return this;
+ }
+
+ /**
+ * Sets the location of the {@link java.util.Properties} file to be edited.
+ *
+ * @param file the file to be edited
+ */
+ @SuppressWarnings("unused")
+ public PropertyFileOperation file(File file) {
+ this.file = file;
+ return this;
+ }
+
+ /**
+ * Sets the {@link #execute() execution} to return a failure on any warnings.
+ *
+ * @param failOnWarning if set to {@code true}, the execution will fail on any warnings.
+ */
+ @SuppressWarnings("unused")
+ public PropertyFileOperation failOnWarning(boolean failOnWarning) {
+ this.failOnWarning = failOnWarning;
+ return this;
+ }
+
+ /**
+ * Sets the comment to be inserted at the top of the {@link java.util.Properties} file.
+ *
+ * @param comment the header comment
+ */
+ @SuppressWarnings("unused")
+ public PropertyFileOperation comment(String comment) {
+ this.comment = comment;
return this;
}
@@ -70,139 +102,45 @@ public class PropertyFileOperation extends AbstractOperation " + dte.getMessage(),
+ dte, failOnWarning);
+ success = false;
+ }
+ }
+
+ if (success) {
+ p.setProperty(entry.getKey(), parsedValue);
+ }
+
+ return success;
+ }
+
/**
* Returns the new value, value or default value depending on which is specified.
*
* @param value the value
- * @param defaultValue the default value
* @param newValue the new value
- * @return the object
+ * @param defaultValue the default value
*/
public static Object currentValue(String value, Object defaultValue, Object newValue) {
if (newValue != null) {
@@ -63,160 +163,37 @@ public final class PropertyFileUtils {
}
}
- /**
- * Loads a {@link Properties properties} file.
- *
- * @param command the issuing command
- * @param file the file location
- * @param p the {@link Properties properties} to load into.
- * @return the boolean
- * @throws ExitStatusException if an error occurred
- */
- public static boolean loadProperties(String command, File file, Properties p, boolean silent)
- throws ExitStatusException {
- boolean success = true;
- if (file != null) {
- if (file.exists()) {
- try (var propStream = Files.newInputStream(file.toPath(), StandardOpenOption.READ)) {
- p.load(propStream);
- } catch (IOException ioe) {
- warn(command, "Could not load properties file: " + ioe.getMessage(), true, silent);
- success = false;
- }
- }
- } else {
- warn(command, "Please specify the properties file location.", true, silent);
- success = false;
- }
- return success;
- }
-
- private static String objectToString(Object o) {
- if (o == null) {
- return "";
- } else {
- return String.valueOf(o);
- }
- }
-
- /**
- * Processes a date {@link Properties property}.
- *
- * @param p the {@link Properties property}
- * @param entry the {@link Entry} containing the {@link Properties property} edits
- * @throws DateTimeException if a parsing error occurs
- */
- @SuppressWarnings("PMD.ExceptionAsFlowControl")
- public static void processDate(Properties p, EntryDate entry) throws IllegalArgumentException {
- var currentValue = currentValue(null, entry.defaultValue(), entry.newValue());
- var pattern = objectToString(entry.pattern());
-
- var dateValue = String.valueOf(currentValue);
- if (pattern != null && !pattern.isBlank()) {
- var offset = 0;
-
- if (entry.calc() != null) {
- offset = entry.calc().apply(offset);
- }
-
- var dtf = DateTimeFormatter.ofPattern(pattern);
- var unit = entry.unit();
-
- try {
- if (currentValue instanceof String) {
- if ("now".equalsIgnoreCase((String) currentValue)) {
- currentValue = ZonedDateTime.now();
- } else {
- throw new DateTimeException("Excepted: Calendar, Date or java.time.");
- }
- } else if (currentValue instanceof LocalDateTime) {
- currentValue = ((LocalDateTime) currentValue).atZone(ZoneId.systemDefault());
- } else if (currentValue instanceof Date) {
- currentValue = ((Date) currentValue).toInstant().atZone(ZoneId.systemDefault());
- } else if (currentValue instanceof Calendar) {
- currentValue = ((Calendar) currentValue).toInstant().atZone(ZoneId.systemDefault());
- } else if (currentValue instanceof Instant) {
- currentValue = ((Instant) currentValue).atZone(ZoneId.systemDefault());
- }
-
- if (currentValue instanceof LocalDate) {
- if (offset != 0) {
- if (unit == EntryDate.Units.DAY) {
- currentValue = ((LocalDate) currentValue).plusDays(offset);
- } else if (unit == EntryDate.Units.MONTH) {
- currentValue = ((LocalDate) currentValue).plusMonths(offset);
- } else if (unit == EntryDate.Units.WEEK) {
- currentValue = ((LocalDate) currentValue).plusWeeks(offset);
- } else if (unit == EntryDate.Units.YEAR) {
- currentValue = ((LocalDate) currentValue).plusYears(offset);
- }
- }
- dateValue = dtf.format((LocalDate) currentValue);
- } else if (currentValue instanceof LocalTime) {
- if (offset != 0) {
- if (unit == EntryDate.Units.SECOND) {
- currentValue = ((LocalTime) currentValue).plusSeconds(offset);
- } else if (unit == EntryDate.Units.MINUTE) {
- currentValue = ((LocalTime) currentValue).plusMinutes(offset);
- } else if (unit == EntryDate.Units.HOUR) {
- currentValue = ((LocalTime) currentValue).plusHours(offset);
- }
- }
- dateValue = dtf.format((LocalTime) currentValue);
- } else if (currentValue instanceof ZonedDateTime) {
- if (offset != 0) {
- if (unit == EntryDate.Units.DAY) {
- currentValue = ((ZonedDateTime) currentValue).plusDays(offset);
- } else if (unit == EntryDate.Units.MONTH) {
- currentValue = ((ZonedDateTime) currentValue).plusMonths(offset);
- } else if (unit == EntryDate.Units.WEEK) {
- currentValue = ((ZonedDateTime) currentValue).plusWeeks(offset);
- } else if (unit == EntryDate.Units.YEAR) {
- currentValue = ((ZonedDateTime) currentValue).plusYears(offset);
- } else if (unit == EntryDate.Units.SECOND) {
- currentValue = ((ZonedDateTime) currentValue).plusSeconds(offset);
- } else if (unit == EntryDate.Units.MINUTE) {
- currentValue = ((ZonedDateTime) currentValue).plusMinutes(offset);
- } else if (unit == EntryDate.Units.HOUR) {
- currentValue = ((ZonedDateTime) currentValue).plusHours(offset);
- }
- }
- dateValue = dtf.format((ZonedDateTime) currentValue);
- }
- } catch (DateTimeException dte) {
- throw new IllegalArgumentException(
- "Non-date value for \"" + entry.key() + "\" --> " + dte.getMessage(), dte);
- }
- }
- p.setProperty(entry.key(), dateValue);
- }
-
/**
* Processes an integer {@link Properties property}.
*
- * @param p the {@link Properties property}
- * @param entry the {@link Entry} containing the {@link Properties property} edits
- * @throws NumberFormatException if a parsing error occurs
+ * @param command the issuing command
+ * @param p the {@link Properties property}
+ * @param entry the {@link Entry} containing the {@link Properties property} edits
*/
- 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;
try {
- var fmt = new DecimalFormat(objectToString(entry.pattern()));
- var currentValue = currentValue(p.getProperty(entry.key()), entry.defaultValue(), entry.newValue());
+ var fmt = new DecimalFormat(entry.getPattern());
+ var value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
+ entry.getNewValue());
- if (currentValue != null) {
- intValue = fmt.parse(String.valueOf(currentValue)).intValue();
+ if (value != null) {
+ intValue = fmt.parse(String.valueOf(value)).intValue();
}
- if (entry.calc() != null) {
- intValue = entry.calc().apply(intValue);
+ if (entry.getCalc() != null) {
+ intValue = entry.getCalc().apply(intValue);
}
-
- p.setProperty(entry.key(), fmt.format(intValue));
+ p.setProperty(entry.getKey(), fmt.format(intValue));
} catch (NumberFormatException | ParseException e) {
- throw new IllegalArgumentException(
- "Non-integer value for \"" + entry.key() + "\" --> " + e.getMessage(), e);
+ warn(command, "Non-integer value for \"" + entry.getKey() + "\" --> " + e.getMessage(), e,
+ failOnWarning);
+ success = false;
}
+
+ return success;
}
/**
@@ -225,30 +202,28 @@ public final class PropertyFileUtils {
* @param p the {@link Properties property}
* @param entry the {@link Entry} containing the {@link Properties property} edits
*/
- public static void processString(Properties p, Entry entry) {
- var currentValue = currentValue(p.getProperty(entry.key()), entry.defaultValue(), entry.newValue());
+ public static boolean processString(Properties p, Entry entry) {
+ var value = PropertyFileUtils.currentValue(p.getProperty(entry.getKey()), entry.getDefaultValue(),
+ entry.getNewValue());
- p.setProperty(entry.key(), String.format(String.valueOf(currentValue), entry.pattern()));
+ p.setProperty(entry.getKey(), String.valueOf(value));
- if (entry.modify() != null && entry.modifyValue() != null) {
- var modify = entry.modify().apply(p.getProperty(entry.key()), entry.modifyValue());
- p.setProperty(entry.key(), String.format(modify, entry.pattern()));
+ if (entry.getModify() != null && entry.getModifyValue() != null) {
+ p.setProperty(entry.getKey(), entry.getModify().apply(p.getProperty(entry.getKey()), entry.getModifyValue()));
}
+
+ return true;
}
/**
- * Saves a {@link Properties properties} file.
+ * Logs a warning.
*
- * @param file the file location
- * @param comment the header comment
- * @param p the {@link Properties} to save into the file
- * @throws IOException the io exception
+ * @param command the issuing command
+ * @param message the message to log
*/
- public static void saveProperties(File file, String comment, Properties p) throws IOException {
- try (var output = Files.newOutputStream(file.toPath())) {
- p.store(output, comment);
- } catch (IOException ioe) {
- throw new IOException("An IO error occurred while saving the Properties file: " + file, ioe);
+ static void warn(String command, String message) {
+ if (LOGGER.isLoggable(Level.WARNING)) {
+ LOGGER.warning('[' + command + "] " + message);
}
}
@@ -257,20 +232,55 @@ public final class PropertyFileUtils {
*
* @param command The command name
* @param message the message log
+ * @param e the related exception
* @param failOnWarning logs and throws exception if set to {@code true}
- * @throws ExitStatusException if a {@link Level#SEVERE} exception occurs
*/
- static void warn(String command, String message, boolean failOnWarning, boolean silent)
- throws ExitStatusException {
+ static void warn(String command, String message, Exception e, boolean failOnWarning) throws Exception {
if (failOnWarning) {
- if (LOGGER.isLoggable(Level.SEVERE) && !silent) {
- LOGGER.log(Level.SEVERE, '[' + command + "] " + message);
- }
- throw new ExitStatusException(ExitStatusException.EXIT_FAILURE);
+ LOGGER.log(Level.SEVERE, '[' + command + "] " + message, e);
+ throw e;
} else {
- if (LOGGER.isLoggable(Level.WARNING) && !silent) {
- LOGGER.warning('[' + command + "] " + message);
+ warn(command, message);
+ }
+ }
+
+ /**
+ * Loads a {@link Properties properties} file.
+ *
+ * @param command the issuing command
+ * @param file the file location
+ * @param p the {@link Properties properties} to load into.
+ */
+ public static boolean loadProperties(String command, File file, Properties p) throws Exception {
+ boolean success = true;
+ if (file != null) {
+ if (file.exists()) {
+ try (var propStream = Files.newInputStream(file.toPath(), StandardOpenOption.READ)) {
+ p.load(propStream);
+ } catch (IOException ioe) {
+ warn(command, "Could not load properties file: " + ioe.getMessage(), ioe, true);
+ success = false;
+ }
}
+ } else {
+ warn(command, "Please specify the properties file location.");
+ success = false;
+ }
+ return success;
+ }
+
+ /**
+ * Saves a {@link Properties properties} file.
+ *
+ * @param file the file location
+ * @param comment the header comment
+ * @param p the {@link Properties} to save into the file
+ */
+ public static void saveProperties(File file, String comment, Properties p) throws IOException {
+ try (var output = Files.newOutputStream(file.toPath())) {
+ p.store(output, comment);
+ } catch (IIOException ioe) {
+ throw new IIOException("An IO error occurred while saving the Properties file: " + file, ioe);
}
}
}
diff --git a/src/test/java/rife/bld/extension/propertyfile/PropertyFileOperationTest.java b/src/test/java/rife/bld/extension/propertyfile/PropertyFileOperationTest.java
deleted file mode 100644
index a0d949d..0000000
--- a/src/test/java/rife/bld/extension/propertyfile/PropertyFileOperationTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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);
- }
-}
diff --git a/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java b/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java
index a3b6695..9ccb3f8 100644
--- a/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java
+++ b/src/test/java/rife/bld/extension/propertyfile/PropertyFileUtilsTest.java
@@ -1,26 +1,26 @@
/*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023 the original author or authors.
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
+ * 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.
+ * 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.junit.jupiter.api.Test;
-import rife.bld.operations.exceptions.ExitStatusException;
import rife.tools.Localization;
import java.io.File;
+import java.io.IOException;
import java.time.*;
import java.util.Calendar;
import java.util.Date;
@@ -37,231 +37,178 @@ import static rife.bld.extension.propertyfile.Calc.SUB;
* @author Erik C. Thauvin
* @since 1.0
*/
-@SuppressWarnings("PMD.AvoidDuplicateLiterals")
class PropertyFileUtilsTest {
- final static Properties p = new Properties();
- final static String t = "test";
+ final Properties p = new Properties();
+ final Entry entry = new Entry("version.major").set("1");
+ final EntryDate entryDate = new EntryDate("adate").pattern("D");
+ final EntryInt entryInt = new EntryInt("version.patch");
+ final int dayOfYear = LocalDate.now().getDayOfYear();
+ final String t = "test";
- public Entry newEntry() {
- p.clear();
- return new Entry("version.major").set("1");
- }
+ @Test
+ void processStringTest() {
+ PropertyFileUtils.processString(p, entry);
- public EntryDate newEntryDate() {
- p.clear();
- return new EntryDate("aDate").pattern("D");
- }
+ assertThat(entry.getNewValue()).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
+ .isEqualTo(p.getProperty(entry.getKey()));
- public EntryInt newEntryInt() {
- p.clear();
- return new EntryInt("version.patch");
+ entry.setKey("version.minor");
+
+ PropertyFileUtils.processString(p, entry.set(0));
+ assertThat(entry.getNewValue().toString()).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
+ .isEqualTo(p.getProperty(entry.getKey()));
}
@Test
- void parseDateSub() {
- var entryDate = newEntryDate().calc(SUB);
- PropertyFileUtils.processDate(p, entryDate.now());
- assertThat(p.getProperty(entryDate.key())).as("processDate(now-3)").isEqualTo(String.valueOf(
- LocalDateTime.now().minusDays(1).getDayOfYear()));
-
- entryDate.calc(v -> v - 2);
- PropertyFileUtils.processDate(p, entryDate.now());
- assertThat(p.getProperty(entryDate.key())).as("processDate(now-2)").isEqualTo(String.valueOf(
- LocalDateTime.now().minusDays(2).getDayOfYear()));
-
- entryDate.calc(SUB);
- PropertyFileUtils.processDate(p, entryDate.set(new Date()));
- assertThat(p.getProperty(entryDate.key())).as("processDate(date-1)").isEqualTo(String.valueOf(
- LocalDateTime.now().minusDays(1).getDayOfYear()));
-
- entryDate.calc(v -> v - 2);
- PropertyFileUtils.processDate(p, entryDate.set(Calendar.getInstance()));
- assertThat(p.getProperty(entryDate.key())).as("processDate(cal-2)").isEqualTo(String.valueOf(
- LocalDateTime.now().minusDays(2).getDayOfYear()));
-
- entryDate.calc(v -> v - 3);
- PropertyFileUtils.processDate(p, entryDate.set(LocalDate.now()));
- assertThat(p.getProperty(entryDate.key())).as("processDate(LocalDate-3)").isEqualTo(String.valueOf(
- LocalDateTime.now().minusDays(3).getDayOfYear()));
+ void testWarn() {
+ assertThatCode(() -> PropertyFileUtils.warn("command", "message", new IOException(t), true))
+ .hasMessage(t).isInstanceOf(IOException.class);
+ assertThatCode(() -> PropertyFileUtils.warn("command", t, new Exception(t), false))
+ .as("failOnWarning = false").doesNotThrowAnyException();
}
@Test
- void parseIntSubTest() {
- var entryInt = newEntryInt().calc(SUB).pattern("0000");
- PropertyFileUtils.processInt(p, entryInt.defaultValue("0017"));
- assertThat(p.getProperty(entryInt.key())).as("sub(0017)").isEqualTo("0016");
-
- PropertyFileUtils.processInt(p, entryInt.set(16).calc(v -> v - 3));
- assertThat(p.getProperty(entryInt.key())).as("sub(16)-3").isEqualTo("0013");
- }
-
- @Test
- @SuppressWarnings("PMD.AvoidDuplicateLiterals")
void parseStringAppend() {
- var entry = newEntry();
- PropertyFileUtils.processString(p, entry.set(1));
PropertyFileUtils.processString(p, entry.modify("-foo", String::concat));
- assertThat(p.getProperty(entry.key())).as(String.format("processString(%s, %s)", entry.key(),
- entry.newValue())).isEqualTo("1-foo");
+ assertThat(p.getProperty(entry.getKey())).as(String.format("processString(%s, %s)", entry.getKey(),
+ entry.getNewValue())).isEqualTo("1-foo");
+ }
+
+ @Test
+ void parseStringPrepend() {
+ PropertyFileUtils.processString(p, entry.modify("foo-", (v, s) -> s + v));
+ assertThat(p.getProperty(entry.getKey())).as(String.format("processString(%s, %s)", entry.getKey(), entry.getNewValue()))
+ .isEqualTo("foo-1");
}
@Test
void parseStringCap() {
- var entry = newEntry();
PropertyFileUtils.processString(p, entry.set(t).modify("", (v, s) -> v.toUpperCase(Localization.getLocale())));
- assertThat(p.getProperty(entry.key())).as("capitalize").isEqualTo(t.toUpperCase(Localization.getLocale()));
+ assertThat(p.getProperty(entry.getKey())).as("capitalize").isEqualTo(t.toUpperCase(Localization.getLocale()));
+
+ }
+
+ @Test
+ void parseStringReplace() {
+ entry.set(t).setModify("T", (v, s) -> v.replace("t", s));
+ PropertyFileUtils.processString(p, entry);
+ assertThat(p.getProperty(entry.getKey())).as("replace(t -> T)").isEqualTo("TesT");
}
@Test
void parseStringCat() {
- var entry = newEntry();
- entry.set(t).modify("-foo", String::concat);
+ entry.set(t).setModify("-foo", String::concat);
PropertyFileUtils.processString(p, entry);
- assertThat(p.getProperty(entry.key())).as("replace").isEqualTo(t + "-foo");
- }
-
- @Test
- void parseStringFormat() {
- var entry = new Entry("foo").set("%.2f").pattern(3.14159f);
- PropertyFileUtils.processString(p, entry);
- assertThat(p.getProperty(entry.key())).as("format").isEqualTo("3.14");
- }
-
-
- @Test
- void parseStringPrepend() {
- var entry = newEntry();
- PropertyFileUtils.processString(p, entry.set(1));
- PropertyFileUtils.processString(p, entry.modify("foo-", (v, s) -> s + v));
- assertThat(p.getProperty(entry.key())).as(String.format("processString(%s, %s)", entry.key(), entry.newValue()))
- .isEqualTo("foo-1");
- }
-
- @Test
- void parseStringReplace() {
- var entry = newEntry();
- entry.set(t).modify("T", (v, s) -> v.replace("t", s));
- PropertyFileUtils.processString(p, entry);
- assertThat(p.getProperty(entry.key())).as("replace(t -> T)").isEqualTo("TesT");
+ assertThat(p.getProperty(entry.getKey())).as("replace").isEqualTo(t + "-foo");
}
@Test
void parseStringSub() {
- var entry = newEntry();
PropertyFileUtils.processString(p, entry.set(t).modify((v, s) -> v.substring(1)));
- assertThat(p.getProperty(entry.key())).as("substring(1)").isEqualTo(t.substring(1));
+ assertThat(p.getProperty(entry.getKey())).as("substring(1)").isEqualTo(t.substring(1));
}
@Test
- void parseTimeTest() {
+ void processIntAddTest() throws Exception {
+ entryInt.calc(ADD);
+ entryInt.setDefaultValue("-1");
+ PropertyFileUtils.processInt(t, p, entryInt, true);
+ assertThat(p.getProperty(entryInt.getKey())).as("add(-1)").isEqualTo("0");
+
+ entryInt.setKey("anint");
+ entryInt.setDefaultValue("0");
+ PropertyFileUtils.processInt(t, p, entryInt, true);
+ assertThat(p.getProperty(entryInt.getKey())).as("add(0)").isEqualTo("1");
+ PropertyFileUtils.processInt(t, p, entryInt, true);
+ assertThat(p.getProperty(entryInt.getKey())).as("add(1)").isEqualTo("2");
+
+ entryInt.setKey("formatted.int");
+ entryInt.setDefaultValue("0013");
+ entryInt.setPattern("0000");
+ PropertyFileUtils.processInt(t, p, entryInt, true);
+ assertThat(p.getProperty(entryInt.getKey())).as("add(0013)").isEqualTo("0014");
+ PropertyFileUtils.processInt(t, p, entryInt, true);
+ assertThat(p.getProperty(entryInt.getKey())).as("add(0014)").isEqualTo("0015");
+
+ entryInt.calc(v -> v + 2);
+ PropertyFileUtils.processInt(t, p, entryInt, true);
+ assertThat(p.getProperty(entryInt.getKey())).as("add(0015)+2").isEqualTo("0017");
+ }
+
+ @Test
+ void parseIntSubTest() throws Exception {
+ entryInt.calc(SUB);
+ entryInt.setPattern("0000");
+ PropertyFileUtils.processInt(t, p, entryInt.defaultValue("0017"), true);
+ assertThat(p.getProperty(entryInt.getKey())).as("sub(0017)").isEqualTo("0016");
+
+ PropertyFileUtils.processInt(t, p, entryInt.set(16).calc(v -> v - 3), true);
+ assertThat(p.getProperty(entryInt.getKey())).as("sub(16)-3").isEqualTo("0013");
+ }
+
+ @Test
+ void processDateAddTest() throws Exception {
+ entryDate.setCalc(ADD);
+ PropertyFileUtils.processDate(t, p, entryDate.now(), true);
+ assertThat(p.getProperty(entryDate.getKey())).as("processDate(now+1)").isEqualTo(String.valueOf(dayOfYear + 1));
+
+ PropertyFileUtils.processDate(t, p, entryDate.now().calc(v -> v + 3), true);
+ assertThat(p.getProperty(entryDate.getKey())).as("processDate(now+3)").isEqualTo(String.valueOf(dayOfYear + 3));
+
+ entryDate.setCalc(ADD);
+ PropertyFileUtils.processDate(t, p, entryDate.set(ZonedDateTime.now()), true);
+ assertThat(p.getProperty(entryDate.getKey())).as("processDate(ZonedDateTime+1)")
+ .isEqualTo(String.valueOf(dayOfYear + 1));
+
+ PropertyFileUtils.processDate(t, p, entryDate.set(Instant.now()).calc(v -> v + 2), true);
+ assertThat(p.getProperty(entryDate.getKey())).as("processDate(Instant+2)").isEqualTo(String.valueOf(dayOfYear + 2));
+
+ entryDate.setCalc(v -> v + 3);
+ PropertyFileUtils.processDate(t, p, entryDate.set(LocalDateTime.now()), true);
+ assertThat(p.getProperty(entryDate.getKey())).as("processDate(LocalDteTime+2)").isEqualTo(String.valueOf(dayOfYear + 3));
+ }
+
+ @Test
+ void parseDateSub() throws Exception {
+ entryDate.setCalc(SUB);
+ PropertyFileUtils.processDate(t, p, entryDate.now(), true);
+ assertThat(p.getProperty(entryDate.getKey())).as("processDate(now-3)").isEqualTo(String.valueOf(dayOfYear - 1));
+
+ entryDate.setCalc(v -> v - 2);
+ PropertyFileUtils.processDate(t, p, entryDate.now(), true);
+ assertThat(p.getProperty(entryDate.getKey())).as("processDate(now-2)").isEqualTo(String.valueOf(dayOfYear - 2));
+
+ entryDate.setCalc(SUB);
+ PropertyFileUtils.processDate(t, p, entryDate.set(new Date()), true);
+ assertThat(p.getProperty(entryDate.getKey())).as("processDate(date-1)").isEqualTo(String.valueOf(dayOfYear - 1));
+
+ entryDate.setCalc(v -> v - 2);
+ PropertyFileUtils.processDate(t, p, entryDate.set(Calendar.getInstance()), true);
+ assertThat(p.getProperty(entryDate.getKey())).as("processDate(cal-2)").isEqualTo(String.valueOf(dayOfYear - 2));
+
+ entryDate.setCalc(v -> v - 3);
+ PropertyFileUtils.processDate(t, p, entryDate.set(LocalDate.now()),
+ true);
+ assertThat(p.getProperty(entryDate.getKey())).as("processDate(LocalDate-3)").isEqualTo(String.valueOf(dayOfYear - 3));
+ }
+
+ @Test
+ void parseTimeTest() throws Exception {
var entry = new EntryDate("time").pattern("m");
var time = LocalTime.now();
- entry.calc(ADD);
- PropertyFileUtils.processDate(p, entry.set(time).unit(EntryDate.Units.MINUTE));
- assertThat(p.getProperty(entry.key())).as("processDate(now+1)")
+ entry.setCalc(ADD);
+ PropertyFileUtils.processDate(t, p, entry.set(time).unit(EntryDate.Units.MINUTE), true);
+ assertThat(p.getProperty(entry.getKey())).as("processDate(now+1)")
.isEqualTo(String.valueOf(time.plusMinutes(1).getMinute()));
- entry.calc(SUB);
- PropertyFileUtils.processDate(p, entry.set(time).unit(EntryDate.Units.HOUR).pattern("H"));
- assertThat(p.getProperty(entry.key())).as("processDate(now+1)")
+ entry.setCalc(SUB);
+ PropertyFileUtils.processDate(t, p, entry.set(time).unit(EntryDate.Units.HOUR).pattern("H"), true);
+ assertThat(p.getProperty(entry.getKey())).as("processDate(now+1)")
.isEqualTo(String.valueOf(time.minusHours(1).getHour()));
}
- @Test
- void processDateAddTest() {
- var entryDate = newEntryDate();
- entryDate.calc(ADD);
- PropertyFileUtils.processDate(p, entryDate.now());
- assertThat(p.getProperty(entryDate.key())).as("processDate(now+1)").isEqualTo(String.valueOf(
- LocalDateTime.now().plusDays(1).getDayOfYear()));
-
- PropertyFileUtils.processDate(p, entryDate.now().calc(v -> v + 3));
- assertThat(p.getProperty(entryDate.key())).as("processDate(now+3)").isEqualTo(String.valueOf(
- LocalDateTime.now().plusDays(3).getDayOfYear()));
-
- entryDate.calc(ADD);
- PropertyFileUtils.processDate(p, entryDate.set(ZonedDateTime.now()));
- assertThat(p.getProperty(entryDate.key())).as("processDate(ZonedDateTime+1)")
- .isEqualTo(String.valueOf(LocalDateTime.now().plusDays(1).getDayOfYear()));
-
- PropertyFileUtils.processDate(p, entryDate.set(Instant.now()).calc(v -> v + 2));
- assertThat(p.getProperty(entryDate.key())).as("processDate(Instant+2)").isEqualTo(String.valueOf(
- LocalDateTime.now().plusDays(2).getDayOfYear()));
-
- entryDate.calc(v -> v + 3);
- PropertyFileUtils.processDate(p, entryDate.set(LocalDateTime.now()));
- assertThat(p.getProperty(entryDate.key())).as("processDate(LocalDteTime+2)")
- .isEqualTo(String.valueOf(LocalDateTime.now().plusDays(3).getDayOfYear()));
- }
-
- @Test
- void processIntAddTest() {
- var entryInt = newEntryInt().calc(ADD).defaultValue("-1");
- PropertyFileUtils.processInt(p, entryInt);
- assertThat(p.getProperty(entryInt.key())).as("add(-1)").isEqualTo("0");
-
- entryInt.key("anInt").defaultValue("0");
- PropertyFileUtils.processInt(p, entryInt);
- assertThat(p.getProperty(entryInt.key())).as("add(0)").isEqualTo("1");
- PropertyFileUtils.processInt(p, entryInt);
- assertThat(p.getProperty(entryInt.key())).as("add(1)").isEqualTo("2");
-
- entryInt.key("formatted.int").defaultValue("0013").pattern("0000");
- PropertyFileUtils.processInt(p, entryInt);
- assertThat(p.getProperty(entryInt.key())).as("add(0013)").isEqualTo("0014");
- PropertyFileUtils.processInt(p, entryInt);
- assertThat(p.getProperty(entryInt.key())).as("add(0014)").isEqualTo("0015");
-
- entryInt.calc(v -> v + 2);
- PropertyFileUtils.processInt(p, entryInt);
- assertThat(p.getProperty(entryInt.key())).as("add(0015)+2").isEqualTo("0017");
- }
-
- @Test
- void processStringTest() {
- var entry = newEntry();
- PropertyFileUtils.processString(p, entry);
-
- assertThat(entry.newValue()).as(String.format("processString(%s, %s)", entry.key(), entry.newValue()))
- .isEqualTo(p.getProperty(entry.key()));
-
- entry.key("version.minor");
-
- PropertyFileUtils.processString(p, entry.set(0));
- assertThat(entry.newValue().toString()).as(String.format("processString(%s, %s)", entry.key(), entry.newValue()))
- .isEqualTo(p.getProperty(entry.key()));
- }
-
- @Test
- void savePropertiesTest() throws Exception {
- var p = new Properties();
- var test = "test";
-
- p.put(test, test);
-
- var tmp = File.createTempFile(test, ".properties");
-
- assertThatCode(() -> PropertyFileUtils.saveProperties(tmp, "Generated file - do not modify!", p))
- .as("save properties").doesNotThrowAnyException();
-
- assertThat(PropertyFileUtils.loadProperties(t, tmp, p, false)).as("load properties").isTrue();
-
- assertThat(p.getProperty(test)).as("read property").isEqualTo(test);
-
- tmp.deleteOnExit();
- }
-
- @Test
- void testChangeKey() {
- var entry = new Entry("foo").key("bar");
- assertThat(entry.key()).isEqualTo("bar");
-
- entry.key("foo");
- assertThat(entry.key()).isEqualTo("foo");
- }
-
@Test
void testCurrentValue() {
var value = "value";
@@ -276,10 +223,21 @@ class PropertyFileUtilsTest {
}
@Test
- void testWarn() {
- assertThatCode(() -> PropertyFileUtils.warn("command", "message", true, false))
- .isInstanceOf(ExitStatusException.class);
- assertThatCode(() -> PropertyFileUtils.warn("command", t, false, false))
- .as("failOnWarning = false").doesNotThrowAnyException();
+ void savePropertiesTest() throws Exception {
+ var p = new Properties();
+ var test = "test";
+
+ p.put(test, test);
+
+ var tmp = File.createTempFile(test, ".properties");
+
+ assertThatCode(() -> PropertyFileUtils.saveProperties(tmp, "Generated file - do not modify!", p))
+ .as("save properties").doesNotThrowAnyException();
+
+ assertThat(PropertyFileUtils.loadProperties(t, tmp, p)).as("load properties").isTrue();
+
+ assertThat(p.getProperty(test)).as("read property").isEqualTo(test);
+
+ tmp.deleteOnExit();
}
-}
+}
\ No newline at end of file