Merge branch 'release/5.0.1'

ids-api/src/main/java/de/fhg/aisec/ids/api/acme/AcmeClient.kt

@@ -23,7 +23,7 @@ import java.net.URI
 import java.nio.file.Path
 
 interface AcmeClient {
-    fun getChallengeAuthorization(challenge: String): String
+    fun getChallengeAuthorization(challenge: String): String?
 
     fun renewCertificate(
         targetDirectory: Path,

ids-api/src/main/java/de/fhg/aisec/ids/api/acme/AcmeTermsOfService.kt

@@ -21,4 +21,4 @@ package de.fhg.aisec.ids.api.acme
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
-class AcmeTermsOfService(val tos: String, @get:JsonProperty(value = "isUri") val isUri: Boolean, val error: String)
+class AcmeTermsOfService(val tos: String?, @get:JsonProperty(value = "isUri") val isUri: Boolean?, val error: String?)

ids-container-manager/src/test/kotlin/de/fhg/aisec/ids/cm/impl/docker/DockerCmIT.kt

@@ -63,12 +63,12 @@ class DockerCmIT {
         val oContainerID = d.pullImage(app)
 
         // We expect a new container to be created
-        Assert.assertTrue(oContainerID.isPresent)
-        Assert.assertNotEquals("", oContainerID.get())
-        wipes.add(oContainerID.get())
+        Assert.assertNotNull(oContainerID)
+        Assert.assertNotEquals("", oContainerID)
+        wipes.add(oContainerID!!)
 
         // we expect the container to be in list()
-        val container = d.list(false).firstOrNull { it.id == oContainerID.get() }
+        val container = d.list(false).firstOrNull { it.id == oContainerID }
         Assert.assertNotNull(container)
         Assert.assertEquals(ContainerStatus.CREATED, container?.status)
     }
@@ -98,8 +98,8 @@ class DockerCmIT {
         val oContainerID = d.pullImage(app)
 
         // We expect a new container to be created
-        Assert.assertTrue(oContainerID.isPresent)
-        val containerID = oContainerID.get()
+        Assert.assertNotNull(oContainerID)
+        val containerID = oContainerID!!
         wipes.add(containerID)
         Assert.assertNotNull(containerID)
 

ids-container-manager/src/test/java/de/fhg/aisec/ids/cm/impl/trustx/ServerDataEvent.java → ids-container-manager/src/test/kotlin/de/fhg/aisec/ids/cm/impl/trustx/ServerDataEvent.kt

@@ -17,18 +17,8 @@
  * limitations under the License.
  * =========================LICENSE_END==================================
  */
-package de.fhg.aisec.ids.cm.impl.trustx;
+package de.fhg.aisec.ids.cm.impl.trustx
 
-import jnr.unixsocket.UnixSocketChannel;
+import jnr.unixsocket.UnixSocketChannel
 
-class ServerDataEvent {
-  public TrustXMock server;
-  public UnixSocketChannel socket;
-  public byte[] data;
-
-  public ServerDataEvent(TrustXMock server, UnixSocketChannel socket, byte[] data) {
-    this.server = server;
-    this.socket = socket;
-    this.data = data;
-  }
-}
+internal class ServerDataEvent(var server: TrustXMock, var socket: UnixSocketChannel, var data: ByteArray)