diff --git a/pom.xml b/pom.xml index 91a4b95..be404a7 100644 --- a/pom.xml +++ b/pom.xml @@ -35,9 +35,9 @@ UTF-8 -Xdoclint:none - 2.2.1 - 2.6.1 - 1.1.7 + 2.3.2 + 2.11.0 + 1.2.3 @@ -63,7 +63,7 @@ redis.clients jedis - 3.0.1 + 3.3.0 @@ -87,14 +87,14 @@ org.slf4j slf4j-api - 1.7.7 + 1.7.30 junit junit - 4.12 + 4.13 test @@ -122,7 +122,7 @@ commons-io commons-io - 2.4 + 2.6 test @@ -220,8 +220,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.7 - 1.7 + 1.8 + 1.8 diff --git a/src/main/java/net/joelinn/quartz/jobstore/RedisJobStore.java b/src/main/java/net/joelinn/quartz/jobstore/RedisJobStore.java index 3d03a20..41d2c2e 100644 --- a/src/main/java/net/joelinn/quartz/jobstore/RedisJobStore.java +++ b/src/main/java/net/joelinn/quartz/jobstore/RedisJobStore.java @@ -139,6 +139,16 @@ public void setClusterCheckinInterval(long interval) { this.clusterCheckinInterval = interval; } + @Override + public void resetTriggerFromErrorState(TriggerKey triggerKey) throws JobPersistenceException { + + } + + @Override + public long getAcquireRetryDelay(int i) { + return 100; + } + /** * Called by the QuartzScheduler before the JobStore is * used, in order to give the it a chance to initialize. diff --git a/src/main/java/net/joelinn/quartz/jobstore/jedis/JedisClusterCommandsWrapper.java b/src/main/java/net/joelinn/quartz/jobstore/jedis/JedisClusterCommandsWrapper.java index a155131..869ac95 100644 --- a/src/main/java/net/joelinn/quartz/jobstore/jedis/JedisClusterCommandsWrapper.java +++ b/src/main/java/net/joelinn/quartz/jobstore/jedis/JedisClusterCommandsWrapper.java @@ -760,4 +760,114 @@ public List bitfield(String s, String... strings) { public Long hstrlen(String s, String s1) { return cluster.hstrlen(s, s1); } + + @Override + public StreamEntryID xadd(String s, StreamEntryID streamEntryID, Map map) { + return null; + } + + @Override + public StreamEntryID xadd(String s, StreamEntryID streamEntryID, Map map, long l, boolean b) { + return null; + } + + @Override + public Long xlen(String s) { + return null; + } + + @Override + public List xrange(String s, StreamEntryID streamEntryID, StreamEntryID streamEntryID1, int i) { + return null; + } + + @Override + public List xrevrange(String s, StreamEntryID streamEntryID, StreamEntryID streamEntryID1, int i) { + return null; + } + + @Override + public long xack(String s, String s1, StreamEntryID... streamEntryIDS) { + return 0; + } + + @Override + public String xgroupCreate(String s, String s1, StreamEntryID streamEntryID, boolean b) { + return null; + } + + @Override + public String xgroupSetID(String s, String s1, StreamEntryID streamEntryID) { + return null; + } + + @Override + public long xgroupDestroy(String s, String s1) { + return 0; + } + + @Override + public Long xgroupDelConsumer(String s, String s1, String s2) { + return null; + } + + @Override + public List xpending(String s, String s1, StreamEntryID streamEntryID, StreamEntryID streamEntryID1, int i, String s2) { + return null; + } + + @Override + public long xdel(String s, StreamEntryID... streamEntryIDS) { + return 0; + } + + @Override + public long xtrim(String s, long l, boolean b) { + return 0; + } + + @Override + public List xclaim(String s, String s1, String s2, long l, long l1, int i, boolean b, StreamEntryID... streamEntryIDS) { + return null; + } + + @Override + public Tuple zpopmax(String s) { + return null; + } + + @Override + public Set zpopmax(String s, int i) { + return null; + } + + @Override + public Tuple zpopmin(String s) { + return null; + } + + @Override + public Set zpopmin(String s, int i) { + return null; + } + + @Override + public List bitfieldReadonly(String s, String... strings) { + return null; + } + + @Override + public StreamInfo xinfoStream(String s) { + return null; + } + + @Override + public List xinfoGroup(String s) { + return null; + } + + @Override + public List xinfoConsumers(String s, String s1) { + return null; + } } diff --git a/src/test/java/net/joelinn/quartz/BaseIntegrationTest.java b/src/test/java/net/joelinn/quartz/BaseIntegrationTest.java index 1f8feba..f27727c 100644 --- a/src/test/java/net/joelinn/quartz/BaseIntegrationTest.java +++ b/src/test/java/net/joelinn/quartz/BaseIntegrationTest.java @@ -58,7 +58,7 @@ protected Properties schedulerConfig(String host, int port) { config.setProperty("org.quartz.jobStore.port", String.valueOf(port)); config.setProperty("org.quartz.threadPool.threadCount", "1"); config.setProperty("org.quartz.jobStore.misfireThreshold", "500"); - config.setProperty(StdSchedulerFactory.PROP_SCHED_SKIP_UPDATE_CHECK, "true"); + // config.setProperty(StdSchedulerFactory.PROP_SCHED_SKIP_UPDATE_CHECK, "true"); return config; } diff --git a/src/test/java/net/joelinn/quartz/mixin/JobDetailMixinTest.java b/src/test/java/net/joelinn/quartz/mixin/JobDetailMixinTest.java index 5018cdd..37d2d89 100644 --- a/src/test/java/net/joelinn/quartz/mixin/JobDetailMixinTest.java +++ b/src/test/java/net/joelinn/quartz/mixin/JobDetailMixinTest.java @@ -39,7 +39,7 @@ public void serializeJobDetail() throws Exception { .build(); String json = mapper.writeValueAsString(testJob); - Map jsonMap = mapper.readValue(json, new TypeReference>() { + HashMap jsonMap = mapper.readValue(json, new TypeReference>() { }); assertThat(jsonMap, hasKey("name"));