Skip to content

Commit d78a798

Browse files
refactor: remove method
1 parent b02bc88 commit d78a798

File tree

2 files changed

+9
-45
lines changed

2 files changed

+9
-45
lines changed

router_context.go

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type Context interface {
2222
Session() Session
2323

2424
// SetSession sets session.
25-
SetSession(sess Session)
25+
SetSession(sess Session) Context
2626

2727
// Request returns request message entry.
2828
Request() *message.Entry
@@ -43,9 +43,6 @@ type Context interface {
4343
// Response returns the response message entry.
4444
Response() *message.Entry
4545

46-
// RawResponseData returns the not yet encoded response data.
47-
RawResponseData() interface{}
48-
4946
// SetResponse encodes data with session's codec and sets response message entry.
5047
SetResponse(id, data interface{}) error
5148

@@ -77,12 +74,11 @@ type Context interface {
7774

7875
// routeContext implements the Context interface.
7976
type routeContext struct {
80-
mu sync.RWMutex
81-
storage map[string]interface{}
82-
session Session
83-
reqEntry *message.Entry
84-
respEntry *message.Entry
85-
rawRespData interface{}
77+
mu sync.RWMutex
78+
storage map[string]interface{}
79+
session Session
80+
reqEntry *message.Entry
81+
respEntry *message.Entry
8682
}
8783

8884
// Deadline implements the context.Context Deadline method.
@@ -115,8 +111,9 @@ func (c *routeContext) Session() Session {
115111
}
116112

117113
// SetSession sets session.
118-
func (c *routeContext) SetSession(sess Session) {
114+
func (c *routeContext) SetSession(sess Session) Context {
119115
c.session = sess
116+
return c
120117
}
121118

122119
// Request implements Context.Request method.
@@ -168,17 +165,6 @@ func (c *routeContext) Response() *message.Entry {
168165
return c.respEntry
169166
}
170167

171-
// RawResponseData returns the not yet encoded response data.
172-
func (c *routeContext) RawResponseData() interface{} {
173-
if c.rawRespData != nil {
174-
return c.rawRespData
175-
}
176-
if c.respEntry != nil {
177-
return c.respEntry.Data
178-
}
179-
return nil
180-
}
181-
182168
// SetResponse implements Context.SetResponse method.
183169
func (c *routeContext) SetResponse(id, data interface{}) error {
184170
codec := c.session.Codec()
@@ -189,7 +175,6 @@ func (c *routeContext) SetResponse(id, data interface{}) error {
189175
if err != nil {
190176
return err
191177
}
192-
c.rawRespData = data
193178
c.respEntry = &message.Entry{
194179
ID: id,
195180
Data: dataRaw,

router_context_test.go

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ func Test_routeContext_SetResponse(t *testing.T) {
149149
err := c.SetResponse(1, "test")
150150
assert.NoError(t, err)
151151
assert.Equal(t, c.respEntry, entry)
152-
assert.Equal(t, c.rawRespData, "test")
153152
})
154153
}
155154

@@ -248,30 +247,10 @@ func Test_routeContext_MustSetResponse(t *testing.T) {
248247
})
249248
}
250249

251-
func Test_routeContext_RawResponseData(t *testing.T) {
252-
t.Run("when raw resp data is not nil", func(t *testing.T) {
253-
c := newContext(nil, nil)
254-
c.rawRespData = 123
255-
assert.Equal(t, c.RawResponseData(), 123)
256-
})
257-
t.Run("when resp entry is not nil", func(t *testing.T) {
258-
c := newContext(nil, nil)
259-
c.rawRespData = nil
260-
c.respEntry = &message.Entry{
261-
Data: []byte("123"),
262-
}
263-
assert.Equal(t, c.RawResponseData(), []byte("123"))
264-
})
265-
t.Run("when resp entry is nil", func(t *testing.T) {
266-
c := newContext(nil, nil)
267-
assert.Nil(t, c.RawResponseData())
268-
})
269-
}
270-
271250
func Test_routeContext_SetSession(t *testing.T) {
272251
sess := newSession(nil, &sessionOption{})
273252
c := newContext(nil, nil)
274-
c.SetSession(sess)
253+
assert.Equal(t, c.SetSession(sess), c)
275254
assert.Equal(t, c.Session(), sess)
276255
}
277256

0 commit comments

Comments
 (0)