[Lift] app to JVM 12, with updated Kotlin, ES client and Spring-Boot

Also add missing prometheus actuator provider, which should fix missing
metrics and warnings during deploy.

Author: oyvindstegard

Dockerfile

@@ -1,4 +1,4 @@
-FROM navikt/java:8
+FROM navikt/java:12
 COPY target/pam-ontologi-indexer-*.jar /app/app.jar
 
 EXPOSE 9023

pom.xml

@@ -14,20 +14,17 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.4.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <version>2.1.7.RELEASE</version>
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <kotlin.version>1.3.31</kotlin.version>
-        <elasticsearch.version>6.2.2</elasticsearch.version>
+        <java.version>12</java.version>
+        <kotlin.version>1.3.41</kotlin.version>
+        <elasticsearch.version>6.5.4</elasticsearch.version>
         <wiremock.version>2.7.1</wiremock.version>
-        <logstash-logback-encoder.version>4.10</logstash-logback-encoder.version>
+        <logstash-logback-encoder.version>6.1</logstash-logback-encoder.version>
     </properties>
 
     <dependencies>
@@ -37,11 +34,13 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-reflect</artifactId>
+            <version>${kotlin.version}</version>
         </dependency>
 
         <dependency>
@@ -82,6 +81,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>

src/main/kotlin/no/nav/arbeid/pam/ontologindexer/es/ElasticsearchIndexClient.kt

@@ -10,37 +10,34 @@ import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest
 import org.elasticsearch.action.bulk.BulkRequest
 import org.elasticsearch.action.bulk.BulkResponse
 import org.elasticsearch.action.index.IndexRequest
-import org.elasticsearch.client.ResponseException
-import org.elasticsearch.client.RestClientBuilder
-import org.elasticsearch.client.RestHighLevelClient
+import org.elasticsearch.client.*
 import org.elasticsearch.common.xcontent.XContentType
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.stereotype.Service
 import java.io.IOException
-import kotlin.streams.toList
+import java.util.stream.Collectors.toList
 
 /**
  * Elasticsearch client implementation.
  * <br></br><br></br>
  * Note that in cases where parameters are used as part of an index name, the value(s) are converted to lower case before being used.
  */
-@ConditionalOnProperty(prefix = "elasticsearch", name = ["usemock"], havingValue = "false", matchIfMissing = true)
 @Service
 class ElasticsearchIndexClient @Autowired
-constructor(client: RestClientBuilder,
-            private val objectMapper: ObjectMapper) : RestHighLevelClient(client) {
+constructor(elasticClientBuilder: RestClientBuilder,
+            private val objectMapper: ObjectMapper) : RestHighLevelClient(elasticClientBuilder) {
 
     val isHealthy: Boolean
         @Throws(IOException::class)
-        get() = super.ping()
+        get() = super.ping(RequestOptions.DEFAULT)
 
     @Throws(IOException::class)
     fun createIndex(index: String, settings: String) {
 
         val lowerCaseIndex = index.toLowerCase()
-        indices().create(CreateIndexRequest(lowerCaseIndex).source(settings, XContentType.JSON))
+        indices().create(CreateIndexRequest(lowerCaseIndex).source(settings, XContentType.JSON), RequestOptions.DEFAULT)
 
     }
 
@@ -50,7 +47,7 @@ constructor(client: RestClientBuilder,
         val lowerCaseIndices = indices.map { it.toLowerCase() }.toTypedArray()
 
         if (lowerCaseIndices.isNotEmpty()) {
-            indices().delete(DeleteIndexRequest(*lowerCaseIndices))
+            indices().delete(DeleteIndexRequest(*lowerCaseIndices), RequestOptions.DEFAULT)
         }
     }
 
@@ -59,7 +56,7 @@ constructor(client: RestClientBuilder,
 
         val lowerCaseIndex = index.toLowerCase()
         try {
-            lowLevelClient.performRequest("GET", "/$lowerCaseIndex")
+            lowLevelClient.performRequest(Request("GET", "/$lowerCaseIndex"))
             return true
         } catch (e: ResponseException) {
             LOG.debug("Exception while calling indexExists" + e.message)
@@ -79,12 +76,10 @@ constructor(client: RestClientBuilder,
                 "        { \"add\" : { \"index\" : \"" + lowerCaseAlias + indexDatestamp + "\", \"alias\" : \"" + lowerCaseAlias + "\" } }\n" +
                 "    ]\n" +
                 "}"
-        lowLevelClient.performRequest(
-                "POST",
-                "/_aliases",
-                emptyMap(),
-                NStringEntity(jsonString, ContentType.APPLICATION_JSON)
-        )
+
+        lowLevelClient.performRequest(Request("POST", "/_aliases").apply {
+            this.entity = NStringEntity(jsonString, ContentType.APPLICATION_JSON)
+        })
 
     }
 
@@ -106,8 +101,8 @@ constructor(client: RestClientBuilder,
     fun fetchIndexDocCount(index: String): Int {
 
         val lowerCaseIndex = index.toLowerCase()
-        lowLevelClient.performRequest("POST", "/$lowerCaseIndex/_refresh")
-        val response = lowLevelClient.performRequest("GET", "/_cat/indices/$lowerCaseIndex")
+        lowLevelClient.performRequest(Request("POST", "/$lowerCaseIndex/_refresh"))
+        val response = lowLevelClient.performRequest(Request("GET", "/_cat/indices/$lowerCaseIndex"))
         val line = EntityUtils.toString(response.entity)
         return Integer.parseInt(line.split(" ".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()[6])
 
@@ -117,15 +112,15 @@ constructor(client: RestClientBuilder,
     fun fetchAllIndicesStartingWith(name: String): List<String> {
 
         val lowerCaseName = name.toLowerCase()
-        val response = lowLevelClient.performRequest("GET", "/_cat/indices/$lowerCaseName*")
+        val response = lowLevelClient.performRequest(Request("GET", "/_cat/indices/$lowerCaseName*"))
 
         return response.entity.content.bufferedReader().lines().filter {
             !it.trim().isEmpty()
         }.map {
             it.split("\\s+".toRegex())[2]
         }.filter {
             it.startsWith(lowerCaseName) // Extra sanity check
-        }.toList()
+        }.collect(toList())
     }
 
     companion object {

src/main/kotlin/no/nav/arbeid/pam/ontologindexer/scheduler/OntologiScheduler.kt

@@ -18,7 +18,7 @@ class OntologiScheduler {
     @Scheduled(cron = CRON_INDEXER)
     fun leggInnStillingstitler() {
 
-        LOGGER.info("leggInnStillingstitler scheduled job startet cron:$CRON_INDEXER")
+        LOGGER.info("leggInnStillingstitler scheduled job startet cron: $CRON_INDEXER")
         jobbtittelIndexerService.indekser()
         LOGGER.info("leggInnStillingstitler scheduled job avsluttet")