Changeset 36042 in osm for applications/editors

Timestamp:

2022-12-12T19:28:40+01:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22520: IllegalStateException: Missing merge target for node (patch by GerdP, modified to add tests)

The added test is essentially an integration test instead of a unit test, mostly
due to having no good way to do a test specifically for the method at issue.
The test uses wiremock to (a) speed up the test and (b) avoid adding a test-time
dependency on the OSM API servers. The test required a custom wiremock response
transformer for the OSM multi-fetch API, since it is not guaranteed that the
order of objects will remain the same, which will lead to stub misses, failing
the test.

Location:

applications/editors/josm/plugins/reverter

Files:

• src/reverter/ChangesetReverter.java (modified) (1 diff)
• src/reverter/RevertChangesetTask.java (modified) (1 diff)
• test (added)
• test/data (added)
• test/data/regress (added)
• test/data/regress/22520 (added)
• test/data/regress/22520/mappings (added)
• test/data/regress/22520/mappings/06_changeset_36536612-c29c9e52-42ec-45c1-ad09-cf995c45c9a9.json (added)
• test/data/regress/22520/mappings/06_changeset_36536612_download-52476299-aea3-40b7-8d1f-dd26f94def70.json (added)
• test/data/regress/22520/mappings/06_way_233056719_3-14834ba3-60fa-41c7-a36d-d3bbf8408bf3.json (added)
• test/data/regress/22520/mappings/capabilities-13745274-1301-4d5b-a442-0a6cba30df61.json (added)
• test/unit (added)
• test/unit/reverter (added)
• test/unit/reverter/ChangesetReverterTest.java (added)

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -424 +424 @@
             ChangesetDataSetEntry entry = it.next();
             if (!checkOsmChangeEntry(entry)) continue;
+            if (entry.getModificationType() == ChangesetModificationType.DELETED
+                    && revertType == RevertType.SELECTION_WITH_UNDELETE) {
+                // see #22520: missing merge target when object is first created and then
+                // deleted in the same changeset
+                ChangesetDataSetEntry first = cds.getFirstEntry(entry.getPrimitive().getPrimitiveId());
+                if (first.getModificationType() == ChangesetModificationType.CREATED)
+                    continue;
+            }
             HistoryOsmPrimitive hp = entry.getPrimitive();
             OsmPrimitive dp = ds.getPrimitiveById(hp.getPrimitiveId());

applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java

@@ -53 +53 @@
 
     public RevertChangesetTask(Collection<Integer> changesetIds, RevertType revertType, boolean autoConfirmDownload, boolean newLayer) {
-        super(tr("Reverting..."));
+        this(null, changesetIds, revertType, autoConfirmDownload, newLayer);
+    }
+
+    /**
+     * Create a new task for reverting a changeset
+     * @param progressMonitor The {@link ProgressMonitor} to use. May be {@code null}
+     * @param changesetIds The changeset ids to revert
+     * @param revertType The type of revert to do
+     * @param autoConfirmDownload {@code true} if the user has already indicated that they want to download missing data
+     * @param newLayer {@code true} if the user wants the reversion to be on a new layer
+     */
+    public RevertChangesetTask(ProgressMonitor progressMonitor, Collection<Integer> changesetIds, RevertType revertType, boolean autoConfirmDownload, boolean newLayer) {
+        super(tr("Reverting..."), progressMonitor, false);
         this.changesetIds = new ArrayList<>(changesetIds);
         this.revertType = revertType;