diff --git a/src/org/redkale/asm/MethodDebugVisitor.java b/src/org/redkale/asm/MethodDebugVisitor.java index 0e444331d..c1b810fcf 100644 --- a/src/org/redkale/asm/MethodDebugVisitor.java +++ b/src/org/redkale/asm/MethodDebugVisitor.java @@ -32,7 +32,7 @@ public class MethodDebugVisitor { System.out.println(); } - private final Map labels = new LinkedHashMap(); + private final Map labels = new LinkedHashMap<>(); private static final String[] opcodes = new String[200]; //0 -18 diff --git a/src/org/redkale/boot/Application.java b/src/org/redkale/boot/Application.java index e77116a9a..9ad5df31b 100644 --- a/src/org/redkale/boot/Application.java +++ b/src/org/redkale/boot/Application.java @@ -502,6 +502,7 @@ public final class Application { if (listenClass.isEmpty()) continue; Class clazz = classLoader.loadClass(listenClass); if (!ApplicationListener.class.isAssignableFrom(clazz)) continue; + @SuppressWarnings("unchecked") ApplicationListener listener = (ApplicationListener) clazz.getDeclaredConstructor().newInstance(); listener.init(config); this.listeners.add(listener); diff --git a/src/org/redkale/boot/NodeHttpServer.java b/src/org/redkale/boot/NodeHttpServer.java index 4ee0f004a..bf3d444eb 100644 --- a/src/org/redkale/boot/NodeHttpServer.java +++ b/src/org/redkale/boot/NodeHttpServer.java @@ -56,16 +56,19 @@ public class NodeHttpServer extends NodeServer { } @Override + @SuppressWarnings("unchecked") protected ClassFilter createServiceClassFilter() { return createClassFilter(this.sncpGroup, null, Service.class, new Class[]{org.redkale.watch.WatchService.class}, Annotation.class, "services", "service"); } @Override + @SuppressWarnings("unchecked") protected ClassFilter createFilterClassFilter() { return createClassFilter(null, null, HttpFilter.class, new Class[]{WatchFilter.class}, null, "filters", "filter"); } @Override + @SuppressWarnings("unchecked") protected ClassFilter createServletClassFilter() { return createClassFilter(null, WebServlet.class, HttpServlet.class, new Class[]{WatchServlet.class}, null, "servlets", "servlet"); } @@ -87,6 +90,7 @@ public class NodeHttpServer extends NodeServer { } @Override + @SuppressWarnings("unchecked") protected void loadServlet(ClassFilter servletFilter, ClassFilter otherFilter) throws Exception { if (httpServer != null) loadHttpServlet(servletFilter, otherFilter); } diff --git a/src/org/redkale/boot/NodeWatchServer.java b/src/org/redkale/boot/NodeWatchServer.java index 63a50df3a..f1addcdf0 100644 --- a/src/org/redkale/boot/NodeWatchServer.java +++ b/src/org/redkale/boot/NodeWatchServer.java @@ -24,16 +24,19 @@ public class NodeWatchServer extends NodeHttpServer { } @Override + @SuppressWarnings("unchecked") protected ClassFilter createServiceClassFilter() { return createClassFilter(this.sncpGroup, null, WatchService.class, null, Annotation.class, "services", "service"); } @Override + @SuppressWarnings("unchecked") protected ClassFilter createFilterClassFilter() { return createClassFilter(null, null, WatchFilter.class, null, null, "filters", "filter"); } @Override + @SuppressWarnings("unchecked") protected ClassFilter createServletClassFilter() { return createClassFilter(null, WebServlet.class, WatchServlet.class, null, null, "servlets", "servlet"); } diff --git a/src/org/redkale/convert/OptionalCoder.java b/src/org/redkale/convert/OptionalCoder.java index 189fc659a..b7f4b606d 100644 --- a/src/org/redkale/convert/OptionalCoder.java +++ b/src/org/redkale/convert/OptionalCoder.java @@ -34,6 +34,7 @@ public class OptionalCoder extends Simple private final Object lock = new Object(); + @SuppressWarnings("unchecked") public OptionalCoder(final ConvertFactory factory, final Type type) { this.type = type; try { diff --git a/src/org/redkale/convert/ext/BigIntegerSimpledCoder.java b/src/org/redkale/convert/ext/BigIntegerSimpledCoder.java index 75a0146f0..a6ea50d1e 100644 --- a/src/org/redkale/convert/ext/BigIntegerSimpledCoder.java +++ b/src/org/redkale/convert/ext/BigIntegerSimpledCoder.java @@ -25,6 +25,7 @@ public final class BigIntegerSimpledCoder ex public static final BigIntegerSimpledCoder instance = new BigIntegerSimpledCoder(); @Override + @SuppressWarnings("unchecked") public void convertTo(W out, BigInteger value) { if (value == null) { out.writeNull(); @@ -34,6 +35,7 @@ public final class BigIntegerSimpledCoder ex } @Override + @SuppressWarnings("unchecked") public BigInteger convertFrom(R in) { byte[] bytes = ByteArraySimpledCoder.instance.convertFrom(in); return bytes == null ? null : new BigInteger(bytes); diff --git a/src/org/redkale/convert/ext/DLongSimpledCoder.java b/src/org/redkale/convert/ext/DLongSimpledCoder.java index 0251429ed..cbf9a8eb3 100644 --- a/src/org/redkale/convert/ext/DLongSimpledCoder.java +++ b/src/org/redkale/convert/ext/DLongSimpledCoder.java @@ -27,6 +27,7 @@ public final class DLongSimpledCoder extends public static final DLongSimpledCoder instance = new DLongSimpledCoder(); @Override + @SuppressWarnings("unchecked") public void convertTo(final W out, final DLong value) { if (value == null) { out.writeNull(); @@ -36,6 +37,7 @@ public final class DLongSimpledCoder extends } @Override + @SuppressWarnings("unchecked") public DLong convertFrom(R in) { byte[] bs = bsSimpledCoder.convertFrom(in); if (bs == null) return null; diff --git a/src/org/redkale/convert/ext/DoubleArraySimpledCoder.java b/src/org/redkale/convert/ext/DoubleArraySimpledCoder.java index 67e3f9ff3..cb4114674 100644 --- a/src/org/redkale/convert/ext/DoubleArraySimpledCoder.java +++ b/src/org/redkale/convert/ext/DoubleArraySimpledCoder.java @@ -74,6 +74,7 @@ public final class DoubleArraySimpledCoder e public static final DoubleStreamSimpledCoder instance = new DoubleStreamSimpledCoder(); @Override + @SuppressWarnings("unchecked") public void convertTo(W out, DoubleStream values) { if (values == null) { out.writeNull(); @@ -83,6 +84,7 @@ public final class DoubleArraySimpledCoder e } @Override + @SuppressWarnings("unchecked") public DoubleStream convertFrom(R in) { double[] value = DoubleArraySimpledCoder.instance.convertFrom(in); return value == null ? null : DoubleStream.of(value); diff --git a/src/org/redkale/convert/ext/IntArraySimpledCoder.java b/src/org/redkale/convert/ext/IntArraySimpledCoder.java index c733988d3..932aec00c 100644 --- a/src/org/redkale/convert/ext/IntArraySimpledCoder.java +++ b/src/org/redkale/convert/ext/IntArraySimpledCoder.java @@ -74,6 +74,7 @@ public final class IntArraySimpledCoder exte public static final IntStreamSimpledCoder instance = new IntStreamSimpledCoder(); @Override + @SuppressWarnings("unchecked") public void convertTo(W out, IntStream values) { if (values == null) { out.writeNull(); @@ -83,6 +84,7 @@ public final class IntArraySimpledCoder exte } @Override + @SuppressWarnings("unchecked") public IntStream convertFrom(R in) { int[] value = IntArraySimpledCoder.instance.convertFrom(in); return value == null ? null : IntStream.of(value); diff --git a/src/org/redkale/convert/ext/LongArraySimpledCoder.java b/src/org/redkale/convert/ext/LongArraySimpledCoder.java index 33f5c36a3..7cae9bd0c 100644 --- a/src/org/redkale/convert/ext/LongArraySimpledCoder.java +++ b/src/org/redkale/convert/ext/LongArraySimpledCoder.java @@ -74,6 +74,7 @@ public final class LongArraySimpledCoder ext public static final LongStreamSimpledCoder instance = new LongStreamSimpledCoder(); @Override + @SuppressWarnings("unchecked") public void convertTo(W out, LongStream values) { if (values == null) { out.writeNull(); @@ -83,6 +84,7 @@ public final class LongArraySimpledCoder ext } @Override + @SuppressWarnings("unchecked") public LongStream convertFrom(R in) { long[] value = LongArraySimpledCoder.instance.convertFrom(in); return value == null ? null : LongStream.of(value); diff --git a/src/org/redkale/net/AsyncConnection.java b/src/org/redkale/net/AsyncConnection.java index 6a75cba0d..45ccde03c 100644 --- a/src/org/redkale/net/AsyncConnection.java +++ b/src/org/redkale/net/AsyncConnection.java @@ -170,7 +170,7 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl */ public static CompletableFuture createTCP(final AsynchronousChannelGroup group, final SSLContext sslContext, final SocketAddress address, final boolean noDelay, final int readTimeoutSecond, final int writeTimeoutSecond) { - final CompletableFuture future = new CompletableFuture(); + final CompletableFuture future = new CompletableFuture<>(); try { final AsynchronousSocketChannel channel = AsynchronousSocketChannel.open(group); channel.connect(address, null, new CompletionHandler() { diff --git a/src/org/redkale/net/SSLCreator.java b/src/org/redkale/net/SSLCreator.java new file mode 100644 index 000000000..afb74cbc8 --- /dev/null +++ b/src/org/redkale/net/SSLCreator.java @@ -0,0 +1,26 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.redkale.net; + +import java.io.IOException; +import javax.net.ssl.SSLContext; +import org.redkale.util.*; + +/** + * 根据配置生成SSLContext + * + *

