You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/09/07 15:47:24 UTC
svn commit: r1807624 [4/4] - in /sis/branches/JDK9: ./
core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/
core/sis-metadata/src/main/java/org/apache/sis/metadata/
core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/ core/sis...
Modified: sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxDataStore.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxDataStore.java?rev=1807624&r1=1807623&r2=1807624&view=diff
==============================================================================
--- sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxDataStore.java [UTF-8] (original)
+++ sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxDataStore.java [UTF-8] Thu Sep 7 15:47:24 2017
@@ -38,6 +38,7 @@ import org.apache.sis.setup.OptionKey;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.DataStoreException;
+import org.apache.sis.internal.storage.URIDataStore;
import org.apache.sis.internal.storage.io.ChannelFactory;
import org.apache.sis.internal.storage.io.IOUtilities;
import org.apache.sis.internal.storage.io.Markable;
@@ -64,7 +65,7 @@ import org.apache.sis.util.Debug;
* @since 0.8
* @module
*/
-public abstract class StaxDataStore extends DataStore {
+public abstract class StaxDataStore extends URIDataStore {
/**
* The locale to use for locale-sensitive data (<strong>not</strong> for logging or warning messages),
* or {@code null} if unspecified.
@@ -372,8 +373,11 @@ public abstract class StaxDataStore exte
/**
* Returns the factory that created this {@code DataStore} instance, or {@code null} if unspecified.
+ *
+ * @return the factory that created this {@code DataStore} instance, or {@code null} if unspecified.
*/
- final StaxDataStoreProvider getProvider() {
+ @Override
+ public final StaxDataStoreProvider getProvider() {
return (StaxDataStoreProvider) provider;
}
Modified: sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java?rev=1807624&r1=1807623&r2=1807624&view=diff
==============================================================================
--- sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java [UTF-8] (original)
+++ sis/branches/JDK9/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/xml/stream/StaxStreamReader.java [UTF-8] Thu Sep 7 15:47:24 2017
@@ -332,12 +332,12 @@ public abstract class StaxStreamReader e
}
/**
- * Returns the current value of {@link XMLStreamReader#getElementText()} as an URI,
+ * Returns the current value of {@link XMLStreamReader#getElementText()} as a URI,
* or {@code null} if that value is null or empty.
*
- * @return the current text element as an URI, or {@code null} if empty.
+ * @return the current text element as a URI, or {@code null} if empty.
* @throws XMLStreamException if a text element can not be returned.
- * @throws URISyntaxException if the text can not be parsed as an URI.
+ * @throws URISyntaxException if the text can not be parsed as a URI.
*/
protected final URI getElementAsURI() throws XMLStreamException, URISyntaxException {
final Context context = Context.current();
Modified: sis/branches/JDK9/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK9/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java?rev=1807624&r1=1807623&r2=1807624&view=diff
==============================================================================
--- sis/branches/JDK9/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java [UTF-8] (original)
+++ sis/branches/JDK9/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/ReaderTest.java [UTF-8] Thu Sep 7 15:47:24 2017
@@ -224,7 +224,7 @@ public final strictfp class ReaderTest e
try (Store reader = create("1.0/waypoint.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_0, reader.getVersion());
- try (Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features(false)) {
final Iterator<Feature> it = features.iterator();
verifyPoint(it.next(), 0, false);
verifyPoint(it.next(), 1, false);
@@ -245,7 +245,7 @@ public final strictfp class ReaderTest e
try (Store reader = create("1.1/waypoint.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_1, reader.getVersion());
- try (Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features(false)) {
final Iterator<Feature> it = features.iterator();
verifyPoint(it.next(), 0, true);
verifyPoint(it.next(), 1, true);
@@ -266,7 +266,7 @@ public final strictfp class ReaderTest e
try (Store reader = create("1.0/route.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_0, reader.getVersion());
- try (Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features(false)) {
final Iterator<Feature> it = features.iterator();
verifyRoute(it.next(), false, 1);
verifyEmpty(it.next(), "rtept");
@@ -295,7 +295,7 @@ public final strictfp class ReaderTest e
* This verification is shared by {@link #testRoute110()} and {@link #testSequentialReads()}.
*/
static void verifyRoute110(final Store reader) throws DataStoreException {
- try (Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features(false)) {
final Iterator<Feature> it = features.iterator();
verifyRoute(it.next(), true, 3);
verifyEmpty(it.next(), "rtept");
@@ -373,7 +373,7 @@ public final strictfp class ReaderTest e
try (Store reader = create("1.0/track.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_0, reader.getVersion());
- try (Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features(false)) {
final Iterator<Feature> it = features.iterator();
verifyTrack(it.next(), false, 1);
verifyEmpty(it.next(), "trkseg");
@@ -393,7 +393,7 @@ public final strictfp class ReaderTest e
try (Store reader = create("1.1/track.xml")) {
verifyAlmostEmptyMetadata((Metadata) reader.getMetadata());
assertEquals("version", StoreProvider.V1_1, reader.getVersion());
- try (Stream<Feature> features = reader.features()) {
+ try (Stream<Feature> features = reader.features(false)) {
final Iterator<Feature> it = features.iterator();
verifyTrack(it.next(), true, 3);
verifyEmpty(it.next(), "trkseg");
@@ -610,13 +610,13 @@ public final strictfp class ReaderTest e
@DependsOnMethod("testSequentialReads")
public void testConcurrentReads() throws DataStoreException {
try (Store reader = createFromURL()) {
- final Stream<Feature> f1 = reader.features();
+ final Stream<Feature> f1 = reader.features(false);
final Iterator<Feature> i1 = f1.iterator();
verifyRoute(i1.next(), true, 3);
- final Stream<Feature> f2 = reader.features();
+ final Stream<Feature> f2 = reader.features(false);
final Iterator<Feature> i2 = f2.iterator();
verifyEmpty(i1.next(), "rtept");
- final Stream<Feature> f3 = reader.features();
+ final Stream<Feature> f3 = reader.features(false);
final Iterator<Feature> i3 = f3.iterator();
verifyRoute(i2.next(), true, 3);
verifyRoute(i3.next(), true, 3);