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 2019/06/25 11:41:25 UTC

[sis] branch geoapi-3.1 updated (e270be9 -> fb60ef7)

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 e270be9  Merge branch 'geoapi-4.0' into geoapi-3.1. They are simplifications enabled by https://issues.apache.org/jira/browse/SIS-463
     add aa6f6cb  Update for a change in GeoAPI: fix 2 wrong method signatures, and tests need to ignore private methods.
     add efd7537  Omit null or empty properties that are now inherited from GeoAPI interfaces. https://github.com/opengeospatial/geoapi/issues/47
     new fb60ef7  Merge branch 'geoapi-4.0' into geoapi-3.1. This merge removes some implementations for null or empty values.

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/feature/NamedFeatureType.java   |  10 +-
 .../sis/internal/jaxb/IdentifierMapEntry.java      |  29 --
 .../sis/internal/jaxb/SpecializedIdentifier.java   |  25 -
 .../jaxb/metadata/replace/ServiceParameter.java    |  12 -
 .../sis/internal/metadata/NameToIdentifier.java    |  18 -
 .../sis/internal/simple/SimpleAttributeType.java   |  32 --
 .../apache/sis/internal/simple/SimpleCitation.java |  32 --
 .../apache/sis/internal/simple/SimpleFormat.java   |  77 ---
 .../internal/simple/SimpleIdentifiedObject.java    |  57 ---
 .../sis/internal/simple/SimpleIdentifier.java      |  12 -
 .../apache/sis/internal/simple/SimpleMetadata.java | 568 ---------------------
 .../apache/sis/metadata/PropertyInformation.java   |  41 --
 .../iso/identification/DefaultBrowseGraphic.java   |   4 +-
 .../metadata/iso/identification/OperationName.java |   7 -
 .../sis/metadata/iso/CustomMetadataTest.java       |  35 +-
 .../sis/test/mock/CoordinateSystemAxisMock.java    |   2 -
 .../apache/sis/test/mock/IdentifiedObjectMock.java |  66 ---
 .../org/apache/sis/test/mock/VerticalCRSMock.java  |   3 -
 .../sis/test/xml/AnnotationConsistencyCheck.java   |  23 +-
 .../sis/internal/referencing/DeprecatedCode.java   |  11 -
 .../sis/internal/referencing/DeprecatedName.java   |  11 -
 .../internal/referencing/NilReferencingObject.java |  24 +-
 .../sis/referencing/datum/GeodeticDatumMock.java   |  23 +-
 .../transform/MathTransformFactoryBase.java        |   7 -
 .../transform/MathTransformFactoryMock.java        |  12 -
 .../test/java/org/apache/sis/util/ClassesTest.java |   7 +-
 .../main/java/org/apache/sis/storage/gdal/PJ.java  |  11 -
 .../org/apache/sis/storage/gdal/MTFactory.java     |   9 -
 .../apache/sis/internal/storage/gpx/Copyright.java | 174 -------
 .../org/apache/sis/internal/storage/gpx/Link.java  |  20 -
 .../apache/sis/internal/storage/gpx/Metadata.java  |  20 +-
 .../apache/sis/internal/storage/gpx/Person.java    | 130 +----
 32 files changed, 56 insertions(+), 1456 deletions(-)


