Note that this method does not open streams from files, paths or URLs. + * Creating input streams and closing them after usage are caller's responsibility.
+ * + * @param in where to read from. + * @return the reader, or {@code null} if the given file where not recognized. + * @throws XMLStreamException if the type of the given input is one recognized types, + * but despite that the reader can not be created. + * + * @since 0.8 + */ + public static XMLStreamReader createFromAny(final Object in) throws XMLStreamException { + if (in instanceof XMLStreamReader) return ((XMLStreamReader) in); + if (in instanceof XMLEventReader) return createXMLStreamReader((XMLEventReader) in); + if (in instanceof InputSource) return createXMLStreamReader((InputSource) in); + if (in instanceof InputStream) return createXMLStreamReader((InputStream) in); + if (in instanceof Reader) return createXMLStreamReader((Reader) in); + if (in instanceof Source) return createXMLStreamReader((Source) in); + if (in instanceof Node) return createXMLStreamReader((Node) in); + return null; + } + /* * Do not provide convenience method for java.io.File, because the caller needs to close the created * input stream himself (this is not done by XMLInputFactory.close(), despite its method name). @@ -60,9 +85,9 @@ public final class XMLInputFactory exten /** * Creates a new reader for the given stream. * - * @param in Where to read from. - * @return The reader. - * @throws XMLStreamException If the reader can not be created. + * @param in where to read from. + * @return the reader. + * @throws XMLStreamException if the reader can not be created. */ public static XMLStreamReader createXMLStreamReader(final InputStream in) throws XMLStreamException { return FACTORY.createXMLStreamReader(in); @@ -71,9 +96,9 @@ public final class XMLInputFactory exten /** * Creates a new reader for the given stream. * - * @param in Where to read from. - * @return The reader. - * @throws XMLStreamException If the reader can not be created. + * @param in where to read from. + * @return the reader. + * @throws XMLStreamException if the reader can not be created. */ public static XMLStreamReader createXMLStreamReader(final Reader in) throws XMLStreamException { return FACTORY.createXMLStreamReader(in); @@ -82,9 +107,9 @@ public final class XMLInputFactory exten /** * Creates a new reader for the given source. * - * @param in Where to read from. - * @return The reader. - * @throws XMLStreamException If the reader can not be created. + * @param in where to read from. + * @return the reader. + * @throws XMLStreamException if the reader can not be created. */ public static XMLStreamReader createXMLStreamReader(final InputSource in) throws XMLStreamException { return FACTORY.createXMLStreamReader(new SAXSource(in)); @@ -93,9 +118,9 @@ public final class XMLInputFactory exten /** * Creates a new reader for the given source. * - * @param in Where to read from. - * @return The reader. - * @throws XMLStreamException If the reader can not be created. + * @param in where to read from. + * @return the reader. + * @throws XMLStreamException if the reader can not be created. */ public static XMLStreamReader createXMLStreamReader(final XMLEventReader in) throws XMLStreamException { return FACTORY.createXMLStreamReader(new StAXSource(in)); @@ -104,9 +129,9 @@ public final class XMLInputFactory exten /** * Creates a new reader for the given source. * - * @param in Where to read from. - * @return The reader. - * @throws XMLStreamException If the reader can not be created. + * @param in where to read from. + * @return the reader. + * @throws XMLStreamException if the reader can not be created. */ public static XMLStreamReader createXMLStreamReader(final Node in) throws XMLStreamException { return FACTORY.createXMLStreamReader(new DOMSource(in)); @@ -115,9 +140,9 @@ public final class XMLInputFactory exten /** * Creates a new reader for the given source. * - * @param in Where to read from. - * @return The reader. - * @throws XMLStreamException If the reader can not be created. + * @param in where to read from. + * @return the reader. + * @throws XMLStreamException if the reader can not be created. */ public static XMLStreamReader createXMLStreamReader(final Source in) throws XMLStreamException { return FACTORY.createXMLStreamReader(in); Modified: sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java?rev=1750175&r1=1750174&r2=1750175&view=diff ============================================================================== --- sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java [UTF-8] (original) +++ sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java [UTF-8] Sat Jun 25 00:30:30 2016 @@ -442,7 +442,7 @@ public final class IOUtilities extends S */ final Set
- * {@code
- * public class UserReader extends StaxStreamReader{
+ * Base class of Apache SIS readers of XML files using STAX parser.
+ * Readers for a given specification should extend this class and provide appropriate read methods.
*
- * public User read() throws XMLStreamException{
- * //casual stax reading operations
- * return user;
- * }
- * }
- * }
- *
- * And should be used like :
- * {@code
- * final UserReader instance = new UserReader();
- * try{
- * instance.setInput(stream);
- * user = instance.read();
- * }finally{
- * instance.dispose();
+ * Example:
+ * {@preformat
+ * public class UserObjectReader extends StaxStreamReader {
+ * public UserObject read() throws XMLStreamException {
+ * // Actual STAX reading operations.
+ * return userObject;
+ * }
+ * }
* }
+ *
+ * And should be used like below:
+ *
+ * {@preformat
+ * UserObject obj;
+ * try (UserObjectReader reader = new UserObjectReader(input)) {
+ * obj = instance.read();
+ * }
* }
- *
*
- * @author Johann Sorel (Geomatys)
- * @since 0.7
- * @version 0.7
+ * @author Johann Sorel (Geomatys)
+ * @author Martin Desruisseaux (Geomatys)
+ * @since 0.8
+ * @version 0.8
* @module
*/
-public abstract class StaxStreamReader extends AbstractConfigurable implements AutoCloseable {
-
+public abstract class StaxStreamReader extends DataStore {
/**
- * Wrapped xml stream reader
+ * The XML stream reader.
*/
- protected XMLStreamReader reader;
-
+ private XMLStreamReader reader;
+
/**
- * Store the input stream if it was generated by the parser itself.
- * It will closed on the dispose method or when a new input is set.
+ * The underlying reader or input stream to close when this {@code StaxStreamReader} is closed,
+ * or {@code null} if none.
*/
- private InputStream sourceStream;
+ private Closeable sourceStream;
/**
- * close potentiel previous stream and cache if there are some.
- * This way the reader can be reused for a different input later.
- * The underlying stax reader will be closed.
- *
- * @throws java.io.IOException if previous source stream caused an exception on close
- * @throws javax.xml.stream.XMLStreamException if previous stax reader caused an exception on close
+ * Creates a new XML store from the given file, URL, stream or reader object.
+ * This constructor invokes {@link StorageConnector#closeAllExcept(Object)},
+ * keeping open only the needed resource.
+ *
+ * @param storage information about the storage (URL, stream, etc).
+ * @throws DataStoreException if an error occurred while opening the XML file.
*/
- public void reset() throws IOException, XMLStreamException {
- if(sourceStream != null){
- sourceStream.close();
- sourceStream = null;
- }
- if(reader != null){
- reader.close();
- reader = null;
+ protected StaxStreamReader(final StorageConnector storage) throws DataStoreException {
+ ArgumentChecks.ensureNonNull("storage", storage);
+ Object obj = storage.getStorage();
+ try {
+ reader = XMLInputFactory.createFromAny(obj);
+ if (reader != null) {
+ if (obj instanceof Closeable) {
+ sourceStream = (Closeable) obj;
+ }
+ } else {
+ final InputStream in = storage.getStorageAs(InputStream.class);
+ if (in == null) {
+ throw new DataStoreException(Errors.format(Errors.Keys.IllegalInputTypeForReader_2, "XML", Classes.getClass(obj)));
+ }
+ reader = XMLInputFactory.createXMLStreamReader(in);
+ sourceStream = in;
+ obj = in;
+ }
+ } catch (XMLStreamException e) {
+ throw new DataStoreException(e);
}
+ storage.closeAllExcept(obj);
}
/**
- * Release potentiel locks or opened stream.
- * Must be called when the reader is not needed anymore.
- * It should not be used after this method has been called.
+ * Returns the error resources in the current locale.
*/
- @Override
- public void close() throws Exception {
- reset();
- }
-
- /**
- * Set the input for this reader.XML language provides two notations for boolean type : - * "true" can be written "1" and "0" significates "false". - * This method considers all this values as CharSequences and return its boolean value.
+ * Skips all remaining elements until we reach the end of the given tag. + * Nested tags of the same name, if any, are also skipped. * - * @param candidate The String to parse - * @return true if bool is equal to "true" or "1". - */ - protected static boolean parseBoolean(final String candidate) { - if (candidate.length() == 1) { - return !candidate.equals("0"); + * @param tagName name of the tag to close. + * @throws DataStoreException if end tag could not be found. + * @throws XMLStreamException if an error occurred while reading the XML stream. + */ + protected final void skipUntilEnd(final String tagName) throws DataStoreException, XMLStreamException { + final XMLStreamReader reader = getReader(); + int nested = 0; + while (reader.hasNext()) { + switch (reader.next()) { + case XMLStreamReader.START_ELEMENT: { + if (tagName.equals(reader.getLocalName())) { + nested++; + } + break; + } + case XMLStreamReader.END_ELEMENT: { + if (tagName.equals(reader.getLocalName())) { + if (--nested < 0) return; + } + break; + } + } } - return Boolean.parseBoolean(candidate); + throw new DataStoreException(errors().getString(Errors.Keys.UnexpectedEndOfFile_1, tagName)); } /** - *This method reads doubles with coma separated.
- * - * @param candidate Can not be null. - * @return parsed double value + * Parses the given string as a boolean value. This method performs the same parsing than + * {@link Boolean#parseBoolean(String)} with one extension: the "0" value is considered + * as {@code false} and the "1" value as {@code true}. + * + * @param value The string value to parse as a boolean. + * @return true if the boolean is equal to "true" or "1". */ - protected static double parseDouble(final String candidate) { - return Double.parseDouble(candidate.replace(',', '.')); + protected static boolean parseBoolean(final String value) { + if (value.length() == 1) { + switch (value.charAt(0)) { + case '0': return false; + case '1': return true; + } + } + return Boolean.parseBoolean(value); } /** - * Iterator on the reader until it reach the end of the given tag name. - * Return the read elements as dom. + * Closes the input stream and releases any resources used by this data store. + * This data store can not be used anymore after this method has been invoked. * - * @param tagName tag - * @return Document read elements as a dom document - * @throws javax.xml.stream.XMLStreamException if conversion to dom failed + * @throws DataStoreException if an error occurred while closing the stream or releasing the resources. */ - protected Document readAsDom(final String tagName) throws XMLStreamException { - - final XMLStreamReader limitedReader = new StreamReaderDelegate(reader){ - boolean finished = false; - - @Override - public boolean hasNext() throws XMLStreamException { - if(finished) return false; - return super.hasNext(); + @Override + public synchronized void close() throws DataStoreException { + try { + if (reader != null) { + reader.close(); + reader = null; } - - @Override - public int next() throws XMLStreamException { - int t = super.next(); - finished = END_ELEMENT == t && tagName.equalsIgnoreCase(reader.getLocalName()); - return t; + if (sourceStream != null) { + sourceStream.close(); + sourceStream = null; } - - }; - - final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - factory.setNamespaceAware(false); - - final TransformerFactory trsFactory = TransformerFactory.newInstance(); - try { - final DocumentBuilder builder = factory.newDocumentBuilder(); - final Transformer idTransform = trsFactory.newTransformer(); - final Source input = new StAXSource(limitedReader); - final ByteArrayOutputStream out = new ByteArrayOutputStream(); - final Result output = new StreamResult(out); - idTransform.transform(input, output); - final Document doc = builder.parse(new ByteArrayInputStream(out.toByteArray())); - return doc; - } catch (TransformerConfigurationException e) { - throw new XMLStreamException(e.getMessage()); - } catch (TransformerFactoryConfigurationError e) { - throw new XMLStreamException(e.getMessage()); - } catch (IOException e) { - throw new XMLStreamException(e.getMessage()); - } catch (TransformerException e) { - throw new XMLStreamException(e.getMessage()); - } catch (SAXException e) { - throw new XMLStreamException(e.getMessage()); - } catch (ParserConfigurationException e) { - throw new XMLStreamException(e.getMessage()); + } catch (IOException | XMLStreamException e) { + throw new DataStoreException(e); } - } - } Modified: sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/StaxStreamWriter.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/StaxStreamWriter.java?rev=1750175&r1=1750174&r2=1750175&view=diff ============================================================================== --- sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/StaxStreamWriter.java [UTF-8] (original) +++ sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/StaxStreamWriter.java [UTF-8] Sat Jun 25 00:30:30 2016 @@ -64,12 +64,12 @@ import org.apache.sis.xml.Namespaces; * } * * - * @author Johann Sorel (Geomatys) - * @since 0.7 - * @version 0.7 + * @author Johann Sorel (Geomatys) + * @since 0.8 + * @version 0.8 * @module */ -public abstract class StaxStreamWriter extends AbstractConfigurable implements AutoCloseable { +public abstract class StaxStreamWriter implements AutoCloseable { /** * Underlying stax writer. Added: sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/XMLStoreProvider.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/XMLStoreProvider.java?rev=1750175&view=auto ============================================================================== --- sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/XMLStoreProvider.java (added) +++ sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/XMLStoreProvider.java [UTF-8] Sat Jun 25 00:30:30 2016 @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sis.internal.xml; + +import org.apache.sis.storage.DataStoreProvider; + + +/** + * The provider of {@link StaxStreamReader} instances. + * + * @author Johann Sorel (Geomatys) + * @author Martin Desruisseaux (Geomatys) + * @since 0.8 + * @version 0.8 + * @module + */ +public abstract class XMLStoreProvider extends DataStoreProvider { + /** + * Creates a new provider. + */ + protected XMLStoreProvider() { + } +} Propchange: sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/XMLStoreProvider.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/XMLStoreProvider.java ------------------------------------------------------------------------------ svn:mime-type = text/plain;charset=UTF-8 Added: sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/package-info.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/package-info.java?rev=1750175&view=auto ============================================================================== --- sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/package-info.java (added) +++ sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/package-info.java [UTF-8] Sat Jun 25 00:30:30 2016 @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Helper classes for reading and writing XML documents using STAX. + * + * @author Johann Sorel (Geomatys) + * @since 0.8 + * @version 0.8 + * @module + */ +package org.apache.sis.internal.xml; Propchange: sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/package-info.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sis/branches/JDK8/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/xml/package-info.java ------------------------------------------------------------------------------ svn:mime-type = text/plain;charset=UTF-8 Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXReaderTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXReaderTest.java?rev=1750175&r1=1750174&r2=1750175&view=diff ============================================================================== --- sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXReaderTest.java [UTF-8] (original) +++ sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXReaderTest.java [UTF-8] Sat Jun 25 00:30:30 2016 @@ -20,11 +20,15 @@ import java.net.URI; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.io.IOException; +import javax.xml.stream.XMLStreamException; import com.esri.core.geometry.Point; import org.opengis.geometry.Envelope; import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.geometry.ImmutableEnvelope; import org.apache.sis.referencing.CommonCRS; +import org.apache.sis.storage.StorageConnector; +import org.apache.sis.storage.DataStoreException; import org.junit.Test; import static org.junit.Assert.*; @@ -50,6 +54,10 @@ public class GPXReaderTest { private static final double DELTA = 0.000001; + private static GPXReader create(final String resource) throws DataStoreException, IOException, XMLStreamException { + return new GPXReader(new StorageConnector(GPXReaderTest.class.getResource(resource))); + } + /** * Tests GPX version 1.0.0 metadata tag parsing. * @@ -57,12 +65,8 @@ public class GPXReaderTest { */ @Test public void testMetadataRead100() throws Exception { - - try (final GPXReader reader = new GPXReader()) { - reader.setInput(GPXReaderTest.class.getResource( - "/org/apache/sis/gpx/sample_metadata100.xml")); - - final MetaData data = reader.getMetadata(); + try (final GPXReader reader = create("/org/apache/sis/gpx/sample_metadata100.xml")) { + final MetaData data = reader.metadata; assertEquals("sample", data.getName()); assertEquals("sample gpx test file", data.getDescription()); @@ -88,12 +92,8 @@ public class GPXReaderTest { */ @Test public void testMetadataRead110() throws Exception { - - try (final GPXReader reader = new GPXReader()) { - reader.setInput(GPXReaderTest.class.getResource( - "/org/apache/sis/gpx/sample_metadata110.xml")); - - final MetaData data = reader.getMetadata(); + try (final GPXReader reader = create("/org/apache/sis/gpx/sample_metadata110.xml")) { + final MetaData data = reader.metadata; assertEquals("sample", data.getName()); assertEquals("sample gpx test file", data.getDescription()); @@ -124,12 +124,8 @@ public class GPXReaderTest { */ @Test public void testWayPointRead100() throws Exception { - - try (final GPXReader reader = new GPXReader()) { - reader.setInput(GPXReaderTest.class.getResource( - "/org/apache/sis/gpx/sample_waypoint100.xml")); - - final MetaData data = reader.getMetadata(); + try (final GPXReader reader = create("/org/apache/sis/gpx/sample_waypoint100.xml")) { + final MetaData data = reader.metadata; assertNull(data.getName()); assertNull(data.getDescription()); @@ -157,12 +153,8 @@ public class GPXReaderTest { */ @Test public void testWayPointRead110() throws Exception { - - try (final GPXReader reader = new GPXReader()) { - reader.setInput(GPXReaderTest.class.getResource( - "/org/apache/sis/gpx/sample_waypoint110.xml")); - - final MetaData data = reader.getMetadata(); + try (final GPXReader reader = create("/org/apache/sis/gpx/sample_waypoint110.xml")) { + final MetaData data = reader.metadata; assertNull(data.getName()); assertNull(data.getDescription()); @@ -191,12 +183,8 @@ public class GPXReaderTest { */ @Test public void testRouteRead100() throws Exception { - - try (final GPXReader reader = new GPXReader()) { - reader.setInput(GPXReaderTest.class.getResource( - "/org/apache/sis/gpx/sample_route100.xml")); - - final MetaData data = reader.getMetadata(); + try (final GPXReader reader = create("/org/apache/sis/gpx/sample_route100.xml")) { + final MetaData data = reader.metadata; assertNull(data.getName()); assertNull(data.getDescription()); @@ -260,12 +248,8 @@ public class GPXReaderTest { */ @Test public void testRouteRead110() throws Exception { - - try (final GPXReader reader = new GPXReader()) { - reader.setInput(GPXReaderTest.class.getResource( - "/org/apache/sis/gpx/sample_route110.xml")); - - final MetaData data = reader.getMetadata(); + try (final GPXReader reader = create("/org/apache/sis/gpx/sample_route110.xml")) { + final MetaData data = reader.metadata; assertNull(data.getName()); assertNull(data.getDescription()); @@ -331,12 +315,8 @@ public class GPXReaderTest { */ @Test public void testTrackRead100() throws Exception { - - try (final GPXReader reader = new GPXReader()) { - reader.setInput(GPXReaderTest.class.getResource( - "/org/apache/sis/gpx/sample_track100.xml")); - - final MetaData data = reader.getMetadata(); + try (final GPXReader reader = create("/org/apache/sis/gpx/sample_track100.xml")) { + final MetaData data = reader.metadata; assertNull(data.getName()); assertNull(data.getDescription()); @@ -405,12 +385,8 @@ public class GPXReaderTest { */ @Test public void testTrackRead110() throws Exception { - - try (final GPXReader reader = new GPXReader()) { - reader.setInput(GPXReaderTest.class.getResource( - "/org/apache/sis/gpx/sample_track110.xml")); - - final MetaData data = reader.getMetadata(); + try (final GPXReader reader = create("/org/apache/sis/gpx/sample_track110.xml")) { + final MetaData data = reader.metadata; assertNull(data.getName()); assertNull(data.getDescription()); @@ -601,6 +577,5 @@ public class GPXReaderTest { envelope.setRange(0, d0, d1); envelope.setRange(1, d2, d3); return new ImmutableEnvelope(envelope); - } } Modified: sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXWriterTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXWriterTest.java?rev=1750175&r1=1750174&r2=1750175&view=diff ============================================================================== --- sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXWriterTest.java [UTF-8] (original) +++ sis/branches/JDK8/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/gpx/GPXWriterTest.java [UTF-8] Sat Jun 25 00:30:30 2016 @@ -29,6 +29,7 @@ import com.esri.core.geometry.Point; import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.geometry.ImmutableEnvelope; import org.apache.sis.referencing.CommonCRS; +import org.apache.sis.storage.StorageConnector; import org.junit.Test; import static org.apache.sis.internal.gpx.GPXConstants.*; @@ -89,9 +90,8 @@ public final strictfp class GPXWriterTes writer.writeEndDocument(); writer.close(); - try (GPXReader reader = new GPXReader()) { - reader.setInput(f); - assertEquals(metaData, reader.getMetadata()); + try (GPXReader reader = new GPXReader(new StorageConnector(f))) { + assertEquals(metaData, reader.metadata); } if (f.exists()) f.delete(); @@ -250,8 +250,7 @@ public final strictfp class GPXWriterTes writer.writeEndDocument(); writer.close(); - final GPXReader reader = new GPXReader(); - reader.setInput(f); + final GPXReader reader = new GPXReader(new StorageConnector(f)); //testing on toString since JTS geometry always fail on equals method. assertEquals(point1.toString(), reader.next().toString());