date:20190914

[sis] 01/03: Rename "ModifiableMetadata.transition" to "transitionTo". The previous name was a bit ambiguous.

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch 1.0-RC
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 887371c3d1d3af278500b317ed574f31faf570ca
Author: Martin Desruisseaux 
AuthorDate: Sat Sep 14 14:06:13 2019 +0200

Rename "ModifiableMetadata.transition" to "transitionTo". The previous name 
was a bit ambiguous.
---
 .../java/org/apache/sis/coverage/grid/GridGeometry.java|  2 +-
 .../sis/internal/metadata/TransformationAccuracy.java  |  2 +-
 .../java/org/apache/sis/metadata/ModifiableMetadata.java   | 14 +++---
 .../main/java/org/apache/sis/metadata/StateChanger.java|  6 +++---
 .../main/java/org/apache/sis/metadata/iso/ISOMetadata.java |  4 ++--
 .../java/org/apache/sis/metadata/iso/extent/Extents.java   |  4 ++--
 .../iso/identification/DefaultRepresentativeFraction.java  |  2 +-
 .../main/java/org/apache/sis/metadata/sql/Dispatcher.java  |  2 +-
 .../java/org/apache/sis/metadata/sql/MetadataFallback.java |  2 +-
 .../org/apache/sis/metadata/ModifiableMetadataTest.java| 10 +-
 .../sis/metadata/iso/citation/DefaultCitationTest.java |  6 +++---
 .../sis/metadata/iso/citation/HardCodedCitations.java  |  8 
 .../identification/DefaultRepresentativeFractionTest.java  |  4 ++--
 .../internal/referencing/PositionalAccuracyConstant.java   |  2 +-
 .../org/apache/sis/referencing/ImmutableIdentifier.java|  4 ++--
 .../java/org/apache/sis/referencing/NamedIdentifier.java   |  4 ++--
 .../apache/sis/referencing/factory/sql/EPSGDataAccess.java |  4 ++--
 .../apache/sis/storage/earthobservation/LandsatReader.java |  2 +-
 .../java/org/apache/sis/storage/gdal/Proj4Factory.java |  2 +-
 .../java/org/apache/sis/storage/netcdf/MetadataReader.java |  2 +-
 .../org/apache/sis/internal/storage/MetadataBuilder.java   |  2 +-
 21 files changed, 44 insertions(+), 44 deletions(-)

