Changeset 15051 in josm for trunk

Timestamp:

2019-05-05T17:35:29+02:00 (6 years ago)

Author:

Don-vip

Message:

see #17634 - allow to define exceptions to the list of forbidden terms, through upload.comment.exception-terms property

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java (modified) (1 diff)

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

@@ -599 +599 @@
         }
 
-        static String validateUploadTag(String uploadValue, String preferencePrefix, List<String> defMandatory, List<String> defForbidden) {
+        static String validateUploadTag(String uploadValue, String preferencePrefix,
+                List<String> defMandatory, List<String> defForbidden, List<String> defException) {
             String uploadValueLc = lower(uploadValue);
             // Check mandatory terms
@@ -608 +609 @@
             }
             // Check forbidden terms
+            List<String> exceptions = Config.getPref().getList(preferencePrefix+".exception-terms", defException);
             List<String> forbiddenTerms = Config.getPref().getList(preferencePrefix+".forbidden-terms", defForbidden)
-                    .stream().map(UploadAction::lower).filter(uploadValueLc::contains).collect(Collectors.toList());
+                    .stream().map(UploadAction::lower)
+                    .filter(x -> uploadValueLc.contains(x) && !exceptions.stream().anyMatch(uploadValueLc::contains))
+                    .collect(Collectors.toList());
             if (!forbiddenTerms.isEmpty()) {
                 return tr("The following forbidden terms have been found: {0}", forbiddenTerms);
@@ -624 +628 @@
             final String uploadComment = dialog.getUploadComment();
             final String uploadCommentRejection = validateUploadTag(
-                    uploadComment, "upload.comment", def, def);
+                    uploadComment, "upload.comment", def, def, def);
             if ((isUploadCommentTooShort(uploadComment) && warnUploadComment()) ||
                 (uploadCommentRejection != null && warnRejectedUploadComment(uploadCommentRejection))) {
@@ -633 +637 @@
             final String uploadSource = dialog.getUploadSource();
             final String uploadSourceRejection = validateUploadTag(
-                    uploadSource, "upload.source", def, def);
+                    uploadSource, "upload.source", def, def, def);
             if ((Utils.isStripEmpty(uploadSource) && warnUploadSource()) ||
                     (uploadSourceRejection != null && warnRejectedUploadSource(uploadSourceRejection))) {

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

@@ -265 +265 @@
         Config.getPref().putList(prefix + ".mandatory-terms", null);
         Config.getPref().putList(prefix + ".forbidden-terms", null);
-        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def));
+        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def, def));
 
         Config.getPref().putList(prefix + ".mandatory-terms", Arrays.asList("foo"));
-        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def));
+        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def, def));
         assertEquals("The following required terms are missing: [foo]",
-                UploadAction.validateUploadTag("bar", prefix, def, def));
+                UploadAction.validateUploadTag("bar", prefix, def, def, def));
 
         Config.getPref().putList(prefix + ".forbidden-terms", Arrays.asList("bar"));
-        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def));
-        assertEquals("The following forbidden terms have been found: [bar]",
-                UploadAction.validateUploadTag("foobar", prefix, def, def));
-        assertEquals("The following forbidden terms have been found: [bar]",
-                UploadAction.validateUploadTag("FOOBAR", prefix, def, def));
+        assertNull(UploadAction.validateUploadTag("foo", prefix, def, def, def));
+        assertEquals("The following forbidden terms have been found: [bar]",
+                UploadAction.validateUploadTag("foobar", prefix, def, def, def));
+        assertEquals("The following forbidden terms have been found: [bar]",
+                UploadAction.validateUploadTag("FOOBAR", prefix, def, def, def));
+
+        Config.getPref().putList(prefix + ".exception-terms", Arrays.asList("barosm"));
+        assertEquals("The following forbidden terms have been found: [bar]",
+                UploadAction.validateUploadTag("foobar", prefix, def, def, def));
+        assertEquals("The following forbidden terms have been found: [bar]",
+                UploadAction.validateUploadTag("FOOBAR", prefix, def, def, def));
+        assertNull(UploadAction.validateUploadTag("foobarosm", prefix, def, def, def));
+        assertNull(UploadAction.validateUploadTag("FOOBAROSM", prefix, def, def, def));
     }