Skip to content

Commit 70d17ad

Browse files
pawels-optimizelypawels-optimizely
committed
addressing PR comments.
1 parent 370d5eb commit 70d17ad

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎examples/main.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,44 +30,44 @@ func main() {
3030

3131
/************* StaticClient ********************/
3232

33-
app, err := optimizelyFactory.StaticClient()
33+
optimizelyClient, err := optimizelyFactory.StaticClient()
3434

3535
if err != nil {
3636
fmt.Printf("Error instantiating client: %s", err)
3737
return
3838
}
3939

40-
enabled, _ := app.IsFeatureEnabled("mutext_feat", user)
40+
enabled, _ := optimizelyClient.IsFeatureEnabled("mutext_feat", user)
4141
fmt.Printf("Is feature enabled? %v\n", enabled)
4242

4343
fmt.Println()
44-
app.Close() // user can close dispatcher
44+
optimizelyClient.Close() // user can close dispatcher
4545
fmt.Println()
4646
/************* Client ********************/
4747

4848
optimizelyFactory = &client.OptimizelyFactory{
4949
SDKKey: "4SLpaJA1r1pgE6T2CoMs9q",
5050
}
5151

52-
app, err = optimizelyFactory.Client()
52+
optimizelyClient, err = optimizelyFactory.Client()
5353

5454
if err != nil {
5555
fmt.Printf("Error instantiating client: %s", err)
5656
return
5757
}
5858

59-
enabled, _ = app.IsFeatureEnabled("mutext_feat", user)
59+
enabled, _ = optimizelyClient.IsFeatureEnabled("mutext_feat", user)
6060
fmt.Printf("Is feature enabled? %v\n", enabled)
61-
app.Close() // user can close dispatcher
61+
optimizelyClient.Close() // user can close dispatcher
6262

6363
/************* Setting Polling Interval ********************/
6464

6565
notificationCenter := notification.NewNotificationCenter()
6666

67-
app, _ = optimizelyFactory.Client(
67+
optimizelyClient, _ = optimizelyFactory.Client(
6868
client.PollingConfigManager("4SLpaJA1r1pgE6T2CoMs9q", time.Second, nil, notificationCenter),
6969
client.CompositeDecisionService(notificationCenter),
7070
client.BatchEventProcessor(event.DefaultBatchSize, event.DefaultEventQueueSize, event.DefaultEventFlushInterval),
7171
)
72-
app.Close()
72+
optimizelyClient.Close()
7373
}

‎optimizely/client/factory.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (f OptimizelyFactory) Client(clientOptions ...OptionFunc) (*OptimizelyClien
6161
if appClient.configManager == nil { // if it was not passed then assign here
6262

6363
appClient.configManager = config.NewPollingProjectConfigManager(executionCtx, f.SDKKey,
64-
config.SetInitialDatafile(f.Datafile), config.SetPollingInterval(config.DefaultPollingInterval), config.SetNotification(notificationCenter))
64+
config.InitialDatafile(f.Datafile), config.PollingInterval(config.DefaultPollingInterval), config.Notification(notificationCenter))
6565
}
6666

6767
return appClient, nil
@@ -70,8 +70,8 @@ func (f OptimizelyFactory) Client(clientOptions ...OptionFunc) (*OptimizelyClien
7070
// PollingConfigManager sets polling config manager on a client
7171
func PollingConfigManager(sdkKey string, pollingInterval time.Duration, initDataFile []byte, notificationCenter notification.Center) OptionFunc {
7272
return func(f *OptimizelyClient, executionCtx utils.ExecutionCtx) {
73-
f.configManager = config.NewPollingProjectConfigManager(f.executionCtx, sdkKey, config.SetInitialDatafile(initDataFile),
74-
config.SetPollingInterval(pollingInterval), config.SetNotification(notificationCenter))
73+
f.configManager = config.NewPollingProjectConfigManager(f.executionCtx, sdkKey, config.InitialDatafile(initDataFile),
74+
config.PollingInterval(pollingInterval), config.Notification(notificationCenter))
7575
}
7676
}
7777

‎optimizely/client/factory_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@ func TestFactoryClientReturnsDefaultClient(t *testing.T) {
4949
func TestClientWithSDKKey(t *testing.T) {
5050
factory := OptimizelyFactory{SDKKey: "1212"}
5151

52-
app, err := factory.Client()
52+
optimizelyClient, err := factory.Client()
5353
assert.NoError(t, err)
54-
assert.NotNil(t, app.configManager)
55-
assert.NotNil(t, app.decisionService)
56-
assert.NotNil(t, app.eventProcessor)
54+
assert.NotNil(t, optimizelyClient.configManager)
55+
assert.NotNil(t, optimizelyClient.decisionService)
56+
assert.NotNil(t, optimizelyClient.eventProcessor)
5757
}
5858

5959
func TestClientWithProjectConfigManagerInOptions(t *testing.T) {
6060
factory := OptimizelyFactory{}
6161
projectConfig := datafileprojectconfig.DatafileProjectConfig{}
6262
configManager := config.NewStaticProjectConfigManager(projectConfig)
6363

64-
app, err := factory.Client(ConfigManager(configManager))
64+
optimizelyClient, err := factory.Client(ConfigManager(configManager))
6565
assert.NoError(t, err)
66-
assert.NotNil(t, app.configManager)
67-
assert.NotNil(t, app.decisionService)
68-
assert.NotNil(t, app.eventProcessor)
66+
assert.NotNil(t, optimizelyClient.configManager)
67+
assert.NotNil(t, optimizelyClient.decisionService)
68+
assert.NotNil(t, optimizelyClient.eventProcessor)
6969
}
7070

7171
func TestClientWithDecisionServiceAndEventProcessorInOptions(t *testing.T) {
@@ -80,8 +80,8 @@ func TestClientWithDecisionServiceAndEventProcessorInOptions(t *testing.T) {
8080
EventDispatcher: &MockDispatcher{},
8181
}
8282

83-
app, err := factory.Client(ConfigManager(configManager), DecisionService(decisionService), EventProcessor(processor))
83+
optimizelyClient, err := factory.Client(ConfigManager(configManager), DecisionService(decisionService), EventProcessor(processor))
8484
assert.NoError(t, err)
85-
assert.Equal(t, decisionService, app.decisionService)
86-
assert.Equal(t, processor, app.eventProcessor)
85+
assert.Equal(t, decisionService, optimizelyClient.decisionService)
86+
assert.Equal(t, processor, optimizelyClient.eventProcessor)
8787
}

‎optimizely/config/polling_manager.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ type PollingProjectConfigManager struct {
5353
// OptionFunc is a type to a proper func
5454
type OptionFunc func(*PollingProjectConfigManager)
5555

56-
// SetDefaultRequester is an optional function, sets default requester based on a key.
57-
func SetDefaultRequester(sdkKey string) OptionFunc {
56+
// DefaultRequester is an optional function, sets default requester based on a key.
57+
func DefaultRequester(sdkKey string) OptionFunc {
5858
return func(p *PollingProjectConfigManager) {
5959

6060
url := fmt.Sprintf(DatafileURLTemplate, sdkKey)
@@ -64,29 +64,29 @@ func SetDefaultRequester(sdkKey string) OptionFunc {
6464
}
6565
}
6666

67-
// SetRequester is an optional function, sets a passed requester
68-
func SetRequester(requester utils.Requester) OptionFunc {
67+
// Requester is an optional function, sets a passed requester
68+
func Requester(requester utils.Requester) OptionFunc {
6969
return func(p *PollingProjectConfigManager) {
7070
p.requester = requester
7171
}
7272
}
7373

74-
// SetPollingInterval is an optional function, sets a passed polling interval
75-
func SetPollingInterval(interval time.Duration) OptionFunc {
74+
// PollingInterval is an optional function, sets a passed polling interval
75+
func PollingInterval(interval time.Duration) OptionFunc {
7676
return func(p *PollingProjectConfigManager) {
7777
p.pollingInterval = interval
7878
}
7979
}
8080

81-
// SetNotification is an optional function, sets a passed notification
82-
func SetNotification(notificationCenter notification.Center) OptionFunc {
81+
// Notification is an optional function, sets a passed notification
82+
func Notification(notificationCenter notification.Center) OptionFunc {
8383
return func(p *PollingProjectConfigManager) {
8484
p.notificationCenter = notificationCenter
8585
}
8686
}
8787

88-
// SetInitialDatafile is an optional function, sets a passed datafile
89-
func SetInitialDatafile(datafile []byte) OptionFunc {
88+
// InitialDatafile is an optional function, sets a passed datafile
89+
func InitialDatafile(datafile []byte) OptionFunc {
9090
return func(p *PollingProjectConfigManager) {
9191
p.initDatafile = datafile
9292
}

‎optimizely/config/polling_manager_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestNewPollingProjectConfigManagerWithOptions(t *testing.T) {
4848
sdkKey := "test_sdk_key"
4949

5050
exeCtx := utils.NewCancelableExecutionCtx()
51-
configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, SetRequester(mockRequester))
51+
configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, Requester(mockRequester))
5252
mockRequester.AssertExpectations(t)
5353

5454
actual, err := configManager.GetConfig()
@@ -66,7 +66,7 @@ func TestNewPollingProjectConfigManagerWithNull(t *testing.T) {
6666
sdkKey := "test_sdk_key"
6767

6868
exeCtx := utils.NewCancelableExecutionCtx()
69-
configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, SetRequester(mockRequester))
69+
configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, Requester(mockRequester))
7070
mockRequester.AssertExpectations(t)
7171

7272
_, err := configManager.GetConfig()
@@ -83,7 +83,7 @@ func TestNewPollingProjectConfigManagerWithSimilarDatafileRevisions(t *testing.T
8383
sdkKey := "test_sdk_key"
8484

8585
exeCtx := utils.NewCancelableExecutionCtx()
86-
configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, SetRequester(mockRequester))
86+
configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, Requester(mockRequester))
8787
mockRequester.AssertExpectations(t)
8888

8989
actual, err := configManager.GetConfig()
@@ -108,7 +108,7 @@ func TestNewPollingProjectConfigManagerWithDifferentDatafileRevisions(t *testing
108108
sdkKey := "test_sdk_key"
109109

110110
exeCtx := utils.NewCancelableExecutionCtx()
111-
configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, SetRequester(mockRequester))
111+
configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, Requester(mockRequester))
112112
mockRequester.AssertExpectations(t)
113113

114114
actual, err := configManager.GetConfig()
@@ -132,7 +132,7 @@ func TestNewPollingProjectConfigManagerOnDecision(t *testing.T) {
132132
sdkKey := "test_sdk_key"
133133

134134
exeCtx := utils.NewCancelableExecutionCtx()
135-
configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, SetRequester(mockRequester), SetNotification(notification.NewNotificationCenter()))
135+
configManager := NewPollingProjectConfigManager(exeCtx, sdkKey, Requester(mockRequester), Notification(notification.NewNotificationCenter()))
136136

137137
var numberOfCalls = 0
138138
callback := func(notification notification.ProjectConfigUpdateNotification) {

0 commit comments

Comments
 (0)