update to spring boot 2.3.4

Author: derlin

build.gradle.kts

@@ -2,9 +2,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.bundling.BootJar // for launchScript
 
 plugins {
-    id("org.springframework.boot") version "2.2.1.RELEASE"
-    id("io.spring.dependency-management") version "1.0.8.RELEASE"
-    id("com.gorylenko.gradle-git-properties") version "2.0.0"
+    id("org.springframework.boot") version "2.3.4.RELEASE"
+    id("io.spring.dependency-management") version "1.0.10.RELEASE"
+    id("com.gorylenko.gradle-git-properties") version "2.2.3"
     war
     kotlin("jvm") version "1.4.0"
     kotlin("plugin.spring") version "1.4.0"
@@ -16,12 +16,6 @@ group = "ch.derlin.bbdata.api"
 version = "2.0.0-alpha"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
-val developmentOnly by configurations.creating
-configurations {
-    runtimeClasspath {
-        extendsFrom(developmentOnly)
-    }
-}
 
 repositories {
     mavenCentral()
@@ -33,6 +27,7 @@ springBoot {
 
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
     // NO HAL REST: implementation("org.springframework.boot:spring-boot-starter-data-rest")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-data-redis")

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

src/main/kotlin/ch/derlin/bbdata/common/cassandra/CassandraStats.kt

@@ -1,6 +1,5 @@
 package ch.derlin.bbdata.common.cassandra
 
-import com.datastax.driver.core.DataType
 import com.fasterxml.jackson.annotation.JsonProperty
 import org.joda.time.DateTime
 import org.springframework.data.cassandra.core.mapping.CassandraType
@@ -34,11 +33,11 @@ data class ObjectStatsCounter(
 
         @Column("n_reads")
         @get:JsonProperty("nReads")
-        @CassandraType(type = DataType.Name.COUNTER)
+        @CassandraType(type = CassandraType.Name.COUNTER)
         val nReads: Long = 0,
 
         @Column("n_values")
         @get:JsonProperty("nValues")
-        @CassandraType(type = DataType.Name.COUNTER)
+        @CassandraType(type = CassandraType.Name.COUNTER)
         val nValues: Long = 0
 )

src/main/kotlin/ch/derlin/bbdata/output/api/apikeys/Apikey.kt

@@ -28,7 +28,7 @@ data class Apikey(
         var userId: Int = 0,
 
         @Column(name = "readonly")
-        var isReadOnly: Boolean = false,
+        var readOnly: Boolean = false,
 
         @Column(name = "description")
         var description: String? = null

src/main/kotlin/ch/derlin/bbdata/output/api/apikeys/ApikeyController.kt

@@ -58,7 +58,7 @@ class ApikeyController(
         if (optionalUserId.isPresent && apikeyRepository.canLogin(optionalUserId.get(), loginBody.password!!) > 0) {
             return apikeyRepository.saveAndFlush(Apikey(
                     userId = optionalUserId.get(),
-                    isReadOnly = false,
+                    readOnly = false,
                     description = AUTOLOGIN_DESCRIPTION,
                     secret = TokenGenerator.generate(),
                     expirationDate = DateTime().plus(AUTOLOGIN_EXPIRE)
@@ -93,7 +93,7 @@ class ApikeyController(
 
         return apikeyRepository.saveAndFlush(Apikey(
                 userId = userId,
-                isReadOnly = !writable,
+                readOnly = !writable,
                 description = descriptionBean?.description,
                 secret = TokenGenerator.generate(),
                 expirationDate = rawExpire?.let { parseDateOrDuration(it) }
@@ -113,7 +113,7 @@ class ApikeyController(
         val apikey = apikeyRepository.findByIdAndUserId(id, userId).orElseThrow { ItemNotFoundException("apikey (id=$id)") }
 
         bean.expirationDate?.let { apikey.expirationDate = parseDateOrDuration(it) }
-        bean.readOnly?.let { apikey.isReadOnly = it }
+        bean.readOnly?.let { apikey.readOnly = it }
         bean.description?.let { apikey.description = it }
 
         return apikeyRepository.saveAndFlush(apikey)

src/main/kotlin/ch/derlin/bbdata/output/api/user_groups/UsergroupMapping.kt

@@ -3,6 +3,7 @@ package ch.derlin.bbdata.output.api.user_groups
 import ch.derlin.bbdata.output.api.NoUpdateOnCreateEntity
 import ch.derlin.bbdata.output.api.users.User
 import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonUnwrapped
 import java.io.Serializable
 import javax.persistence.*
@@ -37,6 +38,7 @@ data class UsergroupMapping(
         val groupId: Int,
 
         @Column(name = "is_admin")
+        @JsonProperty("admin")
         var isAdmin: Boolean,
 
         @JoinColumn(name = "user_id", referencedColumnName = "id", insertable = false, updatable = false)

src/main/kotlin/ch/derlin/bbdata/output/security/SecurityFilter.kt

@@ -113,7 +113,7 @@ class AuthInterceptor : HandlerInterceptor {
                 BadApikeyException("Access denied for user $userId : bad apikey")
             }
             // check if write access is necessary
-            if (apikey.isReadOnly && writeRequired) {
+            if (apikey.readOnly && writeRequired) {
                 // check write permissions
                 throw ForbiddenException("Access denied for user $userId : this apikey is read-only")
             }

src/main/resources/application-noc.properties

@@ -3,7 +3,8 @@
 
 # dynamically set the @SpringBootApplication(exclude) property
 # add a suffix so we don't override the default
-spring.autoconfigure.exclude.cassandra=org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration
+spring.autoconfigure.exclude.cassandra=org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration,\
+  org.springframework.boot.autoconfigure.data.cassandra.CassandraReactiveDataAutoConfiguration
 # custom property to automatically disable any component under the given package
 # see ExcludePackagesFilter
 scan.exclude.cassandra=ch.derlin.bbdata.output.api.values,ch.derlin.bbdata.input,ch.derlin.bbdata.common.cassandra

src/main/resources/application.properties

@@ -1,3 +1,6 @@
+## Embedded server
+server.shutdown=graceful
+
 ## Actuator info endpoint
 # NOTE: the /info actuator endpoint and the /about regular endpoint display exactly the same content.
 #    hence, whatever you show in /info is also available publicly to anyone !
@@ -32,7 +35,7 @@ spring.jpa.show-sql = false
 ## Cassandra properties
 spring.data.cassandra.contact-points=127.0.0.1
 spring.data.cassandra.keyspace-name=bbdata2
-spring.data.cassandra.jmx-enabled=false
+spring.data.cassandra.local-datacenter=datacenter1
 # The following allows to shut up warnings "Spring Data Cassandra - Could not safely identify store assignment"
 # For this to work ensure to set the below property, but ONLY if Cassandra enabled (ie. not NOC profile)
 # @EnableCassandraRepositories(basePackages = ["ch.derlin.bbdata.common.cassandra"])
@@ -86,8 +89,9 @@ spring.task.execution.pool.allow-core-thread-timeout=false
 ## Input/Output
 # make json the default
 spring.data.rest.defaultMediaType=application/json
-# pretty print output + keep map order
+# pretty print output
 spring.jackson.serialization.indent-output=true
+# keep order of properties
 spring.jackson.serialization.order-map-entries-by-keys=true
 # dates (declared here only for swagger)
 spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss