Changeset 18824 in josm

Timestamp:

2023-09-07T19:36:52+02:00 (9 months ago)

Author:

taylor.smock

Message:

Fix #23153: Remote Control API call is adding hashtags many times

This occurs due to adding the hashtags to the comment multiple times.

This is fixed by doing the following:
1) When finding hashtags from a comment, only return the distinct hashtags
2) When adding hashtags from the dataset, only add hashtags that are not already

part of the comment.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/io/UploadDialogModel.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/io/UploadDialogModelTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialogModel.java

@@ -76 +76 @@
      */
     String findHashTags(String comment) {
-        String hashtags = Arrays.stream(comment.split("\\s", -1))
+        String foundHashtags = Arrays.stream(comment.split("\\s", -1))
             .map(s -> Utils.strip(s, ",;"))
             .filter(s -> s.matches("#[a-zA-Z0-9][-_a-zA-Z0-9]+"))
-            .collect(Collectors.joining(";"));
-        return hashtags.isEmpty() ? null : hashtags;
+            .distinct().collect(Collectors.joining(";"));
+        return foundHashtags.isEmpty() ? null : foundHashtags;
     }
 
@@ -96 +96 @@
                 Set<String> sanitizedHashtags = new LinkedHashSet<>();
                 for (String hashtag : hashtags.split(";", -1)) {
-                    sanitizedHashtags.add(hashtag.startsWith("#") ? hashtag : "#" + hashtag);
+                    if (comment == null || !comment.contains(hashtag)) {
+                        sanitizedHashtags.add(hashtag.startsWith("#") ? hashtag : "#" + hashtag);
+                    }
                 }
                 if (!sanitizedHashtags.isEmpty()) {
@@ -108 +110 @@
     /**
      * Inserts/updates/deletes a tag.
-     *
+     * <p>
      * Existing keys are updated. Others are added. A value of {@code null}
      * deletes the key.
@@ -131 +133 @@
     /**
      * Inserts/updates/deletes a tag.
-     *
+     * <p>
      * Existing keys are updated. Others are added. A value of {@code null}
      * deletes the key.
@@ -147 +149 @@
     /**
      * Inserts/updates/deletes all tags from {@code map}.
-     *
+     * <p>
      * Existing keys are updated. Others are added. A value of {@code null}
      * deletes the key.

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java

@@ -20 +20 @@
 import java.util.Set;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;

trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogModelTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.io;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.Main;
 
 /**
  * Unit tests of {@link UploadDialogModel} class.
  */
-public class UploadDialogModelTest {
-    /**
-     * Setup tests
-     */
-    @RegisterExtension
-    public JOSMTestRules test = new JOSMTestRules().preferences().main();
-
+@Main
+class UploadDialogModelTest {
     /**
      * Test of {@link UploadDialogModel}.
@@ -27 +21 @@
     @Test
     void testUploadDialogModel() {
-        assertNotNull(new UploadDialogModel());
+        assertDoesNotThrow(UploadDialogModel::new);
     }
 
@@ -65 +59 @@
     }
 
+    @Test
+    void testNonRegression23153() {
+        final DataSet dataSet = new DataSet();
+        dataSet.getChangeSetTags().put("hashtags", "duplicate");
+        final UploadDialogModel model = new UploadDialogModel();
+        final String hashTags = model.findHashTags("#duplicate #duplicate hashtag");
+        assertEquals("#duplicate", hashTags);
+        final String commentHashtags = UploadDialogModel.addHashTagsFromDataSet("There should be no " + hashTags, dataSet);
+        assertEquals("There should be no #duplicate", commentHashtags);
+    }
+
 }