fix: now properly handles setting new values for existing keys

Author: quintesse

src/main/java/org/codejive/properties/Properties.java

@@ -94,13 +94,12 @@ public String getRaw(String rawKey) {
 
     @Override
     public String put(String key, String value) {
-        String rawKey = escape(key, true);
         String rawValue = escape(value, false);
         if (values.containsKey(key)) {
-            int idx = indexOf(key);
-            addNew(idx, rawKey, key, rawValue, value);
+            replaceValue(key, rawValue, value);
         } else {
-            addNew(-1, rawKey, key, rawValue, value);
+            String rawKey = escape(key, true);
+            addNewKeyValue(rawKey, key, rawValue, value);
         }
         return values.put(key, value);
     }
@@ -117,36 +116,34 @@ public String putRaw(String rawKey, String rawValue) {
         String key = unescape(rawKey);
         String value = unescape(rawValue);
         if (values.containsKey(key)) {
-            int idx = indexOf(key);
-            addNew(idx, rawKey, key, rawValue, value);
+            replaceValue(key, rawValue, value);
         } else {
-            addNew(-1, rawKey, key, rawValue, value);
+            addNewKeyValue(rawKey, key, rawValue, value);
         }
         return values.put(key, value);
     }
 
+    private void replaceValue(String key, String rawValue, String value) {
+        int idx = indexOf(key);
+        tokens.remove(idx + 2);
+        tokens.add(
+                idx + 2, new PropertiesParser.Token(PropertiesParser.Type.VALUE, rawValue, value));
+    }
+
     // Add new tokens to the end of the list of tokens
-    private void addNew(int index, String rawKey, String key, String rawValue, String value) {
+    private void addNewKeyValue(String rawKey, String key, String rawValue, String value) {
         // Add a newline whitespace token if necessary
-        int idx = index >= 0 ? index : tokens.size();
+        int idx = tokens.size();
         if (idx > 0) {
             PropertiesParser.Token token = tokens.get(idx - 1);
             if (token.getType() != PropertiesParser.Type.WHITESPACE) {
-                addToken(index, new PropertiesParser.Token(PropertiesParser.Type.WHITESPACE, "\n"));
+                tokens.add(new PropertiesParser.Token(PropertiesParser.Type.WHITESPACE, "\n"));
             }
         }
         // Add tokens for key, separator and value
-        addToken(index, new PropertiesParser.Token(PropertiesParser.Type.KEY, rawKey, key));
-        addToken(index, new PropertiesParser.Token(PropertiesParser.Type.SEPARATOR, "="));
-        addToken(index, new PropertiesParser.Token(PropertiesParser.Type.VALUE, rawValue, value));
-    }
-
-    private void addToken(int index, PropertiesParser.Token token) {
-        if (index >= 0) {
-            tokens.add(index, token);
-        } else {
-            tokens.add(token);
-        }
+        tokens.add(new PropertiesParser.Token(PropertiesParser.Type.KEY, rawKey, key));
+        tokens.add(new PropertiesParser.Token(PropertiesParser.Type.SEPARATOR, "="));
+        tokens.add(new PropertiesParser.Token(PropertiesParser.Type.VALUE, rawValue, value));
     }
 
     @Override

src/test/java/org/codejive/properties/TestProperties.java

@@ -196,6 +196,44 @@ void testPutRaw() throws IOException, URISyntaxException {
         assertThat(sw.toString(), equalTo(readAll(getResource("/test-putraw.properties"))));
     }
 
+    @Test
+    void testPutReplaceFirst() throws IOException, URISyntaxException {
+        Properties p = new Properties();
+        p.put("one", "simple");
+        p.put("two", "value containing spaces");
+        p.put("three", "and escapes\n\t\r\f");
+        p.put("one", "replaced");
+        StringWriter sw = new StringWriter();
+        p.store(sw);
+        assertThat(
+                sw.toString(), equalTo(readAll(getResource("/test-putreplacefirst.properties"))));
+    }
+
+    @Test
+    void testPutReplaceMiddle() throws IOException, URISyntaxException {
+        Properties p = new Properties();
+        p.put("one", "simple");
+        p.put("two", "value containing spaces");
+        p.put("three", "and escapes\n\t\r\f");
+        p.put("two", "replaced");
+        StringWriter sw = new StringWriter();
+        p.store(sw);
+        assertThat(
+                sw.toString(), equalTo(readAll(getResource("/test-putreplacemiddle.properties"))));
+    }
+
+    @Test
+    void testPutReplaceLast() throws IOException, URISyntaxException {
+        Properties p = new Properties();
+        p.put("one", "simple");
+        p.put("two", "value containing spaces");
+        p.put("three", "and escapes\n\t\r\f");
+        p.put("three", "replaced");
+        StringWriter sw = new StringWriter();
+        p.store(sw);
+        assertThat(sw.toString(), equalTo(readAll(getResource("/test-putreplacelast.properties"))));
+    }
+
     @Test
     public void testInteropLoad() throws IOException, URISyntaxException {
         java.util.Properties p = new java.util.Properties();

src/test/resources/test-putreplacefirst.properties

@@ -0,0 +1,3 @@
+one=replaced
+two=value containing spaces
+three=and escapes\n\t\r\f

src/test/resources/test-putreplacelast.properties

@@ -0,0 +1,3 @@
+one=simple
+two=value containing spaces
+three=replaced

src/test/resources/test-putreplacemiddle.properties

@@ -0,0 +1,3 @@
+one=simple
+two=replaced
+three=and escapes\n\t\r\f