+ * 详情见: https://redkale.org + * + * @author zhangjx + */ +public interface SSLCreator { + + default SSLContext create(Server server, AnyValue sslConf) throws IOException { + + return null; + } +} diff --git a/src/org/redkale/net/Server.java b/src/org/redkale/net/Server.java index da58c0564..509c78d72 100644 --- a/src/org/redkale/net/Server.java +++ b/src/org/redkale/net/Server.java @@ -124,6 +124,19 @@ public abstract class Server list = removeHttpServlet(predicateEntry, predicateFilter); return list == null || list.isEmpty() ? null : list.get(0); } - +@SuppressWarnings("unchecked") public HttpServlet removeHttpServlet(Class websocketOrServletType) { Predicate predicateEntry = (t) -> { Class type = t.servlet.getClass(); @@ -144,6 +144,7 @@ public class HttpPrepareServlet extends PrepareServlet servlets = getServlets(); diff --git a/src/org/redkale/net/http/HttpScope.java b/src/org/redkale/net/http/HttpScope.java index 7a68e892b..145bd2bcf 100644 --- a/src/org/redkale/net/http/HttpScope.java +++ b/src/org/redkale/net/http/HttpScope.java @@ -59,10 +59,12 @@ public class HttpScope { return this; } + @SuppressWarnings("unchecked") public T find(String name) { return this.attributes == null ? null : (T) this.attributes.get(name); } + @SuppressWarnings("unchecked") public T find(HttpScope parent, String name) { T rs = this.attributes == null ? null : (T) this.attributes.get(name); if (rs != null) return rs; diff --git a/src/org/redkale/net/http/HttpServlet.java b/src/org/redkale/net/http/HttpServlet.java index 9ba5ab80f..468cd3f9f 100644 --- a/src/org/redkale/net/http/HttpServlet.java +++ b/src/org/redkale/net/http/HttpServlet.java @@ -294,7 +294,7 @@ public class HttpServlet extends Servlet HttpMapping mapping = method.getAnnotation(HttpMapping.class); this.ignore = mapping == null || !mapping.auth(); this.cacheseconds = mapping == null ? 0 : mapping.cacheseconds(); - this.cache = cacheseconds > 0 ? new ConcurrentHashMap() : null; + this.cache = cacheseconds > 0 ? new ConcurrentHashMap<>() : null; this.cacheHandler = cacheseconds > 0 ? (HttpResponse response, ByteBuffer[] buffers) -> { int status = response.getStatus(); if (status != 200) return null; diff --git a/src/org/redkale/net/sncp/SncpClient.java b/src/org/redkale/net/sncp/SncpClient.java index 05e8e48d6..18500b911 100644 --- a/src/org/redkale/net/sncp/SncpClient.java +++ b/src/org/redkale/net/sncp/SncpClient.java @@ -441,6 +441,7 @@ public final class SncpClient { } } + @SuppressWarnings("unchecked") public void success() { future.complete(this.body); transport.offerBuffer(buffer); @@ -547,6 +548,7 @@ public final class SncpClient { protected final Creator futureCreator; + @SuppressWarnings("unchecked") public SncpAction(final Class clazz, Method method, DLong actionid) { this.actionid = actionid == null ? Sncp.hash(method) : actionid; Type rt = TypeToken.getGenericType(method.getGenericReturnType(), clazz); diff --git a/src/org/redkale/net/sncp/SncpDynServlet.java b/src/org/redkale/net/sncp/SncpDynServlet.java index 41bcaf1ef..a29533592 100644 --- a/src/org/redkale/net/sncp/SncpDynServlet.java +++ b/src/org/redkale/net/sncp/SncpDynServlet.java @@ -105,6 +105,7 @@ public final class SncpDynServlet extends SncpServlet { } @Override + @SuppressWarnings("unchecked") public void execute(SncpRequest request, SncpResponse response) throws IOException { if (bufferSupplier == null) { bufferSupplier = request.getContext().getBufferSupplier(); diff --git a/src/org/redkale/source/CacheMemorySource.java b/src/org/redkale/source/CacheMemorySource.java index 86d75fc04..999b0f2a8 100644 --- a/src/org/redkale/source/CacheMemorySource.java +++ b/src/org/redkale/source/CacheMemorySource.java @@ -27,6 +27,7 @@ import org.redkale.util.*; * * @author zhangjx */ +@SuppressWarnings("unchecked") @Local @AutoLoad(false) @ResourceType(CacheSource.class) @@ -85,6 +86,7 @@ public class CacheMemorySource extends AbstractService impleme } @Override + @SuppressWarnings("unchecked") public void init(AnyValue conf) { if (this.convert == null) this.convert = this.defaultConvert; if (this.convert == null) this.convert = JsonConvert.root(); @@ -320,6 +322,7 @@ public class CacheMemorySource extends AbstractService impleme } @Override + @SuppressWarnings("unchecked") public V get(String key) { if (key == null) return null; CacheEntry entry = container.get(key); @@ -362,6 +365,7 @@ public class CacheMemorySource extends AbstractService impleme @Override @RpcMultiRun + @SuppressWarnings("unchecked") public V getAndRefresh(String key, final int expireSeconds) { if (key == null) return null; CacheEntry entry = container.get(key); @@ -375,6 +379,7 @@ public class CacheMemorySource extends AbstractService impleme @Override @RpcMultiRun + @SuppressWarnings("unchecked") public String getStringAndRefresh(String key, final int expireSeconds) { if (key == null) return null; CacheEntry entry = container.get(key); diff --git a/src/org/redkale/source/DataCallArrayAttribute.java b/src/org/redkale/source/DataCallArrayAttribute.java index 5ae4b4a3c..8d8ccb244 100644 --- a/src/org/redkale/source/DataCallArrayAttribute.java +++ b/src/org/redkale/source/DataCallArrayAttribute.java @@ -18,6 +18,7 @@ import org.redkale.util.*; * @param Entity类的类型 * @param 字段的类型 */ +@SuppressWarnings("unchecked") public final class DataCallArrayAttribute implements Attribute { public static final DataCallArrayAttribute instance = new DataCallArrayAttribute();