sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'geoapi-3.1'
Date Mon, 09 Sep 2019 15:55:51 GMT
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 9671eeb1ade4566930e5f1e3ffcd921871fbebd2
Merge: e6937d1 cbe6d78
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Mon Sep 9 17:55:32 2019 +0200

    Merge branch 'geoapi-3.1'

 .../java/org/apache/sis/console/package-info.java  |   2 +-
 .../java/org/apache/sis/image/PixelIterator.java   |   7 +
 .../apache/sis/image/WritablePixelIterator.java    |   9 +-
 .../apache/sis/internal/metadata/Resources.java    |  27 ++
 .../sis/internal/metadata/Resources.properties     |   2 +
 .../sis/internal/metadata/Resources_fr.properties  |   2 +
 .../sis/internal/metadata/ServicesForUtility.java  |  29 +-
 .../sis/internal/metadata/sql/Initializer.java     |  22 +-
 .../org/apache/sis/metadata/AbstractMetadata.java  |   1 -
 .../org/apache/sis/metadata/MetadataCopier.java    |  41 +-
 .../apache/sis/metadata/iso/DefaultIdentifier.java |   7 +-
 .../sis/metadata/iso/citation/Citations.java       |  20 +-
 .../java/org/apache/sis/xml/ReferenceResolver.java |   2 +-
 .../apache/sis/metadata/MetadataCopierTest.java    |  33 +-
 .../apache/sis/internal/jaxb/referencing/Code.java |   4 +-
 .../sis/internal/referencing/DeprecatedCode.java   |   2 +-
 .../sis/internal/referencing/WKTKeywords.java      |   2 +-
 .../internal/referencing/provider/EPSGName.java    |   2 +-
 .../referencing/provider/MapProjection.java        |   2 +-
 .../java/org/apache/sis/io/wkt/ElementKind.java    |   2 +-
 .../main/java/org/apache/sis/io/wkt/Formatter.java |   2 +-
 .../apache/sis/io/wkt/GeodeticObjectParser.java    |   2 +-
 .../main/java/org/apache/sis/io/wkt/WKTFormat.java |  43 +-
 .../sis/metadata/iso/ImmutableIdentifier.java      | 467 +--------------------
 .../java/org/apache/sis/parameter/Parameters.java  |   4 +-
 .../sis/referencing/AbstractIdentifiedObject.java  |   5 +-
 .../java/org/apache/sis/referencing/Builder.java   |   1 -
 .../apache/sis/referencing/IdentifiedObjects.java  |   4 +-
 .../iso => referencing}/ImmutableIdentifier.java   |  57 +--
 .../apache/sis/referencing/NamedIdentifier.java    |   1 -
 .../sis/referencing/crs/DefaultGeographicCRS.java  |   2 +-
 .../referencing/factory/sql/EPSGDataAccess.java    |   2 +-
 .../operation/InverseOperationMethod.java          |   2 +-
 .../transform/CoordinateSystemTransform.java       |   2 +-
 .../transform/EllipsoidToCentricTransform.java     |   2 +-
 .../sis/internal/jaxb/referencing/CodeTest.java    |   2 +-
 .../parameter/DefaultParameterDescriptorTest.java  |   2 +-
 .../referencing/AbstractIdentifiedObjectTest.java  |   5 +-
 .../referencing/AbstractReferenceSystemTest.java   |   1 -
 .../org/apache/sis/referencing/BuilderTest.java    |   1 -
 .../ImmutableIdentifierTest.java                   |   2 +-
 .../apache/sis/referencing/cs/NormalizerTest.java  |   2 +-
 .../datum/DefaultTemporalDatumTest.java            |   2 +-
 .../operation/DefaultOperationMethodTest.java      |   2 +-
 .../apache/sis/test/integration/MetadataTest.java  |   4 +-
 .../sis/test/suite/ReferencingTestSuite.java       |   2 +-
 .../org/apache/sis/internal/system/Supervisor.java |   2 -
 .../apache/sis/internal/util/MetadataServices.java |  25 ++
 .../sis/internal/util/TemporalUtilities.java       |   2 -
 .../java/org/apache/sis/setup/Configuration.java   | 102 +++++
 .../java/org/apache/sis/util/CharSequences.java    |   4 +-
 .../java/org/apache/sis/util/Configuration.java    |   8 +-
 pom.xml                                            |  21 +-
 .../org/apache/sis/storage/gdal/Proj4Factory.java  |   2 +-
 .../apache/sis/storage/sql/SQLStoreProvider.java   |   6 +-
 .../org/apache/sis/internal/storage/Resources.java |   5 +
 .../sis/internal/storage/Resources.properties      |   1 +
 .../sis/internal/storage/Resources_fr.properties   |   1 +
 .../storage/folder/FolderStoreProvider.java        |   3 +-
 .../org/apache/sis/storage/DataStoreProvider.java  |  19 +-
 .../org/apache/sis/storage/StorageConnector.java   |  11 +-
 61 files changed, 433 insertions(+), 618 deletions(-)

diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
index 31074d2,2cf4b6c..d25347d
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
@@@ -20,7 -20,9 +20,9 @@@ import java.text.Format
  import java.util.Locale;
  import java.util.TimeZone;
  import javax.sql.DataSource;
+ import java.sql.SQLException;
+ import java.util.function.Supplier;
 -import org.opengis.util.ControlledVocabulary;
 +import org.opengis.util.CodeList;
  import org.opengis.metadata.citation.Citation;
  import org.apache.sis.internal.util.MetadataServices;
  import org.apache.sis.internal.metadata.sql.Initializer;
@@@ -30,9 -32,10 +32,9 @@@ import org.apache.sis.util.logging.Logg
  import org.apache.sis.util.iso.Types;
  import org.apache.sis.util.Exceptions;
  import org.apache.sis.util.Classes;
- 
+ import org.apache.sis.util.resources.Errors;
  
  
 -
  /**
   * Implements the metadata services needed by the {@code "sis-utility"} module.
   *
diff --cc core/sis-referencing/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
index 5ea8d90,fcc74cd..e4ff538
--- a/core/sis-referencing/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
@@@ -18,28 -18,9 +18,10 @@@ package org.apache.sis.metadata.iso
  
  import java.util.Map;
  import java.util.Locale;
- import java.util.Objects;
- import java.io.Serializable;
  import org.opengis.metadata.Identifier;
  import org.opengis.metadata.citation.Citation;
- import org.opengis.parameter.ParameterValue;
 +import org.opengis.referencing.ReferenceIdentifier;
  import org.opengis.util.InternationalString;
- import org.apache.sis.util.resources.Errors;
- import org.apache.sis.util.iso.Types;
- import org.apache.sis.metadata.TitleProperty;
- import org.apache.sis.metadata.iso.citation.Citations;
- import org.apache.sis.internal.metadata.Identifiers;
- import org.apache.sis.internal.metadata.NameMeaning;
- import org.apache.sis.internal.referencing.WKTKeywords;
- import org.apache.sis.io.wkt.FormattableObject;
- import org.apache.sis.io.wkt.Formatter;
- import org.apache.sis.io.wkt.Convention;
- import org.apache.sis.io.wkt.ElementKind;
- 
- import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
- import static org.apache.sis.util.CharSequences.trimWhitespaces;
- import static org.apache.sis.util.collection.Containers.property;
  
  
  /**
@@@ -166,20 -42,10 +43,10 @@@ public class ImmutableIdentifier extend
       *
       * @param identifier  the identifier to copy.
       *
-      * @see #castOrCopy(ReferenceIdentifier)
+      * @see #castOrCopy(Identifier)
       */
 -    public ImmutableIdentifier(final Identifier identifier) {
 +    public ImmutableIdentifier(final ReferenceIdentifier identifier) {
-         ensureNonNull("identifier", identifier);
-         code      = identifier.getCode();
-         codeSpace = identifier.getCodeSpace();
-         authority = identifier.getAuthority();
-         version   = identifier.getVersion();
-         if (identifier instanceof DefaultIdentifier) {
-             description = ((DefaultIdentifier) identifier).getDescription();
-         } else {
-             description = null;
-         }
-         validate(null);
+         super(identifier);
      }
  
      /**
diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java
index 5ea8d90,f79eac6..cb5fa3a
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/ImmutableIdentifier.java
@@@ -28,6 -28,6 +28,7 @@@ import org.opengis.util.InternationalSt
  import org.apache.sis.util.resources.Errors;
  import org.apache.sis.util.iso.Types;
  import org.apache.sis.metadata.TitleProperty;
++import org.apache.sis.metadata.iso.DefaultIdentifier;
  import org.apache.sis.metadata.iso.citation.Citations;
  import org.apache.sis.internal.metadata.Identifiers;
  import org.apache.sis.internal.metadata.NameMeaning;
@@@ -116,15 -116,9 +117,15 @@@ public class ImmutableIdentifier extend
      /**
       * For cross-version compatibility.
       */
-     private static final long serialVersionUID = -7681717592582493409L;
+     private static final long serialVersionUID = 1804606250548055829L;
  
      /**
 +     * Key for the {@value} property in the map to be given to the constructor.
 +     * This can be used for setting the value to be returned by {@link #getDescription()}.
 +     */
 +    public static final String DESCRIPTION_KEY = "description";
 +
 +    /**
       * The person or party responsible for maintenance of the namespace, or {@code null}
if not available.
       *
       * @see #getAuthority()
@@@ -166,19 -160,15 +167,19 @@@
       *
       * @param identifier  the identifier to copy.
       *
-      * @see #castOrCopy(ReferenceIdentifier)
+      * @see #castOrCopy(Identifier)
       */
 -    public ImmutableIdentifier(final Identifier identifier) {
 +    public ImmutableIdentifier(final ReferenceIdentifier identifier) {
          ensureNonNull("identifier", identifier);
-         code      = identifier.getCode();
-         codeSpace = identifier.getCodeSpace();
-         authority = identifier.getAuthority();
-         version   = identifier.getVersion();
+         code        = identifier.getCode();
+         codeSpace   = identifier.getCodeSpace();
+         authority   = identifier.getAuthority();
+         version     = identifier.getVersion();
 -        description = identifier.getDescription();
 +        if (identifier instanceof DefaultIdentifier) {
 +            description = ((DefaultIdentifier) identifier).getDescription();
 +        } else {
 +            description = null;
 +        }
          validate(null);
      }
  
diff --cc core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index accd686,7285714..8c038f0
--- a/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@@ -83,7 -83,7 +83,6 @@@ import org.apache.sis.internal.system.L
  import org.apache.sis.internal.system.Semaphores;
  import org.apache.sis.internal.util.Constants;
  import org.apache.sis.internal.util.CollectionsExt;
- import org.apache.sis.metadata.iso.ImmutableIdentifier;
 -import org.apache.sis.internal.util.StandardDateFormat;
  import org.apache.sis.metadata.iso.citation.DefaultCitation;
  import org.apache.sis.metadata.iso.citation.DefaultOnlineResource;
  import org.apache.sis.metadata.iso.extent.DefaultExtent;
diff --cc core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
index 6da4d4f,79b2b2a..3386220
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CodeTest.java
@@@ -18,10 -18,10 +18,10 @@@ package org.apache.sis.internal.jaxb.re
  
  import java.util.Collections;
  import org.opengis.referencing.crs.GeographicCRS;
 -import org.opengis.metadata.Identifier;
 +import org.opengis.referencing.ReferenceIdentifier;
  import org.apache.sis.internal.util.Constants;
  import org.apache.sis.internal.simple.SimpleCitation;
- import org.apache.sis.metadata.iso.ImmutableIdentifier;
+ import org.apache.sis.referencing.ImmutableIdentifier;
  import org.apache.sis.metadata.iso.citation.Citations;
  import org.apache.sis.metadata.iso.citation.DefaultCitation;
  import org.apache.sis.test.DependsOnMethod;
diff --cc core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
index 3d49ba6,8d87e58..21d9819
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
@@@ -59,10 -59,8 +59,8 @@@ public final class Supervisor extends S
      /**
       * Whatever JMX agent is enabled. Setting this variable to {@code false} allows the
       * Java compiler to omit any dependency to this {@code Supervisor} class.
-      *
-      * @see <a href="http://sis.apache.org/source.html#master">Differences between
SIS master and branches</a>
       */
 -    static final boolean ENABLED = true;
 +    static final boolean ENABLED = false;
  
      /**
       * The JMX object name for the {@code Supervisor} service.
diff --cc core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
index cbc6c02,46b554d..6228eb0
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
@@@ -43,10 -43,8 +43,8 @@@ public final class TemporalUtilities ex
       * until we can really provide a sis-temporal module.
       *
       * This constant will be removed after SIS release a sis-temporal module.
-      *
-      * @see <a href="http://sis.apache.org/source.html#master">Differences between
SIS master and branches</a>
       */
 -    public static final boolean REPORT_MISSING_MODULE = true;
 +    public static final boolean REPORT_MISSING_MODULE = false;
  
      /**
       * Do not allow instantiation of this class.


Mime
View raw message