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 2024/04/09 12:40:48 UTC
(sis) branch main updated (3403855d45 -> 65771ca1ee)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
from 3403855d45 Merge branch 'geoapi-3.1'.
add ecf5857313 Post-merge automatic import reorganization.
add e111cc6c47 Post-merge automatic import reorganization.
new 65771ca1ee Merge branch 'geoapi-3.1': automatic post-merge import reorganization.
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/metadata/simple/SimpleIdentifiedObject.java | 2 +-
.../test/org/apache/sis/test/mock/VerticalCRSMock.java | 6 ++++--
.../org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 2 +-
.../org/apache/sis/referencing/AbstractIdentifiedObject.java | 2 +-
.../main/org/apache/sis/referencing/Properties.java | 4 ++--
.../main/org/apache/sis/referencing/StandardDefinitions.java | 2 +-
.../main/org/apache/sis/referencing/datum/AbstractDatum.java | 4 +++-
.../main/org/apache/sis/referencing/internal/Legacy.java | 10 ++++++----
.../sis/referencing/operation/InverseOperationMethod.java | 2 +-
.../org/apache/sis/referencing/privy/NilReferencingObject.java | 2 +-
.../apache/sis/referencing/AbstractReferenceSystemTest.java | 4 +++-
.../org/apache/sis/referencing/GeodeticObjectVerifier.java | 8 ++++----
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 4 +++-
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 4 +++-
.../test/org/apache/sis/test/TestUtilities.java | 8 ++++----
16 files changed, 39 insertions(+), 27 deletions(-)
(sis) 01/01: Merge branch 'geoapi-3.1': automatic post-merge import reorganization.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 65771ca1eeeb0f988303fb97ba3762b74fe88509
Merge: 3403855d45 e111cc6c47
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Apr 9 14:40:11 2024 +0200
Merge branch 'geoapi-3.1': automatic post-merge import reorganization.
.../org/apache/sis/metadata/simple/SimpleIdentifiedObject.java | 2 +-
.../test/org/apache/sis/test/mock/VerticalCRSMock.java | 6 ++++--
.../org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 2 +-
.../org/apache/sis/referencing/AbstractIdentifiedObject.java | 2 +-
.../main/org/apache/sis/referencing/Properties.java | 4 ++--
.../main/org/apache/sis/referencing/StandardDefinitions.java | 2 +-
.../main/org/apache/sis/referencing/datum/AbstractDatum.java | 4 +++-
.../main/org/apache/sis/referencing/internal/Legacy.java | 10 ++++++----
.../sis/referencing/operation/InverseOperationMethod.java | 2 +-
.../org/apache/sis/referencing/privy/NilReferencingObject.java | 2 +-
.../apache/sis/referencing/AbstractReferenceSystemTest.java | 4 +++-
.../org/apache/sis/referencing/GeodeticObjectVerifier.java | 8 ++++----
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 4 +++-
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 4 +++-
.../test/org/apache/sis/test/TestUtilities.java | 8 ++++----
16 files changed, 39 insertions(+), 27 deletions(-)
diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 8330dc4683,d75dbdb9db..4c43f12d45
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@@ -30,14 -29,9 +29,15 @@@ import org.apache.sis.util.privy.Consta
import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
// Specific to the main and geoapi-3.1 branches:
+ import org.opengis.metadata.extent.Extent;
import org.opengis.referencing.ReferenceIdentifier;
+// Specific to the main branch:
+import java.util.Set;
+import java.util.Collection;
+import java.util.Collections;
+import org.opengis.util.GenericName;
+
/**
* A trivial implementation of {@link IdentifiedObject} containing only a primary name.
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
index 82e971b46f,e189a2e320..7487381abf
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
@@@ -25,11 -24,15 +24,14 @@@ import org.opengis.referencing.cs.Range
import org.opengis.referencing.cs.VerticalCS;
import org.opengis.referencing.datum.VerticalDatum;
import org.opengis.referencing.datum.VerticalDatumType;
- import org.opengis.util.InternationalString;
import org.apache.sis.measure.Units;
+ // Specific to the main and geoapi-3.1 branches:
+ import org.opengis.metadata.extent.Extent;
+ import org.opengis.util.InternationalString;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Optional;
-import org.opengis.referencing.datum.RealizationMethod;
+// Specific to the main branch:
+import java.util.Date;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index bf1888bd5c,798c00d7e8..b72f380f9c
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@@ -88,9 -87,8 +87,10 @@@ import org.apache.sis.util.iso.Types
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.ReferenceIdentifier;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
++import org.opengis.referencing.ReferenceSystem;
+import org.apache.sis.referencing.internal.ServicesForMetadata;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 47e11311f5,7c51395de5..33c3997573
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@@ -77,9 -76,8 +76,10 @@@ import static org.apache.sis.util.privy
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.ReferenceIdentifier;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
++import org.opengis.referencing.ReferenceSystem;
+import org.apache.sis.metadata.iso.DefaultIdentifier;
+import org.apache.sis.referencing.internal.Legacy;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
index fcd8057acc,5a3d432312..66f1979699
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
@@@ -34,10 -32,12 +32,12 @@@ import org.apache.sis.util.privy.Abstra
import org.apache.sis.referencing.privy.CoordinateOperations;
// Specific to the main and geoapi-3.1 branches:
+ import org.opengis.referencing.ReferenceSystem;
import org.opengis.referencing.ReferenceIdentifier;
+ import org.opengis.referencing.datum.Datum;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
+import org.apache.sis.referencing.internal.Legacy;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
index 015db59586,d0f57b09ec..45e97fa7e8
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
@@@ -74,8 -73,9 +73,9 @@@ import org.apache.sis.measure.Latitude
import org.apache.sis.measure.Units;
import static org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
-import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;
+// Specific to the main branch:
+import org.opengis.referencing.datum.VerticalDatumType;
++import static org.opengis.referencing.datum.Datum.DOMAIN_OF_VALIDITY_KEY;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
index f26cb27efb,e379725baf..6bed6e6ba0
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
@@@ -44,10 -44,8 +44,12 @@@ import org.apache.sis.io.wkt.Formatter
import static org.apache.sis.util.Utilities.deepEquals;
import static org.apache.sis.util.collection.Containers.property;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
++// Specific to the main and geoapi-4.0 branches:
++import org.apache.sis.referencing.internal.Legacy;
++
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+import org.opengis.metadata.extent.Extent;
- import org.apache.sis.referencing.internal.Legacy;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
index 041fa54fbf,a5abfd686b..a191c57003
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
@@@ -29,31 -29,6 +29,33 @@@ import org.apache.sis.referencing.cs.De
import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis;
import org.apache.sis.referencing.privy.ReferencingUtilities;
- // Specific to the main branch:
- import java.util.List;
- import java.util.Objects;
- import java.util.Collection;
++// Specific to the main and geoapi-4.0 branches:
+import java.util.Date;
+import java.time.Instant;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.time.ZoneOffset;
+import java.time.LocalTime;
+import java.time.OffsetTime;
+import java.time.temporal.Temporal;
++
++// Specific to the main branch:
++import java.util.List;
++import java.util.Objects;
++import java.util.Collection;
+import org.opengis.referencing.ReferenceSystem;
+import org.opengis.referencing.IdentifiedObject;
+import org.opengis.util.InternationalString;
+import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.operation.CoordinateOperation;
+import org.apache.sis.referencing.DefaultObjectDomain;
+import org.apache.sis.referencing.AbstractIdentifiedObject;
+
/**
* Utilities related to version 1 of Well Known Text format, or to ISO 19111:2007.
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/InverseOperationMethod.java
index ed43dac223,2ada34c583..e19a080c35
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/InverseOperationMethod.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/InverseOperationMethod.java
@@@ -40,9 -40,8 +40,9 @@@ import org.apache.sis.referencing.opera
import org.apache.sis.util.Deprecable;
import org.apache.sis.util.collection.Containers;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
- import org.apache.sis.referencing.internal.Legacy;
+import org.apache.sis.referencing.DefaultObjectDomain;
++import org.apache.sis.referencing.internal.Legacy;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
index 51e1ebc998,2a12ed66a7..683e33c423
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/NilReferencingObject.java
@@@ -24,15 -23,9 +23,16 @@@ import org.apache.sis.referencing.Named
import org.apache.sis.util.resources.Vocabulary;
// Specific to the main and geoapi-3.1 branches:
+ import org.opengis.util.InternationalString;
import org.opengis.referencing.ReferenceIdentifier;
+// Specific to the main branch:
+import java.util.Set;
+import java.util.Collection;
+import org.opengis.util.GenericName;
+import org.opengis.metadata.extent.Extent;
+import org.apache.sis.io.wkt.UnformattableObjectException;
+
/**
* A referencing object for which every methods return {@code null} or a neutral value.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractReferenceSystemTest.java
index 7b40839761,6f13ffc51d..d0db525abc
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractReferenceSystemTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractReferenceSystemTest.java
@@@ -38,6 -37,10 +37,9 @@@ import static org.apache.sis.test.TestU
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.referencing.IdentifiedObject.*;
-import static org.opengis.referencing.ObjectDomain.*;
++// Specific to the main branch:
++import static org.opengis.referencing.ReferenceSystem.*;
+
/**
* Tests the {@link AbstractReferenceSystem} class.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticObjectVerifier.java
index 7b726e2c70,dec5d99570..04536e6d46
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticObjectVerifier.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticObjectVerifier.java
@@@ -35,14 -35,12 +35,14 @@@ import org.opengis.referencing.crs.Geod
import org.apache.sis.metadata.privy.AxisNames;
import org.apache.sis.measure.Units;
+ // Test dependencies
+ import static org.junit.jupiter.api.Assertions.*;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
- import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.ReferenceSystem;
++import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.operation.CoordinateOperation;
- // Test dependencies
- import static org.junit.jupiter.api.Assertions.*;
-
/**
* Verifies the values of some geodetic objects. Methods in this class ignore most textual properties like remarks,
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
index a1ab55ea24,a0739e7e8b..a59143c7d1
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
@@@ -31,6 -30,9 +30,9 @@@ import org.apache.sis.referencing.cs.Ha
import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;
++// Specific to the main branch:
++import static org.opengis.referencing.ReferenceSystem.DOMAIN_OF_VALIDITY_KEY;
+
/**
* Collection of coordinate reference systems for testing purpose.
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
index 5efb9e9082,3253928498..77aeab065f
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
@@@ -30,6 -29,10 +29,9 @@@ import static org.apache.sis.util.privy
// Test dependencies
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.referencing.IdentifiedObject.*;
-import static org.opengis.referencing.ObjectDomain.*;
++// Specific to the main branch:
++import static org.opengis.referencing.datum.Datum.*;
+
/**
* Collection of datum for testing purpose.
diff --cc endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java
index 75faeb8601,78f81fc12e..3221913836
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java
@@@ -49,15 -49,13 +49,15 @@@ import org.apache.sis.util.collection.T
import org.apache.sis.util.privy.X364;
import static org.apache.sis.util.privy.StandardDateFormat.UTC;
+ // Test dependencies
+ import static org.junit.jupiter.api.Assertions.*;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-import org.opengis.metadata.extent.GeographicExtent;
+// Specific to the main branch:
++import org.opengis.referencing.ReferenceSystem;
+import org.opengis.metadata.extent.Extent;
+import org.opengis.referencing.datum.Datum;
- import org.opengis.referencing.ReferenceSystem;
+import org.opengis.referencing.operation.CoordinateOperation;
- // Test dependencies
- import static org.junit.jupiter.api.Assertions.*;
-
/**
* Miscellaneous utility methods for test cases.