Index: /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 13273) +++ /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 13274) @@ -4,4 +4,5 @@ import java.awt.HeadlessException; import java.io.IOException; +import java.io.InputStream; import java.io.StringReader; import java.io.StringWriter; @@ -235,5 +236,4 @@ final Response response = HttpClient.create(getCapabilitiesUrl).connect(); - String incomingData = null; if (response.getResponseCode() >= 400) { @@ -241,4 +241,9 @@ } + parseCapabilities(serviceUrlStr, response.getContent()); + } + + void parseCapabilities(String serviceUrlStr, InputStream contentStream) throws IOException, WMSGetCapabilitiesException { + String incomingData = null; try { DocumentBuilder builder = Utils.newSafeDOMBuilder(); @@ -247,5 +252,5 @@ return new InputSource(new StringReader("")); }); - Document document = builder.parse(response.getContent()); + Document document = builder.parse(contentStream); Element root = document.getDocumentElement(); @@ -369,5 +374,5 @@ getChildrenStream(element) .filter(child -> "CRS".equals(child.getNodeName()) || "SRS".equals(child.getNodeName())) - .map(child -> (String) getContent(child)) + .map(child -> getContent(child)) .filter(crs -> !crs.isEmpty()) .map(crs -> crs.trim().toUpperCase(Locale.ENGLISH)) @@ -421,10 +426,10 @@ return missing; else { - String content = (String) getContent(child); + String content = getContent(child); return (!content.isEmpty()) ? content : empty; } } - private static Object getContent(Element element) { + private static String getContent(Element element) { NodeList nl = element.getChildNodes(); StringBuilder content = new StringBuilder(); @@ -433,5 +438,6 @@ switch (node.getNodeType()) { case Node.ELEMENT_NODE: - return node; + content.append(getContent((Element) node)); + break; case Node.CDATA_SECTION_NODE: case Node.TEXT_NODE: Index: /trunk/test/data/regress/15730/capabilities.xml =================================================================== --- /trunk/test/data/regress/15730/capabilities.xml (revision 13274) +++ /trunk/test/data/regress/15730/capabilities.xml (revision 13274) @@ -0,0 +1,86 @@ + + + + + WMS + OGC:WMS + OGC:WMS + + + + + + + + + + + + application/vnd.ogc.wms_xml + + + + + + image/tiff + image/png + image/png24 + image/png32 + image/bmp + image/jpeg + image/svg + + + + + + application/vnd.ogc.sld+xml + + + + + + + application/vnd.ogc.se_xml + application/vnd.ogc.se_inimage + application/vnd.ogc.se_blank + + + 0 + South_Carolina + South Carolina NAIP Imagery 2017 Resolution: 100CM +
+
+DATA IDENTFICATION
+Abstract: The NAIP National Metadata Map contains USGS Quarter Quad and NAIP Seamline boundaries for every year NAIP imagery has been collected. Clicking on the map also makes available a number of metadata fields which describe the day, time, camera, aircraft, and location of NAIP collection. There is also a link which will open an FGDC compliant metadata text file for each NAIP USGS Quarter Quad collected. +
+Purpose: To make additional information and metadata about NAIP available to the public. +
+Language: eng; USA +
+Browse Graphic: http://www.arcgis.com/sharing/rest/content/items/d7eb04e3a14343b39cdc3503f5037003/info/thumbnail/NAIPnationalmetadata.jpg +Browse Graphic Type: JPEG +Browse Graphic Caption: ArcGIS Online REST endpoint content +
+
+POINT OF CONTACT
+Organization Name: USDA-FSA-APFO Aerial Photography Field Office
+Role: Point Of Contact
+Voice: 801-844-2900
+Delivery Point: 2222 West 2300 South
+City: Salt Lake City
+Administrative Area: Utah
+Postal Code: 84119-2020
+Web: https://catalog.data.gov/dataset/naip-national-metadata
+Country: USA
+E-Mail Address: apfo.sales@slc.usda.gov
 +EPSG:4326 +EPSG:0 + + + + +2017Z/2017Z/P1Y + + + Index: /trunk/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java (revision 13273) +++ /trunk/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java (revision 13274) @@ -3,7 +3,12 @@ import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.io.InputStream; import org.junit.Rule; import org.junit.Test; +import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.io.imagery.WMSImagery.WMSGetCapabilitiesException; import org.openstreetmap.josm.testutils.JOSMTestRules; @@ -36,3 +41,18 @@ assertEquals("bar", exc.getIncomingData()); } + + /** + * Non-regression test for bug #15730. + * @throws IOException if any I/O error occurs + * @throws WMSGetCapabilitiesException never + */ + @Test + public void testTicket15730() throws IOException, WMSGetCapabilitiesException { + try (InputStream is = TestUtils.getRegressionDataStream(15730, "capabilities.xml")) { + WMSImagery wms = new WMSImagery(); + wms.parseCapabilities(null, is); + assertEquals(1, wms.getLayers().size()); + assertTrue(wms.getLayers().get(0).abstr.startsWith("South Carolina NAIP Imagery 2017 Resolution: 100CM ")); + } + } }