Fix some warning produced by the compiler

Huulivoide · Huulivoide · commit f3a4b33f20a3 · 2024-08-20T13:22:58.000+03:00
* 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
diff --git a/spring-boot/src/main/kotlin/fi/hsl/jore4/mapmatching/config/jooq/converter/GeometryConverter.kt b/spring-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/spring-boot/src/main/kotlin/fi/hsl/jore4/mapmatching/config/jooq/converter/LineStringConverter.kt b/spring-boot/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/spring-boot/src/test/kotlin/fi/hsl/jore4/mapmatching/service/node/NodeSequenceCombinationsCreatorTest.kt b/spring-boot/src/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)
                 }
             }
diff --git a/spring-boot/src/test/kotlin/fi/hsl/jore4/mapmatching/service/node/VisitedNodesResolverTest.kt b/spring-boot/src/test/kotlin/fi/hsl/jore4/mapmatching/service/node/VisitedNodesResolverTest.kt

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import fi.hsl.jore4.mapmatching.test.generators.InfrastructureNodeIdGenerator.in`
`9`	`9`	`import fi.hsl.jore4.mapmatching.test.generators.Retry`
`10`	`10`	`import fi.hsl.jore4.mapmatching.util.CollectionUtils.filterOutConsecutiveDuplicates`
`11`	`11`	`import org.assertj.core.api.Assertions.assertThat`
	`12`	`+import org.assertj.core.api.InstanceOfAssertFactories`
`12`	`13`	`import org.junit.jupiter.api.DisplayName`
`13`	`14`	`import org.junit.jupiter.api.Nested`
`14`	`15`	`import org.junit.jupiter.api.Test`
`@@ -33,7 +34,7 @@ class NodeSequenceCombinationsCreatorTest {`
`33`	`34`	`val nodesToVisit = VisitSingleNode(nodeId)`
`34`	`35`
`35`	`36`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`36`		`- .asList()`
	`37`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`37`	`38`	`.hasSize(1)`
`38`	`39`	`}`
`39`	`40`	`}`
`@@ -47,7 +48,7 @@ class NodeSequenceCombinationsCreatorTest {`
`47`	`48`	`val nodesToVisit = VisitSingleNode(nodeId)`
`48`	`49`
`49`	`50`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`50`		`- .asList()`
	`51`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`51`	`52`	`.isEqualTo(`
`52`	`53`	`listOf(`
`53`	`54`	`NodeIdSequence(`
`@@ -73,7 +74,7 @@ class NodeSequenceCombinationsCreatorTest {`
`73`	`74`	`val nodesToVisit = VisitNodesOfSingleLinkUnidirectionally(startNodeId, endNodeId)`
`74`	`75`
`75`	`76`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`76`		`- .asList()`
	`77`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`77`	`78`	`.hasSize(1)`
`78`	`79`	`}`
`79`	`80`	`}`
`@@ -87,7 +88,7 @@ class NodeSequenceCombinationsCreatorTest {`
`87`	`88`	`val nodesToVisit = VisitNodesOfSingleLinkUnidirectionally(startNodeId, endNodeId)`
`88`	`89`
`89`	`90`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`90`		`- .asList()`
	`91`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`91`	`92`	`.isEqualTo(`
`92`	`93`	`listOf(`
`93`	`94`	`NodeIdSequence(`
`@@ -114,7 +115,7 @@ class NodeSequenceCombinationsCreatorTest {`
`114`	`115`	`val nodesToVisit = VisitNodesOfSingleLinkBidirectionally(firstNodeId, secondNodeId)`
`115`	`116`
`116`	`117`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`117`		`- .asList()`
	`118`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`118`	`119`	`.hasSize(2)`
`119`	`120`	`}`
`120`	`121`	`}`
`@@ -128,7 +129,7 @@ class NodeSequenceCombinationsCreatorTest {`
`128`	`129`	`val nodesToVisit = VisitNodesOfSingleLinkBidirectionally(firstNodeId, secondNodeId)`
`129`	`130`
`130`	`131`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`131`		`- .asList()`
	`132`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`132`	`133`	`.isEqualTo(`
`133`	`134`	`listOf(`
`134`	`135`	`NodeIdSequence(`
`@@ -173,7 +174,7 @@ class NodeSequenceCombinationsCreatorTest {`
`173`	`174`	`)`
`174`	`175`
`175`	`176`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`176`		`- .asList()`
	`177`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`177`	`178`	`.hasSizeGreaterThanOrEqualTo(1)`
`178`	`179`	`.hasSizeLessThanOrEqualTo(4)`
`179`	`180`	`}`
`@@ -309,7 +310,7 @@ class NodeSequenceCombinationsCreatorTest {`
`309`	`310`	`)`
`310`	`311`
`311`	`312`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`312`		`- .asList()`
	`313`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`313`	`314`	`.hasSizeLessThanOrEqualTo(2)`
`314`	`315`	`}`
`315`	`316`	`}`
`@@ -355,7 +356,7 @@ class NodeSequenceCombinationsCreatorTest {`
`355`	`356`	`)`
`356`	`357`
`357`	`358`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`358`		`- .asList()`
	`359`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`359`	`360`	`.hasSizeLessThanOrEqualTo(2)`
`360`	`361`	`}`
`361`	`362`	`}`
`@@ -401,7 +402,7 @@ class NodeSequenceCombinationsCreatorTest {`
`401`	`402`	`)`
`402`	`403`
`403`	`404`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`404`		`- .asList()`
	`405`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`405`	`406`	`.hasSizeLessThanOrEqualTo(2)`
`406`	`407`	`}`
`407`	`408`	`}`
`@@ -467,7 +468,7 @@ class NodeSequenceCombinationsCreatorTest {`
`467`	`468`	`)`
`468`	`469`
`469`	`470`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`470`		`- .asList()`
	`471`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`471`	`472`	`.hasSizeLessThanOrEqualTo(2)`
`472`	`473`	`}`
`473`	`474`	`}`
`@@ -533,7 +534,7 @@ class NodeSequenceCombinationsCreatorTest {`
`533`	`534`	`)`
`534`	`535`
`535`	`536`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`536`		`- .asList()`
	`537`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`537`	`538`	`.hasSizeGreaterThanOrEqualTo(2)`
`538`	`539`	`}`
`539`	`540`	`}`
`@@ -603,7 +604,7 @@ class NodeSequenceCombinationsCreatorTest {`
`603`	`604`	`)`
`604`	`605`
`605`	`606`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`606`		`- .asList()`
	`607`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`607`	`608`	`.hasSizeGreaterThanOrEqualTo(2)`
`608`	`609`	`}`
`609`	`610`	`}`
`@@ -673,7 +674,7 @@ class NodeSequenceCombinationsCreatorTest {`
`673`	`674`	`)`
`674`	`675`
`675`	`676`	`assertThat(NodeSequenceCombinationsCreator.create(nodesToVisit))`
`676`		`- .asList()`
	`677`	`+ .asInstanceOf(InstanceOfAssertFactories.LIST)`
`677`	`678`	`.hasSize(4)`
`678`	`679`	`}`
`679`	`680`	`}`