From 95c53f99e086e9968f1cb881366f60145aebecad Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Mon, 22 May 2017 20:20:29 +0800
Subject: [PATCH]

---
 src/org/redkale/net/http/RestOnMessage.java   | 39 -------------------
 src/org/redkale/net/http/RestOnOpen.java      | 32 ---------------
 .../redkale/net/http/WebSocketServlet.java    |  5 +++
 3 files changed, 5 insertions(+), 71 deletions(-)
 delete mode 100644 src/org/redkale/net/http/RestOnMessage.java
 delete mode 100644 src/org/redkale/net/http/RestOnOpen.java

diff --git a/src/org/redkale/net/http/RestOnMessage.java b/src/org/redkale/net/http/RestOnMessage.java
deleted file mode 100644
index c664f5068..000000000
--- a/src/org/redkale/net/http/RestOnMessage.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.http;
-
-import java.lang.annotation.*;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * 标记在RestWebSocket的接收消息方法上
- *
- * <br><p>
- * 详情见: https://redkale.org
- *
- * @author zhangjx
- */
-@Inherited
-@Documented
-@Target({METHOD})
-@Retention(RUNTIME)
-public @interface RestOnMessage {
-
-    /**
-     * 请求的方法名, 不能含特殊字符
-     *
-     * @return String
-     */
-    String name() default "";
-
-    /**
-     * 备注描述
-     *
-     * @return String
-     */
-    String comment() default "";
-}
diff --git a/src/org/redkale/net/http/RestOnOpen.java b/src/org/redkale/net/http/RestOnOpen.java
deleted file mode 100644
index 8f97b3970..000000000
--- a/src/org/redkale/net/http/RestOnOpen.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.http;
-
-import java.lang.annotation.*;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * 标记在RestWebSocket的方法上
- *
- * <br><p>
- * 详情见: https://redkale.org
- *
- * @author zhangjx
- */
-@Inherited
-@Documented
-@Target({METHOD})
-@Retention(RUNTIME)
-public @interface RestOnOpen {
-
-    /**
-     * 备注描述
-     *
-     * @return String
-     */
-    String comment() default "";
-}
diff --git a/src/org/redkale/net/http/WebSocketServlet.java b/src/org/redkale/net/http/WebSocketServlet.java
index 4b0088a18..2f4db4035 100644
--- a/src/org/redkale/net/http/WebSocketServlet.java
+++ b/src/org/redkale/net/http/WebSocketServlet.java
@@ -130,6 +130,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
         webSocket._jsonConvert = jsonConvert;
         webSocket._remoteAddress = request.getRemoteAddress();
         webSocket._remoteAddr = request.getRemoteAddr();
+        initWebSocket(webSocket);
         CompletableFuture<Serializable> sessionFuture = webSocket.onOpen(request);
         if (sessionFuture == null) {
             if (debug) logger.finest("WebSocket connect abort, Not found sessionid. request=" + request);
@@ -187,6 +188,10 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
         });
     }
 
+    protected void initWebSocket(WebSocket websocket) {
+
+    }
+
     protected WebSocketNode createWebSocketNode() {
         return null;
     }