drop Java 8 code, fix Javadoc

Author: stoecker

.gitignore

@@ -7,3 +7,6 @@
 /out/
 /checkstyle-josm-wikipedia.xml
 /findbugs-josm-wikipedia.xml
+/dependency-reduced-pom.xml
+/target/
+/test/config/

src/main/java/org/wikipedia/data/WikipediaEntry.java

@@ -11,7 +11,6 @@
 import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.Utils;
 import org.wikipedia.WikipediaApp;
-import org.wikipedia.tools.FunctionalUtil;
 
 public class WikipediaEntry implements Comparable<WikipediaEntry> {
 
@@ -34,11 +33,10 @@ public WikipediaEntry(String lang, String article, LatLon coordinate) {
     }
 
     public static Optional<WikipediaEntry> fromUrl(final String value) {
-        return FunctionalUtil.or(
-            Optional.ofNullable(value)
+        return Optional.ofNullable(value)
                 .map(WIKIPEDIA_FULL_URL_PATTERN::matcher)
                 .filter(Matcher::matches)
-                .map(it -> new WikipediaEntry(it.group(3), Utils.decodeUrl(it.group(5)).replace('_', ' '))),
+                .map(it -> new WikipediaEntry(it.group(3), Utils.decodeUrl(it.group(5)).replace('_', ' '))).or(
             () -> Optional.ofNullable(value)
                 .map(WIKIPEDIA_ALTERNATIVE_URL_PATTERN::matcher)
                 .filter(Matcher::matches)

src/main/java/org/wikipedia/tools/FunctionalUtil.java

@@ -15,7 +15,10 @@ private RegexUtil() {
     }
 
     /**
-     * Note: For values > {@link Integer#MAX_VALUE}, the Mediawiki API will return with an error instead of reporting an entity as missing.
+     * Check if value is a valid property Id
+     * Note: For values > {@link Integer#MAX_VALUE}, the Mediawiki API will return with an error instead of reporting an entity as missing.
+     * @param value id to check
+     * @return {@code true} or {@code false}
      */
     public static boolean isValidPropertyId(final String value) {
         return isValidId(PROPERTY_ID_PATTERN, value);

src/main/java/org/wikipedia/tools/RegexUtil.java

@@ -26,7 +26,6 @@
 import org.wikipedia.api.wikidata_action.WikidataActionApiQuery;
 import org.wikipedia.api.wikidata_action.json.SitematrixResult;
 import org.wikipedia.data.WikipediaEntry;
-import org.wikipedia.tools.FunctionalUtil;
 import org.wikipedia.tools.OsmTagConstants;
 
 public class WikipediaValueFormat extends Test.TagTest {
@@ -59,15 +58,13 @@ public WikipediaValueFormat() {
     @Override
     public void check(OsmPrimitive p) {
         Optional.of(OsmTagConstants.Key.WIKIPEDIA).flatMap(k -> Optional.ofNullable(p.get(k)).map(v -> new Tag(k, v))).flatMap(tag ->
-            FunctionalUtil.or(
-                getFullUrlCheckError(p, tag.getKey(), tag.getValue()),
+            getFullUrlCheckError(p, tag.getKey(), tag.getValue()).or(
                 () -> getLanguageArticleFormatError(p, tag.getKey(), tag.getValue())
             )
             // checkUrlDecode() is tested by core
         ).ifPresent(it -> errors.add(it.build()));
         p.keySet().stream().filter(Objects::nonNull).filter(it -> it.endsWith(":wikipedia")).collect(Collectors.toMap(it -> it, p::get)).forEach((key, value) -> {
-            FunctionalUtil.or(
-                getFullUrlCheckError(p, key, value),
+            getFullUrlCheckError(p, key, value).or(
                 () -> getLanguageArticleFormatError(p, key, value)
             ).ifPresent(it -> errors.add(it.build()));
             checkUrlDecode(p, key, value);
@@ -130,8 +127,7 @@ private Optional<TestError.Builder> getFullUrlCheckError(final OsmPrimitive p, f
     }
 
     private Optional<TestError.Builder> getFullUrlCheckError(final OsmPrimitive p, final String key, final String value, final String message, final Function<WikipediaEntry, Optional<Tag>> newTagGetter) {
-        return FunctionalUtil.or(
-            WikipediaEntry.fromUrl(value).map(newTagGetter).flatMap(newTag ->
+        return WikipediaEntry.fromUrl(value).map(newTagGetter).flatMap(newTag ->
                 Optional.of(
                     AllValidationTests.WIKIPEDIA_TAG_VALUE_IS_FULL_URL.getBuilder(this)
                         .primitives(p)
@@ -144,7 +140,7 @@ private Optional<TestError.Builder> getFullUrlCheckError(final OsmPrimitive p, f
                             newTag.map(it -> it.getKey() + "=" + it.getValue()).orElse(I18n.tr("a new value (manual intervention needed due to language conflict)"))
                         )
                 )
-            ),
+            ).or(
             () -> Optional.ofNullable(
                 CONTAINS_URL_PATTERN.matcher(value).matches()
                     ? AllValidationTests.WIKIPEDIA_TAG_VALUE_CONTAINS_URL.getBuilder(this)