Fix some warning produced by the compiler

* assertThat(list).asList() → assertThat(list).asInstanceOf(InstanceOfAssertFactories.LIST) * Suppressed couple of unchecked cast warnings on the jOOQ converters * Fixed one uncheked cast to checked cast in a jOOQ converter
HSLdevcom · Aug 19, 2024 · 7a9e69a · 7a9e69a
1 parent 64d09ed
commit 7a9e69a
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 106 deletions.
diff --git a/...-boot/src/main/kotlin/fi/hsl/jore4/mapmatching/config/jooq/converter/GeometryConverter.kt b/...-boot/src/main/kotlin/fi/hsl/jore4/mapmatching/config/jooq/converter/GeometryConverter.kt
@@ -8,7 +8,9 @@ import org.geolatte.geom.codec.Wkb
 import org.geolatte.geom.codec.Wkt
 import org.locationtech.jts.io.ParseException
 
-class GeometryConverter(private val geometryType: GeometryType) {
+class GeometryConverter(
+    private val geometryType: GeometryType
+) {
     fun from(databaseObject: Any?): Geometry<C2D>? =
         databaseObject?.let {
             try {
@@ -25,6 +27,6 @@ class GeometryConverter(private val geometryType: GeometryType) {
     companion object {
         fun to(geom: Geometry<C2D>?): String? = geom?.let { Wkt.toWkt(geom) }
 
-        internal fun read(hex: String): Geometry<C2D> = Wkb.fromWkb(ByteBuffer.from(hex)) as Geometry<C2D>
+        internal fun read(hex: String): Geometry<C2D> = Wkb.fromWkb(ByteBuffer.from(hex)).`as`(C2D::class.java)
     }
 }
diff --git a/...oot/src/main/kotlin/fi/hsl/jore4/mapmatching/config/jooq/converter/LineStringConverter.kt b/...oot/src/main/kotlin/fi/hsl/jore4/mapmatching/config/jooq/converter/LineStringConverter.kt
@@ -15,6 +15,7 @@ class LineStringConverter : Converter<Any, LineString<C2D>> {
 
     override fun fromType() = Any::class.java
 
+    @Suppress("UNCHECKED_CAST")
     override fun toType() = LineString::class.java as Class<LineString<C2D>>
 
     companion object {

diff --git a/spring-boot/src/main/kotlin/fi/hsl/jore4/mapmatching/config/jooq/converter/PointConverter.kt b/spring-boot/src/main/kotlin/fi/hsl/jore4/mapmatching/config/jooq/converter/PointConverter.kt
@@ -15,6 +15,7 @@ class PointConverter : Converter<Any, Point<C2D>> {
 
     override fun fromType() = Any::class.java
 
+    @Suppress("UNCHECKED_CAST")
     override fun toType() = Point::class.java as Class<Point<C2D>>
 
     companion object {

diff --git a/.../test/kotlin/fi/hsl/jore4/mapmatching/service/node/NodeSequenceCombinationsCreatorTest.kt b/.../test/kotlin/fi/hsl/jore4/mapmatching/service/node/NodeSequenceCombinationsCreatorTest.kt
@@ -9,6 +9,7 @@ import fi.hsl.jore4.mapmatching.test.generators.InfrastructureNodeIdGenerator.in
 import fi.hsl.jore4.mapmatching.test.generators.Retry
 import fi.hsl.jore4.mapmatching.util.CollectionUtils.filterOutConsecutiveDuplicates
 import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.InstanceOfAssertFactories
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
@@ -33,7 +34,7 @@ class NodeSequenceCombinationsCreatorTest {
                     val nodesToVisit = VisitSingleNode(nodeId)
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSize(1)
                 }
         }
@@ -47,7 +48,7 @@ class NodeSequenceCombinationsCreatorTest {
                     val nodesToVisit = VisitSingleNode(nodeId)
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .isEqualTo(
                             listOf(
                                 NodeIdSequence(
@@ -73,7 +74,7 @@ class NodeSequenceCombinationsCreatorTest {
                     val nodesToVisit = VisitNodesOfSingleLinkUnidirectionally(startNodeId, endNodeId)
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSize(1)
                 }
         }
@@ -87,7 +88,7 @@ class NodeSequenceCombinationsCreatorTest {
                     val nodesToVisit = VisitNodesOfSingleLinkUnidirectionally(startNodeId, endNodeId)
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .isEqualTo(
                             listOf(
                                 NodeIdSequence(
@@ -114,7 +115,7 @@ class NodeSequenceCombinationsCreatorTest {
                     val nodesToVisit = VisitNodesOfSingleLinkBidirectionally(firstNodeId, secondNodeId)
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSize(2)
                 }
         }
@@ -128,7 +129,7 @@ class NodeSequenceCombinationsCreatorTest {
                     val nodesToVisit = VisitNodesOfSingleLinkBidirectionally(firstNodeId, secondNodeId)
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .isEqualTo(
                             listOf(
                                 NodeIdSequence(
@@ -173,7 +174,7 @@ class NodeSequenceCombinationsCreatorTest {
                         )
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSizeGreaterThanOrEqualTo(1)
                         .hasSizeLessThanOrEqualTo(4)
                 }
@@ -309,7 +310,7 @@ class NodeSequenceCombinationsCreatorTest {
                         )
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSizeLessThanOrEqualTo(2)
                 }
             }
@@ -355,7 +356,7 @@ class NodeSequenceCombinationsCreatorTest {
                         )
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSizeLessThanOrEqualTo(2)
                 }
             }
@@ -401,7 +402,7 @@ class NodeSequenceCombinationsCreatorTest {
                         )
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSizeLessThanOrEqualTo(2)
                 }
             }
@@ -467,7 +468,7 @@ class NodeSequenceCombinationsCreatorTest {
                         )
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSizeLessThanOrEqualTo(2)
                 }
             }
@@ -533,7 +534,7 @@ class NodeSequenceCombinationsCreatorTest {
                         )
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSizeGreaterThanOrEqualTo(2)
                 }
             }
@@ -603,7 +604,7 @@ class NodeSequenceCombinationsCreatorTest {
                         )
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSizeGreaterThanOrEqualTo(2)
                 }
             }
@@ -673,7 +674,7 @@ class NodeSequenceCombinationsCreatorTest {
                         )
 
                     assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))
-                        .asList()
+                        .asInstanceOf(InstanceOfAssertFactories.LIST)
                         .hasSize(4)
                 }
             }