[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1. This merge removes some implementations for null or empty values.

Posted by de...@apache.org.
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 fb60ef79dfedc90e43e1956cb839310513893f24
Merge: e270be9 efd7537
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Jun 25 13:38:43 2019 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1.
    This merge removes some implementations for null or empty values.

 .../org/apache/sis/feature/NamedFeatureType.java   |  10 +-
 .../sis/internal/jaxb/IdentifierMapEntry.java      |  29 --
 .../sis/internal/jaxb/SpecializedIdentifier.java   |  25 -
 .../jaxb/metadata/replace/ServiceParameter.java    |  12 -
 .../sis/internal/metadata/NameToIdentifier.java    |  18 -
 .../sis/internal/simple/SimpleAttributeType.java   |  32 --
 .../apache/sis/internal/simple/SimpleCitation.java |  32 --
 .../apache/sis/internal/simple/SimpleFormat.java   |  77 ---
 .../internal/simple/SimpleIdentifiedObject.java    |  57 ---
 .../sis/internal/simple/SimpleIdentifier.java      |  12 -
 .../apache/sis/internal/simple/SimpleMetadata.java | 568 ---------------------
 .../apache/sis/metadata/PropertyInformation.java   |  41 --
 .../iso/identification/DefaultBrowseGraphic.java   |   4 +-
 .../metadata/iso/identification/OperationName.java |   7 -
 .../sis/metadata/iso/CustomMetadataTest.java       |  35 +-
 .../sis/test/mock/CoordinateSystemAxisMock.java    |   2 -
 .../apache/sis/test/mock/IdentifiedObjectMock.java |  66 ---
 .../org/apache/sis/test/mock/VerticalCRSMock.java  |   3 -
 .../sis/test/xml/AnnotationConsistencyCheck.java   |  23 +-
 .../sis/internal/referencing/DeprecatedCode.java   |  11 -
 .../sis/internal/referencing/DeprecatedName.java   |  11 -
 .../internal/referencing/NilReferencingObject.java |  24 +-
 .../sis/referencing/datum/GeodeticDatumMock.java   |  23 +-
 .../transform/MathTransformFactoryBase.java        |   7 -
 .../transform/MathTransformFactoryMock.java        |  12 -
 .../test/java/org/apache/sis/util/ClassesTest.java |   7 +-
 .../main/java/org/apache/sis/storage/gdal/PJ.java  |  11 -
 .../org/apache/sis/storage/gdal/MTFactory.java     |   9 -
 .../apache/sis/internal/storage/gpx/Copyright.java | 174 -------
 .../org/apache/sis/internal/storage/gpx/Link.java  |  20 -
 .../apache/sis/internal/storage/gpx/Metadata.java  |  20 +-
 .../apache/sis/internal/storage/gpx/Person.java    | 130 +----
 32 files changed, 56 insertions(+), 1456 deletions(-)

diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java
index 68ca3de,7554382..0920c68
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleMetadata.java
@@@ -19,36 -19,18 +19,18 @@@ package org.apache.sis.internal.simple
  import java.nio.charset.Charset;
  import java.util.Collection;
  import java.util.Collections;
- import java.util.Date;
  import java.util.Locale;
  import java.util.Map;
- import org.opengis.metadata.ApplicationSchemaInformation;
- import org.opengis.metadata.Identifier;
  import org.opengis.metadata.Metadata;
- import org.opengis.metadata.MetadataExtensionInformation;
  import org.opengis.metadata.MetadataScope;
- import org.opengis.metadata.PortrayalCatalogueReference;
- import org.opengis.metadata.acquisition.AcquisitionInformation;
  import org.opengis.metadata.citation.Citation;
  import org.opengis.metadata.citation.CitationDate;
- import org.opengis.metadata.citation.OnlineResource;
  import org.opengis.metadata.citation.PresentationForm;
 -import org.opengis.metadata.citation.Responsibility;
 +import org.opengis.metadata.citation.ResponsibleParty;
- import org.opengis.metadata.citation.Series;
- import org.opengis.metadata.constraint.Constraints;
- import org.opengis.metadata.content.ContentInformation;
- import org.opengis.metadata.distribution.Distribution;
- import org.opengis.metadata.distribution.Format;
  import org.opengis.metadata.extent.Extent;
  import org.opengis.metadata.identification.*;
- import org.opengis.metadata.lineage.Lineage;
- import org.opengis.metadata.maintenance.MaintenanceInformation;
  import org.opengis.metadata.maintenance.ScopeCode;
- import org.opengis.metadata.quality.DataQuality;
- import org.opengis.metadata.spatial.SpatialRepresentation;
  import org.opengis.metadata.spatial.SpatialRepresentationType;
- import org.opengis.referencing.ReferenceSystem;
- import org.opengis.temporal.Duration;
  import org.opengis.util.InternationalString;
  
  
diff --cc core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
index 362ea9e,a104e87..42e620b
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
@@@ -24,10 -23,8 +23,8 @@@ import javax.xml.bind.annotation.XmlEle
  import javax.xml.bind.annotation.XmlRootElement;
  import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  import org.opengis.util.GenericName;
- import org.opengis.util.InternationalString;
- import org.opengis.metadata.citation.Citation;
 -import org.opengis.metadata.Identifier;
  import org.opengis.referencing.IdentifiedObject;
 +import org.opengis.referencing.ReferenceIdentifier;
  import org.apache.sis.internal.util.Strings;
  import org.apache.sis.internal.util.CollectionsExt;
  import org.apache.sis.internal.jaxb.gco.GO_GenericName;
diff --cc core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/NilReferencingObject.java
index 46b6c40,81f23d5..cac8734
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/NilReferencingObject.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/NilReferencingObject.java
@@@ -16,16 -16,11 +16,11 @@@
   */
  package org.apache.sis.internal.referencing;
  
- import java.util.Set;
- import java.util.Collection;
- import org.opengis.util.GenericName;
  import org.opengis.util.InternationalString;
  import org.opengis.referencing.ReferenceSystem;
 -import org.opengis.metadata.Identifier;
 +import org.opengis.referencing.ReferenceIdentifier;
- import org.opengis.metadata.extent.Extent;
  import org.apache.sis.xml.NilReason;
  import org.apache.sis.xml.NilObject;
- import org.apache.sis.io.wkt.UnformattableObjectException;
  import org.apache.sis.referencing.NamedIdentifier;
  import org.apache.sis.util.resources.Vocabulary;
  
@@@ -80,21 -75,6 +75,6 @@@ public final class NilReferencingObjec
       * Returning null for collection are okay in the particular case of SIS implementation,
       * because the constructor will replace empty collections by null references anyway.
       */
-     @Override public ReferenceIdentifier      getName()        {return UNNAMED;}
-     @Override public Collection<GenericName>  getAlias()       {return null;}
-     @Override public Set<ReferenceIdentifier> getIdentifiers() {return null;}
-     @Override public InternationalString      getRemarks()     {return null;}
-     @Override public InternationalString      getScope()       {return null;}
-     @Override public Extent getDomainOfValidity()              {return null;}
- 
-     /**
-      * Throws the exception in all cases.
-      *
-      * @return never return.
-      * @throws UnformattableObjectException always thrown.
-      */
-     @Override
-     public String toWKT() throws UnformattableObjectException {
-         throw new UnformattableObjectException();
-     }
 -    @Override public Identifier          getName()  {return UNNAMED;}
++    @Override public ReferenceIdentifier getName()  {return UNNAMED;}
+     @Override public InternationalString getScope() {return null;}
  }
