Changeset 14539 in josm for trunk

Timestamp:

2018-12-09T22:02:02+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16073 - check response contents correctly

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -12 +12 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
@@ -89 +90 @@
     }
 
-    private byte[] checkUrl(ImageryInfo info, String url) {
+    private Optional<byte[]> checkUrl(ImageryInfo info, String url) {
         if (url != null && !url.isEmpty()) {
             if (workingURLs.containsKey(url)) {
-                return workingURLs.get(url);
+                return Optional.of(workingURLs.get(url));
             }
             try {
@@ -110 +111 @@
                         workingURLs.put(url, data);
                     }
-                    return data;
+                    return Optional.of(data);
                 } finally {
                     response.disconnect();
@@ -118 +119 @@
             }
         }
-        return new byte[0];
+        return Optional.empty();
     }
 
     private void checkLinkUrl(ImageryInfo info, String url) {
-        if (url != null && checkUrl(info, url).length == 0) {
-            addError(info, url + " -> returned empty contents");
-        }
+        checkUrl(info, url).filter(x -> x.length == 0).ifPresent(x -> addError(info, url + " -> returned empty contents"));
     }
 
@@ -133 +132 @@
             try {
                 String url = tileSource.getTileUrl(zoom, xy.getXIndex(), xy.getYIndex());
-                byte[] data = checkUrl(info, url);
-                try (ByteArrayInputStream bais = new ByteArrayInputStream(data)) {
-                    if (ImageIO.read(bais) == null) {
-                        addImageError(info, url, data, "did not return an image");
+                checkUrl(info, url).ifPresent(data -> {
+                    try (ByteArrayInputStream bais = new ByteArrayInputStream(data)) {
+                        if (ImageIO.read(bais) == null) {
+                            addImageError(info, url, data, "did not return an image");
+                        }
+                    } catch (IOException e) {
+                        addImageError(info, url, data, e.toString());
+                        Logging.trace(e);
                     }
-                } catch (IOException e) {
-                    addImageError(info, url, data, e.toString());
-                    Logging.trace(e);
-                }
+                });
                 return;
             } catch (IOException e) {