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 9b695745b21ad7093229f93da1b385117dfd0d46 Merge: a8a2df6ef0 94b8b5fa2b Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Apr 14 13:01:42 2026 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1. This is a change in GeoAPI `CodeList` for avoiding a deadlock. .../apache/sis/filter/math/FilteringFunction.java | 10 +- .../org.apache.sis.metadata/main/module-info.java | 4 + .../sis/xml/bind/metadata/replace/SensorType.java | 27 ++++- .../referencing/internal/VerticalDatumTypes.java | 2 +- .../apache/sis/util/collection/CodeListSet.java | 54 +++++---- .../apache/sis/util/internal/shared/CodeLists.java | 121 ++++++++++++--------- .../sis/util/collection/CodeListSetTest.java | 11 +- .../apache/sis/util/collection/LargeCodeList.java | 30 ++--- geoapi/snapshot | 2 +- .../gui/referencing/PositionableProjection.java | 9 +- 10 files changed, 172 insertions(+), 98 deletions(-) diff --cc endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/CodeListSetTest.java index 6f449ee356,a0b86b1acd..0c77c3a29d --- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/CodeListSetTest.java +++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/CodeListSetTest.java @@@ -73,8 -74,8 +74,8 @@@ public final class CodeListSetTest exte */ private CodeListSet<OnLineFunction> createOtherKind() { // For the validity of the tests, ordinal value must be the same. - assertEquals(NORTH_NORTH_EAST.ordinal(), OnLineFunction.INFORMATION.ordinal()); - final var c = new CodeListSet<OnLineFunction>(OnLineFunction.class); + assertEquals(NORTH.ordinal(), OnLineFunction.INFORMATION.ordinal()); - final CodeListSet<OnLineFunction> c = new CodeListSet<>(OnLineFunction.class); ++ final var c = new CodeListSet<>(OnLineFunction.class); assertTrue(c.add(OnLineFunction.INFORMATION)); return c; } @@@ -104,9 -105,10 +105,10 @@@ * Tests the {@link CodeListSet#contains(Object)} method. */ @Test + @SuppressWarnings("element-type-mismatch") public void testContains() { final CodeListSet<AxisDirection> c = create(4); - assertTrue (c.contains(NORTH_NORTH_EAST)); + assertTrue (c.contains(NORTH)); assertFalse(c.contains(SOUTH)); assertTrue (c.contains(FUTURE)); assertFalse(c.contains(PAST)); @@@ -211,9 -214,9 +214,9 @@@ */ @Test public void testFill() { - final CodeListSet<AxisDirection> c = new CodeListSet<>(AxisDirection.class, true); + final var c = new CodeListSet<AxisDirection>(AxisDirection.class, true); assertTrue(c.size() >= 32, "Expect at least 32 elements as of GeoAPI 3.0."); - assertTrue(c.toString().startsWith("[AxisDirection.NORTH, AxisDirection.NORTH_NORTH_EAST, ")); + assertTrue(c.toString().startsWith("[AxisDirection.OTHER, AxisDirection.NORTH, ")); /* * Testing the full array would be too long and may change in future GeoAPI version * anyway. Actually the main interest of this test is to ensure that the toString() diff --cc geoapi/snapshot index ae34c761d1,97e0fd0d54..cfe589c99e --- a/geoapi/snapshot +++ b/geoapi/snapshot @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit ae34c761d138ab6bc826a7dde1581a560796201b -Subproject commit 97e0fd0d54e67f99b0e7e61f5c04b84f63cef74e ++Subproject commit cfe589c99e81a42014a0651275d941d6235659f6
