File tree 6 files changed +5
-14
lines changed
components/flow/flow-rest-resource-service-impl/src/main/kotlin/net/corda/flow/rest/impl/v1
libs/rest/rest-server-impl/src/integrationTest/kotlin/net/corda/rest/server/impl
tools/corda-runtime-gradle-plugin/src
integrationTest/kotlin/net/corda/gradle/plugin/queries
main/kotlin/net/corda/gradle/plugin/cordalifecycle
6 files changed +5
-14
lines changed Original file line number Diff line number Diff line change @@ -42,7 +42,6 @@ import net.corda.rest.messagebus.MessageBusUtils.tryWithExceptionHandling
42
42
import net.corda.rest.response.ResponseEntity
43
43
import net.corda.rest.security.CURRENT_REST_CONTEXT
44
44
import net.corda.schema.Schemas.Flow.FLOW_MAPPER_START
45
- import net.corda.schema.Schemas.Flow.FLOW_STATUS_TOPIC
46
45
import net.corda.schema.configuration.MessagingConfig
47
46
import net.corda.tracing.TraceTag
48
47
import net.corda.tracing.addTraceContextToRecord
Original file line number Diff line number Diff line change 1
1
package net.corda.rest.server.impl
2
2
3
- import io.javalin.core.util.Header
4
- import kong.unirest.core.HttpStatus
5
3
import io.javalin.http.Header
4
+ import kong.unirest.core.HttpStatus
6
5
import net.corda.rest.server.config.models.RestServerSettings
7
6
import net.corda.rest.test.utils.WebRequest
8
7
import net.corda.rest.tools.HttpVerb
Original file line number Diff line number Diff line change 1
1
package net.corda.rest.server.impl
2
2
3
3
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
9
5
import kong.unirest.core.HttpStatus
10
6
import net.corda.rest.annotations.RestApiVersion
11
7
import net.corda.rest.server.apigen.test.TestJavaPrimitivesRestResourceImpl
@@ -122,7 +118,7 @@ class RestServerRequestsTest : RestServerTestBase() {
122
118
userName,
123
119
password
124
120
)
125
- assertEquals(HttpStatus .SC_OK , sanityResponse.responseStatus)
121
+ assertEquals(HttpStatus .OK , sanityResponse.responseStatus)
126
122
assertEquals(" Sane" , sanityResponse.body)
127
123
}
128
124
@@ -404,7 +400,7 @@ class RestServerRequestsTest : RestServerTestBase() {
404
400
GET ,
405
401
WebRequest <Any >(" health/sanity" )
406
402
)
407
- val headerValue = getPathResponse.headers[WWW_AUTHENTICATE .lowercase()]
403
+ val headerValue = getPathResponse.headers[Header . WWW_AUTHENTICATE .lowercase()]
408
404
assertEquals(" Basic realm=\" ${UsernamePasswordAuthenticationProvider .REALM_VALUE } \" " , headerValue)
409
405
}
410
406
Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ import net.corda.libs.virtualnode.endpoints.v1.types.HoldingIdentity
8
8
import net.corda.libs.virtualnode.endpoints.v1.types.VirtualNodeInfo
9
9
import net.corda.libs.virtualnode.endpoints.v1.types.VirtualNodes
10
10
import net.corda.virtualnode.OperationalStatus
11
- import org.assertj.core.api.Assertions.assertThat
12
11
import org.junit.jupiter.api.Assertions.assertNotNull
13
12
import org.junit.jupiter.api.Assertions.assertTrue
14
13
import org.junit.jupiter.api.Test
Original file line number Diff line number Diff line change 1
1
package net.corda.gradle.plugin.cordalifecycle
2
2
3
- import kong.unirest.core.Unirest
4
- import net.corda.sdk.network.config.NetworkConfig
5
3
import net.corda.gradle.plugin.exception.CordaRuntimeGradlePluginException
6
4
import net.corda.gradle.plugin.retryAttempts
7
5
import net.corda.restclient.CordaRestClient
8
6
import net.corda.restclient.generated.models.ConfigSchemaVersion
9
7
import net.corda.restclient.generated.models.UpdateConfigParameters
10
8
import net.corda.schema.configuration.ConfigKeys.RootConfigKey
11
9
import net.corda.sdk.config.ClusterConfig
10
+ import net.corda.sdk.network.config.NetworkConfig
12
11
import java.io.File
13
12
import java.net.Authenticator
14
13
import java.net.PasswordAuthentication
Original file line number Diff line number Diff line change 1
1
package net.corda.gradle.plugin.cordalifecycle
2
2
3
- import kong.unirest.core.Unirest
4
3
import net.corda.gradle.plugin.configuration.PluginConfiguration
5
4
import net.corda.gradle.plugin.configuration.ProjectContext
6
5
import net.corda.schema.configuration.ConfigKeys.RootConfigKey
You can’t perform that action at this time.
0 commit comments