chore(*): Remove queue traffic shaping codebase

spinnaker · Mar 29, 2018 · 077b9fe · 077b9fe
1 parent fb192b5
commit 077b9fe
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 1,418 deletions.
diff --git a/orca-queue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisOrcaQueueConfiguration.kt b/orca-queue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisOrcaQueueConfiguration.kt
@@ -59,7 +59,7 @@ class RedisOrcaQueueConfiguration : RedisQueueConfiguration() {
 
   @Bean fun orcaToKeikoSerializationMigrator(objectMapper: ObjectMapper) = OrcaToKeikoSerializationMigrator(objectMapper)
 
-  @Bean(name = arrayOf("queueImpl")) override fun queue(
+  @Bean override fun queue(
     @Qualifier("queueRedisPool") redisPool: Pool<Jedis>,
     redisQueueProperties: RedisQueueProperties,
     clock: Clock,

diff --git a/...queue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisQueueShovelConfiguration.kt b/...queue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisQueueShovelConfiguration.kt
@@ -58,7 +58,7 @@ class RedisQueueShovelConfiguration {
     return RedisConfiguration.createPool(redisPoolConfig, previousConnection, timeout, registry, "previousQueueJedisPool")
   }
 
-  @Bean(name = ["previousQueueImpl"])
+  @Bean(name = ["previous"])
   @ConditionalOnBean(name = ["previousQueueJedisPool"]) fun previousRedisQueue(
     @Qualifier("previousQueueJedisPool") redisPool: Pool<Jedis>,
     redisQueueProperties: RedisQueueProperties,
@@ -82,8 +82,8 @@ class RedisQueueShovelConfiguration {
 
   @Bean
   @ConditionalOnBean(name = arrayOf("previousQueueJedisPool")) fun redisQueueShovel(
-    @Qualifier("queueImpl") queueImpl: RedisQueue,
-    @Qualifier("previousQueueImpl") previousQueueImpl: RedisQueue,
+    queueImpl: RedisQueue,
+    @Qualifier("previous") previousQueueImpl: RedisQueue,
     registry: Registry,
     activator: Activator
   ) =

diff --git a/...ue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisTrafficShapingConfiguration.kt b/...ue-redis/src/main/kotlin/com/netflix/spinnaker/config/RedisTrafficShapingConfiguration.kt
diff --git a/...dis/src/main/kotlin/com/netflix/spinnaker/orca/q/redis/RedisPriorityCapacityRepository.kt b/...dis/src/main/kotlin/com/netflix/spinnaker/orca/q/redis/RedisPriorityCapacityRepository.kt
diff --git a/orca-queue-redis/src/main/kotlin/com/netflix/spinnaker/orca/q/redis/RedisRateLimitBackend.kt b/orca-queue-redis/src/main/kotlin/com/netflix/spinnaker/orca/q/redis/RedisRateLimitBackend.kt
diff --git a/orca-queue/src/main/kotlin/com/netflix/spinnaker/config/OrcaQueueConfiguration.kt b/orca-queue/src/main/kotlin/com/netflix/spinnaker/config/OrcaQueueConfiguration.kt
@@ -33,8 +33,7 @@ import java.time.Clock
 @Configuration
 @ComponentScan(basePackages = [
   "com.netflix.spinnaker.orca.q",
-  "com.netflix.spinnaker.orca.q.handler",
-  "com.netflix.spinnaker.orca.q.trafficshaping"
+  "com.netflix.spinnaker.orca.q.handler"
 ])
 @EnableScheduling
 class OrcaQueueConfiguration {

diff --git a/orca-queue/src/main/kotlin/com/netflix/spinnaker/config/TrafficShapingConfiguration.kt b/orca-queue/src/main/kotlin/com/netflix/spinnaker/config/TrafficShapingConfiguration.kt