chore: clean code

Signed-off-by: Thomas Poignant <[email protected]>

Author: thomaspoignant

SOLUTION_SUMMARY.md

@@ -62,7 +62,8 @@ my-targeted-feature:
 	}
 	defer ffclient.Close()
 
-	fmt.Println("=== Empty Targeting Key Examples ===\n")
+	fmt.Println("=== Empty Targeting Key Examples ===")
+	fmt.Println()
 
 	// Example 1: Static flag (should work with empty context)
 	fmt.Println("1. Static flag with empty evaluation context:")

examples/empty_targeting_key_example.go

@@ -23,12 +23,6 @@ func NewEvaluationContext(key string) EvaluationContext {
 	return EvaluationContext{targetingKey: key, attributes: map[string]interface{}{}}
 }
 
-// NewEvaluationContextWithoutTargetingKey creates a new evaluation context without a targeting key.
-// This should only be used for flags that don't require bucketing (no percentage-based rules).
-func NewEvaluationContextWithoutTargetingKey() EvaluationContext {
-	return EvaluationContext{targetingKey: "", attributes: map[string]interface{}{}}
-}
-
 // Deprecated: NewAnonymousEvaluationContext is here for compatibility reason.
 // Please use NewEvaluationContext instead and add a attributes attribute to know that it is an anonymous user.
 //

ffcontext/context.go

@@ -11,15 +11,6 @@ func NewEvaluationContextBuilder(key string) EvaluationContextBuilder {
 	}
 }
 
-// NewEvaluationContextBuilderWithoutTargetingKey constructs a new EvaluationContextBuilder without a targeting key.
-// This should only be used for flags that don't require bucketing (no percentage-based rules).
-func NewEvaluationContextBuilderWithoutTargetingKey() EvaluationContextBuilder {
-	return &evaluationContextBuilderImpl{
-		key:    "",
-		custom: map[string]interface{}{},
-	}
-}
-
 // EvaluationContextBuilder is a builder to create an EvaluationContext.
 type EvaluationContextBuilder interface {
 	// Deprecated: Anonymous is to flag the context for an anonymous context or not.

ffcontext/context_builder.go

@@ -92,3 +92,21 @@ func TestNewUser(t *testing.T) {
 		})
 	}
 }
+
+func TestNewEvaluationContextWithoutTargetingKey(t *testing.T) {
+	ctx := NewEvaluationContext("")
+	assert.Equal(t, "", ctx.GetKey(), "Should have empty targeting key")
+	assert.Equal(t, map[string]interface{}{}, ctx.GetCustom(), "Should have empty custom attributes")
+	assert.False(t, ctx.IsAnonymous(), "Should not be anonymous by default")
+}
+
+func TestNewEvaluationContextBuilderWithoutTargetingKey(t *testing.T) {
+	ctx := NewEvaluationContextBuilder("").
+		AddCustom("role", "admin").
+		AddCustom("anonymous", true).
+		Build()
+
+	assert.Equal(t, "", ctx.GetKey(), "Should have empty targeting key")
+	assert.Equal(t, "admin", ctx.GetCustom()["role"], "Should have custom attributes")
+	assert.True(t, ctx.IsAnonymous(), "Should be anonymous when set")
+}

ffcontext/context_builder_test.go

@@ -258,7 +258,7 @@ func TestInternalFlag_Value_EmptyContext(t *testing.T) {
 					VariationResult: testconvert.String("disabled"),
 				},
 			},
-			evaluationCtx:  ffcontext.NewEvaluationContextWithoutTargetingKey(),
+			evaluationCtx:  ffcontext.NewEvaluationContext(""),
 			expectedValue:  false,
 			expectedReason: flag.ReasonStatic,
 			shouldSucceed:  true,
@@ -278,7 +278,7 @@ func TestInternalFlag_Value_EmptyContext(t *testing.T) {
 					},
 				},
 			},
-			evaluationCtx:     ffcontext.NewEvaluationContextWithoutTargetingKey(),
+			evaluationCtx:     ffcontext.NewEvaluationContext(""),
 			expectedErrorCode: flag.ErrorCodeTargetingKeyMissing,
 			expectedReason:    flag.ReasonError,
 			shouldSucceed:     false,
@@ -321,7 +321,7 @@ func TestInternalFlag_Value_EmptyContext(t *testing.T) {
 				},
 			},
 			evaluationCtx: func() ffcontext.Context {
-				ctx := ffcontext.NewEvaluationContextWithoutTargetingKey()
+				ctx := ffcontext.NewEvaluationContext("")
 				ctx.AddCustomAttribute("anonymous", true)
 				return ctx
 			}(),
@@ -371,7 +371,7 @@ func TestInternalFlag_GetBucketingKeyValue_EmptyContext(t *testing.T) {
 					VariationResult: testconvert.String("disabled"),
 				},
 			},
-			evaluationCtx: ffcontext.NewEvaluationContextWithoutTargetingKey(),
+			evaluationCtx: ffcontext.NewEvaluationContext(""),
 			expectedKey:   "",
 			expectedError: false,
 			description:   "Non-bucketing flag should allow empty targeting key",
@@ -390,7 +390,7 @@ func TestInternalFlag_GetBucketingKeyValue_EmptyContext(t *testing.T) {
 					},
 				},
 			},
-			evaluationCtx: ffcontext.NewEvaluationContextWithoutTargetingKey(),
+			evaluationCtx: ffcontext.NewEvaluationContext(""),
 			expectedKey:   "",
 			expectedError: true,
 			description:   "Bucketing flag should require targeting key",
@@ -411,7 +411,7 @@ func TestInternalFlag_GetBucketingKeyValue_EmptyContext(t *testing.T) {
 				},
 			},
 			evaluationCtx: func() ffcontext.Context {
-				ctx := ffcontext.NewEvaluationContextWithoutTargetingKey()
+				ctx := ffcontext.NewEvaluationContext("")
 				ctx.AddCustomAttribute("teamId", "team-123")
 				return ctx
 			}(),
@@ -432,7 +432,7 @@ func TestInternalFlag_GetBucketingKeyValue_EmptyContext(t *testing.T) {
 				},
 			},
 			evaluationCtx: func() ffcontext.Context {
-				ctx := ffcontext.NewEvaluationContextWithoutTargetingKey()
+				ctx := ffcontext.NewEvaluationContext("")
 				ctx.AddCustomAttribute("teamId", "")
 				return ctx
 			}(),