Resolving issues with compile and ktlint

tandonks · tandonks · commit ca1aeab6e7e6 · 2024-10-29T18:02:21.000+05:30
Signed-off-by: Kshitij Tandon &lt;tandonks@amazon.com&gt;
diff --git a/src/test/kotlin/org/opensearch/indexmanagement/rollup/RollupRestTestCase.kt b/src/test/kotlin/org/opensearch/indexmanagement/rollup/RollupRestTestCase.kt
@@ -276,7 +276,7 @@ abstract class RollupRestTestCase : IndexManagementRestTestCase() {
         val res =
             client().makeRequest(
                 "PUT", "_cluster/settings", emptyMap(),
-                StringEntity(request, ContentType.APPLICATION_JSON),
+                StringEntity(request, APPLICATION_JSON),
             )
         assertEquals("Request failed", RestStatus.OK, res.restStatus())
     }
diff --git a/src/test/kotlin/org/opensearch/indexmanagement/rollup/interceptor/RollupInterceptorIT.kt b/src/test/kotlin/org/opensearch/indexmanagement/rollup/interceptor/RollupInterceptorIT.kt
@@ -1043,7 +1043,7 @@ class RollupInterceptorIT : RollupRestTestCase() {
                     "max_passenger_count": { "max": { "field": "passenger_count" } }
                 }
             }
-            """.trimIndent()
+        """.trimIndent()
 //        Search 1 non-rollup index and 1 rollup
         updateSearchRawRollupClusterSetting(false)
         val searchResult1 = client().makeRequest("POST", "/$sourceIndex2,$targetIndex2/_search", emptyMap(), StringEntity(req, ContentType.APPLICATION_JSON))

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ abstract class RollupRestTestCase : IndexManagementRestTestCase() {`
`276`	`276`	`val res =`
`277`	`277`	`client().makeRequest(`
`278`	`278`	`"PUT", "_cluster/settings", emptyMap(),`
`279`		`- StringEntity(request, ContentType.APPLICATION_JSON),`
	`279`	`+ StringEntity(request, APPLICATION_JSON),`
`280`	`280`	`)`
`281`	`281`	`assertEquals("Request failed", RestStatus.OK, res.restStatus())`
`282`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1043,7 +1043,7 @@ class RollupInterceptorIT : RollupRestTestCase() {`
`1043`	`1043`	`"max_passenger_count": { "max": { "field": "passenger_count" } }`
`1044`	`1044`	`}`
`1045`	`1045`	`}`
`1046`		`- """.trimIndent()`
	`1046`	`+ """.trimIndent()`
`1047`	`1047`	`// Search 1 non-rollup index and 1 rollup`
`1048`	`1048`	`updateSearchRawRollupClusterSetting(false)`
`1049`	`1049`	`val searchResult1 = client().makeRequest("POST", "/$sourceIndex2,$targetIndex2/_search", emptyMap(), StringEntity(req, ContentType.APPLICATION_JSON))`