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
commit c33f347075ca3119d301da4f96cd3f5c57574567
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Dec 10 18:08:09 2022 +0100
Rename `JDK9` as `JDK17` since it is now a placeholder for methods defined
after Java 11.
---
.../java/org/apache/sis/internal/filter/sqlmm/Registry.java | 4 ++--
.../org/apache/sis/internal/{jdk9 => jdk17}/HexFormat.java | 2 +-
.../apache/sis/internal/{jdk9/JDK9.java => jdk17/JDK17.java} | 11 +++++------
.../org/apache/sis/internal/{jdk9 => jdk17}/package-info.java | 2 +-
.../sis/internal/storage/inflater/HorizontalPredictor.java | 4 ++--
.../sis/internal/storage/inflater/PredictorChannel.java | 4 ++--
.../org/apache/sis/internal/sql/feature/BinaryEncoding.java | 2 +-
.../org/apache/sis/internal/storage/esri/CharactersView.java | 6 +++---
8 files changed, 17 insertions(+), 18 deletions(-)
diff --git
a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/Registry.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/Registry.java
index dac812d98c..397f181b00 100644
---
a/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/Registry.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/internal/filter/sqlmm/Registry.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.Collection;
import org.apache.sis.internal.feature.Geometries;
import org.apache.sis.internal.filter.FunctionRegister;
-import org.apache.sis.internal.jdk9.JDK9;
+import org.apache.sis.internal.jdk17.JDK17;
// Branch-dependent imports
import org.opengis.filter.Expression;
@@ -64,7 +64,7 @@ public final class Registry implements FunctionRegister {
*/
@Override
public Collection<String> getNames() {
- return JDK9.toList(Arrays.stream(SQLMM.values()).map(SQLMM::name));
+ return JDK17.toList(Arrays.stream(SQLMM.values()).map(SQLMM::name));
}
/**
diff --git
a/core/sis-utility/src/main/java/org/apache/sis/internal/jdk9/HexFormat.java
b/core/sis-utility/src/main/java/org/apache/sis/internal/jdk17/HexFormat.java
similarity index 98%
rename from
core/sis-utility/src/main/java/org/apache/sis/internal/jdk9/HexFormat.java
rename to
core/sis-utility/src/main/java/org/apache/sis/internal/jdk17/HexFormat.java
index 0019ed2afb..818719e3d1 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/jdk9/HexFormat.java
+++
b/core/sis-utility/src/main/java/org/apache/sis/internal/jdk17/HexFormat.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.jdk9;
+package org.apache.sis.internal.jdk17;
import org.apache.sis.util.resources.Errors;
diff --git
a/core/sis-utility/src/main/java/org/apache/sis/internal/jdk9/JDK9.java
b/core/sis-utility/src/main/java/org/apache/sis/internal/jdk17/JDK17.java
similarity index 90%
rename from
core/sis-utility/src/main/java/org/apache/sis/internal/jdk9/JDK9.java
rename to
core/sis-utility/src/main/java/org/apache/sis/internal/jdk17/JDK17.java
index 8a370de64c..9578b2ac21 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/jdk9/JDK9.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/jdk17/JDK17.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.jdk9;
+package org.apache.sis.internal.jdk17;
import java.nio.ByteBuffer;
import java.util.List;
@@ -23,19 +23,18 @@ import org.apache.sis.internal.util.UnmodifiableArrayList;
/**
- * Place holder for some functionalities defined only in JDK9.
- * This file will be deleted on the SIS JDK9 branch.
+ * Place holder for some functionalities defined in a JDK more recent than
Java 11.
*
* @author Martin Desruisseaux (Geomatys)
* @since 1.4
* @version 0.8
* @module
*/
-public final class JDK9 {
+public final class JDK17 {
/**
* Do not allow instantiation of this class.
*/
- private JDK9() {
+ private JDK17() {
}
/**
@@ -46,7 +45,7 @@ public final class JDK9 {
* @param dst destination array
*/
public static void get(final ByteBuffer b, int index, final byte[] dst) {
- JDK9.get(b, index, dst, 0, dst.length);
+ get(b, index, dst, 0, dst.length);
}
/**
diff --git
a/core/sis-utility/src/main/java/org/apache/sis/internal/jdk9/package-info.java
b/core/sis-utility/src/main/java/org/apache/sis/internal/jdk17/package-info.java
similarity index 96%
rename from
core/sis-utility/src/main/java/org/apache/sis/internal/jdk9/package-info.java
rename to
core/sis-utility/src/main/java/org/apache/sis/internal/jdk17/package-info.java
index 72b87f3ba7..c766349852 100644
---
a/core/sis-utility/src/main/java/org/apache/sis/internal/jdk9/package-info.java
+++
b/core/sis-utility/src/main/java/org/apache/sis/internal/jdk17/package-info.java
@@ -28,4 +28,4 @@
* @version 0.8
* @module
*/
-package org.apache.sis.internal.jdk9;
+package org.apache.sis.internal.jdk17;
diff --git
a/storage/sis-geotiff/src/main/java/org/apache/sis/internal/storage/inflater/HorizontalPredictor.java
b/storage/sis-geotiff/src/main/java/org/apache/sis/internal/storage/inflater/HorizontalPredictor.java
index 507381f7d2..bef5d6fbdc 100644
---
a/storage/sis-geotiff/src/main/java/org/apache/sis/internal/storage/inflater/HorizontalPredictor.java
+++
b/storage/sis-geotiff/src/main/java/org/apache/sis/internal/storage/inflater/HorizontalPredictor.java
@@ -19,7 +19,7 @@ package org.apache.sis.internal.storage.inflater;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.sis.image.DataType;
-import org.apache.sis.internal.jdk9.JDK9;
+import org.apache.sis.internal.jdk17.JDK17;
/**
@@ -264,7 +264,7 @@ abstract class HorizontalPredictor extends PredictorChannel
{
@Override
void saveLastPixel(final ByteBuffer buffer, int offset, int position) {
System.arraycopy(savedValues, savedValues.length - offset,
savedValues, 0, offset);
- JDK9.get(buffer, position, savedValues, offset, savedValues.length
- offset);
+ JDK17.get(buffer, position, savedValues, offset,
savedValues.length - offset);
}
/**
diff --git
a/storage/sis-geotiff/src/main/java/org/apache/sis/internal/storage/inflater/PredictorChannel.java
b/storage/sis-geotiff/src/main/java/org/apache/sis/internal/storage/inflater/PredictorChannel.java
index ac4f0fa7b2..973b80aff6 100644
---
a/storage/sis-geotiff/src/main/java/org/apache/sis/internal/storage/inflater/PredictorChannel.java
+++
b/storage/sis-geotiff/src/main/java/org/apache/sis/internal/storage/inflater/PredictorChannel.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.internal.geotiff.Predictor;
-import org.apache.sis.internal.jdk9.JDK9;
+import org.apache.sis.internal.jdk17.JDK17;
/**
@@ -117,7 +117,7 @@ abstract class PredictorChannel extends PixelChannel {
if (length > deferred.length) {
deferred = new byte[length];
}
- JDK9.get(target, end, deferred, deferredCount, remaining);
+ JDK17.get(target, end, deferred, deferredCount, remaining);
target.position(end);
deferredCount = length;
}
diff --git
a/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/BinaryEncoding.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/BinaryEncoding.java
index 215007f22f..603e78c386 100644
---
a/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/BinaryEncoding.java
+++
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/BinaryEncoding.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.sis.internal.jdk9.HexFormat;
+import org.apache.sis.internal.jdk17.HexFormat;
/**
diff --git
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/CharactersView.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/CharactersView.java
index d2d3dd5b2a..fde121f2bc 100644
---
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/CharactersView.java
+++
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/esri/CharactersView.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.io.EOFException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import org.apache.sis.internal.jdk9.JDK9;
+import org.apache.sis.internal.jdk17.JDK17;
import org.apache.sis.internal.storage.Resources;
import org.apache.sis.internal.storage.io.ChannelDataInput;
import org.apache.sis.storage.DataStoreContentException;
@@ -220,11 +220,11 @@ final class CharactersView implements CharSequence {
if (direct) {
return new String(array, start, length, StandardCharsets.US_ASCII);
} else if (length <= array.length) {
- JDK9.get(buffer, start, array, 0, length);
+ JDK17.get(buffer, start, array, 0, length);
return new String(array, 0, length, StandardCharsets.US_ASCII);
} else {
final byte[] data = new byte[length];
- JDK9.get(buffer, start, data);
+ JDK17.get(buffer, start, data);
return new String(data, StandardCharsets.US_ASCII);
}
}
