diff --git a/examples/src/main/resources/etc/settings.mapdb b/examples/src/main/resources/etc/settings.mapdb index e0e0e05d..ae188924 100644 Binary files a/examples/src/main/resources/etc/settings.mapdb and b/examples/src/main/resources/etc/settings.mapdb differ diff --git a/ids-dataflow-control/src/main/kotlin/de/fhg/aisec/ids/dataflowcontrol/lucon/LuconEngine.kt b/ids-dataflow-control/src/main/kotlin/de/fhg/aisec/ids/dataflowcontrol/lucon/LuconEngine.kt index e9221556..50766800 100644 --- a/ids-dataflow-control/src/main/kotlin/de/fhg/aisec/ids/dataflowcontrol/lucon/LuconEngine.kt +++ b/ids-dataflow-control/src/main/kotlin/de/fhg/aisec/ids/dataflowcontrol/lucon/LuconEngine.kt @@ -42,13 +42,7 @@ import java.util.regex.Pattern * * @author Julian Schuette (julian.schuette@aisec.fraunhofer.de) */ -class LuconEngine -/** - * Create a new LuconEngine which writes to a given output stream. - * - * @param out OutputStream to write Prolog engine outputs to, or null if output should not printed. - */ -(out: OutputStream?) { +class LuconEngine(out: OutputStream?) { private val p: Prolog = Prolog() val theory: String diff --git a/ids-settings/src/main/kotlin/de/fhg/aisec/ids/settings/SettingsComponent.kt b/ids-settings/src/main/kotlin/de/fhg/aisec/ids/settings/SettingsComponent.kt index 774233cc..6d18b2ca 100644 --- a/ids-settings/src/main/kotlin/de/fhg/aisec/ids/settings/SettingsComponent.kt +++ b/ids-settings/src/main/kotlin/de/fhg/aisec/ids/settings/SettingsComponent.kt @@ -89,10 +89,19 @@ class SettingsComponent : Settings { connectorConfig.let { connectorConfig = ConnectorConfig( - it.appstoreUrl, it.brokerUrl, it.ttpHost, it.ttpPort, it.acmeServerWebcon, - it.acmeDnsWebcon, it.acmePortWebcon, it.tosAcceptWebcon, + it.appstoreUrl, + it.brokerUrl, + it.ttpHost, + it.ttpPort, + it.acmeServerWebcon, + it.acmeDnsWebcon, + it.acmePortWebcon, + it.tosAcceptWebcon, "https://daps.aisec.fraunhofer.de/v2", - it.keystoreName, it.keystorePassword, it.keystoreAliasName, it.truststoreName + it.keystoreName, + it.keystorePassword, + it.keystoreAliasName, + it.truststoreName ) } }