diff --cc storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/PJ.java
index a3d4964,7939ecc..5e9553d
--- a/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/PJ.java
+++ b/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/PJ.java
@@@ -20,9 -20,8 +20,8 @@@ import java.util.Objects
  import java.io.Serializable;
  import java.io.ObjectStreamException;
  import java.io.InvalidObjectException;
 -import org.opengis.metadata.Identifier;
  import org.opengis.util.FactoryException;
- import org.opengis.util.InternationalString;
 +import org.opengis.referencing.ReferenceIdentifier;
  import org.opengis.metadata.citation.Citation;
  import org.opengis.referencing.datum.Ellipsoid;
  import org.opengis.referencing.datum.GeodeticDatum;
diff --cc storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Metadata.java
index 602870b,7b86daa..f0b5e01
--- a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Metadata.java
+++ b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Metadata.java
@@@ -322,13 -321,13 +322,13 @@@ public final class Metadata extends Sim
       * @return means of communication with person(s) and organisations(s) associated with the resource.
       */
      @Override
 -    public Collection<Responsibility> getPointOfContacts() {
 +    public Collection<ResponsibleParty> getPointOfContacts() {
          if (creator != null) {
              final Person p = new Person(creator);
 -            return (author != null) ? UnmodifiableArrayList.wrap(new Responsibility[] {p, author})
 +            return (author != null) ? UnmodifiableArrayList.wrap(new ResponsibleParty[] {p, author})
                                      : Collections.singletonList(author);
          }
-         return (author != null) ? Collections.singletonList(author) : super.getPointOfContacts();
+         return (author != null) ? Collections.singletonList(author) : Collections.emptyList();
      }
  
      /**
diff --cc storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java
index 3d28e83,1dfcd08..a2f3357
--- a/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java
+++ b/storage/sis-xmlstore/src/main/java/org/apache/sis/internal/storage/gpx/Person.java
@@@ -28,8 -26,6 +28,7 @@@ import org.opengis.metadata.citation.Ad
  import org.opengis.metadata.citation.Contact;
  import org.opengis.metadata.citation.OnlineResource;
  import org.opengis.metadata.citation.Role;
 +import org.opengis.metadata.citation.Telephone;
- import org.opengis.metadata.extent.Extent;
  import org.opengis.util.InternationalString;
  import org.apache.sis.util.iso.SimpleInternationalString;
  import org.apache.sis.util.iso.Types;
@@@ -230,28 -184,8 +219,28 @@@ public final class Person implements Re
       * @see #getOnlineResources()
       */
      @Override
 -    public Collection<? extends Contact> getContactInfo() {
 -        return thisOrEmpty(email != null || link != null);
 +    public Proxy getContactInfo() {        // Both Contact singleton and Collection<Contact>.
 +        return new Proxy();
 +    }
 +
 +    private final class Proxy extends AbstractSet<Contact> implements Contact {
 +        @Override public int size() {
 +            return (email != null || link != null) ? 1 : 0;
 +        }
 +
 +        @Override public Iterator<Contact> iterator() {
 +            return Collections.<Contact>singleton(Person.this).iterator();
 +        }
 +
-         @Override public Collection<Telephone>         getPhones()              {return Person.this.getPhones();}
++        @Override public Collection<? extends Telephone> getPhones()            {return Person.this.getPhones();}
 +        @Override public Telephone                     getPhone()               {return Person.this.getPhone();}
 +        @Override public Collection<? extends Address> getAddresses()           {return Person.this.getAddresses();}
 +        @Override public Address                       getAddress()             {return Person.this.getAddress();}
 +        @Override public Collection<OnlineResource>    getOnlineResources()     {return Person.this.getOnlineResources();}
 +        @Override public OnlineResource                getOnlineResource()      {return Person.this.getOnlineResource();}
 +        @Override public InternationalString           getHoursOfService()      {return Person.this.getHoursOfService();}
 +        @Override public InternationalString           getContactInstructions() {return Person.this.getContactInstructions();}
 +        @Override public InternationalString           getContactType()         {return Person.this.getContactType();}
      }