diff --git 
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java 
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
index 12169c1..9caedb6 100644
--- 
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
@@ -849,7 +849,7 @@ public class GridGeometry implements Serializable {
 if (getCoordinateReferenceSystem(envelope) != null && 
!envelope.isAllNaN()) {
 try {
 final DefaultGeographicBoundingBox db = 
ReferencingServices.getInstance().setBounds(envelope, null, null);
-db.transition(DefaultGeographicBoundingBox.State.EDITABLE);
+
db.transitionTo(DefaultGeographicBoundingBox.State.EDITABLE);
 bbox = db;
 } catch (TransformException e) {
 bbox = 
NilReason.INAPPLICABLE.createNilObject(GeographicBoundingBox.class);
diff --git 
a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
 
b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
index c93558b..334fcfd 100644
--- 
a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
+++ 
b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
@@ -79,7 +79,7 @@ public final class TransformationAccuracy extends Static {
 new DefaultAbsoluteExternalPositionalAccuracy(result);
 
element.setNamesOfMeasure(Collections.singleton(TRANSFORMATION_ACCURACY));
 
element.setEvaluationMethodType(EvaluationMethodType.DIRECT_EXTERNAL);
-
element.transition(DefaultAbsoluteExternalPositionalAccuracy.State.FINAL);
+
element.transitionTo(DefaultAbsoluteExternalPositionalAccuracy.State.FINAL);
 
 p = CACHE.putIfAbsent(accuracy, element);
 if (p == null) {
diff --git 
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
 
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
index a6a196f..b1c0d86 100644
--- 
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
+++ 
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
@@ -104,7 +104,7 @@ public abstract class ModifiableMetadata extends 
AbstractMetadata {
 private static final byte STAGED = 1;
 
 /**
- * A value for {@link #state} meaning that execution of {@code 
transition(…)} is in progress.
+ * A value for {@link #state} meaning that execution of {@code 
transitionTo(…)} is in progress.
  * Must be greater than all other values except {@link #COMPLETABLE} and 
{@link #FINAL}.
  */
 private static final byte FREEZING = 2;
@@ -117,7 +117,7 @@ public abstract class ModifiableMetadata extends 
AbstractMetadata {
 private static final byte COMPLETABLE

[sis] 03/03: Clarification about whether a DataStore.getFoo() method can return null. Contain one last-minute API change before 1.0 release: getOpenParameters() return Optional.

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch 1.0-RC
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 04e45b87ecd8f8169d28e6197fc281e24577e6ff
Author: Martin Desruisseaux 
AuthorDate: Sat Sep 14 14:14:49 2019 +0200

Clarification about whether a DataStore.getFoo() method can return null.
Contain one last-minute API change before 1.0 release: getOpenParameters() 
return Optional.
---
 .../sis/storage/earthobservation/LandsatStore.java | 27 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 12 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java |  6 ++---
 .../java/org/apache/sis/storage/sql/SQLStore.java  |  6 ++---
 .../apache/sis/internal/storage/URIDataStore.java  |  7 +++---
 .../apache/sis/internal/storage/folder/Store.java  |  4 ++--
 .../java/org/apache/sis/storage/DataStore.java | 14 +++
 .../org/apache/sis/storage/DataStoreProvider.java  |  2 +-
 .../java/org/apache/sis/storage/DataStoreMock.java |  7 +++---
 9 files changed, 48 insertions(+), 37 deletions(-)

diff --git 
a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
 
b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
index 02bcaf6..770b330 100644
--- 
a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
+++ 
b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
@@ -20,6 +20,7 @@ import java.io.Reader;
 import java.io.BufferedReader;
 import java.io.LineNumberReader;
 import java.io.IOException;
+import java.nio.file.StandardOpenOption;
 import java.net.URI;
 import java.util.Optional;
 import org.opengis.metadata.Metadata;
@@ -28,6 +29,7 @@ import org.opengis.util.FactoryException;
 import org.opengis.parameter.ParameterValueGroup;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.storage.DataStoreException;
+import org.apache.sis.storage.DataStoreClosedException;
 import org.apache.sis.storage.DataStoreReferencingException;
 import org.apache.sis.storage.UnsupportedStorageException;
 import org.apache.sis.storage.StorageConnector;
@@ -114,18 +116,18 @@ public class LandsatStore extends DataStore {
 
 /**
  * Returns the parameters used to open this Landsat data store.
- * If non-null, the parameters are described by {@link 
LandsatStoreProvider#getOpenParameters()} and contains at
- * least a parameter named {@value 
org.apache.sis.storage.DataStoreProvider#LOCATION} with a {@link URI} value.
- * This method may return {@code null} if the storage input can not be 
described by a URI
+ * The parameters are described by {@link 
LandsatStoreProvider#getOpenParameters()} and contains at least
+ * a parameter named {@value 
org.apache.sis.storage.DataStoreProvider#LOCATION} with a {@link URI} value.
+ * The return value may be empty if the storage input can not be described 
by a URI
  * (for example a Landsat file reading directly from a {@link 
java.nio.channels.ReadableByteChannel}).
  *
- * @return parameters used for opening this data store, or {@code null} if 
not available.
+ * @return parameters used for opening this data store.
  *
  * @since 0.8
  */
 @Override
-public ParameterValueGroup getOpenParameters() {
-return URIDataStore.parameters(provider, location);
+public Optional getOpenParameters() {
+return Optional.ofNullable(URIDataStore.parameters(provider, 
location));
 }
 
 /**
@@ -156,17 +158,20 @@ public class LandsatStore extends DataStore {
  */
 @Override
 public synchronized Metadata getMetadata() throws DataStoreException {
-if (metadata == null && source != null) try {
+if (metadata == null) {
+if (source == null) {
+throw new DataStoreClosedException(getLocale(), 
LandsatStoreProvider.NAME, StandardOpenOption.READ);
+}
 try (BufferedReader reader = (source instanceof BufferedReader) ? 
(BufferedReader) source : new LineNumberReader(source)) {
 source = null;  // Will be closed at the end of this 
try-finally block.
 final LandsatReader parser = new 
LandsatReader(getDisplayName(), listeners);
 parser.read(reader);
 metadata = parser.getMetadata();
+} catch (IOException e) {
+throw new DataStoreException(e);
+} catch (FactoryException e) {
+throw new DataStoreReferencingException(e);
 }
-} catch (IOException e) {
-throw new DataStoreException(e);
-} catch (FactoryException e) {
-throw new DataStoreReferencingException(e);
 }
 return metadata;
 }
diff --git

[sis] 02/03: API change before 1.0 release: Reverse the argument order in DataStore.addListener/removeListener. The intent is to be consistent with similar methods elsewhere in SIS, which put the Clas

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch 1.0-RC
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 36f1a43af29e47e3d3579553aebb0e5f028c3f2a
Author: Martin Desruisseaux 
AuthorDate: Sat Sep 14 14:11:08 2019 +0200

API change before 1.0 release: Reverse the argument order in 
DataStore.addListener/removeListener. The intent is to be consistent with 
similar methods elsewhere in SIS, which put the Class argument first.
---
 .../sis/storage/earthobservation/LandsatStore.java   |  4 ++--
 .../org/apache/sis/storage/geotiff/GeoTiffStore.java |  4 ++--
 .../org/apache/sis/storage/netcdf/NetcdfStore.java   |  4 ++--
 .../java/org/apache/sis/storage/sql/SQLStore.java|  4 ++--
 .../sis/internal/storage/AbstractResource.java   |  4 ++--
 .../apache/sis/internal/storage/URIDataStore.java|  4 ++--
 .../apache/sis/internal/storage/folder/Store.java|  4 ++--
 .../main/java/org/apache/sis/storage/DataStore.java  | 18 +-
 .../main/java/org/apache/sis/storage/Resource.java   | 10 +-
 .../org/apache/sis/storage/event/StoreListener.java  |  4 ++--
 .../org/apache/sis/storage/event/StoreListeners.java | 20 ++--
 .../apache/sis/storage/event/StoreListenersTest.java | 14 +++---
 12 files changed, 47 insertions(+), 47 deletions(-)

diff --git 
a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
 
b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
index 37b8672..02bcaf6 100644
--- 
a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
+++ 
b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
@@ -177,10 +177,10 @@ public class LandsatStore extends DataStore {
  * any listener specified for another kind of events will be ignored.
  */
 @Override
-public  void addListener(StoreListener 
listener, Class eventType) {
+public  void addListener(Class eventType, 
StoreListener listener) {
 // If an argument is null, we let the parent class throws (indirectly) 
NullArgumentException.
 if (listener == null || eventType == null || 
eventType.isAssignableFrom(WarningEvent.class)) {
-super.addListener(listener, eventType);
+super.addListener(eventType, listener);
 }
 }
 
diff --git 
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
 
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
index c98525a..3778951 100644
--- 
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
+++ 
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
@@ -347,10 +347,10 @@ public class GeoTiffStore extends DataStore implements 
Aggregate {
  * any listener specified for another kind of events will be ignored.
  */
 @Override
-public  void addListener(StoreListener 
listener, Class eventType) {
+public  void addListener(Class eventType, 
StoreListener listener) {
 // If an argument is null, we let the parent class throws (indirectly) 
NullArgumentException.
 if (listener == null || eventType == null || 
eventType.isAssignableFrom(WarningEvent.class)) {
-super.addListener(listener, eventType);
+super.addListener(eventType, listener);
 }
 }
 
diff --git 
a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
 
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
index 9eed48a..6094911 100644
--- 
a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
+++ 
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
@@ -221,10 +221,10 @@ public class NetcdfStore extends DataStore implements 
Aggregate {
  * any listener specified for another kind of events will be ignored.
  */
 @Override
-public  void addListener(StoreListener 
listener, Class eventType) {
+public  void addListener(Class eventType, 
StoreListener listener) {
 // If an argument is null, we let the parent class throws (indirectly) 
NullArgumentException.
 if (listener == null || eventType == null || 
eventType.isAssignableFrom(WarningEvent.class)) {
-super.addListener(listener, eventType);
+super.addListener(eventType, listener);
 }
 }
 
diff --git 
a/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStore.java 
b/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStore.java
index 38d7966..4ecf249 100644
--- 
a/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStore.java
+++ 
b/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStore.java
@@ -262,10

[sis] branch 1.0-RC updated (c56e277 -> 04e45b8)

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a change to branch 1.0-RC
in repository https://gitbox.apache.org/repos/asf/sis.git.


from c56e277  Bug fix: MetadataCopier.copy(type, metadata) should accept a 
type which is a super-type of the interface implemented by the given metadata 
instance.
 new 887371c  Rename "ModifiableMetadata.transition" to "transitionTo". The 
previous name was a bit ambiguous.
 new 36f1a43  API change before 1.0 release: Reverse the argument order in 
DataStore.addListener/removeListener. The intent is to be consistent with 
similar methods elsewhere in SIS, which put the Class argument first.
 new 04e45b8  Clarification about whether a DataStore.getFoo() method can 
return null. Contain one last-minute API change before 1.0 release: 
getOpenParameters() return Optional.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/sis/coverage/grid/GridGeometry.java |  2 +-
 .../internal/metadata/TransformationAccuracy.java  |  2 +-
 .../apache/sis/metadata/ModifiableMetadata.java| 14 +-
 .../java/org/apache/sis/metadata/StateChanger.java |  6 ++--
 .../org/apache/sis/metadata/iso/ISOMetadata.java   |  4 +--
 .../apache/sis/metadata/iso/extent/Extents.java|  4 +--
 .../DefaultRepresentativeFraction.java |  2 +-
 .../org/apache/sis/metadata/sql/Dispatcher.java|  2 +-
 .../apache/sis/metadata/sql/MetadataFallback.java  |  2 +-
 .../sis/metadata/ModifiableMetadataTest.java   | 10 +++
 .../metadata/iso/citation/DefaultCitationTest.java |  6 ++--
 .../metadata/iso/citation/HardCodedCitations.java  |  8 +++---
 .../DefaultRepresentativeFractionTest.java |  4 +--
 .../referencing/PositionalAccuracyConstant.java|  2 +-
 .../sis/referencing/ImmutableIdentifier.java   |  4 +--
 .../apache/sis/referencing/NamedIdentifier.java|  4 +--
 .../referencing/factory/sql/EPSGDataAccess.java|  4 +--
 .../storage/earthobservation/LandsatReader.java|  2 +-
 .../sis/storage/earthobservation/LandsatStore.java | 31 -
 .../org/apache/sis/storage/gdal/Proj4Factory.java  |  2 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 16 +--
 .../apache/sis/storage/netcdf/MetadataReader.java  |  2 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java | 10 +++
 .../java/org/apache/sis/storage/sql/SQLStore.java  | 10 +++
 .../sis/internal/storage/AbstractResource.java |  4 +--
 .../sis/internal/storage/MetadataBuilder.java  |  2 +-
 .../apache/sis/internal/storage/URIDataStore.java  | 11 
 .../apache/sis/internal/storage/folder/Store.java  |  8 +++---
 .../java/org/apache/sis/storage/DataStore.java | 32 --
 .../org/apache/sis/storage/DataStoreProvider.java  |  2 +-
 .../main/java/org/apache/sis/storage/Resource.java | 10 +++
 .../apache/sis/storage/event/StoreListener.java|  4 +--
 .../apache/sis/storage/event/StoreListeners.java   | 20 +++---
 .../java/org/apache/sis/storage/DataStoreMock.java |  7 +++--
 .../sis/storage/event/StoreListenersTest.java  | 14 +-
 35 files changed, 139 insertions(+), 128 deletions(-)

[sis] branch master updated (90b5999 -> ba0a5b3)

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git.


from 90b5999  Merge branch 'geoapi-3.1': remove deprecated methods.
 add e016ebd  Bug fix: Comparison with `ANY` returned `true` while `false` 
was expected.
 add 11a09b8  Rename "ModifiableMetadata.transition" to "transitionTo". The 
previous name was a bit ambiguous.
 add 82991de  API change before 1.0 release: Reverse the argument order in 
DataStore.addListener/removeListener. The intent is to be consistent with 
similar methods elsewhere in SIS, which put the Class argument first.
 add 48d2fc1  Clarification about whether a DataStore.getFoo() method can 
return null. Contain one last-minute API change before 1.0 release: 
getOpenParameters() return Optional.
 add 6217d6d  Merge branch 'geoapi-4.0' into geoapi-3.1: last minute API 
changes before 1.0 release.
 new ba0a5b3  Merge branch 'geoapi-3.1': last-minute API changes before 1.0 
release.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/sis/coverage/grid/GridGeometry.java |  2 +-
 .../internal/metadata/TransformationAccuracy.java  |  2 +-
 .../apache/sis/metadata/ModifiableMetadata.java| 12 
 .../java/org/apache/sis/metadata/StateChanger.java |  6 ++--
 .../org/apache/sis/metadata/iso/ISOMetadata.java   |  4 +--
 .../apache/sis/metadata/iso/extent/Extents.java|  4 +--
 .../DefaultRepresentativeFraction.java |  2 +-
 .../org/apache/sis/metadata/sql/Dispatcher.java|  2 +-
 .../apache/sis/metadata/sql/MetadataFallback.java  |  2 +-
 .../sis/metadata/ModifiableMetadataTest.java   | 10 +++
 .../metadata/iso/citation/DefaultCitationTest.java |  6 ++--
 .../metadata/iso/citation/HardCodedCitations.java  |  8 +++---
 .../DefaultRepresentativeFractionTest.java |  4 +--
 .../referencing/gazetteer/FinalLocationType.java   |  2 +-
 .../referencing/PositionalAccuracyConstant.java|  2 +-
 .../sis/referencing/ImmutableIdentifier.java   |  4 +--
 .../apache/sis/referencing/NamedIdentifier.java|  4 +--
 .../referencing/factory/sql/EPSGDataAccess.java|  4 +--
 .../storage/earthobservation/LandsatReader.java|  2 +-
 .../sis/storage/earthobservation/LandsatStore.java | 31 -
 .../org/apache/sis/storage/gdal/Proj4Factory.java  |  2 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 16 +--
 .../apache/sis/storage/netcdf/MetadataReader.java  |  2 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java | 10 +++
 .../java/org/apache/sis/storage/sql/SQLStore.java  | 10 +++
 .../sis/internal/storage/AbstractResource.java |  4 +--
 .../sis/internal/storage/MetadataBuilder.java  |  2 +-
 .../apache/sis/internal/storage/URIDataStore.java  | 11 
 .../apache/sis/internal/storage/folder/Store.java  |  8 +++---
 .../java/org/apache/sis/storage/DataStore.java | 32 --
 .../org/apache/sis/storage/DataStoreProvider.java  |  2 +-
 .../main/java/org/apache/sis/storage/Resource.java | 10 +++
 .../apache/sis/storage/event/StoreListener.java|  4 +--
 .../apache/sis/storage/event/StoreListeners.java   | 16 +--
 .../java/org/apache/sis/storage/DataStoreMock.java |  7 +++--
 .../sis/storage/event/StoreListenersTest.java  | 14 +-
 36 files changed, 137 insertions(+), 126 deletions(-)

[sis] 01/01: Merge branch 'geoapi-3.1': last-minute API changes before 1.0 release.

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit ba0a5b3c331714910e1b99025e7aa124816d7506
Merge: 90b5999 6217d6d
Author: Martin Desruisseaux 
AuthorDate: Sat Sep 14 13:49:25 2019 +0200

Merge branch 'geoapi-3.1': last-minute API changes before 1.0 release.

 .../org/apache/sis/coverage/grid/GridGeometry.java |  2 +-
 .../internal/metadata/TransformationAccuracy.java  |  2 +-
 .../apache/sis/metadata/ModifiableMetadata.java| 12 
 .../java/org/apache/sis/metadata/StateChanger.java |  6 ++--
 .../org/apache/sis/metadata/iso/ISOMetadata.java   |  4 +--
 .../apache/sis/metadata/iso/extent/Extents.java|  4 +--
 .../DefaultRepresentativeFraction.java |  2 +-
 .../org/apache/sis/metadata/sql/Dispatcher.java|  2 +-
 .../apache/sis/metadata/sql/MetadataFallback.java  |  2 +-
 .../sis/metadata/ModifiableMetadataTest.java   | 10 +++
 .../metadata/iso/citation/DefaultCitationTest.java |  6 ++--
 .../metadata/iso/citation/HardCodedCitations.java  |  8 +++---
 .../DefaultRepresentativeFractionTest.java |  4 +--
 .../referencing/gazetteer/FinalLocationType.java   |  2 +-
 .../referencing/PositionalAccuracyConstant.java|  2 +-
 .../sis/referencing/ImmutableIdentifier.java   |  4 +--
 .../apache/sis/referencing/NamedIdentifier.java|  4 +--
 .../referencing/factory/sql/EPSGDataAccess.java|  4 +--
 .../storage/earthobservation/LandsatReader.java|  2 +-
 .../sis/storage/earthobservation/LandsatStore.java | 31 -
 .../org/apache/sis/storage/gdal/Proj4Factory.java  |  2 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 16 +--
 .../apache/sis/storage/netcdf/MetadataReader.java  |  2 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java | 10 +++
 .../java/org/apache/sis/storage/sql/SQLStore.java  | 10 +++
 .../sis/internal/storage/AbstractResource.java |  4 +--
 .../sis/internal/storage/MetadataBuilder.java  |  2 +-
 .../apache/sis/internal/storage/URIDataStore.java  | 11 
 .../apache/sis/internal/storage/folder/Store.java  |  8 +++---
 .../java/org/apache/sis/storage/DataStore.java | 32 --
 .../org/apache/sis/storage/DataStoreProvider.java  |  2 +-
 .../main/java/org/apache/sis/storage/Resource.java | 10 +++
 .../apache/sis/storage/event/StoreListener.java|  4 +--
 .../apache/sis/storage/event/StoreListeners.java   | 16 +--
 .../java/org/apache/sis/storage/DataStoreMock.java |  7 +++--
 .../sis/storage/event/StoreListenersTest.java  | 14 +-
 36 files changed, 137 insertions(+), 126 deletions(-)

diff --cc 
core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
index d2f1813,47be601..2f9508a
--- 
a/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
+++ 
b/core/sis-referencing-by-identifiers/src/main/java/org/apache/sis/referencing/gazetteer/FinalLocationType.java
@@@ -199,10 -201,12 +199,10 @@@ final class FinalLocationType extends A
   * @param  metadata  the metadata object to eventually copy, or {@code 
null}.
   * @return an unmodifiable copy of the given metadata object, or {@code 
null} if the given argument is {@code null}.
   */
 -private static  T unmodifiable(final Class type, T metadata) {
 +private static Object unmodifiable(Object metadata) {
  if (metadata instanceof ModifiableMetadata) {
 -metadata = MetadataCopier.forModifiable(((ModifiableMetadata) 
metadata).getStandard()).copy(type, metadata);
 +metadata = MetadataCopier.forModifiable(((ModifiableMetadata) 
metadata).getStandard()).copy(metadata);
- ((ModifiableMetadata) 
metadata).transition(ModifiableMetadata.State.FINAL);
+ ((ModifiableMetadata) 
metadata).transitionTo(ModifiableMetadata.State.FINAL);
  }
  return metadata;
  }

[sis] branch geoapi-3.1 updated (ddbee3b -> 6217d6d)

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a change to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git.


from ddbee3b  Merge branch 'geoapi-4.0' into geoapi-3.1: removal of 
deprecated methods.
 add e016ebd  Bug fix: Comparison with `ANY` returned `true` while `false` 
was expected.
 add 11a09b8  Rename "ModifiableMetadata.transition" to "transitionTo". The 
previous name was a bit ambiguous.
 add 82991de  API change before 1.0 release: Reverse the argument order in 
DataStore.addListener/removeListener. The intent is to be consistent with 
similar methods elsewhere in SIS, which put the Class argument first.
 add 48d2fc1  Clarification about whether a DataStore.getFoo() method can 
return null. Contain one last-minute API change before 1.0 release: 
getOpenParameters() return Optional.
 new 6217d6d  Merge branch 'geoapi-4.0' into geoapi-3.1: last minute API 
changes before 1.0 release.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/sis/coverage/grid/GridGeometry.java |  2 +-
 .../org/apache/sis/filter/ComparisonFunction.java  | 23 ++--
 .../internal/metadata/TransformationAccuracy.java  |  2 +-
 .../apache/sis/metadata/ModifiableMetadata.java| 12 
 .../java/org/apache/sis/metadata/StateChanger.java |  6 ++--
 .../org/apache/sis/metadata/iso/ISOMetadata.java   |  4 +--
 .../apache/sis/metadata/iso/extent/Extents.java|  4 +--
 .../DefaultRepresentativeFraction.java |  2 +-
 .../org/apache/sis/metadata/sql/Dispatcher.java|  2 +-
 .../apache/sis/metadata/sql/MetadataFallback.java  |  2 +-
 .../sis/metadata/ModifiableMetadataTest.java   | 10 +++
 .../metadata/iso/citation/DefaultCitationTest.java |  6 ++--
 .../metadata/iso/citation/HardCodedCitations.java  |  8 +++---
 .../DefaultRepresentativeFractionTest.java |  4 +--
 .../referencing/gazetteer/FinalLocationType.java   |  2 +-
 .../referencing/PositionalAccuracyConstant.java|  2 +-
 .../sis/referencing/ImmutableIdentifier.java   |  4 +--
 .../apache/sis/referencing/NamedIdentifier.java|  4 +--
 .../referencing/factory/sql/EPSGDataAccess.java|  4 +--
 .../apache/sis/test/integration/MetadataTest.java  |  1 -
 .../storage/earthobservation/LandsatReader.java|  2 +-
 .../sis/storage/earthobservation/LandsatStore.java | 31 -
 .../org/apache/sis/storage/gdal/Proj4Factory.java  |  2 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 16 +--
 .../apache/sis/storage/netcdf/MetadataReader.java  |  2 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java | 10 +++
 .../java/org/apache/sis/storage/sql/SQLStore.java  | 10 +++
 .../sis/internal/storage/AbstractResource.java |  4 +--
 .../sis/internal/storage/MetadataBuilder.java  |  2 +-
 .../apache/sis/internal/storage/URIDataStore.java  | 11 
 .../apache/sis/internal/storage/folder/Store.java  |  8 +++---
 .../java/org/apache/sis/storage/DataStore.java | 32 --
 .../org/apache/sis/storage/DataStoreProvider.java  |  2 +-
 .../main/java/org/apache/sis/storage/Resource.java | 10 +++
 .../apache/sis/storage/event/StoreListener.java|  4 +--
 .../apache/sis/storage/event/StoreListeners.java   | 16 +--
 .../java/org/apache/sis/storage/DataStoreMock.java |  7 +++--
 .../sis/storage/event/StoreListenersTest.java  | 14 +-
 38 files changed, 151 insertions(+), 136 deletions(-)

[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: last minute API changes before 1.0 release.

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 6217d6de56fffe09be83ce6ea96e1210eb2df3bc
Merge: ddbee3b 48d2fc1
Author: Martin Desruisseaux 
AuthorDate: Sat Sep 14 13:43:48 2019 +0200

Merge branch 'geoapi-4.0' into geoapi-3.1: last minute API changes before 
1.0 release.

 .../org/apache/sis/coverage/grid/GridGeometry.java |  2 +-
 .../org/apache/sis/filter/ComparisonFunction.java  | 23 ++--
 .../internal/metadata/TransformationAccuracy.java  |  2 +-
 .../apache/sis/metadata/ModifiableMetadata.java| 12 
 .../java/org/apache/sis/metadata/StateChanger.java |  6 ++--
 .../org/apache/sis/metadata/iso/ISOMetadata.java   |  4 +--
 .../apache/sis/metadata/iso/extent/Extents.java|  4 +--
 .../DefaultRepresentativeFraction.java |  2 +-
 .../org/apache/sis/metadata/sql/Dispatcher.java|  2 +-
 .../apache/sis/metadata/sql/MetadataFallback.java  |  2 +-
 .../sis/metadata/ModifiableMetadataTest.java   | 10 +++
 .../metadata/iso/citation/DefaultCitationTest.java |  6 ++--
 .../metadata/iso/citation/HardCodedCitations.java  |  8 +++---
 .../DefaultRepresentativeFractionTest.java |  4 +--
 .../referencing/gazetteer/FinalLocationType.java   |  2 +-
 .../referencing/PositionalAccuracyConstant.java|  2 +-
 .../sis/referencing/ImmutableIdentifier.java   |  4 +--
 .../apache/sis/referencing/NamedIdentifier.java|  4 +--
 .../referencing/factory/sql/EPSGDataAccess.java|  4 +--
 .../apache/sis/test/integration/MetadataTest.java  |  1 -
 .../storage/earthobservation/LandsatReader.java|  2 +-
 .../sis/storage/earthobservation/LandsatStore.java | 31 -
 .../org/apache/sis/storage/gdal/Proj4Factory.java  |  2 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 16 +--
 .../apache/sis/storage/netcdf/MetadataReader.java  |  2 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java | 10 +++
 .../java/org/apache/sis/storage/sql/SQLStore.java  | 10 +++
 .../sis/internal/storage/AbstractResource.java |  4 +--
 .../sis/internal/storage/MetadataBuilder.java  |  2 +-
 .../apache/sis/internal/storage/URIDataStore.java  | 11 
 .../apache/sis/internal/storage/folder/Store.java  |  8 +++---
 .../java/org/apache/sis/storage/DataStore.java | 32 --
 .../org/apache/sis/storage/DataStoreProvider.java  |  2 +-
 .../main/java/org/apache/sis/storage/Resource.java | 10 +++
 .../apache/sis/storage/event/StoreListener.java|  4 +--
 .../apache/sis/storage/event/StoreListeners.java   | 16 +--
 .../java/org/apache/sis/storage/DataStoreMock.java |  7 +++--
 .../sis/storage/event/StoreListenersTest.java  | 14 +-
 38 files changed, 151 insertions(+), 136 deletions(-)

[sis] 04/04: Clarification about whether a DataStore.getFoo() method can return null. Contain one last-minute API change before 1.0 release: getOpenParameters() return Optional.

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 48d2fc1ffd4bd40edc768acb8a7663aa5df41bc1
Author: Martin Desruisseaux 
AuthorDate: Sat Sep 14 11:44:40 2019 +0200

Clarification about whether a DataStore.getFoo() method can return null.
Contain one last-minute API change before 1.0 release: getOpenParameters() 
return Optional.
---
 .../sis/storage/earthobservation/LandsatStore.java | 27 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 12 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java |  6 ++---
 .../java/org/apache/sis/storage/sql/SQLStore.java  |  6 ++---
 .../apache/sis/internal/storage/URIDataStore.java  |  7 +++---
 .../apache/sis/internal/storage/folder/Store.java  |  4 ++--
 .../java/org/apache/sis/storage/DataStore.java | 14 +++
 .../org/apache/sis/storage/DataStoreProvider.java  |  2 +-
 .../java/org/apache/sis/storage/DataStoreMock.java |  7 +++---
 9 files changed, 48 insertions(+), 37 deletions(-)

diff --git 
a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
 
b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
index 02bcaf6..770b330 100644
--- 
a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
+++ 
b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
@@ -20,6 +20,7 @@ import java.io.Reader;
 import java.io.BufferedReader;
 import java.io.LineNumberReader;
 import java.io.IOException;
+import java.nio.file.StandardOpenOption;
 import java.net.URI;
 import java.util.Optional;
 import org.opengis.metadata.Metadata;
@@ -28,6 +29,7 @@ import org.opengis.util.FactoryException;
 import org.opengis.parameter.ParameterValueGroup;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.storage.DataStoreException;
+import org.apache.sis.storage.DataStoreClosedException;
 import org.apache.sis.storage.DataStoreReferencingException;
 import org.apache.sis.storage.UnsupportedStorageException;
 import org.apache.sis.storage.StorageConnector;
@@ -114,18 +116,18 @@ public class LandsatStore extends DataStore {
 
 /**
  * Returns the parameters used to open this Landsat data store.
- * If non-null, the parameters are described by {@link 
LandsatStoreProvider#getOpenParameters()} and contains at
- * least a parameter named {@value 
org.apache.sis.storage.DataStoreProvider#LOCATION} with a {@link URI} value.
- * This method may return {@code null} if the storage input can not be 
described by a URI
+ * The parameters are described by {@link 
LandsatStoreProvider#getOpenParameters()} and contains at least
+ * a parameter named {@value 
org.apache.sis.storage.DataStoreProvider#LOCATION} with a {@link URI} value.
+ * The return value may be empty if the storage input can not be described 
by a URI
  * (for example a Landsat file reading directly from a {@link 
java.nio.channels.ReadableByteChannel}).
  *
- * @return parameters used for opening this data store, or {@code null} if 
not available.
+ * @return parameters used for opening this data store.
  *
  * @since 0.8
  */
 @Override
-public ParameterValueGroup getOpenParameters() {
-return URIDataStore.parameters(provider, location);
+public Optional getOpenParameters() {
+return Optional.ofNullable(URIDataStore.parameters(provider, 
location));
 }
 
 /**
@@ -156,17 +158,20 @@ public class LandsatStore extends DataStore {
  */
 @Override
 public synchronized Metadata getMetadata() throws DataStoreException {
-if (metadata == null && source != null) try {
+if (metadata == null) {
+if (source == null) {
+throw new DataStoreClosedException(getLocale(), 
LandsatStoreProvider.NAME, StandardOpenOption.READ);
+}
 try (BufferedReader reader = (source instanceof BufferedReader) ? 
(BufferedReader) source : new LineNumberReader(source)) {
 source = null;  // Will be closed at the end of this 
try-finally block.
 final LandsatReader parser = new 
LandsatReader(getDisplayName(), listeners);
 parser.read(reader);
 metadata = parser.getMetadata();
+} catch (IOException e) {
+throw new DataStoreException(e);
+} catch (FactoryException e) {
+throw new DataStoreReferencingException(e);
 }
-} catch (IOException e) {
-throw new DataStoreException(e);
-} catch (FactoryException e) {
-throw new DataStoreReferencingException(e);
 }
 return metadata;
 }
diff --git

[sis] 03/04: API change before 1.0 release: Reverse the argument order in DataStore.addListener/removeListener. The intent is to be consistent with similar methods elsewhere in SIS, which put the Clas

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 82991deea8bcc5fdf46dd80e91324618cd3ab450
Author: Martin Desruisseaux 
AuthorDate: Fri Sep 13 19:50:28 2019 +0200

API change before 1.0 release: Reverse the argument order in 
DataStore.addListener/removeListener. The intent is to be consistent with 
similar methods elsewhere in SIS, which put the Class argument first.
---
 .../sis/storage/earthobservation/LandsatStore.java |  4 ++--
 .../org/apache/sis/storage/geotiff/GeoTiffStore.java   |  4 ++--
 .../org/apache/sis/storage/netcdf/NetcdfStore.java |  4 ++--
 .../main/java/org/apache/sis/storage/sql/SQLStore.java |  4 ++--
 .../apache/sis/internal/storage/AbstractResource.java  |  4 ++--
 .../org/apache/sis/internal/storage/URIDataStore.java  |  4 ++--
 .../org/apache/sis/internal/storage/folder/Store.java  |  4 ++--
 .../main/java/org/apache/sis/storage/DataStore.java| 18 +-
 .../src/main/java/org/apache/sis/storage/Resource.java | 10 +-
 .../org/apache/sis/storage/event/StoreListener.java|  4 ++--
 .../org/apache/sis/storage/event/StoreListeners.java   | 16 
 .../apache/sis/storage/event/StoreListenersTest.java   | 14 +++---
 12 files changed, 45 insertions(+), 45 deletions(-)

diff --git 
a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
 
b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
index 37b8672..02bcaf6 100644
--- 
a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
+++ 
b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
@@ -177,10 +177,10 @@ public class LandsatStore extends DataStore {
  * any listener specified for another kind of events will be ignored.
  */
 @Override
-public  void addListener(StoreListener 
listener, Class eventType) {
+public  void addListener(Class eventType, 
StoreListener listener) {
 // If an argument is null, we let the parent class throws (indirectly) 
NullArgumentException.
 if (listener == null || eventType == null || 
eventType.isAssignableFrom(WarningEvent.class)) {
-super.addListener(listener, eventType);
+super.addListener(eventType, listener);
 }
 }
 
diff --git 
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
 
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
index ecbc331..d6e1b25 100644
--- 
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
+++ 
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
@@ -347,10 +347,10 @@ public class GeoTiffStore extends DataStore implements 
Aggregate {
  * any listener specified for another kind of events will be ignored.
  */
 @Override
-public  void addListener(StoreListener 
listener, Class eventType) {
+public  void addListener(Class eventType, 
StoreListener listener) {
 // If an argument is null, we let the parent class throws (indirectly) 
NullArgumentException.
 if (listener == null || eventType == null || 
eventType.isAssignableFrom(WarningEvent.class)) {
-super.addListener(listener, eventType);
+super.addListener(eventType, listener);
 }
 }
 
diff --git 
a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
 
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
index 9eed48a..6094911 100644
--- 
a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
+++ 
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
@@ -221,10 +221,10 @@ public class NetcdfStore extends DataStore implements 
Aggregate {
  * any listener specified for another kind of events will be ignored.
  */
 @Override
-public  void addListener(StoreListener 
listener, Class eventType) {
+public  void addListener(Class eventType, 
StoreListener listener) {
 // If an argument is null, we let the parent class throws (indirectly) 
NullArgumentException.
 if (listener == null || eventType == null || 
eventType.isAssignableFrom(WarningEvent.class)) {
-super.addListener(listener, eventType);
+super.addListener(eventType, listener);
 }
 }
 
diff --git 
a/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStore.java 
b/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStore.java
index 6ef63cf..83acbd3 100644
--- 
a/storage/sis-sqlstore/src/main/java/org/apache/sis/storage/sql/SQLStore.java
+++

[sis] 02/04: Rename "ModifiableMetadata.transition" to "transitionTo". The previous name was a bit ambiguous.

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 11a09b824ba963469c60bd7dacbf0ec6865cc176
Author: Martin Desruisseaux 
AuthorDate: Fri Sep 13 16:47:06 2019 +0200

Rename "ModifiableMetadata.transition" to "transitionTo". The previous name 
was a bit ambiguous.
---
 .../main/java/org/apache/sis/coverage/grid/GridGeometry.java |  2 +-
 .../apache/sis/internal/metadata/TransformationAccuracy.java |  2 +-
 .../java/org/apache/sis/metadata/ModifiableMetadata.java | 12 ++--
 .../src/main/java/org/apache/sis/metadata/StateChanger.java  |  6 +++---
 .../main/java/org/apache/sis/metadata/iso/ISOMetadata.java   |  4 ++--
 .../java/org/apache/sis/metadata/iso/extent/Extents.java |  4 ++--
 .../iso/identification/DefaultRepresentativeFraction.java|  2 +-
 .../main/java/org/apache/sis/metadata/sql/Dispatcher.java|  2 +-
 .../java/org/apache/sis/metadata/sql/MetadataFallback.java   |  2 +-
 .../java/org/apache/sis/metadata/ModifiableMetadataTest.java | 10 +-
 .../sis/metadata/iso/citation/DefaultCitationTest.java   |  6 +++---
 .../apache/sis/metadata/iso/citation/HardCodedCitations.java |  8 
 .../identification/DefaultRepresentativeFractionTest.java|  4 ++--
 .../apache/sis/referencing/gazetteer/FinalLocationType.java  |  2 +-
 .../sis/internal/referencing/PositionalAccuracyConstant.java |  2 +-
 .../java/org/apache/sis/referencing/ImmutableIdentifier.java |  4 ++--
 .../java/org/apache/sis/referencing/NamedIdentifier.java |  4 ++--
 .../apache/sis/referencing/factory/sql/EPSGDataAccess.java   |  4 ++--
 .../java/org/apache/sis/test/integration/MetadataTest.java   |  1 -
 .../apache/sis/storage/earthobservation/LandsatReader.java   |  2 +-
 .../main/java/org/apache/sis/storage/gdal/Proj4Factory.java  |  2 +-
 .../java/org/apache/sis/storage/netcdf/MetadataReader.java   |  2 +-
 .../org/apache/sis/internal/storage/MetadataBuilder.java |  2 +-
 23 files changed, 44 insertions(+), 45 deletions(-)

diff --git 
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java 
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
index 12169c1..9caedb6 100644
--- 
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridGeometry.java
@@ -849,7 +849,7 @@ public class GridGeometry implements Serializable {
 if (getCoordinateReferenceSystem(envelope) != null && 
!envelope.isAllNaN()) {
 try {
 final DefaultGeographicBoundingBox db = 
ReferencingServices.getInstance().setBounds(envelope, null, null);
-db.transition(DefaultGeographicBoundingBox.State.EDITABLE);
+
db.transitionTo(DefaultGeographicBoundingBox.State.EDITABLE);
 bbox = db;
 } catch (TransformException e) {
 bbox = 
NilReason.INAPPLICABLE.createNilObject(GeographicBoundingBox.class);
diff --git 
a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
 
b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
index c93558b..334fcfd 100644
--- 
a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
+++ 
b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
@@ -79,7 +79,7 @@ public final class TransformationAccuracy extends Static {
 new DefaultAbsoluteExternalPositionalAccuracy(result);
 
element.setNamesOfMeasure(Collections.singleton(TRANSFORMATION_ACCURACY));
 
element.setEvaluationMethodType(EvaluationMethodType.DIRECT_EXTERNAL);
-
element.transition(DefaultAbsoluteExternalPositionalAccuracy.State.FINAL);
+
element.transitionTo(DefaultAbsoluteExternalPositionalAccuracy.State.FINAL);
 
 p = CACHE.putIfAbsent(accuracy, element);
 if (p == null) {
diff --git 
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
 
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
index f9c3b78..516c144 100644
--- 
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
+++ 
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
@@ -104,7 +104,7 @@ public abstract class ModifiableMetadata extends 
AbstractMetadata {
 private static final byte STAGED = 1;
 
 /**
- * A value for {@link #state} meaning that execution of {@code 
transition(…)} is in progress.
+ * A value for {@link #state} meaning that execution of {@code 
transitionTo(…)} is in progress.
  * Must be greater than all other values except {@link #COMPLETABLE} and 
{@link #FINAL}.

[sis] branch geoapi-4.0 updated (1cbed34 -> 48d2fc1)

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git.


from 1cbed34  Remove more deprecated methods: 
DefaultEllipsoid.orthodromicDistance, XML.DEFAULT_NAMESPACE.
 new e016ebd  Bug fix: Comparison with `ANY` returned `true` while `false` 
was expected.
 new 11a09b8  Rename "ModifiableMetadata.transition" to "transitionTo". The 
previous name was a bit ambiguous.
 new 82991de  API change before 1.0 release: Reverse the argument order in 
DataStore.addListener/removeListener. The intent is to be consistent with 
similar methods elsewhere in SIS, which put the Class argument first.
 new 48d2fc1  Clarification about whether a DataStore.getFoo() method can 
return null. Contain one last-minute API change before 1.0 release: 
getOpenParameters() return Optional.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/sis/coverage/grid/GridGeometry.java |  2 +-
 .../org/apache/sis/filter/ComparisonFunction.java  | 23 ++--
 .../internal/metadata/TransformationAccuracy.java  |  2 +-
 .../apache/sis/metadata/ModifiableMetadata.java| 12 
 .../java/org/apache/sis/metadata/StateChanger.java |  6 ++--
 .../org/apache/sis/metadata/iso/ISOMetadata.java   |  4 +--
 .../apache/sis/metadata/iso/extent/Extents.java|  4 +--
 .../DefaultRepresentativeFraction.java |  2 +-
 .../org/apache/sis/metadata/sql/Dispatcher.java|  2 +-
 .../apache/sis/metadata/sql/MetadataFallback.java  |  2 +-
 .../sis/metadata/ModifiableMetadataTest.java   | 10 +++
 .../metadata/iso/citation/DefaultCitationTest.java |  6 ++--
 .../metadata/iso/citation/HardCodedCitations.java  |  8 +++---
 .../DefaultRepresentativeFractionTest.java |  4 +--
 .../referencing/gazetteer/FinalLocationType.java   |  2 +-
 .../referencing/PositionalAccuracyConstant.java|  2 +-
 .../sis/referencing/ImmutableIdentifier.java   |  4 +--
 .../apache/sis/referencing/NamedIdentifier.java|  4 +--
 .../referencing/factory/sql/EPSGDataAccess.java|  4 +--
 .../apache/sis/test/integration/MetadataTest.java  |  1 -
 .../storage/earthobservation/LandsatReader.java|  2 +-
 .../sis/storage/earthobservation/LandsatStore.java | 31 -
 .../org/apache/sis/storage/gdal/Proj4Factory.java  |  2 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   | 16 +--
 .../apache/sis/storage/netcdf/MetadataReader.java  |  2 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java | 10 +++
 .../java/org/apache/sis/storage/sql/SQLStore.java  | 10 +++
 .../sis/internal/storage/AbstractResource.java |  4 +--
 .../sis/internal/storage/MetadataBuilder.java  |  2 +-
 .../apache/sis/internal/storage/URIDataStore.java  | 11 
 .../apache/sis/internal/storage/folder/Store.java  |  8 +++---
 .../java/org/apache/sis/storage/DataStore.java | 32 --
 .../org/apache/sis/storage/DataStoreProvider.java  |  2 +-
 .../main/java/org/apache/sis/storage/Resource.java | 10 +++
 .../apache/sis/storage/event/StoreListener.java|  4 +--
 .../apache/sis/storage/event/StoreListeners.java   | 16 +--
 .../java/org/apache/sis/storage/DataStoreMock.java |  7 +++--
 .../sis/storage/event/StoreListenersTest.java  | 14 +-
 38 files changed, 151 insertions(+), 136 deletions(-)

[sis] 01/04: Bug fix: Comparison with `ANY` returned `true` while `false` was expected.

2019-09-14 Thread desruisseaux

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit e016ebd4bdf7fc161867d5f98099a009e0d54bad
Author: Martin Desruisseaux 
AuthorDate: Fri Sep 13 16:27:57 2019 +0200

Bug fix: Comparison with `ANY` returned `true` while `false` was expected.
---
 .../org/apache/sis/filter/ComparisonFunction.java  | 23 +-
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git 
a/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFunction.java 
b/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFunction.java
index dcfccfd..67a580f 100644
--- 
a/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFunction.java
+++ 
b/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFunction.java
@@ -164,11 +164,9 @@ abstract class ComparisonFunction extends BinaryFunction 
implements BinaryCompar
  * All values in the collection may be compared to the other 
value until match condition is met.
  * Null elements in the collection are ignored.
  */
-boolean found  = false;
-boolean hasOne = false;
+boolean match = false;
 for (final Object element : collection) {
 if (element != null) {
-found = true;
 final boolean pass;
 if (collectionFirst) {
 pass = evaluate(element, right);
@@ -176,19 +174,26 @@ abstract class ComparisonFunction extends BinaryFunction 
implements BinaryCompar
 pass = evaluate(left, element);
 }
 switch (matchAction) {
-default:  return false;
// Unknown enumeration.
-case ALL: if (!pass) return false; else break;
-case ANY: if ( pass) return true;  else break;
+default: return false;  // Unknown 
enumeration.
+case ALL: {
+if (!pass) return false;
+match = true;   // Remember 
that we have at least 1 value.
+break;
+}
+case ANY: {
+if (pass) return true;
+break;  // `match` 
still false since no match.
+}
 case ONE: {
 if (pass) {
-if (hasOne) return false;
-hasOne = true;
+if (match) return false;// If a value 
has been found previously.
+match = true;   // Remember 
that we have exactly one value.
 }
 }
 }
 }
 }
-return found;
+return match;
 }
 }
 return false;

[sis] 01/03: Rename "ModifiableMetadata.transition" to "transitionTo". The previous name was a bit ambiguous.

[sis] 03/03: Clarification about whether a DataStore.getFoo() method can return null. Contain one last-minute API change before 1.0 release: getOpenParameters() return Optional.

[sis] 02/03: API change before 1.0 release: Reverse the argument order in DataStore.addListener/removeListener. The intent is to be consistent with similar methods elsewhere in SIS, which put the Clas

[sis] branch 1.0-RC updated (c56e277 -> 04e45b8)

[sis] branch master updated (90b5999 -> ba0a5b3)

[sis] 01/01: Merge branch 'geoapi-3.1': last-minute API changes before 1.0 release.

[sis] branch geoapi-3.1 updated (ddbee3b -> 6217d6d)

[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: last minute API changes before 1.0 release.

[sis] 04/04: Clarification about whether a DataStore.getFoo() method can return null. Contain one last-minute API change before 1.0 release: getOpenParameters() return Optional.

[sis] 03/04: API change before 1.0 release: Reverse the argument order in DataStore.addListener/removeListener. The intent is to be consistent with similar methods elsewhere in SIS, which put the Clas

[sis] 02/04: Rename "ModifiableMetadata.transition" to "transitionTo". The previous name was a bit ambiguous.

[sis] branch geoapi-4.0 updated (1cbed34 -> 48d2fc1)

[sis] 01/04: Bug fix: Comparison with `ANY` returned `true` while `false` was expected.

13 matches

Site Navigation

Mail list logo

Footer information