From 4d0bdefbfe9d7dbfa728f3102f7b9879612f5c03 Mon Sep 17 00:00:00 2001 From: LWogan Date: Mon, 2 Dec 2024 10:52:41 +0000 Subject: [PATCH] CORE-XXXX: detekt --- .../corda/flow/rest/impl/v1/FlowRestResourceImpl.kt | 1 - .../corda/rest/server/impl/AbstractWebsocketTest.kt | 3 +-- .../corda/rest/server/impl/RestServerRequestsTest.kt | 10 +++------- .../corda/gradle/plugin/queries/QueriesTasksTest.kt | 1 - .../plugin/cordalifecycle/EnvironmentSetupHelper.kt | 3 +-- .../plugin/cordalifecycle/EnvironmentSetupTasks.kt | 1 - 6 files changed, 5 insertions(+), 14 deletions(-) diff --git a/components/flow/flow-rest-resource-service-impl/src/main/kotlin/net/corda/flow/rest/impl/v1/FlowRestResourceImpl.kt b/components/flow/flow-rest-resource-service-impl/src/main/kotlin/net/corda/flow/rest/impl/v1/FlowRestResourceImpl.kt index c596402bf23..8f83c2536df 100644 --- a/components/flow/flow-rest-resource-service-impl/src/main/kotlin/net/corda/flow/rest/impl/v1/FlowRestResourceImpl.kt +++ b/components/flow/flow-rest-resource-service-impl/src/main/kotlin/net/corda/flow/rest/impl/v1/FlowRestResourceImpl.kt @@ -42,7 +42,6 @@ import net.corda.rest.messagebus.MessageBusUtils.tryWithExceptionHandling import net.corda.rest.response.ResponseEntity import net.corda.rest.security.CURRENT_REST_CONTEXT import net.corda.schema.Schemas.Flow.FLOW_MAPPER_START -import net.corda.schema.Schemas.Flow.FLOW_STATUS_TOPIC import net.corda.schema.configuration.MessagingConfig import net.corda.tracing.TraceTag import net.corda.tracing.addTraceContextToRecord diff --git a/libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl/AbstractWebsocketTest.kt b/libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl/AbstractWebsocketTest.kt index 4b3fd46b012..17bd07d183e 100644 --- a/libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl/AbstractWebsocketTest.kt +++ b/libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl/AbstractWebsocketTest.kt @@ -1,8 +1,7 @@ package net.corda.rest.server.impl -import io.javalin.core.util.Header -import kong.unirest.core.HttpStatus import io.javalin.http.Header +import kong.unirest.core.HttpStatus import net.corda.rest.server.config.models.RestServerSettings import net.corda.rest.test.utils.WebRequest import net.corda.rest.tools.HttpVerb diff --git a/libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl/RestServerRequestsTest.kt b/libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl/RestServerRequestsTest.kt index ff7fe9f7bfc..0ea5533fa57 100644 --- a/libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl/RestServerRequestsTest.kt +++ b/libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl/RestServerRequestsTest.kt @@ -1,11 +1,7 @@ package net.corda.rest.server.impl import com.google.gson.Gson -import io.javalin.core.util.Header -import io.javalin.http.Header.ACCESS_CONTROL_ALLOW_CREDENTIALS -import io.javalin.http.Header.ACCESS_CONTROL_ALLOW_ORIGIN -import io.javalin.http.Header.CACHE_CONTROL -import io.javalin.http.Header.WWW_AUTHENTICATE +import io.javalin.http.Header import kong.unirest.core.HttpStatus import net.corda.rest.annotations.RestApiVersion import net.corda.rest.server.apigen.test.TestJavaPrimitivesRestResourceImpl @@ -122,7 +118,7 @@ class RestServerRequestsTest : RestServerTestBase() { userName, password ) - assertEquals(HttpStatus.SC_OK, sanityResponse.responseStatus) + assertEquals(HttpStatus.OK, sanityResponse.responseStatus) assertEquals("Sane", sanityResponse.body) } @@ -404,7 +400,7 @@ class RestServerRequestsTest : RestServerTestBase() { GET, WebRequest("health/sanity") ) - val headerValue = getPathResponse.headers[WWW_AUTHENTICATE.lowercase()] + val headerValue = getPathResponse.headers[Header.WWW_AUTHENTICATE.lowercase()] assertEquals("Basic realm=\"${UsernamePasswordAuthenticationProvider.REALM_VALUE}\"", headerValue) } diff --git a/tools/corda-runtime-gradle-plugin/src/integrationTest/kotlin/net/corda/gradle/plugin/queries/QueriesTasksTest.kt b/tools/corda-runtime-gradle-plugin/src/integrationTest/kotlin/net/corda/gradle/plugin/queries/QueriesTasksTest.kt index 061c63ed152..c7afd41ed3b 100644 --- a/tools/corda-runtime-gradle-plugin/src/integrationTest/kotlin/net/corda/gradle/plugin/queries/QueriesTasksTest.kt +++ b/tools/corda-runtime-gradle-plugin/src/integrationTest/kotlin/net/corda/gradle/plugin/queries/QueriesTasksTest.kt @@ -8,7 +8,6 @@ import net.corda.libs.virtualnode.endpoints.v1.types.HoldingIdentity import net.corda.libs.virtualnode.endpoints.v1.types.VirtualNodeInfo import net.corda.libs.virtualnode.endpoints.v1.types.VirtualNodes import net.corda.virtualnode.OperationalStatus -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test diff --git a/tools/corda-runtime-gradle-plugin/src/main/kotlin/net/corda/gradle/plugin/cordalifecycle/EnvironmentSetupHelper.kt b/tools/corda-runtime-gradle-plugin/src/main/kotlin/net/corda/gradle/plugin/cordalifecycle/EnvironmentSetupHelper.kt index 2a84353f49a..282d20b6175 100644 --- a/tools/corda-runtime-gradle-plugin/src/main/kotlin/net/corda/gradle/plugin/cordalifecycle/EnvironmentSetupHelper.kt +++ b/tools/corda-runtime-gradle-plugin/src/main/kotlin/net/corda/gradle/plugin/cordalifecycle/EnvironmentSetupHelper.kt @@ -1,7 +1,5 @@ package net.corda.gradle.plugin.cordalifecycle -import kong.unirest.core.Unirest -import net.corda.sdk.network.config.NetworkConfig import net.corda.gradle.plugin.exception.CordaRuntimeGradlePluginException import net.corda.gradle.plugin.retryAttempts import net.corda.restclient.CordaRestClient @@ -9,6 +7,7 @@ import net.corda.restclient.generated.models.ConfigSchemaVersion import net.corda.restclient.generated.models.UpdateConfigParameters import net.corda.schema.configuration.ConfigKeys.RootConfigKey import net.corda.sdk.config.ClusterConfig +import net.corda.sdk.network.config.NetworkConfig import java.io.File import java.net.Authenticator import java.net.PasswordAuthentication diff --git a/tools/corda-runtime-gradle-plugin/src/main/kotlin/net/corda/gradle/plugin/cordalifecycle/EnvironmentSetupTasks.kt b/tools/corda-runtime-gradle-plugin/src/main/kotlin/net/corda/gradle/plugin/cordalifecycle/EnvironmentSetupTasks.kt index 7a6f4faa1b2..d6d46a38f05 100644 --- a/tools/corda-runtime-gradle-plugin/src/main/kotlin/net/corda/gradle/plugin/cordalifecycle/EnvironmentSetupTasks.kt +++ b/tools/corda-runtime-gradle-plugin/src/main/kotlin/net/corda/gradle/plugin/cordalifecycle/EnvironmentSetupTasks.kt @@ -1,6 +1,5 @@ package net.corda.gradle.plugin.cordalifecycle -import kong.unirest.core.Unirest import net.corda.gradle.plugin.configuration.PluginConfiguration import net.corda.gradle.plugin.configuration.ProjectContext import net.corda.schema.configuration.ConfigKeys.RootConfigKey