Merge pull request #131 from Fraunhofer-AISEC/release/7.0.0

Release 7.0.0

build.gradle.kts

@@ -25,7 +25,7 @@ licenseReport {
 
 allprojects {
     group = "de.fhg.aisec.ids"
-    version = "7.0.0-rc2"
+    version = "7.0.0"
 
     val versionRegex = ".*(rc-?[0-9]*|beta)$".toRegex(RegexOption.IGNORE_CASE)
 

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 idscp2 = "0.16.1"
-ktlint = "0.47.1"
+ktlint = "0.48.2"
 
 # Kotlin library/compiler version
 kotlin = "1.8.0"
@@ -17,13 +17,13 @@ jaxbApi = "2.4.0-b180830.0359"
 jaxbImpl = "4.0.1"
 jaxActivation = "1.2.0"
 
-camel = "3.18.4"
+camel = "3.18.5"
 influxDB = "2.23"
 
 guava = "31.1-jre"
 junit4 = "4.13.2"
 junit5 = "5.9.2"
-mockito = "4.11.0"
+mockito = "5.0.0"
 mapdb = "3.0.9"
 jnrunix = "0.38.19"
 protobuf = "3.21.12"
@@ -56,11 +56,11 @@ commonsCli = "1.5.0"
 javaxValidation = "2.0.1.Final"
 
 # Needed for web console
-auth0Jwt = "4.2.1"
+auth0Jwt = "4.2.2"
 swagger = "1.6.9"
 jose4j = "0.9.2"
 
-springBoot = "2.7.7"
+springBoot = "2.7.8"
 springSecurity = "5.8.1"
 bouncyCastle = "1.70"
 
@@ -157,7 +157,7 @@ swagger = { id = "com.benjaminsproule.swagger", version = "1.0.14" }
 protobuf = { id = "com.google.protobuf",  version = "0.9.2" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-plugin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
-spotless = { id = "com.diffplug.spotless", version = "6.12.1" }
+spotless = { id = "com.diffplug.spotless", version = "6.14.0" }
 licenseReport = { id = "com.github.jk1.dependency-license-report", version = "2.1" }
 versions = { id = "com.github.ben-manes.versions", version = "0.44.0" }
 buildconfig = { id = "com.github.gmazzo.buildconfig", version = "3.1.0" }

ids-webconsole/src/main/kotlin/de/fhg/aisec/ids/webconsole/api/ConfigApi.kt

@@ -42,7 +42,6 @@ import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.server.ResponseStatusException
 import java.util.TreeMap
 import java.util.regex.Pattern
-import java.util.stream.Collectors
 import javax.ws.rs.core.MediaType
 
 /**
@@ -193,27 +192,21 @@ class ConfigApi {
 
             // add route id before host identifier for web console view
             val retAllSettings = mutableMapOf<String, ConnectionSettings>()
-            for ((key, value) in allSettings) {
+            allSettings.forEach { (key, value) ->
                 if (key == Constants.GENERAL_CONFIG) {
                     retAllSettings[key] = value
                 } else {
-                    var endpointIdentifiers = routeInputs
+                    val endpointIdentifiers = routeInputs
                         .entries
-                        .stream()
                         .filter { (_, value1) ->
-                            value1.stream().anyMatch { u: String -> u.startsWith("idsserver://$key") }
+                            value1.any { u: String -> u.startsWith("idsserver://$key") }
                         }
-                        .map { (key1) -> "$key1 - $key" }
-                        .collect(Collectors.toList())
-                    if (endpointIdentifiers.isEmpty()) {
-                        endpointIdentifiers = listOf("<no route found> - $key")
-                    }
+                        .map { "$it - $key" }
+                        .ifEmpty { listOf("<no route found> - $key") }
 
                     // add endpoint configurations
                     endpointIdentifiers.forEach { endpointIdentifier: String ->
-                        if (retAllSettings.keys.stream()
-                            .noneMatch { anObject: String? -> endpointIdentifier == anObject }
-                        ) {
+                        if (retAllSettings.keys.none { endpointIdentifier == it }) {
                             retAllSettings[endpointIdentifier] = value
                         }
                     }