From 75f32aecb27d011eca861736188ed52fcb6d312c Mon Sep 17 00:00:00 2001 From: Anoop Panicker Date: Fri, 25 Oct 2019 13:47:45 -0700 Subject: [PATCH] upgrade dyno queues and jedis version --- contribs/dependencies.lock | 54 +- .../netflix/conductor/metrics/Monitors.java | 1 - .../conductor/service/ExecutionService.java | 1 + redis-persistence/dependencies.lock | 801 ++++++-- .../dao/dynomite/queue/DynoQueueDAO.java | 2 +- .../com/netflix/conductor/dyno/DynoProxy.java | 49 +- .../dyno/DynoProxyDiscoveryProvider.java | 14 +- .../dyno/RedisQueuesDiscoveryProvider.java | 21 +- .../conductor/dyno/RedisQueuesProvider.java | 21 +- .../jedis/DynomiteJedisProvider.java | 16 +- .../jedis/InMemoryJedisProvider.java | 15 +- .../netflix/conductor/jedis/JedisCluster.java | 1737 +++++++++++++++++ .../conductor/jedis/JedisClusterSentinel.java | 1729 ---------------- .../netflix/conductor/jedis/JedisMock.java | 829 +------- .../jedis/RedisClusterJedisProvider.java | 32 +- .../conductor/jedis/RedisJedisProvider.java | 29 +- .../jedis/RedisSentinelJedisProvider.java | 29 +- .../dao/dynomite/DynoQueueDAOTest.java | 77 +- .../dao/dynomite/RedisExecutionDAOTest.java | 6 +- .../dao/dynomite/RedisMetadataDAOTest.java | 111 +- .../conductor/dao/redis/JedisMock.java | 46 +- ...ConfigurationHostSupplierProviderTest.java | 24 +- .../jedis/JedisClusterSentinelTest.java | 580 ------ .../conductor/jedis/JedisClusterTest.java | 586 ++++++ server/dependencies.lock | 1075 ++++++++-- .../server/DynomiteClusterModule.java | 16 +- .../conductor/server/LocalRedisModule.java | 16 +- .../conductor/server/RedisClusterModule.java | 16 +- .../conductor/server/RedisSentinelModule.java | 15 +- test-harness/dependencies.lock | 400 +++- versionsOfDependencies.gradle | 10 +- 31 files changed, 4549 insertions(+), 3809 deletions(-) create mode 100644 redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisCluster.java delete mode 100644 redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisClusterSentinel.java delete mode 100644 redis-persistence/src/test/java/com/netflix/conductor/jedis/JedisClusterSentinelTest.java create mode 100644 redis-persistence/src/test/java/com/netflix/conductor/jedis/JedisClusterTest.java diff --git a/contribs/dependencies.lock b/contribs/dependencies.lock index d4e326f0a1..87f188d743 100644 --- a/contribs/dependencies.lock +++ b/contribs/dependencies.lock @@ -7,7 +7,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -27,11 +27,11 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "requested": "latest.release" }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -468,7 +468,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -488,11 +488,11 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "requested": "latest.release" }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -936,7 +936,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -956,11 +956,11 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "requested": "latest.release" }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -1460,7 +1460,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -1480,11 +1480,11 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "requested": "latest.release" }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -1921,7 +1921,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -1941,11 +1941,11 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "requested": "latest.release" }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -2382,7 +2382,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -2402,11 +2402,11 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "requested": "latest.release" }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -2905,7 +2905,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -2925,11 +2925,11 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "requested": "latest.release" }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -3428,7 +3428,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -3448,11 +3448,11 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "requested": "latest.release" }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -3951,7 +3951,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -3971,11 +3971,11 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "requested": "latest.release" }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", diff --git a/core/src/main/java/com/netflix/conductor/metrics/Monitors.java b/core/src/main/java/com/netflix/conductor/metrics/Monitors.java index def58fbfc7..7ceacea22c 100644 --- a/core/src/main/java/com/netflix/conductor/metrics/Monitors.java +++ b/core/src/main/java/com/netflix/conductor/metrics/Monitors.java @@ -100,7 +100,6 @@ private static void gauge(String className, String name, long measurement, Strin public static Timer getTimer(String className, String name, String... additionalTags) { Map tags = toMap(className, additionalTags); - tags.put("unit", TimeUnit.SECONDS.name()); return timers.computeIfAbsent(name, s -> new ConcurrentHashMap<>()).computeIfAbsent(tags, t -> { Id id = registry.createId(name, tags); return PercentileTimer.get(registry, id); diff --git a/core/src/main/java/com/netflix/conductor/service/ExecutionService.java b/core/src/main/java/com/netflix/conductor/service/ExecutionService.java index d5b11b2046..c61a02633c 100644 --- a/core/src/main/java/com/netflix/conductor/service/ExecutionService.java +++ b/core/src/main/java/com/netflix/conductor/service/ExecutionService.java @@ -378,6 +378,7 @@ public SearchResult searchWorkflowByTasks(String query, String } }) .filter(Objects::nonNull) + .distinct() .collect(Collectors.toList()); int missing = taskSummarySearchResult.getResults().size() - workflowSummaries.size(); long totalHits = taskSummarySearchResult.getTotalHits() - missing; diff --git a/redis-persistence/dependencies.lock b/redis-persistence/dependencies.lock index a3bca0badc..69f6a3ddbb 100644 --- a/redis-persistence/dependencies.lock +++ b/redis-persistence/dependencies.lock @@ -121,9 +121,10 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.3", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -165,7 +166,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -193,36 +197,61 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", - "requested": "2.0.0-rc8" + "locked": "2.0.13", + "requested": "2.0.13" }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -282,7 +311,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-client" ] @@ -293,6 +325,12 @@ "com.netflix.eureka:eureka-client" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.9", "transitive": [ @@ -376,7 +414,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -427,7 +468,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -438,7 +479,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4" ] @@ -493,6 +537,12 @@ "net.minidev:accessors-smart" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17" @@ -505,12 +555,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "com.netflix.spectator:spectator-api", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -518,12 +572,15 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "redis.clients:jedis": { - "locked": "2.9.0", - "requested": "2.9.0", + "locked": "3.0.1", + "requested": "3.0.+", "transitive": [ "com.netflix.dyno:dyno-jedis", "org.rarefiedredis.redis:redis-java" @@ -676,9 +733,10 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.3", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -720,7 +778,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -748,36 +809,61 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", - "requested": "2.0.0-rc8" + "locked": "2.0.13", + "requested": "2.0.13" }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -837,7 +923,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-client" ] @@ -848,6 +937,12 @@ "com.netflix.eureka:eureka-client" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.9", "transitive": [ @@ -931,7 +1026,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -982,7 +1080,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -993,7 +1091,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4" ] @@ -1048,6 +1149,12 @@ "net.minidev:accessors-smart" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17" @@ -1060,12 +1167,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "com.netflix.spectator:spectator-api", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -1073,12 +1184,15 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "redis.clients:jedis": { - "locked": "2.9.0", - "requested": "2.9.0", + "locked": "3.0.1", + "requested": "3.0.+", "transitive": [ "com.netflix.dyno:dyno-jedis", "org.rarefiedredis.redis:redis-java" @@ -1231,9 +1345,10 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.3", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -1275,7 +1390,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -1303,36 +1421,61 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", - "requested": "2.0.0-rc8" + "locked": "2.0.13", + "requested": "2.0.13" }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -1392,7 +1535,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-client" ] @@ -1403,6 +1549,12 @@ "com.netflix.eureka:eureka-client" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.9", "transitive": [ @@ -1486,7 +1638,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -1537,7 +1692,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -1548,7 +1703,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4" ] @@ -1603,6 +1761,12 @@ "net.minidev:accessors-smart" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17" @@ -1615,12 +1779,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "com.netflix.spectator:spectator-api", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -1628,12 +1796,15 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "redis.clients:jedis": { - "locked": "2.9.0", - "requested": "2.9.0", + "locked": "3.0.1", + "requested": "3.0.+", "transitive": [ "com.netflix.dyno:dyno-jedis", "org.rarefiedredis.redis:redis-java" @@ -1849,9 +2020,10 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.3", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -1893,7 +2065,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -1921,36 +2096,61 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", - "requested": "2.0.0-rc8" + "locked": "2.0.13", + "requested": "2.0.13" }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -2010,7 +2210,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-client" ] @@ -2021,6 +2224,12 @@ "com.netflix.eureka:eureka-client" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.9", "transitive": [ @@ -2104,7 +2313,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -2155,7 +2367,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -2166,7 +2378,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4" ] @@ -2221,6 +2436,12 @@ "net.minidev:accessors-smart" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17" @@ -2233,12 +2454,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "com.netflix.spectator:spectator-api", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -2246,12 +2471,15 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "redis.clients:jedis": { - "locked": "2.9.0", - "requested": "2.9.0", + "locked": "3.0.1", + "requested": "3.0.+", "transitive": [ "com.netflix.dyno:dyno-jedis", "org.rarefiedredis.redis:redis-java" @@ -2404,9 +2632,10 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.3", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -2448,7 +2677,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -2476,36 +2708,61 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", - "requested": "2.0.0-rc8" + "locked": "2.0.13", + "requested": "2.0.13" }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -2565,7 +2822,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-client" ] @@ -2576,6 +2836,12 @@ "com.netflix.eureka:eureka-client" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.9", "transitive": [ @@ -2659,7 +2925,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -2710,7 +2979,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -2721,7 +2990,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4" ] @@ -2776,6 +3048,12 @@ "net.minidev:accessors-smart" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17" @@ -2788,12 +3066,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "com.netflix.spectator:spectator-api", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -2801,12 +3083,15 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "redis.clients:jedis": { - "locked": "2.9.0", - "requested": "2.9.0", + "locked": "3.0.1", + "requested": "3.0.+", "transitive": [ "com.netflix.dyno:dyno-jedis", "org.rarefiedredis.redis:redis-java" @@ -2959,9 +3244,10 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.3", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -3003,7 +3289,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -3031,36 +3320,61 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", - "requested": "2.0.0-rc8" + "locked": "2.0.13", + "requested": "2.0.13" }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -3120,7 +3434,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-client" ] @@ -3131,6 +3448,12 @@ "com.netflix.eureka:eureka-client" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.9", "transitive": [ @@ -3214,7 +3537,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -3269,7 +3595,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -3280,7 +3606,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4" ] @@ -3351,6 +3680,12 @@ "net.minidev:accessors-smart" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17" @@ -3363,12 +3698,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "com.netflix.spectator:spectator-api", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -3376,12 +3715,15 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "redis.clients:jedis": { - "locked": "2.9.0", - "requested": "2.9.0", + "locked": "3.0.1", + "requested": "3.0.+", "transitive": [ "com.netflix.dyno:dyno-jedis", "org.rarefiedredis.redis:redis-java" @@ -3534,9 +3876,10 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.3", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -3578,7 +3921,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -3606,36 +3952,61 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", - "requested": "2.0.0-rc8" + "locked": "2.0.13", + "requested": "2.0.13" }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -3695,7 +4066,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-client" ] @@ -3706,6 +4080,12 @@ "com.netflix.eureka:eureka-client" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.9", "transitive": [ @@ -3789,7 +4169,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -3844,7 +4227,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -3855,7 +4238,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4" ] @@ -3926,6 +4312,12 @@ "net.minidev:accessors-smart" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17" @@ -3938,12 +4330,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "com.netflix.spectator:spectator-api", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -3951,12 +4347,15 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "redis.clients:jedis": { - "locked": "2.9.0", - "requested": "2.9.0", + "locked": "3.0.1", + "requested": "3.0.+", "transitive": [ "com.netflix.dyno:dyno-jedis", "org.rarefiedredis.redis:redis-java" @@ -4109,9 +4508,10 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.3", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -4153,7 +4553,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -4181,36 +4584,61 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", - "requested": "2.0.0-rc8" + "locked": "2.0.13", + "requested": "2.0.13" }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -4270,7 +4698,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-client" ] @@ -4281,6 +4712,12 @@ "com.netflix.eureka:eureka-client" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.9", "transitive": [ @@ -4364,7 +4801,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -4419,7 +4859,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -4430,7 +4870,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4" ] @@ -4501,6 +4944,12 @@ "net.minidev:accessors-smart" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17" @@ -4513,12 +4962,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "com.netflix.spectator:spectator-api", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -4526,12 +4979,15 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "redis.clients:jedis": { - "locked": "2.9.0", - "requested": "2.9.0", + "locked": "3.0.1", + "requested": "3.0.+", "transitive": [ "com.netflix.dyno:dyno-jedis", "org.rarefiedredis.redis:redis-java" @@ -4684,9 +5140,10 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.3", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -4728,7 +5185,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -4756,36 +5216,61 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", - "requested": "2.0.0-rc8" + "locked": "2.0.13", + "requested": "2.0.13" }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -4845,7 +5330,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey:jersey-client" ] @@ -4856,6 +5344,12 @@ "com.netflix.eureka:eureka-client" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.9", "transitive": [ @@ -4939,7 +5433,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix" ] }, @@ -4994,7 +5491,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -5005,7 +5502,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4" ] @@ -5076,6 +5576,12 @@ "net.minidev:accessors-smart" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17" @@ -5088,12 +5594,16 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", "com.netflix.servo:servo-core", "com.netflix.spectator:spectator-api", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -5101,12 +5611,15 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "redis.clients:jedis": { - "locked": "2.9.0", - "requested": "2.9.0", + "locked": "3.0.1", + "requested": "3.0.+", "transitive": [ "com.netflix.dyno:dyno-jedis", "org.rarefiedredis.redis:redis-java" diff --git a/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/queue/DynoQueueDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/queue/DynoQueueDAO.java index b94af6ef16..bcaca3a07a 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/queue/DynoQueueDAO.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/dao/dynomite/queue/DynoQueueDAO.java @@ -27,7 +27,7 @@ import com.netflix.dyno.queues.shard.DynoShardSupplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import redis.clients.jedis.JedisCommands; +import redis.clients.jedis.commands.JedisCommands; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/redis-persistence/src/main/java/com/netflix/conductor/dyno/DynoProxy.java b/redis-persistence/src/main/java/com/netflix/conductor/dyno/DynoProxy.java index 7f3415b0b7..ff531488dd 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/dyno/DynoProxy.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/dyno/DynoProxy.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Netflix, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with @@ -13,15 +13,10 @@ package com.netflix.conductor.dyno; import com.google.inject.Singleton; - import com.netflix.conductor.core.config.Configuration; import com.netflix.discovery.DiscoveryClient; import com.netflix.dyno.connectionpool.exception.DynoException; import com.netflix.dyno.jedis.DynoJedisClient; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -30,25 +25,25 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutionException; - import javax.inject.Inject; - -import redis.clients.jedis.JedisCommands; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import redis.clients.jedis.ScanParams; import redis.clients.jedis.ScanResult; import redis.clients.jedis.Tuple; -import redis.clients.jedis.params.sortedset.ZAddParams; +import redis.clients.jedis.commands.JedisCommands; +import redis.clients.jedis.params.ZAddParams; /** - * - * @author Viren Proxy for the Dynomite client + * @author Viren + * Proxy for the Dynomite client */ @Singleton public class DynoProxy { private static Logger logger = LoggerFactory.getLogger(DynoProxy.class); - protected DiscoveryClient dc; + protected DiscoveryClient discoveryClient; protected JedisCommands dynoClient; @@ -57,18 +52,18 @@ public DynoProxy(JedisCommands dynoClient) { this.dynoClient = dynoClient; } - @Deprecated /** * @deprecated The preferred method of construction for this use case is via DynoProxyDiscoveryProvider. */ - public DynoProxy(DiscoveryClient dc, Configuration config) throws DynoException, InterruptedException, ExecutionException { - this.dc = dc; + @Deprecated + public DynoProxy(DiscoveryClient discoveryClient, Configuration config) throws DynoException, InterruptedException, ExecutionException { + this.discoveryClient = discoveryClient; String cluster = config.getProperty("workflow.dynomite.cluster", null); String applicationName = config.getAppId(); this.dynoClient = new DynoJedisClient.Builder() .withApplicationName(applicationName) .withDynomiteClusterName(cluster) - .withDiscoveryClient(dc) + .withDiscoveryClient(discoveryClient) .build(); } @@ -160,9 +155,9 @@ public Map hscan(String key, int count) { Map m = new HashMap<>(); int cursor = 0; do { - ScanResult> sr = dynoClient.hscan(key, "" + cursor); - cursor = Integer.parseInt(sr.getStringCursor()); - for (Entry r : sr.getResult()) { + ScanResult> scanResult = dynoClient.hscan(key, "" + cursor); + cursor = Integer.parseInt(scanResult.getCursor()); + for (Entry r : scanResult.getResult()) { m.put(r.getKey(), r.getValue()); } if (m.size() > count) { @@ -178,9 +173,9 @@ public Map hgetAll(String key) { JedisCommands dyno = dynoClient; int cursor = 0; do { - ScanResult> sr = dyno.hscan(key, "" + cursor); - cursor = Integer.parseInt(sr.getStringCursor()); - for (Entry r : sr.getResult()) { + ScanResult> scanResult = dyno.hscan(key, "" + cursor); + cursor = Integer.parseInt(scanResult.getCursor()); + for (Entry r : scanResult.getResult()) { m.put(r.getKey(), r.getValue()); } } while (cursor > 0); @@ -200,7 +195,7 @@ public Set hkeys(String key) { int cursor = 0; do { ScanResult> sr = client.hscan(key, "" + cursor); - cursor = Integer.parseInt(sr.getStringCursor()); + cursor = Integer.parseInt(sr.getCursor()); List> result = sr.getResult(); for (Entry e : result) { keys.add(e.getKey()); @@ -248,9 +243,9 @@ public Set smembers(String key) { sp.count(50); do { - ScanResult sr = client.sscan(key, "" + cursor, sp); - cursor = Integer.parseInt(sr.getStringCursor()); - r.addAll(sr.getResult()); + ScanResult scanResult = client.sscan(key, "" + cursor, sp); + cursor = Integer.parseInt(scanResult.getCursor()); + r.addAll(scanResult.getResult()); } while (cursor > 0); diff --git a/redis-persistence/src/main/java/com/netflix/conductor/dyno/DynoProxyDiscoveryProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/dyno/DynoProxyDiscoveryProvider.java index 753321d5f6..d46e58c3f8 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/dyno/DynoProxyDiscoveryProvider.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/dyno/DynoProxyDiscoveryProvider.java @@ -1,3 +1,15 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.dyno; import com.netflix.discovery.DiscoveryClient; @@ -6,7 +18,7 @@ import javax.inject.Inject; import javax.inject.Provider; -import redis.clients.jedis.JedisCommands; +import redis.clients.jedis.commands.JedisCommands; public class DynoProxyDiscoveryProvider implements Provider { private final DiscoveryClient discoveryClient; diff --git a/redis-persistence/src/main/java/com/netflix/conductor/dyno/RedisQueuesDiscoveryProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/dyno/RedisQueuesDiscoveryProvider.java index c3933b7d99..ef7d3edb8d 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/dyno/RedisQueuesDiscoveryProvider.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/dyno/RedisQueuesDiscoveryProvider.java @@ -1,3 +1,15 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.dyno; import com.netflix.discovery.DiscoveryClient; @@ -8,13 +20,12 @@ import com.netflix.dyno.queues.ShardSupplier; import com.netflix.dyno.queues.redis.RedisQueues; import com.netflix.dyno.queues.shard.DynoShardSupplier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.inject.Inject; -import javax.inject.Provider; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; +import javax.inject.Provider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RedisQueuesDiscoveryProvider implements Provider { diff --git a/redis-persistence/src/main/java/com/netflix/conductor/dyno/RedisQueuesProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/dyno/RedisQueuesProvider.java index c9521cdf64..99f059a871 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/dyno/RedisQueuesProvider.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/dyno/RedisQueuesProvider.java @@ -1,16 +1,25 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.dyno; import com.netflix.dyno.queues.ShardSupplier; import com.netflix.dyno.queues.redis.RedisQueues; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; - -import redis.clients.jedis.JedisCommands; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import redis.clients.jedis.commands.JedisCommands; public class RedisQueuesProvider implements Provider { diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/DynomiteJedisProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/DynomiteJedisProvider.java index 9652e98e8b..76dd3a37cf 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/jedis/DynomiteJedisProvider.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/jedis/DynomiteJedisProvider.java @@ -1,3 +1,15 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.jedis; import com.netflix.conductor.dyno.DynomiteConfiguration; @@ -5,11 +17,9 @@ import com.netflix.dyno.connectionpool.TokenMapSupplier; import com.netflix.dyno.connectionpool.impl.ConnectionPoolConfigurationImpl; import com.netflix.dyno.jedis.DynoJedisClient; - import javax.inject.Inject; import javax.inject.Provider; - -import redis.clients.jedis.JedisCommands; +import redis.clients.jedis.commands.JedisCommands; public class DynomiteJedisProvider implements Provider { diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/InMemoryJedisProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/InMemoryJedisProvider.java index 162767bc59..197b93e715 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/jedis/InMemoryJedisProvider.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/jedis/InMemoryJedisProvider.java @@ -1,9 +1,20 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.jedis; -import redis.clients.jedis.JedisCommands; - import javax.inject.Provider; import javax.inject.Singleton; +import redis.clients.jedis.commands.JedisCommands; @Singleton public class InMemoryJedisProvider implements Provider { diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisCluster.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisCluster.java new file mode 100644 index 0000000000..d8ba16e524 --- /dev/null +++ b/redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisCluster.java @@ -0,0 +1,1737 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ +package com.netflix.conductor.jedis; + +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import redis.clients.jedis.BitPosParams; +import redis.clients.jedis.GeoCoordinate; +import redis.clients.jedis.GeoRadiusResponse; +import redis.clients.jedis.GeoUnit; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPoolAbstract; +import redis.clients.jedis.ListPosition; +import redis.clients.jedis.ScanParams; +import redis.clients.jedis.ScanResult; +import redis.clients.jedis.SortingParams; +import redis.clients.jedis.Tuple; +import redis.clients.jedis.commands.JedisCommands; +import redis.clients.jedis.params.GeoRadiusParam; +import redis.clients.jedis.params.SetParams; +import redis.clients.jedis.params.ZAddParams; +import redis.clients.jedis.params.ZIncrByParams; + +public class JedisCluster implements JedisCommands { + + private final JedisPoolAbstract jedisPool; + + public JedisCluster(JedisPoolAbstract jedisPool) { + this.jedisPool = jedisPool; + } + + @Override + public String set(String key, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.set(key, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String set(String key, String value, SetParams params) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.set(key, value, params); + } + } + + @Override + public String get(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.get(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Boolean exists(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.exists(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long persist(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.persist(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String type(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.type(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public byte[] dump(String key) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.dump(key); + } + } + + @Override + public String restore(String key, int ttl, byte[] serializedValue) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.restore(key, ttl, serializedValue); + } + } + + @Override + public String restoreReplace(String key, int ttl, byte[] serializedValue) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.restoreReplace(key, ttl, serializedValue); + } + } + + @Override + public Long expire(String key, int seconds) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.expire(key, seconds); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long pexpire(String key, long milliseconds) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.pexpire(key, milliseconds); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long expireAt(String key, long unixTime) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.expireAt(key, unixTime); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long pexpireAt(String key, long millisecondsTimestamp) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.pexpireAt(key, millisecondsTimestamp); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long ttl(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.ttl(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long pttl(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.pttl(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long touch(String key) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.touch(key); + } + } + + @Override + public Boolean setbit(String key, long offset, boolean value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.setbit(key, offset, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Boolean setbit(String key, long offset, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.setbit(key, offset, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Boolean getbit(String key, long offset) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.getbit(key, offset); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long setrange(String key, long offset, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.setrange(key, offset, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String getrange(String key, long startOffset, long endOffset) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.getrange(key, startOffset, endOffset); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String getSet(String key, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.getSet(key, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long setnx(String key, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.setnx(key, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String setex(String key, int seconds, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.setex(key, seconds, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String psetex(String key, long milliseconds, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.psetex(key, milliseconds, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long decrBy(String key, long integer) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.decrBy(key, integer); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long decr(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.decr(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long incrBy(String key, long integer) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.incrBy(key, integer); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Double incrByFloat(String key, double value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.incrByFloat(key, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long incr(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.incr(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long append(String key, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.append(key, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String substr(String key, int start, int end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.substr(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long hset(String key, String field, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hset(key, field, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long hset(String key, Map hash) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.hset(key, hash); + } + } + + @Override + public String hget(String key, String field) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hget(key, field); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long hsetnx(String key, String field, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hsetnx(key, field, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String hmset(String key, Map hash) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hmset(key, hash); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List hmget(String key, String... fields) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hmget(key, fields); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long hincrBy(String key, String field, long value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hincrBy(key, field, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Double hincrByFloat(String key, String field, double value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hincrByFloat(key, field, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Boolean hexists(String key, String field) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hexists(key, field); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long hdel(String key, String... field) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hdel(key, field); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long hlen(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hlen(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set hkeys(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hkeys(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List hvals(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hvals(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Map hgetAll(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hgetAll(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long rpush(String key, String... string) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.rpush(key, string); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long lpush(String key, String... string) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.lpush(key, string); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long llen(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.llen(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List lrange(String key, long start, long end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.lrange(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String ltrim(String key, long start, long end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.ltrim(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String lindex(String key, long index) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.lindex(key, index); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String lset(String key, long index, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.lset(key, index, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long lrem(String key, long count, String value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.lrem(key, count, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String lpop(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.lpop(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String rpop(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.rpop(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long sadd(String key, String... member) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.sadd(key, member); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set smembers(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.smembers(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long srem(String key, String... member) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.srem(key, member); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String spop(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.spop(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set spop(String key, long count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.spop(key, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long scard(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.scard(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Boolean sismember(String key, String member) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.sismember(key, member); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public String srandmember(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.srandmember(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List srandmember(String key, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.srandmember(key, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long strlen(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.strlen(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zadd(String key, double score, String member) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zadd(key, score, member); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zadd(String key, double score, String member, ZAddParams params) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zadd(key, score, member, params); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zadd(String key, Map scoreMembers) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zadd(key, scoreMembers); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zadd(String key, Map scoreMembers, ZAddParams params) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zadd(key, scoreMembers, params); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrange(String key, long start, long end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrange(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zrem(String key, String... member) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrem(key, member); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Double zincrby(String key, double score, String member) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zincrby(key, score, member); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Double zincrby(String key, double score, String member, ZIncrByParams params) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zincrby(key, score, member, params); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zrank(String key, String member) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrank(key, member); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zrevrank(String key, String member) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrank(key, member); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrange(String key, long start, long end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrange(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeWithScores(String key, long start, long end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeWithScores(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeWithScores(String key, long start, long end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeWithScores(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zcard(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zcard(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Double zscore(String key, String member) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zscore(key, member); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List sort(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.sort(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List sort(String key, SortingParams sortingParameters) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.sort(key, sortingParameters); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zcount(String key, double min, double max) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zcount(key, min, max); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zcount(String key, String min, String max) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zcount(key, min, max); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeByScore(String key, double min, double max) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeByScore(key, min, max); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeByScore(String key, String min, String max) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeByScore(key, min, max); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeByScore(String key, double max, double min) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeByScore(key, max, min); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeByScore(String key, double min, double max, int offset, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeByScore(key, min, max, offset, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeByScore(String key, String max, String min) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeByScore(key, max, min); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeByScore(String key, String min, String max, int offset, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeByScore(key, min, max, offset, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeByScore(String key, double max, double min, int offset, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeByScore(key, max, min, offset, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeByScoreWithScores(String key, double min, double max) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeByScoreWithScores(key, min, max); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeByScoreWithScores(String key, double max, double min) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeByScoreWithScores(key, max, min); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeByScoreWithScores(String key, double min, double max, int offset, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeByScoreWithScores(key, min, max, offset, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeByScore(String key, String max, String min, int offset, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeByScore(key, max, min, offset, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeByScoreWithScores(String key, String min, String max) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeByScoreWithScores(key, min, max); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeByScoreWithScores(String key, String max, String min) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeByScoreWithScores(key, max, min); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeByScoreWithScores(String key, String min, String max, int offset, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeByScoreWithScores(key, min, max, offset, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeByScoreWithScores(String key, double max, double min, int offset, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeByScoreWithScores(key, max, min, offset, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeByScoreWithScores(String key, String max, String min, int offset, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeByScoreWithScores(key, max, min, offset, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zremrangeByRank(String key, long start, long end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zremrangeByRank(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zremrangeByScore(String key, double start, double end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zremrangeByScore(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zremrangeByScore(String key, String start, String end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zremrangeByScore(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zlexcount(String key, String min, String max) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zlexcount(key, min, max); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeByLex(String key, String min, String max) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeByLex(key, min, max); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrangeByLex(String key, String min, String max, int offset, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrangeByLex(key, min, max, offset, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeByLex(String key, String max, String min) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeByLex(key, max, min); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Set zrevrangeByLex(String key, String max, String min, int offset, int count) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zrevrangeByLex(key, max, min, offset, count); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long zremrangeByLex(String key, String min, String max) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zremrangeByLex(key, min, max); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long linsert(String key, ListPosition where, String pivot, String value) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.linsert(key, where, pivot, value); + } + } + + @Override + public Long lpushx(String key, String... string) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.lpushx(key, string); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long rpushx(String key, String... string) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.rpushx(key, string); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List blpop(int timeout, String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.blpop(timeout, key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List brpop(int timeout, String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.brpop(timeout, key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long del(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.del(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long unlink(String key) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.unlink(key); + } + } + + @Override + public String echo(String string) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.echo(string); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long move(String key, int dbIndex) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.move(key, dbIndex); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long bitcount(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.bitcount(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long bitcount(String key, long start, long end) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.bitcount(key, start, end); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long bitpos(String key, boolean value) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.bitpos(key, value); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long bitpos(String key, boolean value, BitPosParams params) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.bitpos(key, value, params); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public ScanResult> hscan(String key, String cursor) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hscan(key, cursor); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public ScanResult> hscan(String key, String cursor, ScanParams params) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.hscan(key, cursor, params); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public ScanResult sscan(String key, String cursor) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.sscan(key, cursor); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public ScanResult sscan(String key, String cursor, ScanParams params) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.sscan(key, cursor, params); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public ScanResult zscan(String key, String cursor) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zscan(key, cursor); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public ScanResult zscan(String key, String cursor, ScanParams params) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.zscan(key, cursor, params); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long pfadd(String key, String... elements) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.pfadd(key, elements); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public long pfcount(String key) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.pfcount(key); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long geoadd(String key, double longitude, double latitude, String member) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.geoadd(key, longitude, latitude, member); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long geoadd(String key, Map memberCoordinateMap) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.geoadd(key, memberCoordinateMap); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Double geodist(String key, String member1, String member2) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.geodist(key, member1, member2); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Double geodist(String key, String member1, String member2, GeoUnit unit) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.geodist(key, member1, member2, unit); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List geohash(String key, String... members) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.geohash(key, members); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List geopos(String key, String... members) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.geopos(key, members); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List georadius(String key, double longitude, double latitude, double radius, GeoUnit unit) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.georadius(key, longitude, latitude, radius, unit); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List georadiusReadonly(String key, double longitude, double latitude, double radius, + GeoUnit unit) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.georadiusReadonly(key, longitude, latitude, radius, unit); + } + } + + @Override + public List georadius(String key, double longitude, double latitude, double radius, GeoUnit unit, + GeoRadiusParam param) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.georadius(key, longitude, latitude, radius, unit, param); + } + } + + @Override + public List georadiusReadonly(String key, double longitude, double latitude, double radius, + GeoUnit unit, GeoRadiusParam param) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.georadiusReadonly(key, longitude, latitude, radius, unit, param); + } + } + + @Override + public List georadiusByMember(String key, String member, double radius, GeoUnit unit) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.georadiusByMember(key, member, radius, unit); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public List georadiusByMemberReadonly(String key, String member, double radius, GeoUnit unit) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.georadiusByMemberReadonly(key, member, radius, unit); + } + } + + @Override + public List georadiusByMember(String key, String member, double radius, GeoUnit unit, + GeoRadiusParam param) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.georadiusByMember(key, member, radius, unit, param); + } + } + + @Override + public List georadiusByMemberReadonly(String key, String member, double radius, GeoUnit unit, + GeoRadiusParam param) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.georadiusByMemberReadonly(key, member, radius, unit, param); + } + } + + @Override + public List bitfield(String key, String... arguments) { + Jedis jedis = null; + try { + jedis = jedisPool.getResource(); + return jedis.bitfield(key, arguments); + } finally { + if (jedis != null) + jedis.close(); + } + } + + @Override + public Long hstrlen(String key, String field) { + try (Jedis jedis = jedisPool.getResource()) { + return jedis.hstrlen(key, field); + } + } +} diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisClusterSentinel.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisClusterSentinel.java deleted file mode 100644 index 62fc7dff57..0000000000 --- a/redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisClusterSentinel.java +++ /dev/null @@ -1,1729 +0,0 @@ -package com.netflix.conductor.jedis; - -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import redis.clients.jedis.BinaryClient.LIST_POSITION; -import redis.clients.jedis.BitPosParams; -import redis.clients.jedis.GeoCoordinate; -import redis.clients.jedis.GeoRadiusResponse; -import redis.clients.jedis.GeoUnit; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisCommands; -import redis.clients.jedis.JedisSentinelPool; -import redis.clients.jedis.ScanParams; -import redis.clients.jedis.ScanResult; -import redis.clients.jedis.SortingParams; -import redis.clients.jedis.Tuple; -import redis.clients.jedis.params.geo.GeoRadiusParam; -import redis.clients.jedis.params.sortedset.ZAddParams; -import redis.clients.jedis.params.sortedset.ZIncrByParams; - -public class JedisClusterSentinel implements JedisCommands { - - private final JedisSentinelPool jedisPool; - - public JedisClusterSentinel(JedisSentinelPool jedisPool) { - this.jedisPool = jedisPool; - } - - @Override - public String set(String key, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.set(key, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String set(String key, String value, String nxxx, String expx, long time) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.set(key, value, nxxx, expx, time); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String set(String key, String value, String nxxx) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.set(key, value, nxxx); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String get(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.get(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Boolean exists(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.exists(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long persist(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.persist(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String type(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.type(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long expire(String key, int seconds) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.expire(key, seconds); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long pexpire(String key, long milliseconds) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.pexpire(key, milliseconds); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long expireAt(String key, long unixTime) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.expireAt(key, unixTime); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long pexpireAt(String key, long millisecondsTimestamp) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.pexpireAt(key, millisecondsTimestamp); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long ttl(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.ttl(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long pttl(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.pttl(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Boolean setbit(String key, long offset, boolean value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.setbit(key, offset, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Boolean setbit(String key, long offset, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.setbit(key, offset, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Boolean getbit(String key, long offset) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.getbit(key, offset); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long setrange(String key, long offset, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.setrange(key, offset, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String getrange(String key, long startOffset, long endOffset) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.getrange(key, startOffset, endOffset); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String getSet(String key, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.getSet(key, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long setnx(String key, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.setnx(key, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String setex(String key, int seconds, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.setex(key, seconds, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String psetex(String key, long milliseconds, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.psetex(key, milliseconds, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long decrBy(String key, long integer) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.decrBy(key, integer); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long decr(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.decr(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long incrBy(String key, long integer) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.incrBy(key, integer); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Double incrByFloat(String key, double value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.incrByFloat(key, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long incr(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.incr(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long append(String key, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.append(key, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String substr(String key, int start, int end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.substr(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long hset(String key, String field, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hset(key, field, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String hget(String key, String field) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hget(key, field); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long hsetnx(String key, String field, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hsetnx(key, field, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String hmset(String key, Map hash) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hmset(key, hash); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List hmget(String key, String... fields) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hmget(key, fields); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long hincrBy(String key, String field, long value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hincrBy(key, field, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Double hincrByFloat(String key, String field, double value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hincrByFloat(key, field, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Boolean hexists(String key, String field) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hexists(key, field); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long hdel(String key, String... field) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hdel(key, field); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long hlen(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hlen(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set hkeys(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hkeys(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List hvals(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hvals(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Map hgetAll(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hgetAll(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long rpush(String key, String... string) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.rpush(key, string); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long lpush(String key, String... string) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.lpush(key, string); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long llen(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.llen(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List lrange(String key, long start, long end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.lrange(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String ltrim(String key, long start, long end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.ltrim(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String lindex(String key, long index) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.lindex(key, index); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String lset(String key, long index, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.lset(key, index, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long lrem(String key, long count, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.lrem(key, count, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String lpop(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.lpop(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String rpop(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.rpop(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long sadd(String key, String... member) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.sadd(key, member); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set smembers(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.smembers(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long srem(String key, String... member) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.srem(key, member); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String spop(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.spop(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set spop(String key, long count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.spop(key, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long scard(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.scard(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Boolean sismember(String key, String member) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.sismember(key, member); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String srandmember(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.srandmember(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List srandmember(String key, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.srandmember(key, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long strlen(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.strlen(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zadd(String key, double score, String member) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zadd(key, score, member); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zadd(String key, double score, String member, ZAddParams params) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zadd(key, score, member, params); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zadd(String key, Map scoreMembers) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zadd(key, scoreMembers); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zadd(String key, Map scoreMembers, ZAddParams params) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zadd(key, scoreMembers, params); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrange(String key, long start, long end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrange(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zrem(String key, String... member) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrem(key, member); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Double zincrby(String key, double score, String member) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zincrby(key, score, member); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Double zincrby(String key, double score, String member, ZIncrByParams params) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zincrby(key, score, member, params); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zrank(String key, String member) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrank(key, member); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zrevrank(String key, String member) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrank(key, member); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrange(String key, long start, long end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrange(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeWithScores(String key, long start, long end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeWithScores(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeWithScores(String key, long start, long end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeWithScores(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zcard(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zcard(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Double zscore(String key, String member) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zscore(key, member); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List sort(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.sort(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List sort(String key, SortingParams sortingParameters) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.sort(key, sortingParameters); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zcount(String key, double min, double max) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zcount(key, min, max); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zcount(String key, String min, String max) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zcount(key, min, max); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeByScore(String key, double min, double max) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeByScore(key, min, max); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeByScore(String key, String min, String max) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeByScore(key, min, max); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeByScore(String key, double max, double min) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeByScore(key, max, min); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeByScore(String key, double min, double max, int offset, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeByScore(key, min, max, offset, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeByScore(String key, String max, String min) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeByScore(key, max, min); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeByScore(String key, String min, String max, int offset, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeByScore(key, min, max, offset, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeByScore(String key, double max, double min, int offset, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeByScore(key, max, min, offset, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeByScoreWithScores(String key, double min, double max) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeByScoreWithScores(key, min, max); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeByScoreWithScores(String key, double max, double min) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeByScoreWithScores(key, max, min); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeByScoreWithScores(String key, double min, double max, int offset, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeByScoreWithScores(key, min, max, offset, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeByScore(String key, String max, String min, int offset, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeByScore(key, max, min, offset, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeByScoreWithScores(String key, String min, String max) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeByScoreWithScores(key, min, max); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeByScoreWithScores(String key, String max, String min) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeByScoreWithScores(key, max, min); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeByScoreWithScores(String key, String min, String max, int offset, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeByScoreWithScores(key, min, max, offset, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeByScoreWithScores(String key, double max, double min, int offset, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeByScoreWithScores(key, max, min, offset, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeByScoreWithScores(String key, String max, String min, int offset, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeByScoreWithScores(key, max, min, offset, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zremrangeByRank(String key, long start, long end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zremrangeByRank(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zremrangeByScore(String key, double start, double end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zremrangeByScore(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zremrangeByScore(String key, String start, String end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zremrangeByScore(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zlexcount(String key, String min, String max) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zlexcount(key, min, max); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeByLex(String key, String min, String max) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeByLex(key, min, max); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrangeByLex(String key, String min, String max, int offset, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrangeByLex(key, min, max, offset, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeByLex(String key, String max, String min) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeByLex(key, max, min); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Set zrevrangeByLex(String key, String max, String min, int offset, int count) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zrevrangeByLex(key, max, min, offset, count); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long zremrangeByLex(String key, String min, String max) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zremrangeByLex(key, min, max); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long linsert(String key, LIST_POSITION where, String pivot, String value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.linsert(key, where, pivot, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long lpushx(String key, String... string) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.lpushx(key, string); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long rpushx(String key, String... string) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.rpushx(key, string); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - @Deprecated - public List blpop(String arg) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.blpop(arg); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List blpop(int timeout, String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.blpop(timeout, key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - @Deprecated - public List brpop(String arg) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.brpop(arg); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List brpop(int timeout, String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.brpop(timeout, key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long del(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.del(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public String echo(String string) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.echo(string); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long move(String key, int dbIndex) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.move(key, dbIndex); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long bitcount(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.bitcount(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long bitcount(String key, long start, long end) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.bitcount(key, start, end); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long bitpos(String key, boolean value) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.bitpos(key, value); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long bitpos(String key, boolean value, BitPosParams params) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.bitpos(key, value, params); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - @Deprecated - public ScanResult> hscan(String key, int cursor) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hscan(key, cursor); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - @Deprecated - public ScanResult sscan(String key, int cursor) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.sscan(key, cursor); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - @Deprecated - public ScanResult zscan(String key, int cursor) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zscan(key, cursor); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public ScanResult> hscan(String key, String cursor) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hscan(key, cursor); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public ScanResult> hscan(String key, String cursor, ScanParams params) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.hscan(key, cursor, params); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public ScanResult sscan(String key, String cursor) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.sscan(key, cursor); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public ScanResult sscan(String key, String cursor, ScanParams params) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.sscan(key, cursor, params); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public ScanResult zscan(String key, String cursor) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zscan(key, cursor); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public ScanResult zscan(String key, String cursor, ScanParams params) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.zscan(key, cursor, params); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long pfadd(String key, String... elements) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.pfadd(key, elements); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public long pfcount(String key) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.pfcount(key); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long geoadd(String key, double longitude, double latitude, String member) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.geoadd(key, longitude, latitude, member); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Long geoadd(String key, Map memberCoordinateMap) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.geoadd(key, memberCoordinateMap); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Double geodist(String key, String member1, String member2) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.geodist(key, member1, member2); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public Double geodist(String key, String member1, String member2, GeoUnit unit) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.geodist(key, member1, member2, unit); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List geohash(String key, String... members) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.geohash(key, members); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List geopos(String key, String... members) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.geopos(key, members); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List georadius(String key, double longitude, double latitude, double radius, GeoUnit unit) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.georadius(key, longitude, latitude, radius, unit); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List georadius(String key, double longitude, double latitude, double radius, GeoUnit unit, - GeoRadiusParam param) { - return null; - } - - @Override - public List georadiusByMember(String key, String member, double radius, GeoUnit unit) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.georadiusByMember(key, member, radius, unit); - } finally { - if (jedis != null) - jedis.close(); - } - } - - @Override - public List georadiusByMember(String key, String member, double radius, GeoUnit unit, - GeoRadiusParam param) { - return null; - } - - @Override - public List bitfield(String key, String... arguments) { - Jedis jedis = null; - try { - jedis = jedisPool.getResource(); - return jedis.bitfield(key, arguments); - } finally { - if (jedis != null) - jedis.close(); - } - } - -} \ No newline at end of file diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisMock.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisMock.java index 5e7bac8a61..6dbc755170 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisMock.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/jedis/JedisMock.java @@ -1,5 +1,5 @@ -/** - * Copyright 2016 Netflix, Inc. +/* + * Copyright 2019 Netflix, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,15 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * - */ package com.netflix.conductor.jedis; -import org.rarefiedredis.redis.IRedisClient; -import org.rarefiedredis.redis.IRedisSortedSet.ZsetPair; -import org.rarefiedredis.redis.RedisMock; - import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; @@ -30,13 +23,15 @@ import java.util.Map.Entry; import java.util.Set; import java.util.stream.Collectors; - +import org.rarefiedredis.redis.IRedisClient; +import org.rarefiedredis.redis.IRedisSortedSet.ZsetPair; +import org.rarefiedredis.redis.RedisMock; import redis.clients.jedis.Jedis; import redis.clients.jedis.ScanParams; import redis.clients.jedis.ScanResult; import redis.clients.jedis.Tuple; import redis.clients.jedis.exceptions.JedisException; -import redis.clients.jedis.params.sortedset.ZAddParams; +import redis.clients.jedis.params.ZAddParams; /** * @author Viren @@ -68,17 +63,6 @@ private Set toTupleSet(Set pairs) { } } - - @Override public String set(final String key, final String value, final String nxxx, final String expx, - final long time) { - try { - return redis.set(key, value, nxxx, expx, String.valueOf(time)); - } - catch (Exception e) { - throw new JedisException(e); - } - } - @Override public String get(final String key) { try { return redis.get(key); @@ -744,7 +728,7 @@ public Long zadd(String key, double score, String member, ZAddParams params) { try { - if(params.contains("xx")) { + if(params.getParam("xx") != null) { Double existing = redis.zscore(key, member); if(existing == null) { return 0L; @@ -886,81 +870,7 @@ public Long zadd(String key, double score, String member, ZAddParams params) { throw new JedisException(e); } } - /* - public List sort(final String key) { - checkIsInMulti(); - client.sort(key); - return client.getMultiBulkReply(); - } - - public List sort(final String key, final SortingParams sortingParameters) { - checkIsInMulti(); - client.sort(key, sortingParameters); - return client.getMultiBulkReply(); - } - public List blpop(final int timeout, final String... keys) { - return blpop(getArgsAddTimeout(timeout, keys)); - } - - private String[] getArgsAddTimeout(int timeout, String[] keys) { - final int keyCount = keys.length; - final String[] args = new String[keyCount + 1]; - for (int at = 0; at != keyCount; ++at) { - args[at] = keys[at]; - } - - args[keyCount] = String.valueOf(timeout); - return args; - } - - public List blpop(String... args) { - checkIsInMulti(); - client.blpop(args); - client.setTimeoutInfinite(); - try { - return client.getMultiBulkReply(); - } finally { - client.rollbackTimeout(); - } - } - - public List brpop(String... args) { - checkIsInMulti(); - client.brpop(args); - client.setTimeoutInfinite(); - try { - return client.getMultiBulkReply(); - } finally { - client.rollbackTimeout(); - } - } - - @Deprecated - public List blpop(String arg) { - return blpop(new String[] { arg }); - } - - public List brpop(String arg) { - return brpop(new String[] { arg }); - } - - public Long sort(final String key, final SortingParams sortingParameters, final String dstkey) { - checkIsInMulti(); - client.sort(key, sortingParameters, dstkey); - return client.getIntegerReply(); - } - - public Long sort(final String key, final String dstkey) { - checkIsInMulti(); - client.sort(key, dstkey); - return client.getIntegerReply(); - } - - public List brpop(final int timeout, final String... keys) { - return brpop(getArgsAddTimeout(timeout, keys)); - } - */ @Override public Long zcount(final String key, final double min, final double max) { try { return redis.zcount(key, min, max); @@ -1186,7 +1096,7 @@ public ScanResult> hscan(final String key, final String cu Map results = mockr.results; List> list = results.entrySet().stream().collect(Collectors.toList()); ScanResult> result = new ScanResult>("0", list); - + return result; } catch (Exception e) { @@ -1207,727 +1117,4 @@ public ScanResult zscan(final String key, final String cursor) { throw new JedisException(e); } } - - - /* - public Long zunionstore(final String dstkey, final ZParams params, final String... sets) { - checkIsInMulti(); - client.zunionstore(dstkey, params, sets); - return client.getIntegerReply(); - } - - public Long zinterstore(final String dstkey, final String... sets) { - checkIsInMulti(); - client.zinterstore(dstkey, sets); - return client.getIntegerReply(); - } - - public Long zinterstore(final String dstkey, final ZParams params, final String... sets) { - checkIsInMulti(); - client.zinterstore(dstkey, params, sets); - return client.getIntegerReply(); - } - - @Override - public Long zlexcount(final String key, final String min, final String max) { - checkIsInMulti(); - client.zlexcount(key, min, max); - return client.getIntegerReply(); - } - - @Override - public Set zrangeByLex(final String key, final String min, final String max) { - checkIsInMulti(); - client.zrangeByLex(key, min, max); - final List members = client.getMultiBulkReply(); - if (members == null) { - return null; - } - return new LinkedHashSet(members); - } - - @Override - public Set zrangeByLex(final String key, final String min, final String max, - final int offset, final int count) { - checkIsInMulti(); - client.zrangeByLex(key, min, max, offset, count); - final List members = client.getMultiBulkReply(); - if (members == null) { - return null; - } - return new LinkedHashSet(members); - } - - @Override - public Set zrevrangeByLex(String key, String max, String min) { - checkIsInMulti(); - client.zrevrangeByLex(key, max, min); - final List members = client.getMultiBulkReply(); - if (members == null) { - return null; - } - return new LinkedHashSet(members); - } - - @Override - public Set zrevrangeByLex(String key, String max, String min, int offset, int count) { - checkIsInMulti(); - client.zrevrangeByLex(key, max, min, offset, count); - final List members = client.getMultiBulkReply(); - if (members == null) { - return null; - } - return new LinkedHashSet(members); - } - - @Override - public Long zremrangeByLex(final String key, final String min, final String max) { - checkIsInMulti(); - client.zremrangeByLex(key, min, max); - return client.getIntegerReply(); - } - - public Long strlen(final String key) { - client.strlen(key); - return client.getIntegerReply(); - } - - public Long lpushx(final String key, final String... string) { - client.lpushx(key, string); - return client.getIntegerReply(); - } - - public Long persist(final String key) { - client.persist(key); - return client.getIntegerReply(); - } - - public Long rpushx(final String key, final String... string) { - client.rpushx(key, string); - return client.getIntegerReply(); - } - - public String echo(final String string) { - client.echo(string); - return client.getBulkReply(); - } - - public Long linsert(final String key, final LIST_POSITION where, final String pivot, - final String value) { - client.linsert(key, where, pivot, value); - return client.getIntegerReply(); - } - - public String brpoplpush(String source, String destination, int timeout) { - client.brpoplpush(source, destination, timeout); - client.setTimeoutInfinite(); - try { - return client.getBulkReply(); - } finally { - client.rollbackTimeout(); - } - } - - public Boolean setbit(String key, long offset, boolean value) { - client.setbit(key, offset, value); - return client.getIntegerReply() == 1; - } - - public Boolean setbit(String key, long offset, String value) { - client.setbit(key, offset, value); - return client.getIntegerReply() == 1; - } - - public Boolean getbit(String key, long offset) { - client.getbit(key, offset); - return client.getIntegerReply() == 1; - } - - public Long setrange(String key, long offset, String value) { - client.setrange(key, offset, value); - return client.getIntegerReply(); - } - - public String getrange(String key, long startOffset, long endOffset) { - client.getrange(key, startOffset, endOffset); - return client.getBulkReply(); - } - - public Long bitpos(final String key, final boolean value) { - return bitpos(key, value, new BitPosParams()); - } - - public Long bitpos(final String key, final boolean value, final BitPosParams params) { - client.bitpos(key, value, params); - return client.getIntegerReply(); - } - - public List configGet(final String pattern) { - client.configGet(pattern); - return client.getMultiBulkReply(); - } - - public String configSet(final String parameter, final String value) { - client.configSet(parameter, value); - return client.getStatusCodeReply(); - } - - public Object eval(String script, int keyCount, String... params) { - client.setTimeoutInfinite(); - try { - client.eval(script, keyCount, params); - return getEvalResult(); - } finally { - client.rollbackTimeout(); - } - } - - public void subscribe(final JedisPubSub jedisPubSub, final String... channels) { - client.setTimeoutInfinite(); - try { - jedisPubSub.proceed(client, channels); - } finally { - client.rollbackTimeout(); - } - } - - public Long publish(final String channel, final String message) { - checkIsInMulti(); - connect(); - client.publish(channel, message); - return client.getIntegerReply(); - } - - public void psubscribe(final JedisPubSub jedisPubSub, final String... patterns) { - checkIsInMulti(); - client.setTimeoutInfinite(); - try { - jedisPubSub.proceedWithPatterns(client, patterns); - } finally { - client.rollbackTimeout(); - } - } - - protected static String[] getParams(List keys, List args) { - int keyCount = keys.size(); - int argCount = args.size(); - - String[] params = new String[keyCount + args.size()]; - - for (int i = 0; i < keyCount; i++) - params[i] = keys.get(i); - - for (int i = 0; i < argCount; i++) - params[keyCount + i] = args.get(i); - - return params; - } - - public Object eval(String script, List keys, List args) { - return eval(script, keys.size(), getParams(keys, args)); - } - - public Object eval(String script) { - return eval(script, 0); - } - - public Object evalsha(String script) { - return evalsha(script, 0); - } - - private Object getEvalResult() { - return evalResult(client.getOne()); - } - - private Object evalResult(Object result) { - if (result instanceof byte[]) return SafeEncoder.encode((byte[]) result); - - if (result instanceof List) { - List list = (List) result; - List listResult = new ArrayList(list.size()); - for (Object bin : list) { - listResult.add(evalResult(bin)); - } - - return listResult; - } - - return result; - } - - public Object evalsha(String sha1, List keys, List args) { - return evalsha(sha1, keys.size(), getParams(keys, args)); - } - - public Object evalsha(String sha1, int keyCount, String... params) { - checkIsInMulti(); - client.evalsha(sha1, keyCount, params); - return getEvalResult(); - } - - public Boolean scriptExists(String sha1) { - String[] a = new String[1]; - a[0] = sha1; - return scriptExists(a).get(0); - } - - public List scriptExists(String... sha1) { - client.scriptExists(sha1); - List result = client.getIntegerMultiBulkReply(); - List exists = new ArrayList(); - - for (Long value : result) - exists.add(value == 1); - - return exists; - } - - public String scriptLoad(String script) { - client.scriptLoad(script); - return client.getBulkReply(); - } - - public List slowlogGet() { - client.slowlogGet(); - return Slowlog.from(client.getObjectMultiBulkReply()); - } - - public List slowlogGet(long entries) { - client.slowlogGet(entries); - return Slowlog.from(client.getObjectMultiBulkReply()); - } - - public Long objectRefcount(String string) { - client.objectRefcount(string); - return client.getIntegerReply(); - } - - public String objectEncoding(String string) { - client.objectEncoding(string); - return client.getBulkReply(); - } - - public Long objectIdletime(String string) { - client.objectIdletime(string); - return client.getIntegerReply(); - } - - public Long bitcount(final String key) { - client.bitcount(key); - return client.getIntegerReply(); - } - - public Long bitcount(final String key, long start, long end) { - client.bitcount(key, start, end); - return client.getIntegerReply(); - } - - public Long bitop(BitOP op, final String destKey, String... srcKeys) { - client.bitop(op, destKey, srcKeys); - return client.getIntegerReply(); - } - - @SuppressWarnings("rawtypes") - public List> sentinelMasters() { - client.sentinel(Protocol.SENTINEL_MASTERS); - final List reply = client.getObjectMultiBulkReply(); - - final List> masters = new ArrayList>(); - for (Object obj : reply) { - masters.add(BuilderFactory.STRING_MAP.build((List) obj)); - } - return masters; - } - - public List sentinelGetMasterAddrByName(String masterName) { - client.sentinel(Protocol.SENTINEL_GET_MASTER_ADDR_BY_NAME, masterName); - final List reply = client.getObjectMultiBulkReply(); - return BuilderFactory.STRING_LIST.build(reply); - } - - public Long sentinelReset(String pattern) { - client.sentinel(Protocol.SENTINEL_RESET, pattern); - return client.getIntegerReply(); - } - - @SuppressWarnings("rawtypes") - public List> sentinelSlaves(String masterName) { - client.sentinel(Protocol.SENTINEL_SLAVES, masterName); - final List reply = client.getObjectMultiBulkReply(); - - final List> slaves = new ArrayList>(); - for (Object obj : reply) { - slaves.add(BuilderFactory.STRING_MAP.build((List) obj)); - } - return slaves; - } - - public String sentinelFailover(String masterName) { - client.sentinel(Protocol.SENTINEL_FAILOVER, masterName); - return client.getStatusCodeReply(); - } - - public String sentinelMonitor(String masterName, String ip, int port, int quorum) { - client.sentinel(Protocol.SENTINEL_MONITOR, masterName, ip, String.valueOf(port), - String.valueOf(quorum)); - return client.getStatusCodeReply(); - } - - public String sentinelRemove(String masterName) { - client.sentinel(Protocol.SENTINEL_REMOVE, masterName); - return client.getStatusCodeReply(); - } - - public String sentinelSet(String masterName, Map parameterMap) { - int index = 0; - int paramsLength = parameterMap.size() * 2 + 2; - String[] params = new String[paramsLength]; - - params[index++] = Protocol.SENTINEL_SET; - params[index++] = masterName; - for (Entry entry : parameterMap.entrySet()) { - params[index++] = entry.getKey(); - params[index++] = entry.getValue(); - } - - client.sentinel(params); - return client.getStatusCodeReply(); - } - - public byte[] dump(final String key) { - checkIsInMulti(); - client.dump(key); - return client.getBinaryBulkReply(); - } - - public String restore(final String key, final int ttl, final byte[] serializedValue) { - checkIsInMulti(); - client.restore(key, ttl, serializedValue); - return client.getStatusCodeReply(); - } - - public Long pexpire(final String key, final long milliseconds) { - checkIsInMulti(); - client.pexpire(key, milliseconds); - return client.getIntegerReply(); - } - - public Long pexpireAt(final String key, final long millisecondsTimestamp) { - checkIsInMulti(); - client.pexpireAt(key, millisecondsTimestamp); - return client.getIntegerReply(); - } - - public Long pttl(final String key) { - checkIsInMulti(); - client.pttl(key); - return client.getIntegerReply(); - } - - public String psetex(final String key, final long milliseconds, final String value) { - checkIsInMulti(); - client.psetex(key, milliseconds, value); - return client.getStatusCodeReply(); - } - - public String set(final String key, final String value, final String nxxx) { - checkIsInMulti(); - client.set(key, value, nxxx); - return client.getStatusCodeReply(); - } - - public String set(final String key, final String value, final String nxxx, final String expx, - final int time) { - checkIsInMulti(); - client.set(key, value, nxxx, expx, time); - return client.getStatusCodeReply(); - } - - public String clientKill(final String client) { - checkIsInMulti(); - this.client.clientKill(client); - return this.client.getStatusCodeReply(); - } - - public String clientSetname(final String name) { - checkIsInMulti(); - client.clientSetname(name); - return client.getStatusCodeReply(); - } - - public String migrate(final String host, final int port, final String key, - final int destinationDb, final int timeout) { - checkIsInMulti(); - client.migrate(host, port, key, destinationDb, timeout); - return client.getStatusCodeReply(); - } - - public ScanResult scan(final String cursor) { - return scan(cursor, new ScanParams()); - } - - public ScanResult scan(final String cursor, final ScanParams params) { - checkIsInMulti(); - client.scan(cursor, params); - List result = client.getObjectMultiBulkReply(); - String newcursor = new String((byte[]) result.get(0)); - List results = new ArrayList(); - List rawResults = (List) result.get(1); - for (byte[] bs : rawResults) { - results.add(SafeEncoder.encode(bs)); - } - return new ScanResult(newcursor, results); - } - - public ScanResult> hscan(final String key, final String cursor) { - return hscan(key, cursor, new ScanParams()); - } - - public ScanResult> hscan(final String key, final String cursor, - final ScanParams params) { - checkIsInMulti(); - client.hscan(key, cursor, params); - List result = client.getObjectMultiBulkReply(); - String newcursor = new String((byte[]) result.get(0)); - List> results = new ArrayList>(); - List rawResults = (List) result.get(1); - Iterator iterator = rawResults.iterator(); - while (iterator.hasNext()) { - results.add(new AbstractMap.SimpleEntry(SafeEncoder.encode(iterator.next()), - SafeEncoder.encode(iterator.next()))); - } - return new ScanResult>(newcursor, results); - } - - public ScanResult sscan(final String key, final String cursor) { - return sscan(key, cursor, new ScanParams()); - } - - public ScanResult sscan(final String key, final String cursor, final ScanParams params) { - checkIsInMulti(); - client.sscan(key, cursor, params); - List result = client.getObjectMultiBulkReply(); - String newcursor = new String((byte[]) result.get(0)); - List results = new ArrayList(); - List rawResults = (List) result.get(1); - for (byte[] bs : rawResults) { - results.add(SafeEncoder.encode(bs)); - } - return new ScanResult(newcursor, results); - } - - - - public ScanResult zscan(final String key, final String cursor, final ScanParams params) { - checkIsInMulti(); - client.zscan(key, cursor, params); - List result = client.getObjectMultiBulkReply(); - String newcursor = new String((byte[]) result.get(0)); - List results = new ArrayList(); - List rawResults = (List) result.get(1); - Iterator iterator = rawResults.iterator(); - while (iterator.hasNext()) { - results.add(new Tuple(SafeEncoder.encode(iterator.next()), Double.valueOf(SafeEncoder - .encode(iterator.next())))); - } - return new ScanResult(newcursor, results); - } - - public String clusterNodes() { - checkIsInMulti(); - client.clusterNodes(); - return client.getBulkReply(); - } - - public String clusterMeet(final String ip, final int port) { - checkIsInMulti(); - client.clusterMeet(ip, port); - return client.getStatusCodeReply(); - } - - public String clusterReset(final Reset resetType) { - checkIsInMulti(); - client.clusterReset(resetType); - return client.getStatusCodeReply(); - } - - public String clusterAddSlots(final int... slots) { - checkIsInMulti(); - client.clusterAddSlots(slots); - return client.getStatusCodeReply(); - } - - public String clusterDelSlots(final int... slots) { - checkIsInMulti(); - client.clusterDelSlots(slots); - return client.getStatusCodeReply(); - } - - public String clusterInfo() { - checkIsInMulti(); - client.clusterInfo(); - return client.getStatusCodeReply(); - } - - public List clusterGetKeysInSlot(final int slot, final int count) { - checkIsInMulti(); - client.clusterGetKeysInSlot(slot, count); - return client.getMultiBulkReply(); - } - - public String clusterSetSlotNode(final int slot, final String nodeId) { - checkIsInMulti(); - client.clusterSetSlotNode(slot, nodeId); - return client.getStatusCodeReply(); - } - - public String clusterSetSlotMigrating(final int slot, final String nodeId) { - checkIsInMulti(); - client.clusterSetSlotMigrating(slot, nodeId); - return client.getStatusCodeReply(); - } - - public String clusterSetSlotImporting(final int slot, final String nodeId) { - checkIsInMulti(); - client.clusterSetSlotImporting(slot, nodeId); - return client.getStatusCodeReply(); - } - - public String clusterSetSlotStable(final int slot) { - checkIsInMulti(); - client.clusterSetSlotStable(slot); - return client.getStatusCodeReply(); - } - - public String clusterForget(final String nodeId) { - checkIsInMulti(); - client.clusterForget(nodeId); - return client.getStatusCodeReply(); - } - - public String clusterFlushSlots() { - checkIsInMulti(); - client.clusterFlushSlots(); - return client.getStatusCodeReply(); - } - - public Long clusterKeySlot(final String key) { - checkIsInMulti(); - client.clusterKeySlot(key); - return client.getIntegerReply(); - } - - public Long clusterCountKeysInSlot(final int slot) { - checkIsInMulti(); - client.clusterCountKeysInSlot(slot); - return client.getIntegerReply(); - } - - public String clusterSaveConfig() { - checkIsInMulti(); - client.clusterSaveConfig(); - return client.getStatusCodeReply(); - } - - public String clusterReplicate(final String nodeId) { - checkIsInMulti(); - client.clusterReplicate(nodeId); - return client.getStatusCodeReply(); - } - - public List clusterSlaves(final String nodeId) { - checkIsInMulti(); - client.clusterSlaves(nodeId); - return client.getMultiBulkReply(); - } - - public String clusterFailover() { - checkIsInMulti(); - client.clusterFailover(); - return client.getStatusCodeReply(); - } - - @Override - public List clusterSlots() { - checkIsInMulti(); - client.clusterSlots(); - return client.getObjectMultiBulkReply(); - } - - public String asking() { - checkIsInMulti(); - client.asking(); - return client.getStatusCodeReply(); - } - - public List pubsubChannels(String pattern) { - checkIsInMulti(); - client.pubsubChannels(pattern); - return client.getMultiBulkReply(); - } - - public Long pubsubNumPat() { - checkIsInMulti(); - client.pubsubNumPat(); - return client.getIntegerReply(); - } - - public Map pubsubNumSub(String... channels) { - checkIsInMulti(); - client.pubsubNumSub(channels); - return BuilderFactory.PUBSUB_NUMSUB_MAP.build(client.getBinaryMultiBulkReply()); - } - - @Override - public void close() { - if (dataSource != null) { - if (client.isBroken()) { - this.dataSource.returnBrokenResource(this); - } else { - this.dataSource.returnResource(this); - } - } else { - client.close(); - } - } - - public void setDataSource(JedisPoolAbstract jedisPool) { - this.dataSource = jedisPool; - } - - public Long pfadd(final String key, final String... elements) { - checkIsInMulti(); - client.pfadd(key, elements); - return client.getIntegerReply(); - } - - public long pfcount(final String key) { - checkIsInMulti(); - client.pfcount(key); - return client.getIntegerReply(); - } - - @Override - public long pfcount(String... keys) { - checkIsInMulti(); - client.pfcount(keys); - return client.getIntegerReply(); - } - - public String pfmerge(final String destkey, final String... sourcekeys) { - checkIsInMulti(); - client.pfmerge(destkey, sourcekeys); - return client.getStatusCodeReply(); - } - - @Override - public List blpop(int timeout, String key) { - return blpop(key, String.valueOf(timeout)); - } - - @Override - public List brpop(int timeout, String key) { - return brpop(key, String.valueOf(timeout)); - } - */ } diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java index ef663469ac..4157fac1d2 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java @@ -1,18 +1,26 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.jedis; import com.netflix.dyno.connectionpool.Host; import com.netflix.dyno.connectionpool.HostSupplier; - -import org.apache.commons.pool2.impl.GenericObjectPoolConfig; - import java.util.ArrayList; - import javax.inject.Inject; import javax.inject.Provider; - -import redis.clients.jedis.HostAndPort; -import redis.clients.jedis.JedisCluster; -import redis.clients.jedis.JedisCommands; +import org.apache.commons.pool2.impl.GenericObjectPoolConfig; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.commands.JedisCommands; public class RedisClusterJedisProvider implements Provider { @@ -26,10 +34,14 @@ public RedisClusterJedisProvider(HostSupplier hostSupplier){ @Override public JedisCommands get() { // FIXME This doesn't seem very safe, but is how it was in the code this was moved from. - Host host = new ArrayList(hostSupplier.getHosts()).get(0); + Host host = new ArrayList<>(hostSupplier.getHosts()).get(0); GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig(); poolConfig.setMinIdle(5); poolConfig.setMaxTotal(1000); - return new JedisCluster(new HostAndPort(host.getHostName(), host.getPort()), poolConfig); + + JedisPool jedisPool = new JedisPool(poolConfig, host.getHostName(), host.getPort()); + Jedis jedis = new Jedis(); + jedis.setDataSource(jedisPool); + return jedis; } } diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisJedisProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisJedisProvider.java index 7c347d4227..d1fa02fd64 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisJedisProvider.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisJedisProvider.java @@ -1,21 +1,28 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.jedis; import com.google.common.collect.Lists; - import com.netflix.conductor.dyno.DynomiteConfiguration; import com.netflix.dyno.connectionpool.Host; import com.netflix.dyno.connectionpool.HostSupplier; - +import javax.inject.Inject; +import javax.inject.Provider; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import javax.inject.Inject; -import javax.inject.Provider; - -import redis.clients.jedis.HostAndPort; -import redis.clients.jedis.JedisCluster; -import redis.clients.jedis.JedisCommands; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.commands.JedisCommands; public class RedisJedisProvider implements Provider { private static Logger logger = LoggerFactory.getLogger(RedisJedisProvider.class); @@ -38,6 +45,8 @@ public JedisCommands get() { poolConfig.setMinIdle(5); poolConfig.setMaxTotal(1000); logger.info("Starting conductor server using redis_cluster " + configuration.getClusterName()); - return new JedisCluster(new HostAndPort(host.getHostName(), host.getPort()), poolConfig); + + JedisPool jedisPool = new JedisPool(poolConfig, host.getHostName(), host.getPort()); + return new JedisCluster(jedisPool); } } diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisSentinelJedisProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisSentinelJedisProvider.java index 030b30a4cd..61a6f366a9 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisSentinelJedisProvider.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisSentinelJedisProvider.java @@ -1,22 +1,33 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.jedis; import com.netflix.conductor.dyno.DynomiteConfiguration; import com.netflix.dyno.connectionpool.Host; import com.netflix.dyno.connectionpool.HostSupplier; +import java.util.HashSet; +import java.util.Set; +import javax.inject.Inject; +import javax.inject.Provider; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import redis.clients.jedis.JedisCommands; import redis.clients.jedis.JedisSentinelPool; - -import javax.inject.Inject; -import javax.inject.Provider; -import java.util.HashSet; -import java.util.Set; +import redis.clients.jedis.commands.JedisCommands; public class RedisSentinelJedisProvider implements Provider { private static Logger logger = LoggerFactory.getLogger(RedisSentinelJedisProvider.class); - private final JedisSentinelPool jedisPool; + private final JedisSentinelPool jedisSentinelPool; @Inject public RedisSentinelJedisProvider(HostSupplier hostSupplier, DynomiteConfiguration configuration) { @@ -32,11 +43,11 @@ public RedisSentinelJedisProvider(HostSupplier hostSupplier, DynomiteConfigurati sentinels.add(host.getHostName() + ":" + host.getPort()); } - jedisPool = new JedisSentinelPool(configuration.getClusterName(), sentinels, poolConfig); + jedisSentinelPool = new JedisSentinelPool(configuration.getClusterName(), sentinels, poolConfig); } @Override public JedisCommands get() { - return new JedisClusterSentinel(jedisPool); + return new JedisCluster(jedisSentinelPool); } } diff --git a/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/DynoQueueDAOTest.java b/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/DynoQueueDAOTest.java index 2484c89597..47a2a3104f 100644 --- a/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/DynoQueueDAOTest.java +++ b/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/DynoQueueDAOTest.java @@ -1,5 +1,5 @@ -/** - * Copyright 2016 Netflix, Inc. +/* + * Copyright 2019 Netflix, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,29 +15,25 @@ */ package com.netflix.conductor.dao.dynomite; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import com.netflix.conductor.config.TestConfiguration; -import com.netflix.conductor.common.utils.JsonMapperProvider; import com.netflix.conductor.dao.QueueDAO; import com.netflix.conductor.dao.dynomite.queue.DynoQueueDAO; import com.netflix.conductor.dao.redis.JedisMock; +import com.netflix.dyno.connectionpool.Host; import com.netflix.dyno.queues.ShardSupplier; - +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import redis.clients.jedis.JedisCommands; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import redis.clients.jedis.commands.JedisCommands; /** * @@ -46,24 +42,27 @@ */ public class DynoQueueDAOTest { - private QueueDAO dao; - - private static ObjectMapper om = new JsonMapperProvider().get(); + private QueueDAO queueDAO; @Before - public void init() throws Exception { + public void init() { JedisCommands jedisMock = new JedisMock(); - dao = new DynoQueueDAO(jedisMock, jedisMock, new ShardSupplier() { + queueDAO = new DynoQueueDAO(jedisMock, jedisMock, new ShardSupplier() { @Override public Set getQueueShards() { - return Arrays.asList("a").stream().collect(Collectors.toSet()); + return new HashSet<>(Collections.singletonList("a")); } @Override public String getCurrentShard() { return "a"; } + + @Override + public String getShardForHost(Host host) { + return "a"; + } }, new TestConfiguration()); } @@ -77,67 +76,65 @@ public void test() { for(int i = 0; i < 10; i++) { String messageId = "msg" + i; - dao.push(queueName, messageId, offsetTimeInSecond); + queueDAO.push(queueName, messageId, offsetTimeInSecond); } - int size = dao.getSize(queueName); + int size = queueDAO.getSize(queueName); assertEquals(10, size); - Map details = dao.queuesDetail(); + Map details = queueDAO.queuesDetail(); assertEquals(1, details.size()); assertEquals(10L, details.get(queueName).longValue()); for(int i = 0; i < 10; i++) { String messageId = "msg" + i; - dao.pushIfNotExists(queueName, messageId, offsetTimeInSecond); + queueDAO.pushIfNotExists(queueName, messageId, offsetTimeInSecond); } - List popped = dao.pop(queueName, 10, 100); + List popped = queueDAO.pop(queueName, 10, 100); assertNotNull(popped); assertEquals(10, popped.size()); - Map>> verbose = dao.queuesDetailVerbose(); + Map>> verbose = queueDAO.queuesDetailVerbose(); assertEquals(1, verbose.size()); long shardSize = verbose.get(queueName).get("a").get("size"); long unackedSize = verbose.get(queueName).get("a").get("uacked"); assertEquals(0, shardSize); assertEquals(10, unackedSize); - popped.forEach(messageId -> dao.ack(queueName, messageId)); + popped.forEach(messageId -> queueDAO.ack(queueName, messageId)); - verbose = dao.queuesDetailVerbose(); + verbose = queueDAO.queuesDetailVerbose(); assertEquals(1, verbose.size()); shardSize = verbose.get(queueName).get("a").get("size"); unackedSize = verbose.get(queueName).get("a").get("uacked"); assertEquals(0, shardSize); assertEquals(0, unackedSize); - popped = dao.pop(queueName, 10, 100); + popped = queueDAO.pop(queueName, 10, 100); assertNotNull(popped); assertEquals(0, popped.size()); for(int i = 0; i < 10; i++) { String messageId = "msg" + i; - dao.pushIfNotExists(queueName, messageId, offsetTimeInSecond); + queueDAO.pushIfNotExists(queueName, messageId, offsetTimeInSecond); } - size = dao.getSize(queueName); + size = queueDAO.getSize(queueName); assertEquals(10, size); for(int i = 0; i < 10; i++) { String messageId = "msg" + i; - dao.remove(queueName, messageId); + queueDAO.remove(queueName, messageId); } - size = dao.getSize(queueName); + size = queueDAO.getSize(queueName); assertEquals(0, size); for(int i = 0; i < 10; i++) { String messageId = "msg" + i; - dao.pushIfNotExists(queueName, messageId, offsetTimeInSecond); + queueDAO.pushIfNotExists(queueName, messageId, offsetTimeInSecond); } - dao.flush(queueName); - size = dao.getSize(queueName); + queueDAO.flush(queueName); + size = queueDAO.getSize(queueName); assertEquals(0, size); - } - } diff --git a/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/RedisExecutionDAOTest.java b/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/RedisExecutionDAOTest.java index e6586ef4e9..0c11ab8aab 100644 --- a/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/RedisExecutionDAOTest.java +++ b/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/RedisExecutionDAOTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Netflix, Inc. + * Copyright 2019 Netflix, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import redis.clients.jedis.JedisCommands; +import redis.clients.jedis.commands.JedisCommands; import java.util.Collections; import java.util.List; @@ -47,7 +47,6 @@ public class RedisExecutionDAOTest extends ExecutionDAOTest { private RedisExecutionDAO executionDAO; private static ObjectMapper objectMapper = new JsonMapperProvider().get(); - @SuppressWarnings("unchecked") @Before public void init() { Configuration config = new TestConfiguration(); @@ -58,7 +57,6 @@ public void init() { } @Test - @SuppressWarnings("unchecked") public void testCorrelateTaskToWorkflowInDS() { String workflowId = "workflowId"; String taskId = "taskId1"; diff --git a/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/RedisMetadataDAOTest.java b/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/RedisMetadataDAOTest.java index 22b5cadb4e..1302edbd93 100644 --- a/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/RedisMetadataDAOTest.java +++ b/redis-persistence/src/test/java/com/netflix/conductor/dao/dynomite/RedisMetadataDAOTest.java @@ -1,5 +1,5 @@ -/** - * Copyright 2016 Netflix, Inc. +/* + * Copyright 2019 Netflix, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * - */ package com.netflix.conductor.dao.dynomite; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import com.fasterxml.jackson.databind.ObjectMapper; import com.netflix.conductor.common.metadata.events.EventHandler; import com.netflix.conductor.common.metadata.events.EventHandler.Action; @@ -33,22 +35,16 @@ import com.netflix.conductor.core.execution.ApplicationException; import com.netflix.conductor.dao.redis.JedisMock; import com.netflix.conductor.dyno.DynoProxy; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.junit.Before; -import org.junit.Test; -import redis.clients.jedis.JedisCommands; - import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.junit.Before; +import org.junit.Test; +import redis.clients.jedis.commands.JedisCommands; /** * @author Viren @@ -56,9 +52,9 @@ */ public class RedisMetadataDAOTest { - private RedisMetadataDAO dao; + private RedisMetadataDAO redisMetadataDAO; - private static ObjectMapper om = new JsonMapperProvider().get(); + private static ObjectMapper objectMapper = new JsonMapperProvider().get(); @Before public void init() { @@ -66,21 +62,21 @@ public void init() { JedisCommands jedisMock = new JedisMock(); DynoProxy dynoClient = new DynoProxy(jedisMock); - dao = new RedisMetadataDAO(dynoClient, om, config); + redisMetadataDAO = new RedisMetadataDAO(dynoClient, objectMapper, config); } @Test(expected = ApplicationException.class) - public void testDup() throws Exception { + public void testDup() { WorkflowDef def = new WorkflowDef(); def.setName("testDup"); def.setVersion(1); - dao.create(def); - dao.create(def); + redisMetadataDAO.create(def); + redisMetadataDAO.create(def); } @Test - public void testWorkflowDefOperations() throws Exception { + public void testWorkflowDefOperations() { WorkflowDef def = new WorkflowDef(); def.setName("test"); @@ -92,32 +88,32 @@ public void testWorkflowDefOperations() throws Exception { def.setUpdatedBy("unit_test2"); def.setUpdateTime(2L); - dao.create(def); + redisMetadataDAO.create(def); - List all = dao.getAll(); + List all = redisMetadataDAO.getAll(); assertNotNull(all); assertEquals(1, all.size()); assertEquals("test", all.get(0).getName()); assertEquals(1, all.get(0).getVersion()); - WorkflowDef found = dao.get("test", 1).get(); + WorkflowDef found = redisMetadataDAO.get("test", 1).get(); assertTrue(EqualsBuilder.reflectionEquals(def, found)); def.setVersion(2); - dao.create(def); + redisMetadataDAO.create(def); - all = dao.getAll(); + all = redisMetadataDAO.getAll(); assertNotNull(all); assertEquals(2, all.size()); assertEquals("test", all.get(0).getName()); assertEquals(1, all.get(0).getVersion()); - found = dao.getLatest(def.getName()).get(); + found = redisMetadataDAO.getLatest(def.getName()).get(); assertEquals(def.getName(), found.getName()); assertEquals(def.getVersion(), found.getVersion()); assertEquals(2, found.getVersion()); - all = dao.getAllVersions(def.getName()); + all = redisMetadataDAO.getAllVersions(def.getName()); assertNotNull(all); assertEquals(2, all.size()); assertEquals("test", all.get(0).getName()); @@ -126,20 +122,20 @@ public void testWorkflowDefOperations() throws Exception { assertEquals(2, all.get(1).getVersion()); def.setDescription("updated"); - dao.update(def); - found = dao.get(def.getName(), def.getVersion()).get(); + redisMetadataDAO.update(def); + found = redisMetadataDAO.get(def.getName(), def.getVersion()).get(); assertEquals(def.getDescription(), found.getDescription()); - List allnames = dao.findAll(); + List allnames = redisMetadataDAO.findAll(); assertNotNull(allnames); assertEquals(1, allnames.size()); assertEquals(def.getName(), allnames.get(0)); - dao.removeWorkflowDef("test", 1); - Optional deleted = dao.get("test", 1); + redisMetadataDAO.removeWorkflowDef("test", 1); + Optional deleted = redisMetadataDAO.get("test", 1); assertFalse(deleted.isPresent()); - dao.removeWorkflowDef("test", 2); - Optional latestDef = dao.getLatest("test"); + redisMetadataDAO.removeWorkflowDef("test", 2); + Optional latestDef = redisMetadataDAO.getLatest("test"); assertFalse(latestDef.isPresent()); WorkflowDef[] workflowDefsArray = new WorkflowDef[3]; @@ -153,18 +149,18 @@ public void testWorkflowDefOperations() throws Exception { workflowDefsArray[i-1].setOwnerApp("ownerApp"); workflowDefsArray[i-1].setUpdatedBy("unit_test2"); workflowDefsArray[i-1].setUpdateTime(2L); - dao.create( workflowDefsArray[i-1]); + redisMetadataDAO.create( workflowDefsArray[i-1]); } - dao.removeWorkflowDef("test", 1); - dao.removeWorkflowDef("test", 2); - WorkflowDef workflow = dao.getLatest("test").get(); + redisMetadataDAO.removeWorkflowDef("test", 1); + redisMetadataDAO.removeWorkflowDef("test", 2); + WorkflowDef workflow = redisMetadataDAO.getLatest("test").get(); assertEquals(workflow.getVersion(), 3); } @Test(expected = ApplicationException.class) public void removeInvalidWorkflowDef() throws Exception { WorkflowDef def = new WorkflowDef(); - dao.removeWorkflowDef("hello", 1); + redisMetadataDAO.removeWorkflowDef("hello", 1); } @Test @@ -186,23 +182,23 @@ public void testTaskDefOperations() throws Exception { def.setRateLimitPerFrequency(50); def.setRateLimitFrequencyInSeconds(1); - dao.createTaskDef(def); + redisMetadataDAO.createTaskDef(def); - TaskDef found = dao.getTaskDef(def.getName()); + TaskDef found = redisMetadataDAO.getTaskDef(def.getName()); assertTrue(EqualsBuilder.reflectionEquals(def, found)); def.setDescription("updated description"); - dao.updateTaskDef(def); - found = dao.getTaskDef(def.getName()); + redisMetadataDAO.updateTaskDef(def); + found = redisMetadataDAO.getTaskDef(def.getName()); assertTrue(EqualsBuilder.reflectionEquals(def, found)); assertEquals("updated description", found.getDescription()); for(int i = 0; i < 9; i++) { TaskDef tdf = new TaskDef("taskA" + i); - dao.createTaskDef(tdf); + redisMetadataDAO.createTaskDef(tdf); } - List all = dao.getAllTaskDefs(); + List all = redisMetadataDAO.getAllTaskDefs(); assertNotNull(all); assertEquals(10, all.size()); Set allnames = all.stream().map(TaskDef::getName).collect(Collectors.toSet()); @@ -215,9 +211,9 @@ public void testTaskDefOperations() throws Exception { } for(int i = 0; i < 9; i++) { - dao.removeTaskDef(def.getName() + i); + redisMetadataDAO.removeTaskDef(def.getName() + i); } - all = dao.getAllTaskDefs(); + all = redisMetadataDAO.getAllTaskDefs(); assertNotNull(all); assertEquals(1, all.size()); assertEquals(def.getName(), all.get(0).getName()); @@ -225,7 +221,7 @@ public void testTaskDefOperations() throws Exception { @Test(expected = ApplicationException.class) public void testRemoveTaskDef() throws Exception { - dao.removeTaskDef("test" + UUID.randomUUID().toString()); + redisMetadataDAO.removeTaskDef("test" + UUID.randomUUID().toString()); } @Test @@ -243,33 +239,32 @@ public void testEventHandlers() { eh.getActions().add(action); eh.setEvent(event1); - dao.addEventHandler(eh); - List all = dao.getEventHandlers(); + redisMetadataDAO.addEventHandler(eh); + List all = redisMetadataDAO.getEventHandlers(); assertNotNull(all); assertEquals(1, all.size()); assertEquals(eh.getName(), all.get(0).getName()); assertEquals(eh.getEvent(), all.get(0).getEvent()); - List byEvents = dao.getEventHandlersForEvent(event1, true); + List byEvents = redisMetadataDAO.getEventHandlersForEvent(event1, true); assertNotNull(byEvents); assertEquals(0, byEvents.size()); //event is marked as in-active eh.setActive(true); eh.setEvent(event2); - dao.updateEventHandler(eh); + redisMetadataDAO.updateEventHandler(eh); - all = dao.getEventHandlers(); + all = redisMetadataDAO.getEventHandlers(); assertNotNull(all); assertEquals(1, all.size()); - byEvents = dao.getEventHandlersForEvent(event1, true); + byEvents = redisMetadataDAO.getEventHandlersForEvent(event1, true); assertNotNull(byEvents); assertEquals(0, byEvents.size()); - byEvents = dao.getEventHandlersForEvent(event2, true); + byEvents = redisMetadataDAO.getEventHandlersForEvent(event2, true); assertNotNull(byEvents); assertEquals(1, byEvents.size()); - } } diff --git a/redis-persistence/src/test/java/com/netflix/conductor/dao/redis/JedisMock.java b/redis-persistence/src/test/java/com/netflix/conductor/dao/redis/JedisMock.java index dbcae4992f..d8d5db3b9e 100644 --- a/redis-persistence/src/test/java/com/netflix/conductor/dao/redis/JedisMock.java +++ b/redis-persistence/src/test/java/com/netflix/conductor/dao/redis/JedisMock.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Netflix, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,9 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * - */ package com.netflix.conductor.dao.redis; import java.util.ArrayList; @@ -36,7 +33,7 @@ import redis.clients.jedis.ScanResult; import redis.clients.jedis.Tuple; import redis.clients.jedis.exceptions.JedisException; -import redis.clients.jedis.params.sortedset.ZAddParams; +import redis.clients.jedis.params.ZAddParams; /** * @author Viren @@ -52,7 +49,7 @@ public JedisMock() { } private Set toTupleSet(Set pairs) { - Set set = new HashSet(); + Set set = new HashSet<>(); for (ZsetPair pair : pairs) { set.add(new Tuple(pair.member, pair.score)); } @@ -68,17 +65,6 @@ private Set toTupleSet(Set pairs) { } } - - @Override public String set(final String key, final String value, final String nxxx, final String expx, - final long time) { - try { - return redis.set(key, value, nxxx, expx, String.valueOf(time)); - } - catch (Exception e) { - throw new JedisException(e); - } - } - @Override public String get(final String key) { try { return redis.get(key); @@ -123,31 +109,7 @@ private Set toTupleSet(Set pairs) { throw new JedisException(e); } } - /* - public Set keys(final String pattern) { - checkIsInMulti(); - client.keys(pattern); - return BuilderFactory.STRING_SET.build(client.getBinaryMultiBulkReply()); - } - public String randomKey() { - checkIsInMulti(); - client.randomKey(); - return client.getBulkReply(); - } - - public String rename(final String oldkey, final String newkey) { - checkIsInMulti(); - client.rename(oldkey, newkey); - return client.getStatusCodeReply(); - } - - public Long renamenx(final String oldkey, final String newkey) { - checkIsInMulti(); - client.renamenx(oldkey, newkey); - return client.getIntegerReply(); - } - */ @Override public Long expire(final String key, final int seconds) { try { return redis.expire(key, seconds) ? 1L : 0L; @@ -744,7 +706,7 @@ public Long zadd(String key, double score, String member, ZAddParams params) { try { - if(params.contains("xx")) { + if(params.getParam("xx") != null) { Double existing = redis.zscore(key, member); if(existing == null) { return 0L; diff --git a/redis-persistence/src/test/java/com/netflix/conductor/jedis/ConfigurationHostSupplierProviderTest.java b/redis-persistence/src/test/java/com/netflix/conductor/jedis/ConfigurationHostSupplierProviderTest.java index 3f10249b8e..1bbaffadb5 100644 --- a/redis-persistence/src/test/java/com/netflix/conductor/jedis/ConfigurationHostSupplierProviderTest.java +++ b/redis-persistence/src/test/java/com/netflix/conductor/jedis/ConfigurationHostSupplierProviderTest.java @@ -1,3 +1,18 @@ +/* + * Copyright 2016 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.netflix.conductor.jedis; import com.netflix.conductor.dyno.SystemPropertiesDynomiteConfiguration; @@ -15,13 +30,13 @@ public class ConfigurationHostSupplierProviderTest { private ConfigurationHostSupplierProvider provider; @Before - public void setUp() throws Exception { + public void setUp() { configuration = new TestPropertiesDynomiteConfiguration(); provider = new ConfigurationHostSupplierProvider(configuration); } @Test - public void getHost() throws Exception { + public void getHost() { configuration.setProperty("workflow.dynomite.cluster.hosts", "dyno1:8102:us-east-1c"); List hosts = provider.get().getHosts(); @@ -35,7 +50,7 @@ public void getHost() throws Exception { } @Test - public void getMultipleHosts() throws Exception { + public void getMultipleHosts() { configuration.setProperty("workflow.dynomite.cluster.hosts", "dyno1:8102:us-east-1c;dyno2:8103:us-east-1c"); @@ -55,7 +70,7 @@ public void getMultipleHosts() throws Exception { } @Test - public void getAuthenticatedHost() throws Exception { + public void getAuthenticatedHost() { configuration .setProperty("workflow.dynomite.cluster.hosts", "redis1:6432:us-east-1c:password"); @@ -84,6 +99,7 @@ public String getProperty(String key, String defaultValue) { return prop.getOrDefault(key, defaultValue).toString(); } + @SuppressWarnings("unchecked") @Override public Map getAll() { return (Map) prop; diff --git a/redis-persistence/src/test/java/com/netflix/conductor/jedis/JedisClusterSentinelTest.java b/redis-persistence/src/test/java/com/netflix/conductor/jedis/JedisClusterSentinelTest.java deleted file mode 100644 index 83b1786ce0..0000000000 --- a/redis-persistence/src/test/java/com/netflix/conductor/jedis/JedisClusterSentinelTest.java +++ /dev/null @@ -1,580 +0,0 @@ -package com.netflix.conductor.jedis; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.HashMap; - -import org.junit.Before; -import org.junit.Test; - -import redis.clients.jedis.BinaryClient.LIST_POSITION; -import redis.clients.jedis.GeoUnit; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisSentinelPool; -import redis.clients.jedis.ScanParams; -import redis.clients.jedis.SortingParams; -import redis.clients.jedis.params.geo.GeoRadiusParam; -import redis.clients.jedis.params.sortedset.ZAddParams; -import redis.clients.jedis.params.sortedset.ZIncrByParams; - -public class JedisClusterSentinelTest { - private final Jedis jedis = mock(Jedis.class); - private final JedisSentinelPool jedisPool = mock(JedisSentinelPool.class); - private final JedisClusterSentinel jedisCluster = new JedisClusterSentinel(jedisPool); - - @Before - public void init() { - when(this.jedisPool.getResource()).thenReturn(this.jedis); - } - - @Test - public void testSet() throws Exception { - jedisCluster.set("key", "value"); - jedisCluster.set("key", "value", "nxxx"); - jedisCluster.set("key", "value", "nxxx", "expx", 1337); - } - - @Test - public void testGet() { - jedisCluster.get("key"); - } - - @Test - public void testExists() { - jedisCluster.exists("key"); - } - - @Test - public void testPersist() { - jedisCluster.persist("key"); - } - - @Test - public void testType() { - jedisCluster.type("key"); - } - - @Test - public void testExpire() { - jedisCluster.expire("key", 1337); - } - - @Test - public void testPexpire() { - jedisCluster.pexpire("key", 1337); - } - - @Test - public void testExpireAt() { - jedisCluster.expireAt("key", 1337); - } - - @Test - public void testPexpireAt() { - jedisCluster.pexpireAt("key", 1337); - } - - @Test - public void testTtl() { - jedisCluster.ttl("key"); - } - - @Test - public void testPttl() { - jedisCluster.pttl("key"); - } - - @Test - public void testSetbit() { - jedisCluster.setbit("key", 1337, "value"); - jedisCluster.setbit("key", 1337, true); - } - - @Test - public void testGetbit() { - jedisCluster.getbit("key", 1337); - } - - @Test - public void testSetrange() { - jedisCluster.setrange("key", 1337, "value"); - } - - @Test - public void testGetrange() { - jedisCluster.getrange("key", 1337, 1338); - } - - @Test - public void testGetSet() { - jedisCluster.getSet("key", "value"); - } - - @Test - public void testSetnx() { - jedisCluster.setnx("test", "value"); - } - - @Test - public void testSetex() { - jedisCluster.setex("key", 1337, "value"); - } - - @Test - public void testPsetex() { - jedisCluster.psetex("key", 1337, "value"); - } - - @Test - public void testDecrBy() { - jedisCluster.decrBy("key", 1337); - } - - @Test - public void testDecr() { - jedisCluster.decr("key"); - } - - @Test - public void testIncrBy() { - jedisCluster.incrBy("key", 1337); - } - - @Test - public void testIncrByFloat() { - jedisCluster.incrByFloat("key", 1337); - } - - @Test - public void testIncr() { - jedisCluster.incr("key"); - } - - @Test - public void testAppend() { - jedisCluster.append("key", "value"); - } - - @Test - public void testSubstr() { - jedisCluster.substr("key", 1337, 1338); - } - - @Test - public void testHset() { - jedisCluster.hset("key", "field", "value"); - } - - @Test - public void testHget() { - jedisCluster.hget("key", "field"); - } - - @Test - public void testHsetnx() { - jedisCluster.hsetnx("key", "field", "value"); - } - - @Test - public void testHmset() { - jedisCluster.hmset("key", new HashMap()); - } - - @Test - public void testHmget() { - jedisCluster.hmget("key", "fields"); - } - - @Test - public void testHincrBy() { - jedisCluster.hincrBy("key", "field", 1337); - } - - @Test - public void testHincrByFloat() { - jedisCluster.hincrByFloat("key", "field", 1337); - } - - @Test - public void testHexists() { - jedisCluster.hexists("key", "field"); - } - - @Test - public void testHdel() { - jedisCluster.hdel("key", "field"); - } - - @Test - public void testHlen() { - jedisCluster.hlen("key"); - } - - @Test - public void testHkeys() { - jedisCluster.hkeys("key"); - } - - @Test - public void testHvals() { - jedisCluster.hvals("key"); - } - - @Test - public void testGgetAll() { - jedisCluster.hgetAll("key"); - } - - @Test - public void testRpush() { - jedisCluster.rpush("key", "string"); - } - - @Test - public void testLpush() { - jedisCluster.lpush("key", "string"); - } - - @Test - public void testLlen() { - jedisCluster.llen("key"); - } - - @Test - public void testLrange() { - jedisCluster.lrange("key", 1337, 1338); - } - - @Test - public void testLtrim() { - jedisCluster.ltrim("key", 1337, 1338); - } - - @Test - public void testLindex() { - jedisCluster.lindex("key", 1337); - } - - @Test - public void testLset() { - jedisCluster.lset("key", 1337, "value"); - } - - @Test - public void testLrem() { - jedisCluster.lrem("key", 1337, "value"); - } - - @Test - public void testLpop() { - jedisCluster.lpop("key"); - } - - @Test - public void testRpop() { - jedisCluster.rpop("key"); - } - - @Test - public void testSadd() { - jedisCluster.sadd("key", "member"); - } - - @Test - public void testSmembers() { - jedisCluster.smembers("key"); - } - - @Test - public void testSrem() { - jedisCluster.srem("key", "member"); - } - - @Test - public void testSpop() { - jedisCluster.spop("key"); - jedisCluster.spop("key", 1337); - } - - @Test - public void testScard() { - jedisCluster.scard("key"); - } - - @Test - public void testSismember() { - jedisCluster.sismember("key", "member"); - } - - @Test - public void testSrandmember() { - jedisCluster.srandmember("key"); - jedisCluster.srandmember("key", 1337); - } - - @Test - public void testStrlen() { - jedisCluster.strlen("key"); - } - - @Test - public void testZadd() { - jedisCluster.zadd("key", new HashMap<>()); - jedisCluster.zadd("key", new HashMap<>(), ZAddParams.zAddParams()); - jedisCluster.zadd("key", 1337, "members"); - jedisCluster.zadd("key", 1337, "members", ZAddParams.zAddParams()); - } - - @Test - public void testZrange() { - jedisCluster.zrange("key", 1337, 1338); - } - - @Test - public void testZrem() { - jedisCluster.zrem("key", "member"); - } - - @Test - public void testZincrby() { - jedisCluster.zincrby("key", 1337, "member"); - jedisCluster.zincrby("key", 1337, "member", ZIncrByParams.zIncrByParams()); - } - - @Test - public void testZrank() { - jedisCluster.zrank("key", "member"); - } - - @Test - public void testZrevrank() { - jedisCluster.zrevrank("key", "member"); - } - - @Test - public void testZrevrange() { - jedisCluster.zrevrange("key", 1337, 1338); - } - - @Test - public void testZrangeWithScores() { - jedisCluster.zrangeWithScores("key", 1337, 1338); - } - - @Test - public void testZrevrangeWithScores() { - jedisCluster.zrevrangeWithScores("key", 1337, 1338); - } - - @Test - public void testZcard() { - jedisCluster.zcard("key"); - } - - @Test - public void testZscore() { - jedisCluster.zscore("key", "member"); - } - - @Test - public void testSort() { - jedisCluster.sort("key"); - jedisCluster.sort("key", new SortingParams()); - } - - @Test - public void testZcount() { - jedisCluster.zcount("key", "min", "max"); - jedisCluster.zcount("key", 1337, 1338); - } - - @Test - public void testZrangeByScore() { - jedisCluster.zrangeByScore("key", "min", "max"); - jedisCluster.zrangeByScore("key", 1337, 1338); - jedisCluster.zrangeByScore("key", "min", "max", 1337, 1338); - jedisCluster.zrangeByScore("key", 1337, 1338, 1339, 1340); - } - - - @Test - public void testZrevrangeByScore() { - jedisCluster.zrevrangeByScore("key", "max", "min"); - jedisCluster.zrevrangeByScore("key", 1337, 1338); - jedisCluster.zrevrangeByScore("key", "max", "min", 1337, 1338); - jedisCluster.zrevrangeByScore("key", 1337, 1338, 1339, 1340); - } - - @Test - public void testZrangeByScoreWithScores() { - jedisCluster.zrangeByScoreWithScores("key", "min", "max"); - jedisCluster.zrangeByScoreWithScores("key", "min", "max", 1337, 1338); - jedisCluster.zrangeByScoreWithScores("key", 1337, 1338); - jedisCluster.zrangeByScoreWithScores("key", 1337, 1338, 1339, 1340); - } - - @Test - public void testZrevrangeByScoreWithScores() { - jedisCluster.zrevrangeByScoreWithScores("key", "max", "min"); - jedisCluster.zrevrangeByScoreWithScores("key", "max", "min", 1337, 1338); - jedisCluster.zrevrangeByScoreWithScores("key", 1337, 1338); - jedisCluster.zrevrangeByScoreWithScores("key", 1337, 1338, 1339, 1340); - } - - @Test - public void testZremrangeByRank() { - jedisCluster.zremrangeByRank("key", 1337, 1338); - } - - @Test - public void testZremrangeByScore() { - jedisCluster.zremrangeByScore("key", "start", "end"); - jedisCluster.zremrangeByScore("key", 1337, 1338); - } - - @Test - public void testZlexcount() { - jedisCluster.zlexcount("key", "min", "max"); - } - - @Test - public void testZrangeByLex() { - jedisCluster.zrangeByLex("key", "min", "max"); - jedisCluster.zrangeByLex("key", "min", "max", 1337, 1338); - } - - @Test - public void testZrevrangeByLex() { - jedisCluster.zrevrangeByLex("key", "max", "min"); - jedisCluster.zrevrangeByLex("key", "max", "min", 1337, 1338); - } - - @Test - public void testZremrangeByLex() { - jedisCluster.zremrangeByLex("key", "min", "max"); - } - - @Test - public void testLinsert() { - jedisCluster.linsert("key", LIST_POSITION.AFTER, "pivot", "value"); - } - - @Test - public void testLpushx() { - jedisCluster.lpushx("key", "string"); - } - - @Test - public void testRpushx() { - jedisCluster.rpushx("key", "string"); - } - - @Test - public void testBlpop() { - jedisCluster.blpop("arg"); - jedisCluster.blpop(1337, "arg"); - } - - @Test - public void testBrpop() { - jedisCluster.brpop("arg"); - jedisCluster.brpop(1337, "arg"); - } - - @Test - public void testDel() { - jedisCluster.del("key"); - } - - @Test - public void testEcho() { - jedisCluster.echo("string"); - } - - @Test - public void testMove() { - jedisCluster.move("key", 1337); - } - - @Test - public void testBitcount() { - jedisCluster.bitcount("key"); - jedisCluster.bitcount("key", 1337, 1338); - } - - @Test - public void testBitpos() { - jedisCluster.bitpos("key", true); - } - - @Test - public void testHscan() { - jedisCluster.hscan("key", "cursor"); - jedisCluster.hscan("key", "cursor", new ScanParams()); - jedisCluster.hscan("key", 1337); - } - - @Test - public void testSscan() { - jedisCluster.sscan("key", "cursor"); - jedisCluster.sscan("key", "cursor", new ScanParams()); - jedisCluster.sscan("key", 1337); - } - - @Test - public void testZscan() { - jedisCluster.zscan("key", "cursor"); - jedisCluster.zscan("key", "cursor", new ScanParams()); - jedisCluster.zscan("key", 1337); - } - - @Test - public void testPfadd() { - jedisCluster.pfadd("key", "elements"); - } - - @Test - public void testPfcount() { - jedisCluster.pfcount("key"); - } - - @Test - public void testGeoadd() { - jedisCluster.geoadd("key", new HashMap<>()); - jedisCluster.geoadd("key", 1337, 1338, "member"); - } - - @Test - public void testGeodist() { - jedisCluster.geodist("key", "member1", "member2"); - jedisCluster.geodist("key", "member1", "member2", GeoUnit.KM); - } - - @Test - public void testGeohash() { - jedisCluster.geohash("key", "members"); - } - - @Test - public void testGeopos() { - jedisCluster.geopos("key", "members"); - } - - @Test - public void testGeoradius() { - jedisCluster.georadius("key", 1337, 1338, 32, GeoUnit.KM); - jedisCluster.georadius("key", 1337, 1338, 32, GeoUnit.KM, GeoRadiusParam.geoRadiusParam()); - } - - @Test - public void testGeoradiusByMember() { - jedisCluster.georadiusByMember("key", "member", 1337, GeoUnit.KM); - jedisCluster.georadiusByMember("key", "member", 1337, GeoUnit.KM, GeoRadiusParam.geoRadiusParam()); - } - - @Test - public void testBitfield() { - jedisCluster.bitfield("key", "arguments"); - } -} \ No newline at end of file diff --git a/redis-persistence/src/test/java/com/netflix/conductor/jedis/JedisClusterTest.java b/redis-persistence/src/test/java/com/netflix/conductor/jedis/JedisClusterTest.java new file mode 100644 index 0000000000..03aaab9958 --- /dev/null +++ b/redis-persistence/src/test/java/com/netflix/conductor/jedis/JedisClusterTest.java @@ -0,0 +1,586 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ +package com.netflix.conductor.jedis; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.HashMap; +import org.junit.Before; +import org.junit.Test; +import redis.clients.jedis.GeoUnit; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisSentinelPool; +import redis.clients.jedis.ListPosition; +import redis.clients.jedis.ScanParams; +import redis.clients.jedis.SortingParams; +import redis.clients.jedis.params.GeoRadiusParam; +import redis.clients.jedis.params.SetParams; +import redis.clients.jedis.params.ZAddParams; +import redis.clients.jedis.params.ZIncrByParams; + +public class JedisClusterTest { + + private final Jedis jedis = mock(Jedis.class); + private final JedisSentinelPool jedisPool = mock(JedisSentinelPool.class); + private final JedisCluster jedisCluster = new JedisCluster(jedisPool); + + @Before + public void init() { + when(this.jedisPool.getResource()).thenReturn(this.jedis); + } + + @Test + public void testSet() { + jedisCluster.set("key", "value"); + jedisCluster.set("key", "value", SetParams.setParams()); + } + + @Test + public void testGet() { + jedisCluster.get("key"); + } + + @Test + public void testExists() { + jedisCluster.exists("key"); + } + + @Test + public void testPersist() { + jedisCluster.persist("key"); + } + + @Test + public void testType() { + jedisCluster.type("key"); + } + + @Test + public void testExpire() { + jedisCluster.expire("key", 1337); + } + + @Test + public void testPexpire() { + jedisCluster.pexpire("key", 1337); + } + + @Test + public void testExpireAt() { + jedisCluster.expireAt("key", 1337); + } + + @Test + public void testPexpireAt() { + jedisCluster.pexpireAt("key", 1337); + } + + @Test + public void testTtl() { + jedisCluster.ttl("key"); + } + + @Test + public void testPttl() { + jedisCluster.pttl("key"); + } + + @Test + public void testSetbit() { + jedisCluster.setbit("key", 1337, "value"); + jedisCluster.setbit("key", 1337, true); + } + + @Test + public void testGetbit() { + jedisCluster.getbit("key", 1337); + } + + @Test + public void testSetrange() { + jedisCluster.setrange("key", 1337, "value"); + } + + @Test + public void testGetrange() { + jedisCluster.getrange("key", 1337, 1338); + } + + @Test + public void testGetSet() { + jedisCluster.getSet("key", "value"); + } + + @Test + public void testSetnx() { + jedisCluster.setnx("test", "value"); + } + + @Test + public void testSetex() { + jedisCluster.setex("key", 1337, "value"); + } + + @Test + public void testPsetex() { + jedisCluster.psetex("key", 1337, "value"); + } + + @Test + public void testDecrBy() { + jedisCluster.decrBy("key", 1337); + } + + @Test + public void testDecr() { + jedisCluster.decr("key"); + } + + @Test + public void testIncrBy() { + jedisCluster.incrBy("key", 1337); + } + + @Test + public void testIncrByFloat() { + jedisCluster.incrByFloat("key", 1337); + } + + @Test + public void testIncr() { + jedisCluster.incr("key"); + } + + @Test + public void testAppend() { + jedisCluster.append("key", "value"); + } + + @Test + public void testSubstr() { + jedisCluster.substr("key", 1337, 1338); + } + + @Test + public void testHset() { + jedisCluster.hset("key", "field", "value"); + } + + @Test + public void testHget() { + jedisCluster.hget("key", "field"); + } + + @Test + public void testHsetnx() { + jedisCluster.hsetnx("key", "field", "value"); + } + + @Test + public void testHmset() { + jedisCluster.hmset("key", new HashMap()); + } + + @Test + public void testHmget() { + jedisCluster.hmget("key", "fields"); + } + + @Test + public void testHincrBy() { + jedisCluster.hincrBy("key", "field", 1337); + } + + @Test + public void testHincrByFloat() { + jedisCluster.hincrByFloat("key", "field", 1337); + } + + @Test + public void testHexists() { + jedisCluster.hexists("key", "field"); + } + + @Test + public void testHdel() { + jedisCluster.hdel("key", "field"); + } + + @Test + public void testHlen() { + jedisCluster.hlen("key"); + } + + @Test + public void testHkeys() { + jedisCluster.hkeys("key"); + } + + @Test + public void testHvals() { + jedisCluster.hvals("key"); + } + + @Test + public void testGgetAll() { + jedisCluster.hgetAll("key"); + } + + @Test + public void testRpush() { + jedisCluster.rpush("key", "string"); + } + + @Test + public void testLpush() { + jedisCluster.lpush("key", "string"); + } + + @Test + public void testLlen() { + jedisCluster.llen("key"); + } + + @Test + public void testLrange() { + jedisCluster.lrange("key", 1337, 1338); + } + + @Test + public void testLtrim() { + jedisCluster.ltrim("key", 1337, 1338); + } + + @Test + public void testLindex() { + jedisCluster.lindex("key", 1337); + } + + @Test + public void testLset() { + jedisCluster.lset("key", 1337, "value"); + } + + @Test + public void testLrem() { + jedisCluster.lrem("key", 1337, "value"); + } + + @Test + public void testLpop() { + jedisCluster.lpop("key"); + } + + @Test + public void testRpop() { + jedisCluster.rpop("key"); + } + + @Test + public void testSadd() { + jedisCluster.sadd("key", "member"); + } + + @Test + public void testSmembers() { + jedisCluster.smembers("key"); + } + + @Test + public void testSrem() { + jedisCluster.srem("key", "member"); + } + + @Test + public void testSpop() { + jedisCluster.spop("key"); + jedisCluster.spop("key", 1337); + } + + @Test + public void testScard() { + jedisCluster.scard("key"); + } + + @Test + public void testSismember() { + jedisCluster.sismember("key", "member"); + } + + @Test + public void testSrandmember() { + jedisCluster.srandmember("key"); + jedisCluster.srandmember("key", 1337); + } + + @Test + public void testStrlen() { + jedisCluster.strlen("key"); + } + + @Test + public void testZadd() { + jedisCluster.zadd("key", new HashMap<>()); + jedisCluster.zadd("key", new HashMap<>(), ZAddParams.zAddParams()); + jedisCluster.zadd("key", 1337, "members"); + jedisCluster.zadd("key", 1337, "members", ZAddParams.zAddParams()); + } + + @Test + public void testZrange() { + jedisCluster.zrange("key", 1337, 1338); + } + + @Test + public void testZrem() { + jedisCluster.zrem("key", "member"); + } + + @Test + public void testZincrby() { + jedisCluster.zincrby("key", 1337, "member"); + jedisCluster.zincrby("key", 1337, "member", ZIncrByParams.zIncrByParams()); + } + + @Test + public void testZrank() { + jedisCluster.zrank("key", "member"); + } + + @Test + public void testZrevrank() { + jedisCluster.zrevrank("key", "member"); + } + + @Test + public void testZrevrange() { + jedisCluster.zrevrange("key", 1337, 1338); + } + + @Test + public void testZrangeWithScores() { + jedisCluster.zrangeWithScores("key", 1337, 1338); + } + + @Test + public void testZrevrangeWithScores() { + jedisCluster.zrevrangeWithScores("key", 1337, 1338); + } + + @Test + public void testZcard() { + jedisCluster.zcard("key"); + } + + @Test + public void testZscore() { + jedisCluster.zscore("key", "member"); + } + + @Test + public void testSort() { + jedisCluster.sort("key"); + jedisCluster.sort("key", new SortingParams()); + } + + @Test + public void testZcount() { + jedisCluster.zcount("key", "min", "max"); + jedisCluster.zcount("key", 1337, 1338); + } + + @Test + public void testZrangeByScore() { + jedisCluster.zrangeByScore("key", "min", "max"); + jedisCluster.zrangeByScore("key", 1337, 1338); + jedisCluster.zrangeByScore("key", "min", "max", 1337, 1338); + jedisCluster.zrangeByScore("key", 1337, 1338, 1339, 1340); + } + + + @Test + public void testZrevrangeByScore() { + jedisCluster.zrevrangeByScore("key", "max", "min"); + jedisCluster.zrevrangeByScore("key", 1337, 1338); + jedisCluster.zrevrangeByScore("key", "max", "min", 1337, 1338); + jedisCluster.zrevrangeByScore("key", 1337, 1338, 1339, 1340); + } + + @Test + public void testZrangeByScoreWithScores() { + jedisCluster.zrangeByScoreWithScores("key", "min", "max"); + jedisCluster.zrangeByScoreWithScores("key", "min", "max", 1337, 1338); + jedisCluster.zrangeByScoreWithScores("key", 1337, 1338); + jedisCluster.zrangeByScoreWithScores("key", 1337, 1338, 1339, 1340); + } + + @Test + public void testZrevrangeByScoreWithScores() { + jedisCluster.zrevrangeByScoreWithScores("key", "max", "min"); + jedisCluster.zrevrangeByScoreWithScores("key", "max", "min", 1337, 1338); + jedisCluster.zrevrangeByScoreWithScores("key", 1337, 1338); + jedisCluster.zrevrangeByScoreWithScores("key", 1337, 1338, 1339, 1340); + } + + @Test + public void testZremrangeByRank() { + jedisCluster.zremrangeByRank("key", 1337, 1338); + } + + @Test + public void testZremrangeByScore() { + jedisCluster.zremrangeByScore("key", "start", "end"); + jedisCluster.zremrangeByScore("key", 1337, 1338); + } + + @Test + public void testZlexcount() { + jedisCluster.zlexcount("key", "min", "max"); + } + + @Test + public void testZrangeByLex() { + jedisCluster.zrangeByLex("key", "min", "max"); + jedisCluster.zrangeByLex("key", "min", "max", 1337, 1338); + } + + @Test + public void testZrevrangeByLex() { + jedisCluster.zrevrangeByLex("key", "max", "min"); + jedisCluster.zrevrangeByLex("key", "max", "min", 1337, 1338); + } + + @Test + public void testZremrangeByLex() { + jedisCluster.zremrangeByLex("key", "min", "max"); + } + + @Test + public void testLinsert() { + jedisCluster.linsert("key", ListPosition.AFTER, "pivot", "value"); + } + + @Test + public void testLpushx() { + jedisCluster.lpushx("key", "string"); + } + + @Test + public void testRpushx() { + jedisCluster.rpushx("key", "string"); + } + + @Test + public void testBlpop() { + jedisCluster.blpop(1337, "arg"); + } + + @Test + public void testBrpop() { + jedisCluster.brpop(1337, "arg"); + } + + @Test + public void testDel() { + jedisCluster.del("key"); + } + + @Test + public void testEcho() { + jedisCluster.echo("string"); + } + + @Test + public void testMove() { + jedisCluster.move("key", 1337); + } + + @Test + public void testBitcount() { + jedisCluster.bitcount("key"); + jedisCluster.bitcount("key", 1337, 1338); + } + + @Test + public void testBitpos() { + jedisCluster.bitpos("key", true); + } + + @Test + public void testHscan() { + jedisCluster.hscan("key", "cursor"); + jedisCluster.hscan("key", "cursor", new ScanParams()); + } + + @Test + public void testSscan() { + jedisCluster.sscan("key", "cursor"); + jedisCluster.sscan("key", "cursor", new ScanParams()); + } + + @Test + public void testZscan() { + jedisCluster.zscan("key", "cursor"); + jedisCluster.zscan("key", "cursor", new ScanParams()); + } + + @Test + public void testPfadd() { + jedisCluster.pfadd("key", "elements"); + } + + @Test + public void testPfcount() { + jedisCluster.pfcount("key"); + } + + @Test + public void testGeoadd() { + jedisCluster.geoadd("key", new HashMap<>()); + jedisCluster.geoadd("key", 1337, 1338, "member"); + } + + @Test + public void testGeodist() { + jedisCluster.geodist("key", "member1", "member2"); + jedisCluster.geodist("key", "member1", "member2", GeoUnit.KM); + } + + @Test + public void testGeohash() { + jedisCluster.geohash("key", "members"); + } + + @Test + public void testGeopos() { + jedisCluster.geopos("key", "members"); + } + + @Test + public void testGeoradius() { + jedisCluster.georadius("key", 1337, 1338, 32, GeoUnit.KM); + jedisCluster.georadius("key", 1337, 1338, 32, GeoUnit.KM, GeoRadiusParam.geoRadiusParam()); + } + + @Test + public void testGeoradiusByMember() { + jedisCluster.georadiusByMember("key", "member", 1337, GeoUnit.KM); + jedisCluster.georadiusByMember("key", "member", 1337, GeoUnit.KM, GeoRadiusParam.geoRadiusParam()); + } + + @Test + public void testBitfield() { + jedisCluster.bitfield("key", "arguments"); + } +} \ No newline at end of file diff --git a/server/dependencies.lock b/server/dependencies.lock index 270fc05e82..3a919dbffd 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -14,7 +14,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -34,13 +34,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -259,10 +259,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -365,7 +366,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -452,38 +456,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -605,7 +634,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -658,6 +690,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -946,7 +984,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -1019,7 +1060,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -1036,7 +1077,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -1203,6 +1247,10 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -1224,7 +1272,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -1446,6 +1495,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -1468,7 +1523,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -1479,7 +1537,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -1487,7 +1546,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -1504,7 +1566,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -1551,7 +1613,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -1571,13 +1633,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -1796,10 +1858,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -1902,7 +1965,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -1989,38 +2055,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -2142,7 +2233,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -2195,6 +2289,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -2483,7 +2583,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -2556,7 +2659,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -2573,7 +2676,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -2740,6 +2846,10 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -2761,7 +2871,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -2983,6 +3094,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -3005,7 +3122,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -3016,7 +3136,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -3024,7 +3145,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -3041,7 +3165,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -3088,7 +3212,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -3108,13 +3232,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -3333,10 +3457,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -3439,7 +3564,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -3526,38 +3654,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -3679,7 +3832,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -3732,6 +3888,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -4020,7 +4182,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -4093,7 +4258,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -4110,7 +4275,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -4277,6 +4445,10 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -4298,7 +4470,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -4520,6 +4693,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -4542,7 +4721,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -4553,7 +4735,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -4561,7 +4744,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -4578,7 +4764,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -4625,7 +4811,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -4645,13 +4831,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -4870,10 +5056,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -4976,7 +5163,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -5063,38 +5253,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -5216,7 +5431,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -5269,6 +5487,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -5557,7 +5781,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -5630,7 +5857,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -5647,7 +5874,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -5814,6 +6044,10 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -5835,7 +6069,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -6057,6 +6292,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -6079,7 +6320,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -6090,7 +6334,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -6098,7 +6343,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -6115,7 +6363,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -7230,7 +7478,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -7250,13 +7498,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -7475,10 +7723,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -7581,7 +7830,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -7668,38 +7920,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -7821,7 +8098,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -7874,6 +8154,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -8162,7 +8448,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -8235,7 +8524,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -8252,7 +8541,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -8419,6 +8711,10 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -8440,7 +8736,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -8662,6 +8959,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -8684,7 +8987,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -8695,7 +9001,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -8703,7 +9010,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -8720,7 +9030,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -8767,7 +9077,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -8787,13 +9097,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -9012,10 +9322,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -9118,7 +9429,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -9205,38 +9519,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -9358,7 +9697,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -9411,6 +9753,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -9699,7 +10047,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -9772,7 +10123,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -9789,7 +10140,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -9956,6 +10310,10 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -9977,7 +10335,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -10199,6 +10558,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -10221,7 +10586,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -10232,7 +10600,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -10240,7 +10609,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -10257,7 +10629,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -10304,7 +10676,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -10324,13 +10696,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -10549,10 +10921,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -10655,7 +11028,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -10742,38 +11118,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -10895,7 +11296,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -10948,6 +11352,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -11233,7 +11643,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -11306,7 +11719,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -11323,7 +11736,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -11478,6 +11894,10 @@ "com.fasterxml.jackson.dataformat:jackson-dataformat-xml" ] }, + "org.eclipse.jetty:jetty-jmx": { + "project": true, + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-server": { "project": true, "requested": "9.3.9.v20160517" @@ -11705,6 +12125,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -11727,7 +12153,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -11738,7 +12167,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -11746,7 +12176,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -11763,7 +12196,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -11810,7 +12243,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -11830,13 +12263,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -12055,10 +12488,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -12161,7 +12595,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -12248,38 +12685,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -12401,7 +12863,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -12454,6 +12919,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -12742,7 +13213,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -12819,7 +13293,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -12836,7 +13310,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -13003,6 +13480,10 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -13024,7 +13505,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -13262,6 +13744,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -13284,7 +13772,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -13295,7 +13786,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -13303,7 +13795,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -13320,7 +13815,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -13367,7 +13862,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -13387,13 +13882,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -13612,10 +14107,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -13718,7 +14214,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -13805,38 +14304,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -13958,7 +14482,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -14011,6 +14538,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -14299,7 +14832,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -14376,7 +14912,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -14393,7 +14929,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -14560,6 +15099,10 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -14581,7 +15124,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -14819,6 +15363,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -14841,7 +15391,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -14852,7 +15405,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -14860,7 +15414,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -14877,7 +15434,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -14924,7 +15481,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -14944,13 +15501,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -15169,10 +15726,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -15275,7 +15833,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -15362,38 +15923,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -15515,7 +16101,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -15568,6 +16157,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -15856,7 +16451,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -15933,7 +16531,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -15950,7 +16548,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -16117,6 +16718,10 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -16138,7 +16743,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -16376,6 +16982,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -16398,7 +17010,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -16409,7 +17024,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -16417,7 +17033,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -16434,7 +17053,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -16481,7 +17100,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -16501,13 +17120,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -16726,10 +17345,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -16832,7 +17452,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -16919,38 +17542,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.6", "transitive": [ @@ -17072,7 +17720,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -17125,6 +17776,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -17413,7 +18070,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -17490,7 +18150,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -17507,7 +18167,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -17674,6 +18337,10 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "requested": "9.3.9.v20160517" + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -17695,7 +18362,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -17933,6 +18601,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "transitive": [ @@ -17955,7 +18629,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -17966,7 +18643,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -17974,7 +18652,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.xerial.snappy:snappy-java": { @@ -17991,7 +18672,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", diff --git a/server/src/main/java/com/netflix/conductor/server/DynomiteClusterModule.java b/server/src/main/java/com/netflix/conductor/server/DynomiteClusterModule.java index 56ac5c5f2d..1e935fb8bc 100644 --- a/server/src/main/java/com/netflix/conductor/server/DynomiteClusterModule.java +++ b/server/src/main/java/com/netflix/conductor/server/DynomiteClusterModule.java @@ -1,8 +1,19 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.server; import com.google.inject.AbstractModule; import com.google.inject.name.Names; - import com.netflix.conductor.dyno.DynoShardSupplierProvider; import com.netflix.conductor.dyno.DynomiteConfiguration; import com.netflix.conductor.dyno.RedisQueuesProvider; @@ -13,8 +24,7 @@ import com.netflix.dyno.connectionpool.HostSupplier; import com.netflix.dyno.connectionpool.TokenMapSupplier; import com.netflix.dyno.queues.ShardSupplier; - -import redis.clients.jedis.JedisCommands; +import redis.clients.jedis.commands.JedisCommands; public class DynomiteClusterModule extends AbstractModule { diff --git a/server/src/main/java/com/netflix/conductor/server/LocalRedisModule.java b/server/src/main/java/com/netflix/conductor/server/LocalRedisModule.java index ee4d7cf83d..bf6ba44041 100644 --- a/server/src/main/java/com/netflix/conductor/server/LocalRedisModule.java +++ b/server/src/main/java/com/netflix/conductor/server/LocalRedisModule.java @@ -1,8 +1,19 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.server; import com.google.inject.AbstractModule; import com.google.inject.name.Names; - import com.netflix.conductor.dyno.DynoShardSupplierProvider; import com.netflix.conductor.dyno.DynomiteConfiguration; import com.netflix.conductor.dyno.RedisQueuesProvider; @@ -11,8 +22,7 @@ import com.netflix.conductor.jedis.LocalHostSupplierProvider; import com.netflix.dyno.connectionpool.HostSupplier; import com.netflix.dyno.queues.ShardSupplier; - -import redis.clients.jedis.JedisCommands; +import redis.clients.jedis.commands.JedisCommands; public class LocalRedisModule extends AbstractModule { @Override diff --git a/server/src/main/java/com/netflix/conductor/server/RedisClusterModule.java b/server/src/main/java/com/netflix/conductor/server/RedisClusterModule.java index b0d229bd76..7e61a83895 100644 --- a/server/src/main/java/com/netflix/conductor/server/RedisClusterModule.java +++ b/server/src/main/java/com/netflix/conductor/server/RedisClusterModule.java @@ -1,7 +1,18 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.server; import com.google.inject.AbstractModule; - import com.google.inject.name.Names; import com.netflix.conductor.dyno.DynoShardSupplierProvider; import com.netflix.conductor.dyno.DynomiteConfiguration; @@ -10,9 +21,8 @@ import com.netflix.conductor.jedis.ConfigurationHostSupplierProvider; import com.netflix.conductor.jedis.RedisClusterJedisProvider; import com.netflix.dyno.connectionpool.HostSupplier; - import com.netflix.dyno.queues.ShardSupplier; -import redis.clients.jedis.JedisCommands; +import redis.clients.jedis.commands.JedisCommands; public class RedisClusterModule extends AbstractModule { @Override diff --git a/server/src/main/java/com/netflix/conductor/server/RedisSentinelModule.java b/server/src/main/java/com/netflix/conductor/server/RedisSentinelModule.java index 4222e94cee..6e42716753 100644 --- a/server/src/main/java/com/netflix/conductor/server/RedisSentinelModule.java +++ b/server/src/main/java/com/netflix/conductor/server/RedisSentinelModule.java @@ -1,3 +1,15 @@ +/* + * Copyright 2019 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ package com.netflix.conductor.server; import com.google.inject.AbstractModule; @@ -12,8 +24,7 @@ import com.netflix.dyno.connectionpool.HostSupplier; import com.netflix.dyno.connectionpool.TokenMapSupplier; import com.netflix.dyno.queues.ShardSupplier; - -import redis.clients.jedis.JedisCommands; +import redis.clients.jedis.commands.JedisCommands; public class RedisSentinelModule extends AbstractModule { @Override diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index b620992695..88fa5dfcd7 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -105,7 +105,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -126,13 +126,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -353,10 +353,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -460,7 +461,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -583,38 +587,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.7", "transitive": [ @@ -744,7 +773,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -797,6 +829,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -1092,7 +1130,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -1183,7 +1224,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -1200,7 +1241,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -1371,6 +1415,12 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "transitive": [ + "com.netflix.conductor:conductor-server" + ] + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -1396,7 +1446,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -1644,6 +1695,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17", @@ -1668,7 +1725,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -1679,7 +1739,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -1687,7 +1748,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.springframework:spring-core": { @@ -1710,7 +1774,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -1785,7 +1849,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -1806,13 +1870,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -2033,10 +2097,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -2140,7 +2205,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -2263,38 +2331,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.7", "transitive": [ @@ -2424,7 +2517,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -2477,6 +2573,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -2772,7 +2874,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -2863,7 +2968,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -2880,7 +2985,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -3051,6 +3159,12 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "transitive": [ + "com.netflix.conductor:conductor-server" + ] + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -3076,7 +3190,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -3324,6 +3439,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17", @@ -3348,7 +3469,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -3359,7 +3483,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -3367,7 +3492,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.springframework:spring-core": { @@ -3390,7 +3518,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -3465,7 +3593,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -3486,13 +3614,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -3713,10 +3841,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -3820,7 +3949,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -3943,38 +4075,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.7", "transitive": [ @@ -4104,7 +4261,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -4157,6 +4317,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -4452,7 +4618,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -4543,7 +4712,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -4560,7 +4729,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -4731,6 +4903,12 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "transitive": [ + "com.netflix.conductor:conductor-server" + ] + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -4756,7 +4934,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -5004,6 +5183,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17", @@ -5028,7 +5213,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -5039,7 +5227,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -5047,7 +5236,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.springframework:spring-core": { @@ -5070,7 +5262,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", @@ -5145,7 +5337,7 @@ ] }, "com.amazonaws:aws-java-sdk-core": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -5166,13 +5358,13 @@ ] }, "com.amazonaws:aws-java-sdk-sqs": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.netflix.conductor:conductor-contribs" ] }, "com.amazonaws:jmespath-java": { - "locked": "1.11.641", + "locked": "1.11.662", "transitive": [ "com.amazonaws:aws-java-sdk-kms", "com.amazonaws:aws-java-sdk-s3", @@ -5393,10 +5585,11 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.7", + "locked": "2.8.5", "transitive": [ "com.ecwid.consul:consul-api", "com.google.protobuf:protobuf-java-util", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "io.grpc:grpc-core" ] @@ -5500,7 +5693,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "com.jayway.jsonpath:json-path": { @@ -5623,38 +5819,63 @@ "project": true }, "com.netflix.dyno-queues:dyno-queues-core": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, "com.netflix.dyno-queues:dyno-queues-redis": { - "locked": "2.0.0-rc8", + "locked": "2.0.13", "transitive": [ "com.netflix.conductor:conductor-redis-persistence" ] }, "com.netflix.dyno:dyno-contrib": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache" ] }, "com.netflix.dyno:dyno-core": { - "locked": "1.6.5-rc.4", + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-core", "com.netflix.dyno-queues:dyno-queues-redis", "com.netflix.dyno:dyno-contrib", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, - "com.netflix.dyno:dyno-jedis": { - "locked": "1.6.5-rc.4", + "com.netflix.dyno:dyno-demo": { + "locked": "1.7.2-rc2", "transitive": [ "com.netflix.dyno-queues:dyno-queues-redis" ] }, + "com.netflix.dyno:dyno-jedis": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno-queues:dyno-queues-redis", + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-recipes" + ] + }, + "com.netflix.dyno:dyno-memcache": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, + "com.netflix.dyno:dyno-recipes": { + "locked": "1.7.2-rc2", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "com.netflix.eureka:eureka-client": { "locked": "1.8.7", "transitive": [ @@ -5784,7 +6005,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs.jersey-oauth:oauth-signature", "com.sun.jersey.contribs:jersey-multipart", @@ -5837,6 +6061,12 @@ "com.netflix.conductor:conductor-mysql-persistence" ] }, + "commons-cli:commons-cli": { + "locked": "1.4", + "transitive": [ + "com.netflix.dyno:dyno-demo" + ] + }, "commons-codec:commons-codec": { "locked": "1.11", "transitive": [ @@ -6132,7 +6362,10 @@ "com.fasterxml.jackson.datatype:jackson-datatype-joda", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.netflix-commons:netflix-infix", "org.elasticsearch:elasticsearch" ] @@ -6223,7 +6456,7 @@ ] }, "org.apache.commons:commons-pool2": { - "locked": "2.4.2", + "locked": "2.4.3", "transitive": [ "redis.clients:jedis" ] @@ -6240,7 +6473,10 @@ "com.amazonaws:aws-java-sdk-core", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.eureka:eureka-client", "com.sun.jersey.contribs:jersey-apache-client4", "org.elasticsearch.client:elasticsearch-rest-client" @@ -6411,6 +6647,12 @@ "org.eclipse.jetty:jetty-server" ] }, + "org.eclipse.jetty:jetty-jmx": { + "locked": "9.3.9.v20160517", + "transitive": [ + "com.netflix.conductor:conductor-server" + ] + }, "org.eclipse.jetty:jetty-security": { "locked": "9.3.9.v20160517", "transitive": [ @@ -6436,7 +6678,8 @@ "locked": "9.3.9.v20160517", "transitive": [ "org.eclipse.jetty:jetty-http", - "org.eclipse.jetty:jetty-io" + "org.eclipse.jetty:jetty-io", + "org.eclipse.jetty:jetty-jmx" ] }, "org.elasticsearch.client:elasticsearch-rest-client": { @@ -6684,6 +6927,12 @@ "com.github.jnr:jnr-ffi" ] }, + "org.projectlombok:lombok": { + "locked": "1.18.4", + "transitive": [ + "com.netflix.dyno:dyno-jedis" + ] + }, "org.rarefiedredis.redis:redis-java": { "locked": "0.0.17", "requested": "0.0.17", @@ -6708,7 +6957,10 @@ "com.netflix.conductor:conductor-common", "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", + "com.netflix.dyno:dyno-demo", "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes", "com.netflix.governator:governator-core", "com.netflix.netflix-commons:netflix-eventbus", "com.netflix.netflix-commons:netflix-infix", @@ -6719,7 +6971,8 @@ "io.swagger:swagger-core", "io.swagger:swagger-models", "org.apache.kafka:kafka-clients", - "org.slf4j:slf4j-log4j12" + "org.slf4j:slf4j-log4j12", + "redis.clients:jedis" ] }, "org.slf4j:slf4j-log4j12": { @@ -6727,7 +6980,10 @@ "transitive": [ "com.netflix.dyno:dyno-contrib", "com.netflix.dyno:dyno-core", - "com.netflix.dyno:dyno-jedis" + "com.netflix.dyno:dyno-demo", + "com.netflix.dyno:dyno-jedis", + "com.netflix.dyno:dyno-memcache", + "com.netflix.dyno:dyno-recipes" ] }, "org.springframework:spring-core": { @@ -6750,7 +7006,7 @@ ] }, "redis.clients:jedis": { - "locked": "2.9.0", + "locked": "3.0.1", "transitive": [ "com.netflix.conductor:conductor-redis-persistence", "com.netflix.dyno:dyno-jedis", diff --git a/versionsOfDependencies.gradle b/versionsOfDependencies.gradle index b0178c2415..0bf609c0b1 100644 --- a/versionsOfDependencies.gradle +++ b/versionsOfDependencies.gradle @@ -10,7 +10,7 @@ ext { revCassandraUnit = '3.5.0.1' revCommonsLang3 = '3.0' revCommonsIo = '2.4' - revDynoQueues = '2.0.0-rc8' + revDynoQueues = '2.0.13' revElasticSearch5 = '5.6.8' revElasticSearch5Client = '5.6.8' revElasticSearch6 = '6.5.1' @@ -30,28 +30,28 @@ ext { revJavaxInject = '1' revJacksonCore = '2.7.5' revJacksonDatabind = '2.7.5' - revJedis = '2.9.0' + revJedis = '3.0.+' revJerseyBundle = '1.19.1' revJerseyClient = '1.19.4' revJerseyGuice = '1.19.4' + revJetteyServer = '9.3.9.v20160517' + revJettyServlet = '9.3.9.v20160517' revJUnit = '4.12' revJsr311Api = '1.1.1' revJq = '0.0.8' revLog4jApi = '2.9.1' revLog4jCore = '2.9.1' revMariaDB4j = '2.2.3' - revRxJava = '1.2.2' revMockito = '1.10.19' revMySqlConnector = '8.0.11' revNatsStreaming = '0.5.0' - revJetteyServer = '9.3.9.v20160517' - revJettyServlet = '9.3.9.v20160517' revOauthClient = '1.19.4' revOauthSignature = '1.19.4' revProtoBuf = '3.5.1' revProtogenAnnotations = '1.0.0' revProtogenCodegen = '1.4.0' revRarefiedRedis = '0.0.17' + revRxJava = '1.2.2' revServo = '0.12.17' revServletApi = '3.1.0' revSpotifyCompletableFutures = '0.3.1'