修改:jdk-api 使用修改,支持 jdk8 语法

This commit is contained in:
梁显优 2022-01-13 18:21:00 +08:00
parent 0df9e254e6
commit 90378c5daf
4 changed files with 24 additions and 11 deletions

View File

@ -5,6 +5,7 @@ import com.google.gson.reflect.TypeToken;
import com.zdemo.zhub.Rpc; import com.zdemo.zhub.Rpc;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
@ -32,8 +33,10 @@ public abstract class AbstractConsumer implements IConsumer {
if (!eventMap.isEmpty()) { if (!eventMap.isEmpty()) {
return eventMap.keySet(); return eventMap.keySet();
} }
HashSet<String> set = new HashSet<>();
set.add("-");
return Set.of("-"); return set;
} }
protected void accept(String topic, String value) { protected void accept(String topic, String value) {

View File

@ -10,7 +10,7 @@ public class EventType<T> {
public final TypeToken<T> typeToken; public final TypeToken<T> typeToken;
private final Consumer<T> consumer; private final Consumer<T> consumer;
private final static TypeToken<String> stringToken = new TypeToken<>() { private final static TypeToken<String> stringToken = new TypeToken<String>() {
}; };
private EventType(String topic, TypeToken<T> typeToken, Consumer<T> consumer) { private EventType(String topic, TypeToken<T> typeToken, Consumer<T> consumer) {

View File

@ -7,15 +7,15 @@ import java.util.Map;
public interface IType { public interface IType {
TypeToken<String> STRING = new TypeToken<>() { TypeToken<String> STRING = new TypeToken<String>() {
}; };
TypeToken<Integer> INT = new TypeToken<>() { TypeToken<Integer> INT = new TypeToken<Integer>() {
}; };
TypeToken<Map<String, String>> MAP = new TypeToken<>() { TypeToken<Map<String, String>> MAP = new TypeToken<Map<String, String>>() {
}; };
TypeToken<List<Map<String, String>>> LMAP = new TypeToken<>() { TypeToken<List<Map<String, String>>> LMAP = new TypeToken<List<Map<String, String>>>() {
}; };
} }

View File

@ -420,11 +420,21 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
} }
switch (endchar) { switch (endchar) {
case "M" -> delay *= (1000 * 60 * 60 * 24 * 30); case "M":
case "d" -> delay *= (1000 * 60 * 60 * 24); delay *= (1000 * 60 * 60 * 24 * 30);
case "H" -> delay *= (1000 * 60 * 60); break;
case "m" -> delay *= (1000 * 60); case "d":
case "s" -> delay *= 1000; delay *= (1000 * 60 * 60 * 24);
break;
case "H":
delay *= (1000 * 60 * 60);
break;
case "m":
delay *= (1000 * 60);
break;
case "s":
delay *= 1000;
break;
} }
delay(topic, v, delay); delay(topic, v, delay);