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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 5133c41726 Update for a change in GeoAPI-conformance module: WKT tests
moved.
5133c41726 is described below
commit 5133c4172635aa8b8163ad8888235d100e49e009
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Mon May 13 18:41:43 2024 +0200
Update for a change in GeoAPI-conformance module: WKT tests moved.
---
.../apache/sis/referencing/operation/InverseOperationMethod.java | 4 ++--
.../apache/sis/io/wkt/{WKTParserTest.java => CRSParserTest.java} | 6 +++---
.../org/apache/sis/referencing/operation/provider/ProviderMock.java | 2 +-
.../sis/referencing/operation/provider/SeismicBinGridMock.java | 2 +-
geoapi/snapshot | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git
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
index 808f81cc25..677ca42b60 100644
---
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
@@ -103,10 +103,10 @@ final class InverseOperationMethod extends
DefaultOperationMethod {
}
Identifier name = method.getName();
name = new ImmutableIdentifier(null, null, "Inverse of " +
name.getCode());
- final Map<String,Object> properties = new HashMap<>(6);
+ final var properties = new HashMap<String,Object>(6);
properties.put(NAME_KEY, name);
properties.put(FORMULA_KEY, method.getFormula());
- properties.put(REMARKS_KEY, method.getRemarks().orElse(null));
+ method.getRemarks().ifPresent((remarks) -> properties.put(REMARKS_KEY,
remarks));
if (method instanceof Deprecable) {
properties.put(DEPRECATED_KEY, ((Deprecable)
method).isDeprecated());
}
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/CRSParserTest.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
rename to
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/CRSParserTest.java
index e9032f4814..70d4ed59c9 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/CRSParserTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Disabled;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.opengis.test.wkt.CRSParserTest;
+import org.opengis.test.referencing.WKTParserTest;
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.FailureDetailsReporter;
@@ -42,7 +42,7 @@ import org.apache.sis.test.FailureDetailsReporter;
* @author Martin Desruisseaux (IRD, Geomatys)
*/
@ExtendWith(FailureDetailsReporter.class)
-public final class WKTParserTest extends CRSParserTest {
+public final class CRSParserTest extends WKTParserTest {
/**
* A JUnit extension for listening to log events.
*/
@@ -59,7 +59,7 @@ public final class WKTParserTest extends CRSParserTest {
/**
* Creates a new test case using the default {@code CRSFactory}
implementation.
*/
- public WKTParserTest() {
+ public CRSParserTest() {
super(GeodeticObjectFactory.provider());
loggings = new LoggingWatcher(Loggers.WKT);
}
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProviderMock.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProviderMock.java
index a3df2b9712..7ff33ebd0a 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProviderMock.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/ProviderMock.java
@@ -29,7 +29,7 @@ import
org.apache.sis.referencing.operation.transform.AbstractMathTransform;
/**
* Base class of mock provider for coordinate operations not yet implemented
in Apache SIS.
* This is used for operations needed for executing some Well Known Text (WKT)
parsing tests
- * in the {@link org.apache.sis.io.wkt.WKTParserTest} class, without doing any
real coordinate
+ * in the {@link org.apache.sis.io.wkt.CRSParserTest} class, without doing any
real coordinate
* operations with the parsed objects.
*
* <p>Subclasses may be promoted to a real operation if we implement their
formulas in a future Apache SIS version.</p>
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java
index 7b792eade2..1ce7cc9481 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/SeismicBinGridMock.java
@@ -26,7 +26,7 @@ import org.apache.sis.measure.Units;
* The provider for <q>P6 (I = J-90°) seismic bin grid transformation</q>
transformation (EPSG:1049).
*
* This conversion is not yet implemented in Apache SIS, but we need to at
least accept the parameters
- * for a Well Known Text (WKT) parsing test in the {@link
org.apache.sis.io.wkt.WKTParserTest} class.
+ * for a Well Known Text (WKT) parsing test in the {@link
org.apache.sis.io.wkt.CRSParserTest} class.
*
* <p>This class may be promoted to a real operation if we implement the
formulas in a future Apache SIS version.</p>
*
diff --git a/geoapi/snapshot b/geoapi/snapshot
index 3f1075267a..84a19169e8 160000
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@ -1 +1 @@
-Subproject commit 3f1075267a6ad5495b8218521b7efbd86f1f177c
+Subproject commit 84a19169e8c1e6f2485036b6efb283645be94b97
