Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #45

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<additionalparam>-Xdoclint:none</additionalparam>
<quartz.version>2.2.1</quartz.version>
<jackson.version>2.6.1</jackson.version>
<logback.version>1.1.7</logback.version>
<quartz.version>2.3.2</quartz.version>
<jackson.version>2.11.0</jackson.version>
<logback.version>1.2.3</logback.version>
</properties>

<repositories>
Expand All @@ -63,7 +63,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>3.0.1</version>
<version>3.3.0</version>
</dependency>

<dependency>
Expand All @@ -87,14 +87,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.7</version>
<version>1.7.30</version>
</dependency>

<!-- Testing dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -122,7 +122,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>2.6</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -220,8 +220,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/net/joelinn/quartz/jobstore/RedisJobStore.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 <code>JobStore</code> is
* used, in order to give the it a chance to initialize.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -760,4 +760,114 @@ public List<Long> 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<String, String> map) {
return null;
}

@Override
public StreamEntryID xadd(String s, StreamEntryID streamEntryID, Map<String, String> map, long l, boolean b) {
return null;
}

@Override
public Long xlen(String s) {
return null;
}

@Override
public List<StreamEntry> xrange(String s, StreamEntryID streamEntryID, StreamEntryID streamEntryID1, int i) {
return null;
}

@Override
public List<StreamEntry> 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<StreamPendingEntry> 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<StreamEntry> 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<Tuple> zpopmax(String s, int i) {
return null;
}

@Override
public Tuple zpopmin(String s) {
return null;
}

@Override
public Set<Tuple> zpopmin(String s, int i) {
return null;
}

@Override
public List<Long> bitfieldReadonly(String s, String... strings) {
return null;
}

@Override
public StreamInfo xinfoStream(String s) {
return null;
}

@Override
public List<StreamGroupInfo> xinfoGroup(String s) {
return null;
}

@Override
public List<StreamConsumersInfo> xinfoConsumers(String s, String s1) {
return null;
}
}
2 changes: 1 addition & 1 deletion src/test/java/net/joelinn/quartz/BaseIntegrationTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void serializeJobDetail() throws Exception {
.build();

String json = mapper.writeValueAsString(testJob);
Map<String, Object> jsonMap = mapper.readValue(json, new TypeReference<HashMap<String, String>>() {
HashMap<String, String> jsonMap = mapper.readValue(json, new TypeReference<HashMap<String, String>>() {
});

assertThat(jsonMap, hasKey("name"));
Expand Down