Addressing Mike's feedback

Author: aliabbasrizvi

optimizely/decision/composite_feature_service.go

@@ -28,15 +28,15 @@ var cfLogger = logging.GetLogger("CompositeFeatureService")
 
 // CompositeFeatureService is the default out-of-the-box feature decision service
 type CompositeFeatureService struct {
-	featureExperimentDecisionService ExperimentService
-	rolloutDecisionService    FeatureService
+	featureExperimentService ExperimentService
+	rolloutDecisionService   FeatureService
 }
 
 // NewCompositeFeatureService returns a new instance of the CompositeFeatureService
 func NewCompositeFeatureService() *CompositeFeatureService {
 	return &CompositeFeatureService{
-		featureExperimentDecisionService: NewFeatureExperimentService(),
-		rolloutDecisionService:    NewRolloutService(),
+		featureExperimentService: NewFeatureExperimentService(),
+		rolloutDecisionService:   NewRolloutService(),
 	}
 }
 
@@ -45,15 +45,15 @@ func (f CompositeFeatureService) GetDecision(decisionContext FeatureDecisionCont
 	feature := decisionContext.Feature
 
 	// Check if user is bucketed in feature experiment
-	if f.featureExperimentDecisionService != nil && len(feature.FeatureExperiments) > 0 {
+	if f.featureExperimentService != nil && len(feature.FeatureExperiments) > 0 {
 		// @TODO: add in a feature decision service that takes into account multiple experiments (via group mutex)
 		experiment := feature.FeatureExperiments[0]
 		experimentDecisionContext := ExperimentDecisionContext{
 			Experiment:    &experiment,
 			ProjectConfig: decisionContext.ProjectConfig,
 		}
 
-		experimentDecision, err := f.featureExperimentDecisionService.GetDecision(experimentDecisionContext, userContext)
+		experimentDecision, err := f.featureExperimentService.GetDecision(experimentDecisionContext, userContext)
 		// Variation not nil means we got a decision and should return it
 		if experimentDecision.Variation != nil {
 			featureDecision := FeatureDecision{

optimizely/decision/feature_experiment_service.go

@@ -23,7 +23,7 @@ import (
 
 // FeatureExperimentService helps evaluate feature test associated with the feature
 type FeatureExperimentService struct {
-	featureExperimentDecisionService ExperimentService
+	featureExperimentService ExperimentService
 }
 
 // NewFeatureExperimentService returns a new instance of the FeatureExperimentService
@@ -33,5 +33,5 @@ func NewFeatureExperimentService() *CompositeExperimentService {
 
 // GetDecision returns a decision for the given feature test and user context
 func (f FeatureExperimentService) GetDecision(decisionContext ExperimentDecisionContext, userContext entities.UserContext) (ExperimentDecision, error) {
-	return f.featureExperimentDecisionService.GetDecision(decisionContext, userContext)
+	return f.featureExperimentService.GetDecision(decisionContext, userContext)
 }