Skip to content

Commit 4d0bdef

Browse files
committed
CORE-XXXX: detekt
1 parent 8b5e762 commit 4d0bdef

File tree

6 files changed

+5
-14
lines changed

6 files changed

+5
-14
lines changed

components/flow/flow-rest-resource-service-impl/src/main/kotlin/net/corda/flow/rest/impl/v1/FlowRestResourceImpl.kt

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import net.corda.rest.messagebus.MessageBusUtils.tryWithExceptionHandling
4242
import net.corda.rest.response.ResponseEntity
4343
import net.corda.rest.security.CURRENT_REST_CONTEXT
4444
import net.corda.schema.Schemas.Flow.FLOW_MAPPER_START
45-
import net.corda.schema.Schemas.Flow.FLOW_STATUS_TOPIC
4645
import net.corda.schema.configuration.MessagingConfig
4746
import net.corda.tracing.TraceTag
4847
import net.corda.tracing.addTraceContextToRecord

libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl/AbstractWebsocketTest.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package net.corda.rest.server.impl
22

3-
import io.javalin.core.util.Header
4-
import kong.unirest.core.HttpStatus
53
import io.javalin.http.Header
4+
import kong.unirest.core.HttpStatus
65
import net.corda.rest.server.config.models.RestServerSettings
76
import net.corda.rest.test.utils.WebRequest
87
import net.corda.rest.tools.HttpVerb

libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl/RestServerRequestsTest.kt

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package net.corda.rest.server.impl
22

33
import com.google.gson.Gson
4-
import io.javalin.core.util.Header
5-
import io.javalin.http.Header.ACCESS_CONTROL_ALLOW_CREDENTIALS
6-
import io.javalin.http.Header.ACCESS_CONTROL_ALLOW_ORIGIN
7-
import io.javalin.http.Header.CACHE_CONTROL
8-
import io.javalin.http.Header.WWW_AUTHENTICATE
4+
import io.javalin.http.Header
95
import kong.unirest.core.HttpStatus
106
import net.corda.rest.annotations.RestApiVersion
117
import net.corda.rest.server.apigen.test.TestJavaPrimitivesRestResourceImpl
@@ -122,7 +118,7 @@ class RestServerRequestsTest : RestServerTestBase() {
122118
userName,
123119
password
124120
)
125-
assertEquals(HttpStatus.SC_OK, sanityResponse.responseStatus)
121+
assertEquals(HttpStatus.OK, sanityResponse.responseStatus)
126122
assertEquals("Sane", sanityResponse.body)
127123
}
128124

@@ -404,7 +400,7 @@ class RestServerRequestsTest : RestServerTestBase() {
404400
GET,
405401
WebRequest<Any>("health/sanity")
406402
)
407-
val headerValue = getPathResponse.headers[WWW_AUTHENTICATE.lowercase()]
403+
val headerValue = getPathResponse.headers[Header.WWW_AUTHENTICATE.lowercase()]
408404
assertEquals("Basic realm=\"${UsernamePasswordAuthenticationProvider.REALM_VALUE}\"", headerValue)
409405
}
410406

tools/corda-runtime-gradle-plugin/src/integrationTest/kotlin/net/corda/gradle/plugin/queries/QueriesTasksTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import net.corda.libs.virtualnode.endpoints.v1.types.HoldingIdentity
88
import net.corda.libs.virtualnode.endpoints.v1.types.VirtualNodeInfo
99
import net.corda.libs.virtualnode.endpoints.v1.types.VirtualNodes
1010
import net.corda.virtualnode.OperationalStatus
11-
import org.assertj.core.api.Assertions.assertThat
1211
import org.junit.jupiter.api.Assertions.assertNotNull
1312
import org.junit.jupiter.api.Assertions.assertTrue
1413
import org.junit.jupiter.api.Test

tools/corda-runtime-gradle-plugin/src/main/kotlin/net/corda/gradle/plugin/cordalifecycle/EnvironmentSetupHelper.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package net.corda.gradle.plugin.cordalifecycle
22

3-
import kong.unirest.core.Unirest
4-
import net.corda.sdk.network.config.NetworkConfig
53
import net.corda.gradle.plugin.exception.CordaRuntimeGradlePluginException
64
import net.corda.gradle.plugin.retryAttempts
75
import net.corda.restclient.CordaRestClient
86
import net.corda.restclient.generated.models.ConfigSchemaVersion
97
import net.corda.restclient.generated.models.UpdateConfigParameters
108
import net.corda.schema.configuration.ConfigKeys.RootConfigKey
119
import net.corda.sdk.config.ClusterConfig
10+
import net.corda.sdk.network.config.NetworkConfig
1211
import java.io.File
1312
import java.net.Authenticator
1413
import java.net.PasswordAuthentication

tools/corda-runtime-gradle-plugin/src/main/kotlin/net/corda/gradle/plugin/cordalifecycle/EnvironmentSetupTasks.kt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.corda.gradle.plugin.cordalifecycle
22

3-
import kong.unirest.core.Unirest
43
import net.corda.gradle.plugin.configuration.PluginConfiguration
54
import net.corda.gradle.plugin.configuration.ProjectContext
65
import net.corda.schema.configuration.ConfigKeys.RootConfigKey

0 commit comments

Comments
 (0)