From c0fdabe0391a514a8094642bf710df16b2801b90 Mon Sep 17 00:00:00 2001 From: crusader Date: Wed, 29 Nov 2017 01:24:16 +0900 Subject: [PATCH] ing --- connection/socket/servlet_handlers.go | 6 ++--- .../websocket/fasthttp/servlet_handlers.go | 6 ++--- rpc_servlet_context.go | 20 --------------- rpc_servlet_handler.go | 25 ------------------- server/servlet_handler.go | 2 +- server/servlet_handlers.go | 6 ++--- rpc_servlet.go => servlet.go | 10 ++++---- servlet_context.go | 20 +++++++++++++++ servlet_handler.go | 25 +++++++++++++++++++ ...servlet_handlers.go => servlet_handlers.go | 24 +++++++++--------- 10 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 rpc_servlet_context.go delete mode 100644 rpc_servlet_handler.go rename rpc_servlet.go => servlet.go (96%) create mode 100644 servlet_context.go create mode 100644 servlet_handler.go rename rpc_servlet_handlers.go => servlet_handlers.go (59%) diff --git a/connection/socket/servlet_handlers.go b/connection/socket/servlet_handlers.go index add09a9..5bca25a 100644 --- a/connection/socket/servlet_handlers.go +++ b/connection/socket/servlet_handlers.go @@ -10,14 +10,14 @@ import ( type ServletHandlers struct { } -func (sh *ServletHandlers) ReadRequest(servletCTX rpc.RPCServletContext, codec protocol.ServerCodec, conn interface{}) (protocol.ServerRequestCodec, error) { +func (sh *ServletHandlers) ReadRequest(servletCTX rpc.ServletContext, codec protocol.ServerCodec, conn interface{}) (protocol.ServerRequestCodec, error) { nConn := conn.(net.Conn) requestCodec, err := codec.NewRequest(nConn) return requestCodec, err } -func (sh *ServletHandlers) WriteResponse(servletCTX rpc.RPCServletContext, conn interface{}, requestCodec protocol.ServerRequestCodec, result interface{}, err error) error { +func (sh *ServletHandlers) WriteResponse(servletCTX rpc.ServletContext, conn interface{}, requestCodec protocol.ServerRequestCodec, result interface{}, err error) error { nConn := conn.(net.Conn) if nil != err { @@ -33,7 +33,7 @@ func (sh *ServletHandlers) WriteResponse(servletCTX rpc.RPCServletContext, conn return nil } -func (sh *ServletHandlers) WriteNotification(servletCTX rpc.RPCServletContext, conn interface{}, codec protocol.ServerCodec, method string, args []interface{}) error { +func (sh *ServletHandlers) WriteNotification(servletCTX rpc.ServletContext, conn interface{}, codec protocol.ServerCodec, method string, args []interface{}) error { nConn := conn.(net.Conn) if wErr := codec.WriteNotification(nConn, method, args); nil != wErr { diff --git a/connection/websocket/fasthttp/servlet_handlers.go b/connection/websocket/fasthttp/servlet_handlers.go index 3c9f497..e43d1eb 100644 --- a/connection/websocket/fasthttp/servlet_handlers.go +++ b/connection/websocket/fasthttp/servlet_handlers.go @@ -10,7 +10,7 @@ import ( type ServletHandlers struct { } -func (sh *ServletHandlers) ReadRequest(servletCTX rpc.RPCServletContext, codec protocol.ServerCodec, conn interface{}) (protocol.ServerRequestCodec, error) { +func (sh *ServletHandlers) ReadRequest(servletCTX rpc.ServletContext, codec protocol.ServerCodec, conn interface{}) (protocol.ServerRequestCodec, error) { soc := conn.(cwf.Socket) _, r, err := soc.NextReader() @@ -19,7 +19,7 @@ func (sh *ServletHandlers) ReadRequest(servletCTX rpc.RPCServletContext, codec p return requestCodec, err } -func (sh *ServletHandlers) WriteResponse(servletCTX rpc.RPCServletContext, conn interface{}, requestCodec protocol.ServerRequestCodec, result interface{}, err error) error { +func (sh *ServletHandlers) WriteResponse(servletCTX rpc.ServletContext, conn interface{}, requestCodec protocol.ServerRequestCodec, result interface{}, err error) error { soc := conn.(cwf.Socket) wc, wErr := soc.NextWriter(websocket.TextMessage) @@ -40,7 +40,7 @@ func (sh *ServletHandlers) WriteResponse(servletCTX rpc.RPCServletContext, conn return nil } -func (sh *ServletHandlers) WriteNotification(servletCTX rpc.RPCServletContext, conn interface{}, codec protocol.ServerCodec, method string, args []interface{}) error { +func (sh *ServletHandlers) WriteNotification(servletCTX rpc.ServletContext, conn interface{}, codec protocol.ServerCodec, method string, args []interface{}) error { soc := conn.(cwf.Socket) wc, wErr := soc.NextWriter(websocket.TextMessage) diff --git a/rpc_servlet_context.go b/rpc_servlet_context.go deleted file mode 100644 index 4642905..0000000 --- a/rpc_servlet_context.go +++ /dev/null @@ -1,20 +0,0 @@ -package rpc - -import ( - cuc "git.loafle.net/commons_go/util/context" -) - -type RPCServletContext interface { - cuc.Context -} - -type rpcServletContext struct { - cuc.Context -} - -func newRPCServletContext(parent cuc.Context) RPCServletContext { - sCTX := &rpcServletContext{} - sCTX.Context = cuc.NewContext(parent) - - return sCTX -} diff --git a/rpc_servlet_handler.go b/rpc_servlet_handler.go deleted file mode 100644 index 44c236b..0000000 --- a/rpc_servlet_handler.go +++ /dev/null @@ -1,25 +0,0 @@ -package rpc - -import ( - "git.loafle.net/commons_go/rpc/protocol" - cuc "git.loafle.net/commons_go/util/context" -) - -type RPCServletHandler interface { - ServletContext(parent cuc.Context) RPCServletContext - - Init(servletCTX RPCServletContext) error - - ReadRequest(servletCTX RPCServletContext, codec protocol.ServerCodec, conn interface{}) (protocol.ServerRequestCodec, error) - Invoke(servletCTX RPCServletContext, requestCodec protocol.RegistryCodec) (result interface{}, err error) - WriteResponse(servletCTX RPCServletContext, conn interface{}, requestCodec protocol.ServerRequestCodec, result interface{}, err error) error - WriteNotification(servletCTX RPCServletContext, conn interface{}, codec protocol.ServerCodec, method string, args []interface{}) error - - Destroy(servletCTX RPCServletContext) - - RegisterCodec(contentType string, codec protocol.ServerCodec) - getCodec(contentType string) (protocol.ServerCodec, error) - - GetPendingResponses() int - Validate() -} diff --git a/server/servlet_handler.go b/server/servlet_handler.go index 13d1d83..05b9903 100644 --- a/server/servlet_handler.go +++ b/server/servlet_handler.go @@ -3,5 +3,5 @@ package server import "git.loafle.net/commons_go/rpc" type ServletHandler interface { - rpc.RPCServletHandler + rpc.ServletHandler } diff --git a/server/servlet_handlers.go b/server/servlet_handlers.go index e31e4ab..bfd74eb 100644 --- a/server/servlet_handlers.go +++ b/server/servlet_handlers.go @@ -9,12 +9,12 @@ import ( ) type ServletHandlers struct { - rpc.RPCServletHandlers + rpc.ServletHandlers RPCRegistry rpc.Registry } -func (sh *ServletHandlers) Invoke(servletCTX rpc.RPCServletContext, requestCodec protocol.RegistryCodec) (result interface{}, err error) { +func (sh *ServletHandlers) Invoke(servletCTX rpc.ServletContext, requestCodec protocol.RegistryCodec) (result interface{}, err error) { if !sh.RPCRegistry.HasMethod(requestCodec.Method()) { return nil, fmt.Errorf("RPC Servlet Handler: Method[%s] is not exist", requestCodec.Method()) } @@ -32,7 +32,7 @@ func (sh *ServletHandlers) Invoke(servletCTX rpc.RPCServletContext, requestCodec } func (sh *ServletHandlers) Validate() { - sh.RPCServletHandlers.Validate() + sh.ServletHandlers.Validate() if nil == sh.RPCRegistry { logging.Logger().Panic(fmt.Sprintf("RPC Servlet Handler: RPC Registry must be specified")) diff --git a/rpc_servlet.go b/servlet.go similarity index 96% rename from rpc_servlet.go rename to servlet.go index 8b5e6ae..ae954b0 100644 --- a/rpc_servlet.go +++ b/servlet.go @@ -11,7 +11,7 @@ import ( cuc "git.loafle.net/commons_go/util/context" ) -func NewRPCServlet(sh RPCServletHandler) RPCServlet { +func NewRPCServlet(sh ServletHandler) RPCServlet { return &rpcServlet{ sh: sh, } @@ -23,12 +23,12 @@ type RPCServlet interface { Send(method string, args ...interface{}) (err error) - Context() RPCServletContext + Context() ServletContext } type rpcServlet struct { - ctx RPCServletContext - sh RPCServletHandler + ctx ServletContext + sh ServletHandler responseQueueChan chan *responseState doneChan chan<- error @@ -103,7 +103,7 @@ func (s *rpcServlet) Send(method string, args ...interface{}) (err error) { return nil } -func (s *rpcServlet) Context() RPCServletContext { +func (s *rpcServlet) Context() ServletContext { return s.ctx } diff --git a/servlet_context.go b/servlet_context.go new file mode 100644 index 0000000..391f340 --- /dev/null +++ b/servlet_context.go @@ -0,0 +1,20 @@ +package rpc + +import ( + cuc "git.loafle.net/commons_go/util/context" +) + +type ServletContext interface { + cuc.Context +} + +type servletContext struct { + cuc.Context +} + +func newServletContext(parent cuc.Context) ServletContext { + sCTX := &servletContext{} + sCTX.Context = cuc.NewContext(parent) + + return sCTX +} diff --git a/servlet_handler.go b/servlet_handler.go new file mode 100644 index 0000000..1fa3c61 --- /dev/null +++ b/servlet_handler.go @@ -0,0 +1,25 @@ +package rpc + +import ( + "git.loafle.net/commons_go/rpc/protocol" + cuc "git.loafle.net/commons_go/util/context" +) + +type ServletHandler interface { + ServletContext(parent cuc.Context) ServletContext + + Init(servletCTX ServletContext) error + + ReadRequest(servletCTX ServletContext, codec protocol.ServerCodec, conn interface{}) (protocol.ServerRequestCodec, error) + Invoke(servletCTX ServletContext, requestCodec protocol.RegistryCodec) (result interface{}, err error) + WriteResponse(servletCTX ServletContext, conn interface{}, requestCodec protocol.ServerRequestCodec, result interface{}, err error) error + WriteNotification(servletCTX ServletContext, conn interface{}, codec protocol.ServerCodec, method string, args []interface{}) error + + Destroy(servletCTX ServletContext) + + RegisterCodec(contentType string, codec protocol.ServerCodec) + getCodec(contentType string) (protocol.ServerCodec, error) + + GetPendingResponses() int + Validate() +} diff --git a/rpc_servlet_handlers.go b/servlet_handlers.go similarity index 59% rename from rpc_servlet_handlers.go rename to servlet_handlers.go index 4732e97..19a2d1c 100644 --- a/rpc_servlet_handlers.go +++ b/servlet_handlers.go @@ -8,7 +8,7 @@ import ( cuc "git.loafle.net/commons_go/util/context" ) -type RPCServletHandlers struct { +type ServletHandlers struct { // The maximum number of pending messages in the queue. // // The number of pending requsts should exceed the expected number @@ -21,31 +21,31 @@ type RPCServletHandlers struct { codecs map[string]protocol.ServerCodec } -func (sh *RPCServletHandlers) ServletContext(parent cuc.Context) RPCServletContext { +func (sh *ServletHandlers) ServletContext(parent cuc.Context) ServletContext { return newRPCServletContext(parent) } -func (sh *RPCServletHandlers) Init(servletCTX RPCServletContext) error { +func (sh *ServletHandlers) Init(servletCTX ServletContext) error { return nil } -func (sh *RPCServletHandlers) ReadRequest(servletCTX RPCServletContext, codec protocol.ServerCodec, conn interface{}) (protocol.ServerRequestCodec, error) { +func (sh *ServletHandlers) ReadRequest(servletCTX ServletContext, codec protocol.ServerCodec, conn interface{}) (protocol.ServerRequestCodec, error) { return nil, fmt.Errorf("Servlet Handler: ReadRequest is not implemented") } -func (sh *RPCServletHandlers) Invoke(servletCTX RPCServletContext, requestCodec protocol.RegistryCodec) (result interface{}, err error) { +func (sh *ServletHandlers) Invoke(servletCTX ServletContext, requestCodec protocol.RegistryCodec) (result interface{}, err error) { return nil, fmt.Errorf("Servlet Handler: Invoke is not implemented") } -func (sh *RPCServletHandlers) WriteResponse(servletCTX RPCServletContext, conn interface{}, requestCodec protocol.ServerRequestCodec, result interface{}, err error) error { +func (sh *ServletHandlers) WriteResponse(servletCTX ServletContext, conn interface{}, requestCodec protocol.ServerRequestCodec, result interface{}, err error) error { return fmt.Errorf("Servlet Handler: WriteResponse is not implemented") } -func (sh *RPCServletHandlers) WriteNotification(servletCTX RPCServletContext, conn interface{}, codec protocol.ServerCodec, method string, args []interface{}) error { +func (sh *ServletHandlers) WriteNotification(servletCTX ServletContext, conn interface{}, codec protocol.ServerCodec, method string, args []interface{}) error { return fmt.Errorf("Servlet Handler: WriteNotification is not implemented") } -func (sh *RPCServletHandlers) Destroy(servletCTX RPCServletContext) { +func (sh *ServletHandlers) Destroy(servletCTX ServletContext) { // no op } @@ -54,14 +54,14 @@ func (sh *RPCServletHandlers) Destroy(servletCTX RPCServletContext) { // Codecs are defined to process a given serialization scheme, e.g., JSON or // XML. A codec is chosen based on the "Content-Type" header from the request, // excluding the charset definition. -func (sh *RPCServletHandlers) RegisterCodec(contentType string, codec protocol.ServerCodec) { +func (sh *ServletHandlers) RegisterCodec(contentType string, codec protocol.ServerCodec) { if nil == sh.codecs { sh.codecs = make(map[string]protocol.ServerCodec) } sh.codecs[strings.ToLower(contentType)] = codec } -func (sh *RPCServletHandlers) getCodec(contentType string) (protocol.ServerCodec, error) { +func (sh *ServletHandlers) getCodec(contentType string) (protocol.ServerCodec, error) { var codec protocol.ServerCodec if contentType == "" && len(sh.codecs) == 1 { // If Content-Type is not set and only one codec has been registered, @@ -76,11 +76,11 @@ func (sh *RPCServletHandlers) getCodec(contentType string) (protocol.ServerCodec return codec, nil } -func (sh *RPCServletHandlers) GetPendingResponses() int { +func (sh *ServletHandlers) GetPendingResponses() int { return sh.PendingResponses } -func (sh *RPCServletHandlers) Validate() { +func (sh *ServletHandlers) Validate() { if 0 >= sh.PendingResponses { sh.PendingResponses = DefaultPendingResponses }