Skip to content

Commit

Permalink
make eventType a private variables inside (#8)
Browse files Browse the repository at this point in the history
* make eventType a private variables inside

* hide internal error
  • Loading branch information
viney-shih committed Jun 16, 2022
1 parent bbe6347 commit 498e3c9
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 41 deletions.
22 changes: 11 additions & 11 deletions event.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ import (
)

var (
// ErrSelfEvent indicates event triggered by itself.
ErrSelfEvent = errors.New("event triggered by itself")
// errSelfEvent indicates event triggered by itself.
errSelfEvent = errors.New("event triggered by itself")
)

// EventType is an enumeration of events used to communicate with each other via Pubsub.
// eventType is an enumeration of events used to communicate with each other via Pubsub.
/*
ENUM(
None // Not registered Event by default.
Evict // Evict presents eviction event.
)
*/
type EventType int32
type eventType int32

var regTopicEventMap map[string]EventType
var regTopicEventMap map[string]eventType

func init() {
regTopicEventMap = map[string]EventType{}
regTopicEventMap = map[string]eventType{}

for typ := range _EventTypeMap {
for typ := range _eventTypeMap {
if typ == EventTypeNone {
continue
}
Expand All @@ -38,12 +38,12 @@ func init() {
}

// Topic generates the topic for specified event.
func (x EventType) Topic() string {
func (x eventType) Topic() string {
return customKey(topicDelim, packageKey, topicKey, x.String())
}

type event struct {
Type EventType
Type eventType
Body eventBody
}

Expand Down Expand Up @@ -94,7 +94,7 @@ func (mb *messageBroker) send(ctx context.Context, e event) error {
}

func (mb *messageBroker) listen(
ctx context.Context, types []EventType, cb func(context.Context, *event, error),
ctx context.Context, types []eventType, cb func(context.Context, *event, error),
) {
if !mb.registered() {
return
Expand Down Expand Up @@ -127,7 +127,7 @@ func (mb *messageBroker) listen(
}

if e.Body.FID == mb.fid {
cb(ctx, &e, ErrSelfEvent)
cb(ctx, &e, errSelfEvent)
continue
}

Expand Down
40 changes: 20 additions & 20 deletions event_enum.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions event_enum_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,30 @@ func TestEnumSuite(t *testing.T) {
func (s *enumSuite) TestString() {
s.Require().Equal("Evict", EventTypeEvict.String())

notExisted := EventType(1000)
s.Require().Equal("EventType(1000)", notExisted.String())
notExisted := eventType(1000)
s.Require().Equal("eventType(1000)", notExisted.String())
}

func (s *enumSuite) TestParseEventType() {
var typ EventType
var typ eventType
var err error

// normal case
typ, err = ParseEventType("Evict")
typ, err = ParseeventType("Evict")
s.Require().NoError(err)
s.Require().Equal(EventTypeEvict, typ)

// lower case
typ, err = ParseEventType("evict")
typ, err = ParseeventType("evict")
s.Require().NoError(err)
s.Require().Equal(EventTypeEvict, typ)

// upper case
typ, err = ParseEventType("NONE")
typ, err = ParseeventType("NONE")
s.Require().NoError(err)
s.Require().Equal(EventTypeNone, typ)

// err
_, err = ParseEventType("not-existed")
s.Require().Equal(fmt.Errorf("not-existed is not a valid EventType"), err)
_, err = ParseeventType("not-existed")
s.Require().Equal(fmt.Errorf("not-existed is not a valid eventType"), err)
}
4 changes: 2 additions & 2 deletions factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func newFactory(sharedCache Adapter, localCache Adapter, options ...ServiceOptio
}

// subscribing events
f.mb.listen(context.TODO(), []EventType{EventTypeEvict}, f.subscribedEventsHandler())
f.mb.listen(context.TODO(), []eventType{EventTypeEvict}, f.subscribedEventsHandler())

return f
}
Expand Down Expand Up @@ -165,7 +165,7 @@ func (f *factory) Close() {

func (f *factory) subscribedEventsHandler() func(ctx context.Context, e *event, err error) {
return func(ctx context.Context, e *event, err error) {
if err == ErrSelfEvent {
if err == errSelfEvent {
// do nothing
return
} else if err != nil {
Expand Down

0 comments on commit 498e3c9

Please sign in to comment.