Dependency upgrades and amendments

sheinbergon · Aug 26, 2023 · 547e504 · 547e504
1 parent f1ccc07
commit 547e504
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 98 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/detekt.yml b/detekt.yml
@@ -304,13 +304,11 @@ naming:
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
   FunctionParameterNaming:
     active: true
     excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     parameterPattern: '[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
   InvalidPackageDeclaration:
     active: false
     rootPackage: ''
@@ -349,7 +347,6 @@ naming:
     variablePattern: '[a-z][A-Za-z0-9]*'
     privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
 
 performance:
   active: true
@@ -421,7 +418,7 @@ style:
     includeLineWrapping: false
   ForbiddenComment:
     active: true
-    values: [ 'FIXME:','STOPSHIP:' ]
+    comments: [ 'FIXME:','STOPSHIP:' ]
   ForbiddenImport:
     active: false
     imports: [ ]
@@ -448,8 +445,6 @@ style:
     ignoreNamedArgument: true
     ignoreEnums: false
     ignoreRanges: false
-  MandatoryBracesIfStatements:
-    active: false
   MaxLineLength:
     active: true
     excludes: "**/*Configuration.kt"
@@ -471,8 +466,6 @@ style:
     active: true
   OptionalUnit:
     active: false
-  OptionalWhenBraces:
-    active: false
   PreferToOverPairSyntax:
     active: false
   ProtectedMemberInFinalClass:

diff --git a/pom.xml b/pom.xml
@@ -8,20 +8,20 @@
         <checkstyle.version>9.3</checkstyle.version>
         <dremio.version>23.0.1-202210141019030815-c1de8bcc</dremio.version>
         <dremio-arrow.version>9.0.0-20220922165652-3a8c29faef-dremio</dremio-arrow.version>
-        <proj4j.version>1.2.3</proj4j.version>
+        <proj4j.version>1.3.0</proj4j.version>
         <jts-core.version>1.19.0</jts-core.version>
         <jts-io-common.version>1.19.0</jts-io-common.version>
         <commons-io.version>2.11.0</commons-io.version>
         <junit.version>4.13.2</junit.version>
         <junit-jupiter.version>5.9.1</junit-jupiter.version>
-        <kotlin.version>1.7.21</kotlin.version>
-        <kotest.version>5.5.4</kotest.version>
+        <kotlin.version>1.9.0</kotlin.version>
+        <kotest.version>5.6.2</kotest.version>
         <joda.version>2.9</joda.version>
-        <detekt.version>1.22.0</detekt.version>
+        <detekt.version>1.23.1</detekt.version>
         <carrotsearch.version>0.7.0</carrotsearch.version>
         <arrow-memory-netty.version>9.0.0</arrow-memory-netty.version>
     </properties>
-    <version>0.7.14-SNAPSHOT</version>
+    <version>0.7.16-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>dremio-udf-gis</name>
     <description>GIS UDF extensions for Dremio</description>
@@ -250,7 +250,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.12</version>
+                <version>1.6.13</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
@@ -261,7 +261,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -311,7 +311,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -388,77 +388,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.0.0-M9</version>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-                <version>4.3.0</version>
-                <configuration>
-                    <sourceEncoding>UTF-8</sourceEncoding>
-                    <repoToken>${env.COVERALLS_TOKEN}</repoToken>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                        <version>2.3.1</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin.version}</version>
-                <executions>
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>process-test-sources</phase>
-                        <goals>
-                            <goal>test-compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>compile</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <jvmTarget>1.8</jvmTarget>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.10</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>

diff --git a/src/main/java/org/sheinbergon/dremio/udf/gis/util/GeometryHelpers.java b/src/main/java/org/sheinbergon/dremio/udf/gis/util/GeometryHelpers.java
@@ -66,13 +66,6 @@ public static Geometry emptyGeometry() {
     return factory.createEmpty(GEOMETRY_DIMENSIONS);
   }
 
-  public static String toUTF8String(final @Nonnull VarCharHolder holder) {
-    return StringFunctionHelpers.toStringFromUTF8(
-        holder.start,
-        holder.end,
-        holder.buffer);
-  }
-
   public static String toUTF8String(final @Nonnull NullableVarCharHolder holder) {
     return StringFunctionHelpers.toStringFromUTF8(
         holder.start,
@@ -221,10 +214,6 @@ public static Geometry toGeometry(
     }
   }
 
-  public static int toBitValue(final boolean value) {
-    return value ? BIT_TRUE : BIT_FALSE;
-  }
-
   public static void populate(
       final @Nonnull byte[] bytes,
       final @Nonnull ArrowBuf buffer,

diff --git a/src/test/kotlin/org/sheinbergon/dremio/udf/gis/spec/GeometryInputFunSpec.kt b/src/test/kotlin/org/sheinbergon/dremio/udf/gis/spec/GeometryInputFunSpec.kt
@@ -44,7 +44,9 @@ abstract class GeometryInputFunSpec<F : SimpleFunction, I : ValueHolder, V : Any
       }
     }
 
-    final override fun NullableVarCharHolder.markNotSet() = this.valueIsNotSet()
+    final override fun NullableVarCharHolder.markNotSet() {
+      this.valueIsNotSet()
+    }
 
     final override fun NullableVarCharHolder.set(value: String) = this.setUtf8(value)
   }

diff --git a/src/test/kotlin/org/sheinbergon/dremio/udf/gis/spec/GeometryRelationFunSpec.kt b/src/test/kotlin/org/sheinbergon/dremio/udf/gis/spec/GeometryRelationFunSpec.kt
@@ -47,8 +47,9 @@ abstract class GeometryRelationFunSpec<F : SimpleFunction, O : ValueHolder> : Fu
       this.isSet shouldBeExactly 1
     }
 
-    override fun NullableVarCharHolder.valueIsNotSet() =
+    override fun NullableVarCharHolder.valueIsNotSet() {
       this.isSet shouldBe 0
+    }
   }
 
   abstract class NullableBitOutput<F : SimpleFunction> : GeometryRelationFunSpec<F, NullableBitHolder>() {
@@ -91,8 +92,9 @@ abstract class GeometryRelationFunSpec<F : SimpleFunction, O : ValueHolder> : Fu
       }
     }
 
-    override fun NullableBitHolder.valueIsNotSet() =
+    override fun NullableBitHolder.valueIsNotSet() {
       this.isSet shouldBe 0
+    }
   }
 
   protected fun testNullGeometryRelation(