Remove usages of HashMap functions that are not thread-safe.

- Removes the usages of the underlying HashMap functions on Properties objects that lack synchronization and are not thread safe.

Author: ryantse

core/src/main/java/pl/project13/core/GitDataProvider.java

@@ -245,7 +245,7 @@ protected SimpleDateFormat getSimpleDateFormatWithTimeZone() {
   protected void maybePut(@Nonnull Properties properties, String key, SupplierEx<String> value)
           throws GitCommitIdExecutionException {
     String keyWithPrefix = prefixDot + key;
-    if (properties.containsKey(keyWithPrefix)) {
+    if (properties.stringPropertyNames().contains(keyWithPrefix)) {
       String propertyValue = properties.getProperty(keyWithPrefix);
       log.info("Using cached {} with value {}", keyWithPrefix, propertyValue);
     } else if (PropertiesFilterer.isIncluded(keyWithPrefix, includeOnlyProperties, excludeProperties)) {

core/src/main/java/pl/project13/core/PropertiesFileGenerator.java

@@ -75,8 +75,8 @@ public void maybeGeneratePropertiesFile(@Nonnull Properties localProperties, Fil
 
           final String buildTimeProperty = prefixDot + GitCommitPropertyConstant.BUILD_TIME;
 
-          propertiesCopy.remove(buildTimeProperty);
-          persistedProperties.remove(buildTimeProperty);
+          propertiesCopy.setProperty(buildTimeProperty, null);
+          persistedProperties.setProperty(buildTimeProperty, null);
 
           shouldGenerate = !propertiesCopy.equals(persistedProperties);
         } catch (CannotReadFileException ex) {

core/src/main/java/pl/project13/core/cibuild/BuildServerDataProvider.java

@@ -168,7 +168,7 @@ private void loadBuildHostData(@Nonnull Properties properties) {
 
   protected void maybePut(@Nonnull Properties properties, @Nonnull String key, Supplier<String> supplier) {
     String keyWithPrefix = prefixDot + key;
-    if (properties.containsKey(keyWithPrefix)) {
+    if (properties.stringPropertyNames().contains(keyWithPrefix)) {
       String propertyValue = properties.getProperty(keyWithPrefix);
       log.info("Using cached {} with value {}", keyWithPrefix, propertyValue);
     } else if (PropertiesFilterer.isIncluded(keyWithPrefix, includeOnlyProperties, excludeProperties)) {

core/src/main/java/pl/project13/core/util/PropertyManager.java

@@ -30,7 +30,7 @@ public static void putWithoutPrefix(@Nonnull Properties properties, String key,
     if (!isNotEmpty(value)) {
       value = "Unknown";
     }
-    properties.put(key, value);
+    properties.setProperty(key, value);
   }
 
   private static boolean isNotEmpty(@Nullable String value) {

maven/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java

@@ -564,7 +564,9 @@ private void loadBuildData(Properties properties) {
   }
 
   private void publishPropertiesInto(Properties p) {
-    p.putAll(properties);
+    for (String propertyName : properties.stringPropertyNames()) {
+      p.setProperty(propertyName, properties.getProperty(propertyName));
+    }
   }
 
   /**
@@ -603,9 +605,8 @@ private File lookupGitDirectory() throws GitCommitIdExecutionException {
   }
 
   private void logProperties() {
-    for (Object key : properties.keySet()) {
-      String keyString = key.toString();
-      log.info("including property {} in results", keyString);
+    for (String propertyName : properties.stringPropertyNames()) {
+      log.info("including property {} in results", propertyName);
     }
   }
 

maven/src/main/java/pl/project13/maven/git/PropertiesReplacer.java

@@ -50,21 +50,18 @@ public void performReplacement(Properties properties, List<ReplacementProperty>
   }
 
   private void performReplacementOnAllGeneratedProperties(Properties properties, ReplacementProperty replacementProperty) {
-    Map<Object, Object> propertiesToBeAdded = new HashMap<>();
-    for (Map.Entry<Object, Object> entry : properties.entrySet()) {
-      String key = (String)entry.getKey();
-      String content = (String)entry.getValue();
+    for (String propertyName : properties.stringPropertyNames()) {
+      String content = properties.getProperty(propertyName);
       String result = performReplacement(replacementProperty, content);
       if ((replacementProperty.getPropertyOutputSuffix() != null) && (!replacementProperty.getPropertyOutputSuffix().isEmpty())) {
-        String newPropertyKey = key + "." + replacementProperty.getPropertyOutputSuffix();
-        propertiesToBeAdded.put(newPropertyKey, result);
-        log.info("apply replace on property " + key + " and save to " + newPropertyKey + ": original value '" + content + "' with '" + result + "'");
+        String newPropertyKey = propertyName + "." + replacementProperty.getPropertyOutputSuffix();
+        properties.setProperty(newPropertyKey, result);
+        log.info("apply replace on property " + propertyName + " and save to " + newPropertyKey + ": original value '" + content + "' with '" + result + "'");
       } else {
-        entry.setValue(result);
-        log.info("apply replace on property " + key + ": original value '" + content + "' with '" + result + "'");
+        properties.setProperty(propertyName, result);
+        log.info("apply replace on property " + propertyName + ": original value '" + content + "' with '" + result + "'");
       }
     }
-    properties.putAll(propertiesToBeAdded);
   }
 
   private void performReplacementOnSingleProperty(Properties properties, ReplacementProperty replacementProperty, String propertyKey) {