(incubator-baremaps) branch flatgeobuf updated: Fix codeql issues

[bchapuis]

This is an automated email from the ASF dual-hosted git repository.

bchapuis pushed a commit to branch flatgeobuf
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git


The following commit(s) were added to refs/heads/flatgeobuf by this push:
     new 3d3e06ef Fix codeql issues
3d3e06ef is described below

commit 3d3e06ef26af843bc0a70affb6c466fb129234eb
Author: Bertil Chapuis <bchap...@gmail.com>
AuthorDate: Wed Jun 26 16:12:31 2024 +0200

    Fix codeql issues
---
 .../org/apache/baremaps/flatgeobuf/FlatGeoBufWriter.java   |  1 +
 .../java/org/apache/baremaps/flatgeobuf/PackedRTree.java   |  4 ++--
 .../org/apache/baremaps/flatgeobuf/FlatGeoBufTest.java     | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git 
a/baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/FlatGeoBufWriter.java
 
b/baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/FlatGeoBufWriter.java
index 2b24e56c..2c620715 100644
--- 
a/baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/FlatGeoBufWriter.java
+++ 
b/baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/FlatGeoBufWriter.java
@@ -71,6 +71,7 @@ public class FlatGeoBufWriter implements AutoCloseable {
     writeFeature(channel, header, feature);
   }
 
+  @Override
   public void close() throws IOException {
     channel.close();
   }
diff --git 
a/baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/PackedRTree.java
 
b/baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/PackedRTree.java
index 11fdbe68..4c3bf63b 100644
--- 
a/baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/PackedRTree.java
+++ 
b/baremaps-flatgeobuf/src/main/java/org/apache/baremaps/flatgeobuf/PackedRTree.java
@@ -72,13 +72,13 @@ public class PackedRTree {
   void generateNodes() {
     long pos;
     long end;
-    for (short i = 0; i < levelBounds.size() - 1; i++) {
+    for (int i = 0; i < levelBounds.size() - 1; i++) {
       pos = levelBounds.get(i).first;
       end = levelBounds.get(i).second;
       long newpos = levelBounds.get(i + 1).first;
       while (pos < end) {
         NodeItem node = new NodeItem(pos);
-        for (short j = 0; j < this.nodeSize && pos < end; j++) {
+        for (long j = 0; j < this.nodeSize && pos < end; j++) {
           node.expand(nodeItems[(int) pos++]);
         }
         nodeItems[(int) newpos++] = node;
diff --git 
a/baremaps-flatgeobuf/src/test/java/org/apache/baremaps/flatgeobuf/FlatGeoBufTest.java
 
b/baremaps-flatgeobuf/src/test/java/org/apache/baremaps/flatgeobuf/FlatGeoBufTest.java
index 130c74e4..f5308922 100644
--- 
a/baremaps-flatgeobuf/src/test/java/org/apache/baremaps/flatgeobuf/FlatGeoBufTest.java
+++ 
b/baremaps-flatgeobuf/src/test/java/org/apache/baremaps/flatgeobuf/FlatGeoBufTest.java
@@ -63,7 +63,7 @@ class FlatGeoBufTest {
       writer.writeIndexBuffer(indexBuffer);
 
       // Copy the features
-      for (int i = 0; i < headerFlatGeoBuf1.featuresCount(); i++) {
+      for (long i = 0; i < headerFlatGeoBuf1.featuresCount(); i++) {
         FlatGeoBuf.Feature feature = reader.readFeature();
         writer.writeFeature(feature);
         featureRecords.add(feature);
@@ -116,7 +116,7 @@ class FlatGeoBufTest {
 
       // Copy the features
       var buffer = ByteBuffer.allocate(1 << 10).order(ByteOrder.LITTLE_ENDIAN);
-      for (int i = 0; i < headerFlatGeoBuf1.featuresCount(); i++) {
+      for (long i = 0; i < headerFlatGeoBuf1.featuresCount(); i++) {
         Feature feature = FlatGeoBufReader.readFeatureBuffer(channel, buffer);
         FlatGeoBufWriter.writeFeatureBuffer(tempChannel, feature);
         FlatGeoBuf.Feature featureRecord =
@@ -139,12 +139,12 @@ class FlatGeoBufTest {
 
       // Read the features
       ByteBuffer buffer = ByteBuffer.allocate(1 << 
10).order(ByteOrder.LITTLE_ENDIAN);
-      for (int i = 0; i < headerFlatGeoBuf2.featuresCount(); i++) {
+      for (long i = 0; i < headerFlatGeoBuf2.featuresCount(); i++) {
         Feature featureFlatGeoBuf = 
FlatGeoBufReader.readFeatureBuffer(channel, buffer);
         FlatGeoBuf.Feature featureRecord =
             FlatGeoBufReader.asFlatGeoBuf(headerFlatGeoBuf2, 
featureFlatGeoBuf);
         assertNotNull(featureRecord);
-        assertEquals(featureRecords.get(i), featureRecord);
+        assertEquals(featureRecords.get((int) i), featureRecord);
       }
     }
   }
@@ -173,7 +173,7 @@ class FlatGeoBufTest {
 
       // Copy the features
       var buffer = ByteBuffer.allocate(1 << 10).order(ByteOrder.LITTLE_ENDIAN);
-      for (int i = 0; i < headerFlatGeoBuf1.featuresCount(); i++) {
+      for (long i = 0; i < headerFlatGeoBuf1.featuresCount(); i++) {
         FlatGeoBuf.Feature feature =
             FlatGeoBufReader.readFeature(channel, headerFlatGeoBuf1, buffer);
         FlatGeoBufWriter.writeFeature(tempChannel, headerFlatGeoBuf1, feature);
@@ -195,11 +195,11 @@ class FlatGeoBufTest {
 
       // Read the features
       ByteBuffer buffer = ByteBuffer.allocate(1 << 
10).order(ByteOrder.LITTLE_ENDIAN);
-      for (int i = 0; i < headerFlatGeoBuf2.featuresCount(); i++) {
+      for (long i = 0; i < headerFlatGeoBuf2.featuresCount(); i++) {
         FlatGeoBuf.Feature featureRecord =
             FlatGeoBufReader.readFeature(channel, headerFlatGeoBuf2, buffer);
         assertNotNull(featureRecord);
-        assertEquals(featureRecords.get(i), featureRecord);
+        assertEquals(featureRecords.get((int) i), featureRecord);
       }
     }
   }