Skip to content
This repository was archived by the owner on Oct 8, 2020. It is now read-only.

Commit 49cf548

Browse files
authored
refactor(spring): Bump korkVersion, refactor eureka integration (#175)
1 parent 75024b6 commit 49cf548

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
korkVersion=7.50.0
1+
korkVersion=7.51.1
22
kotlinVersion=1.3.70
33
org.gradle.parallel=true
44
spinnakerGradleVersion=8.3.0

keiko-spring/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ dependencies {
66
api("com.netflix.spinnaker.kork:kork-core") {
77
exclude(module: "logback-classic")
88
}
9-
api "com.netflix.eureka:eureka-client"
109

1110
testImplementation project(":keiko-test-common")
1211
}

keiko-spring/src/main/kotlin/com/netflix/spinnaker/q/discovery/DiscoveryActivator.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.netflix.spinnaker.q.discovery
1818

19-
import com.netflix.appinfo.InstanceInfo.InstanceStatus.UP
20-
import com.netflix.spinnaker.kork.eureka.RemoteStatusChangedEvent
19+
import com.netflix.spinnaker.kork.discovery.InstanceStatus.UP
20+
import com.netflix.spinnaker.kork.discovery.RemoteStatusChangedEvent
2121
import com.netflix.spinnaker.q.Activator
2222
import java.util.concurrent.atomic.AtomicBoolean
2323
import org.slf4j.LoggerFactory

keiko-spring/src/test/kotlin/com/netflix/spinnaker/q/discovery/DiscoveryActivatorTest.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package com.netflix.spinnaker.q.discovery
1818

19-
import com.netflix.appinfo.InstanceInfo.InstanceStatus
20-
import com.netflix.appinfo.InstanceInfo.InstanceStatus.OUT_OF_SERVICE
21-
import com.netflix.appinfo.InstanceInfo.InstanceStatus.UP
22-
import com.netflix.discovery.StatusChangeEvent
23-
import com.netflix.spinnaker.kork.eureka.RemoteStatusChangedEvent
19+
import com.netflix.spinnaker.kork.discovery.DiscoveryStatusChangeEvent
20+
import com.netflix.spinnaker.kork.discovery.InstanceStatus
21+
import com.netflix.spinnaker.kork.discovery.InstanceStatus.OUT_OF_SERVICE
22+
import com.netflix.spinnaker.kork.discovery.InstanceStatus.UP
23+
import com.netflix.spinnaker.kork.discovery.RemoteStatusChangedEvent
2424
import com.netflix.spinnaker.spek.and
2525
import org.assertj.core.api.Assertions.assertThat
2626
import org.jetbrains.spek.api.Spek
@@ -66,4 +66,4 @@ private fun DiscoveryActivator.triggerEvent(from: InstanceStatus, to: InstanceSt
6666
onApplicationEvent(event(from, to))
6767

6868
private fun event(from: InstanceStatus, to: InstanceStatus) =
69-
RemoteStatusChangedEvent(StatusChangeEvent(from, to))
69+
RemoteStatusChangedEvent(DiscoveryStatusChangeEvent(from, to))

0 commit comments

Comments
 (0)