Align v3 data class field names with param names, add ALLOWED_PARAMS tests

Rename query→q, language→lang in V3AutocompleteRequest and
V3ReverseRequest so field names match URL parameters exactly.
Add reflection-based tests verifying ALLOWED_PARAMS matches
data class fields for all v3 request types.

Author: henrik242

proxy/src/main/kotlin/no/entur/geocoder/proxy/photon/PhotonAutocompleteRequest.kt

@@ -132,7 +132,7 @@ data class PhotonAutocompleteRequest(
                 if (req.sources.any { it.contains("kartverket") || it.contains("matrikkelen") }) {
                     null
                 } else {
-                    req.query.takeIf { !it.contains("(\\s\\d|\\d\\s)".toRegex()) }?.let { Category.OSM_ADDRESS }
+                    req.q.takeIf { !it.contains("(\\s\\d|\\d\\s)".toRegex()) }?.let { Category.OSM_ADDRESS }
                 }
             val excludes =
                 listOfNotNull(
@@ -141,17 +141,17 @@ data class PhotonAutocompleteRequest(
                 )
 
             return PhotonAutocompleteRequest(
-                query = req.query,
+                query = req.q,
                 limit = req.limit,
-                language = handleLang(req.language),
+                language = handleLang(req.lang),
                 includes = includes,
                 excludes = excludes,
                 lat = req.lat,
                 lon = req.lon,
                 zoom = req.photonZoom(),
                 locationBiasScale = req.photonLocationBiasScale(),
                 includeHousenumbers =
-                    req.sources.any { it.contains("kartverket") || it.contains("matrikkelen") } && !req.query.contains("\\s\\d".toRegex()),
+                    req.sources.any { it.contains("kartverket") || it.contains("matrikkelen") } && !req.q.contains("\\s\\d".toRegex()),
                 debug = false,
             )
         }

proxy/src/main/kotlin/no/entur/geocoder/proxy/photon/PhotonReverseRequest.kt

@@ -53,7 +53,7 @@ data class PhotonReverseRequest(
             return PhotonReverseRequest(
                 latitude = req.lat,
                 longitude = req.lon,
-                language = handleLang(req.language),
+                language = handleLang(req.lang),
                 limit = req.limit,
                 radius = req.radius,
                 includes = includes,

proxy/src/main/kotlin/no/entur/geocoder/proxy/v3/V3AutocompleteRequest.kt

@@ -5,9 +5,9 @@ import kotlin.math.ln
 import kotlin.math.roundToInt
 
 data class V3AutocompleteRequest(
-    val query: String = "",
+    val q: String = "",
     val limit: Int = 10,
-    val language: String = "no",
+    val lang: String = "no",
     val lat: Double? = null,
     val lon: Double? = null,
     val radius: Double? = null,
@@ -40,7 +40,7 @@ data class V3AutocompleteRequest(
         private const val DEFAULT_WEIGHT = 0.8
         private val LN2 = ln(2.0)
 
-        private val ALLOWED_PARAMS =
+        internal val ALLOWED_PARAMS =
             setOf(
                 "q", "limit", "lang", "lat", "lon",
                 "radius", "weight", "layers", "sources", "countries", "countyIds",
@@ -54,9 +54,9 @@ data class V3AutocompleteRequest(
             val lat = req["lat"]?.toDoubleOrNull()
             val lon = req["lon"]?.toDoubleOrNull()
             return V3AutocompleteRequest(
-                query = req["q"] ?: "",
+                q = req["q"] ?: "",
                 limit = req["limit"]?.toIntOrNull() ?: 10,
-                language = req["lang"] ?: "no",
+                lang = req["lang"] ?: "no",
                 lat = lat,
                 lon = lon,
                 radius = req["radius"]?.toDoubleOrNull(),

proxy/src/main/kotlin/no/entur/geocoder/proxy/v3/V3PlaceRequest.kt

@@ -8,7 +8,7 @@ data class V3PlaceRequest(val ids: List<String>) {
     }
 
     companion object {
-        private val ALLOWED_PARAMS = setOf("ids")
+        internal val ALLOWED_PARAMS = setOf("ids")
 
         fun from(req: Parameters): V3PlaceRequest {
             val unknown = req.names().filterNot { it in ALLOWED_PARAMS }

proxy/src/main/kotlin/no/entur/geocoder/proxy/v3/V3ResultTransformer.kt

@@ -49,9 +49,9 @@ object V3ResultTransformer {
                 Metadata(
                     query =
                         QueryInfo(
-                            text = req.query,
+                            text = req.q,
                             limit = req.limit,
-                            language = req.language,
+                            language = req.lang,
                             filters = filters,
                         ),
                     resultCount = features.size,
@@ -76,7 +76,7 @@ object V3ResultTransformer {
                             latitude = req.lat,
                             longitude = req.lon,
                             limit = req.limit,
-                            language = req.language,
+                            language = req.lang,
                         ),
                     resultCount = features.size,
                     timestamp = System.currentTimeMillis(),

proxy/src/main/kotlin/no/entur/geocoder/proxy/v3/V3ReverseRequest.kt

@@ -7,7 +7,7 @@ data class V3ReverseRequest(
     val lon: Double,
     val radius: Double? = null,
     val limit: Int = 10,
-    val language: String = "no",
+    val lang: String = "no",
     val layers: List<String> = emptyList(),
     val sources: List<String> = emptyList(),
     val multimodal: String = "parent",
@@ -18,7 +18,7 @@ data class V3ReverseRequest(
     }
 
     companion object {
-        private val ALLOWED_PARAMS =
+        internal val ALLOWED_PARAMS =
             setOf(
                 "lat", "lon", "radius", "limit", "lang",
                 "layers", "sources", "multimodal",
@@ -35,7 +35,7 @@ data class V3ReverseRequest(
                         ?: throw IllegalArgumentException("Parameter 'lon' is required"),
                 radius = req["radius"]?.toDoubleOrNull(),
                 limit = req["limit"]?.toIntOrNull() ?: 10,
-                language = req["lang"] ?: "no",
+                lang = req["lang"] ?: "no",
                 layers = req["layers"]?.split(",")?.filter { it.isNotBlank() } ?: emptyList(),
                 sources = req["sources"]?.split(",")?.filter { it.isNotBlank() } ?: emptyList(),
                 multimodal = req["multimodal"] ?: "parent",

proxy/src/test/kotlin/no/entur/geocoder/proxy/v3/V3AllowedParamsTest.kt

@@ -0,0 +1,26 @@
+package no.entur.geocoder.proxy.v3
+
+import kotlin.reflect.KClass
+import kotlin.reflect.full.primaryConstructor
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class V3AllowedParamsTest {
+    private fun expectedParams(klass: KClass<*>): Set<String> =
+        klass.primaryConstructor?.parameters?.mapNotNull { it.name }?.toSet().orEmpty()
+
+    @Test
+    fun `autocomplete ALLOWED_PARAMS matches data class fields`() {
+        assertEquals(expectedParams(V3AutocompleteRequest::class), V3AutocompleteRequest.ALLOWED_PARAMS)
+    }
+
+    @Test
+    fun `reverse ALLOWED_PARAMS matches data class fields`() {
+        assertEquals(expectedParams(V3ReverseRequest::class), V3ReverseRequest.ALLOWED_PARAMS)
+    }
+
+    @Test
+    fun `place ALLOWED_PARAMS matches data class fields`() {
+        assertEquals(expectedParams(V3PlaceRequest::class), V3PlaceRequest.ALLOWED_PARAMS)
+    }
+}

proxy/src/test/kotlin/no/entur/geocoder/proxy/v3/V3AutocompleteRequestTest.kt

@@ -7,66 +7,66 @@ import kotlin.test.assertNull
 class V3AutocompleteRequestTest {
     @Test
     fun `photonZoom returns null when no focus point`() {
-        val req = V3AutocompleteRequest(query = "oslo")
+        val req = V3AutocompleteRequest(q = "oslo")
         assertNull(req.photonZoom())
         assertNull(req.photonLocationBiasScale())
     }
 
     @Test
     fun `photonZoom uses default radius of 50km`() {
-        val req = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7)
+        val req = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7)
         // 50km -> zoom = 18 - log2(50/0.25) = 18 - log2(200) ≈ 18 - 7.64 = 10
         assertEquals(10, req.photonZoom())
     }
 
     @Test
     fun `photonZoom with explicit radius`() {
         // 4km -> zoom = 18 - log2(4/0.25) = 18 - 4 = 14
-        val req = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7, radius = 4.0)
+        val req = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7, radius = 4.0)
         assertEquals(14, req.photonZoom())
     }
 
     @Test
     fun `photonZoom with small radius`() {
         // 0.25km -> zoom = 18 - log2(1) = 18
-        val req = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7, radius = 0.25)
+        val req = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7, radius = 0.25)
         assertEquals(18, req.photonZoom())
     }
 
     @Test
     fun `photonZoom clamps to valid range`() {
-        val large = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7, radius = 100000.0)
+        val large = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7, radius = 100000.0)
         assertEquals(0, large.photonZoom())
 
-        val tiny = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7, radius = 0.001)
+        val tiny = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7, radius = 0.001)
         assertEquals(18, tiny.photonZoom())
     }
 
     @Test
     fun `photonLocationBiasScale uses default weight of 0_8`() {
-        val req = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7)
+        val req = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7)
         // weight 0.8 -> location_bias_scale = 1 - 0.8 = 0.2
         assertEquals(0.2, req.photonLocationBiasScale()!!, 0.001)
     }
 
     @Test
     fun `photonLocationBiasScale with explicit weight`() {
-        val noFocus = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7, weight = 0.0)
+        val noFocus = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7, weight = 0.0)
         assertEquals(1.0, noFocus.photonLocationBiasScale())
 
-        val maxFocus = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7, weight = 1.0)
+        val maxFocus = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7, weight = 1.0)
         assertEquals(0.0, maxFocus.photonLocationBiasScale())
 
-        val half = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7, weight = 0.5)
+        val half = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7, weight = 0.5)
         assertEquals(0.5, half.photonLocationBiasScale())
     }
 
     @Test
     fun `photonLocationBiasScale clamps weight`() {
-        val over = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7, weight = 2.0)
+        val over = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7, weight = 2.0)
         assertEquals(0.0, over.photonLocationBiasScale())
 
-        val under = V3AutocompleteRequest(query = "oslo", lat = 59.9, lon = 10.7, weight = -1.0)
+        val under = V3AutocompleteRequest(q = "oslo", lat = 59.9, lon = 10.7, weight = -1.0)
         assertEquals(1.0, under.photonLocationBiasScale())
     }
 }

proxy/src/test/kotlin/no/entur/geocoder/proxy/v3/V3ResultTransformerTest.kt

@@ -114,7 +114,7 @@ class V3ResultTransformerTest {
                         ),
                     ),
             )
-        val req = V3AutocompleteRequest(query = "test")
+        val req = V3AutocompleteRequest(q = "test")
         return V3ResultTransformer
             .parseAndTransform(photonResult, req)
             .features