From 0cf64121aed3724fe25bb4394717fb2df101282e Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Tue, 12 Jun 2018 16:52:09 +0800
Subject: [PATCH]

---
 src/org/redkale/net/PrepareServlet.java     |  2 +-
 src/org/redkale/net/http/WebSocketNode.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/org/redkale/net/PrepareServlet.java b/src/org/redkale/net/PrepareServlet.java
index 15113b803..b6c416327 100644
--- a/src/org/redkale/net/PrepareServlet.java
+++ b/src/org/redkale/net/PrepareServlet.java
@@ -210,7 +210,7 @@ public abstract class PrepareServlet<K extends Serializable, C extends Context,
     @SuppressWarnings("unchecked")
     public abstract void addServlet(S servlet, Object attachment, AnyValue conf, K... mappings);
 
-    public final void prepare(final ByteBuffer buffer, final R request, final P response) throws IOException {
+    public void prepare(final ByteBuffer buffer, final R request, final P response) throws IOException {
         executeCounter.incrementAndGet();
         final int rs = request.readHeader(buffer);
         if (rs < 0) {
diff --git a/src/org/redkale/net/http/WebSocketNode.java b/src/org/redkale/net/http/WebSocketNode.java
index aca6fe2a4..bf9833b64 100644
--- a/src/org/redkale/net/http/WebSocketNode.java
+++ b/src/org/redkale/net/http/WebSocketNode.java
@@ -221,7 +221,7 @@ public abstract class WebSocketNode {
      * @return int
      */
     @Local
-    public final CompletableFuture<Integer> forceCloseWebSocket(final Serializable userid) {
+    public CompletableFuture<Integer> forceCloseWebSocket(final Serializable userid) {
         CompletableFuture<Integer> localFuture = null;
         if (this.localEngine != null) localFuture = CompletableFuture.completedFuture(localEngine.forceCloseLocalWebSocket(userid));
         if (this.sncpNodeAddresses == null || this.remoteNode == null) {
@@ -380,7 +380,7 @@ public abstract class WebSocketNode {
      * @return 为0表示成功， 其他值表示部分发送异常
      */
     @Local
-    public final CompletableFuture<Integer> sendMessage(final Convert convert, final Object message0, final boolean last, final Serializable... userids) {
+    public CompletableFuture<Integer> sendMessage(final Convert convert, final Object message0, final boolean last, final Serializable... userids) {
         if (userids == null || userids.length < 1) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
         if (message0 instanceof CompletableFuture) return ((CompletableFuture) message0).thenApply(msg -> sendMessage(convert, msg, last, userids));
         final Object message = (convert == null || message0 instanceof WebSocketPacket) ? message0 : ((convert instanceof TextConvert) ? new WebSocketPacket(((TextConvert) convert).convertTo(message0), last) : new WebSocketPacket(((BinaryConvert) convert).convertTo(message0), last));
@@ -500,7 +500,7 @@ public abstract class WebSocketNode {
      * @return 为0表示成功， 其他值表示部分发送异常
      */
     @Local
-    public final CompletableFuture<Integer> broadcastMessage(final WebSocketRange wsrange, final Convert convert, final Object message0, final boolean last) {
+    public CompletableFuture<Integer> broadcastMessage(final WebSocketRange wsrange, final Convert convert, final Object message0, final boolean last) {
         if (message0 instanceof CompletableFuture) return ((CompletableFuture) message0).thenApply(msg -> broadcastMessage(wsrange, convert, msg, last));
         final Object message = (convert == null || message0 instanceof WebSocketPacket) ? message0 : ((convert instanceof TextConvert) ? new WebSocketPacket(((TextConvert) convert).convertTo(message0), last) : new WebSocketPacket(((BinaryConvert) convert).convertTo(message0), last));
         if (this.localEngine != null && this.sncpNodeAddresses == null) { //本地模式且没有分布式
@@ -525,7 +525,7 @@ public abstract class WebSocketNode {
         return localFuture == null ? remoteFuture : localFuture.thenCombine(remoteFuture, (a, b) -> a | b);
     }
 
-    private CompletableFuture<Integer> sendOneMessage(final Object message, final boolean last, final Serializable userid) {
+    protected CompletableFuture<Integer> sendOneMessage(final Object message, final boolean last, final Serializable userid) {
         if (message instanceof CompletableFuture) return ((CompletableFuture) message).thenApply(msg -> sendOneMessage(msg, last, userid));
         if (logger.isLoggable(Level.FINEST)) {
             logger.finest("websocket want send message {userid:" + userid + ", content:'" + (message instanceof WebSocketPacket ? ((WebSocketPacket) message).toSimpleString() : JsonConvert.root().convertTo(message)) + "'} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine");
@@ -559,7 +559,7 @@ public abstract class WebSocketNode {
         return localFuture == null ? remoteFuture : localFuture.thenCombine(remoteFuture, (a, b) -> a | b);
     }
 
-    private Object formatRemoteMessage(Object message) {
+    protected Object formatRemoteMessage(Object message) {
         if (message instanceof WebSocketPacket) return message;
         if (message instanceof byte[]) return message;
         if (message instanceof CharSequence) return message;