Skip to content

Commit a4f18c3

Browse files
alexandraoberaigneralexandraoberaigner
committed
feat: gemini suggestions
1 parent 269dfe4 commit a4f18c3

File tree

4 files changed

+24
-36
lines changed

4 files changed

+24
-36
lines changed

‎src/main/java/dev/openfeature/sdk/HookSupport.java‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,39 @@
1515
class HookSupport {
1616

1717
public EvaluationContext beforeHooks(
18-
FlagValueType flagValueType,
1918
HookContext hookCtx,
2019
List<Pair<Hook, HookData>> hookDataPairs,
2120
Map<String, Object> hints) {
22-
return callBeforeHooks(flagValueType, hookCtx, hookDataPairs, hints);
21+
return callBeforeHooks(hookCtx, hookDataPairs, hints);
2322
}
2423

2524
public void afterHooks(
26-
FlagValueType flagValueType,
2725
HookContext hookContext,
2826
FlagEvaluationDetails details,
2927
List<Pair<Hook, HookData>> hookDataPairs,
3028
Map<String, Object> hints) {
3129
executeHooksUnchecked(
32-
flagValueType, hookDataPairs, hookContext, (hook, ctx) -> hook.after(ctx, details, hints));
30+
hookDataPairs, hookContext, (hook, ctx) -> hook.after(ctx, details, hints));
3331
}
3432

3533
public void afterAllHooks(
36-
FlagValueType flagValueType,
3734
HookContext hookCtx,
3835
FlagEvaluationDetails details,
3936
List<Pair<Hook, HookData>> hookDataPairs,
4037
Map<String, Object> hints) {
4138
executeHooks(
42-
flagValueType,
4339
hookDataPairs,
4440
hookCtx,
4541
"finally",
4642
(hook, ctx) -> hook.finallyAfter(ctx, details, hints));
4743
}
4844

4945
public void errorHooks(
50-
FlagValueType flagValueType,
5146
HookContext hookCtx,
5247
Exception e,
5348
List<Pair<Hook, HookData>> hookDataPairs,
5449
Map<String, Object> hints) {
55-
executeHooks(flagValueType, hookDataPairs, hookCtx, "error", (hook, ctx) -> hook.error(ctx, e, hints));
50+
executeHooks(hookDataPairs, hookCtx, "error", (hook, ctx) -> hook.error(ctx, e, hints));
5651
}
5752

5853
public List<Pair<Hook, HookData>> getHookDataPairs(List<Hook> hooks, FlagValueType flagValueType) {
@@ -66,15 +61,14 @@ public List<Pair<Hook, HookData>> getHookDataPairs(List<Hook> hooks, FlagValueTy
6661
}
6762

6863
private <T> void executeHooks(
69-
FlagValueType flagValueType,
7064
List<Pair<Hook, HookData>> hookDataPairs,
7165
HookContext hookContext,
7266
String hookMethod,
7367
BiConsumer<Hook<T>, HookContext> hookCode) {
7468
if (hookDataPairs != null) {
7569
for (Pair<Hook, HookData> hookDataPair : hookDataPairs) {
76-
Hook hook = hookDataPair.getLeft();
77-
HookData hookData = hookDataPair.getRight();
70+
Hook hook = hookDataPair.getKey();
71+
HookData hookData = hookDataPair.getValue();
7872
executeChecked(hook, hookData, hookContext, hookCode, hookMethod);
7973
}
8074
}
@@ -101,22 +95,20 @@ private <T> void executeChecked(
10195

10296
// after hooks can throw in order to do validation
10397
private <T> void executeHooksUnchecked(
104-
FlagValueType flagValueType,
10598
List<Pair<Hook, HookData>> hookDataPairs,
10699
HookContext hookContext,
107100
BiConsumer<Hook<T>, HookContext> hookCode) {
108101
if (hookDataPairs != null) {
109102
for (Pair<Hook, HookData> hookDataPair : hookDataPairs) {
110-
Hook hook = hookDataPair.getLeft();
111-
HookData hookData = hookDataPair.getRight();
103+
Hook hook = hookDataPair.getKey();
104+
HookData hookData = hookDataPair.getValue();
112105
var hookCtxWithData = new HookContextWithData(hookContext, hookData);
113106
hookCode.accept(hook, hookCtxWithData);
114107
}
115108
}
116109
}
117110

118111
private EvaluationContext callBeforeHooks(
119-
FlagValueType flagValueType,
120112
HookContext hookCtx,
121113
List<Pair<Hook, HookData>> hookDataPairs,
122114
Map<String, Object> hints) {
@@ -126,8 +118,8 @@ private EvaluationContext callBeforeHooks(
126118
EvaluationContext context = hookCtx.getCtx();
127119

128120
for (Pair<Hook, HookData> hookDataPair : reversedHooks) {
129-
Hook hook = hookDataPair.getLeft();
130-
HookData hookData = hookDataPair.getRight();
121+
Hook hook = hookDataPair.getKey();
122+
HookData hookData = hookDataPair.getValue();
131123

132124
// Create a new context with this hook's data
133125
HookContext contextWithHookData = new HookContextWithData(hookCtx, hookData);

‎src/main/java/dev/openfeature/sdk/OpenFeatureClient.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(
183183
mergedHooks = ObjectUtils.merge(
184184
provider.getProviderHooks(), flagOptions.getHooks(), clientHooks, openfeatureApi.getMutableHooks());
185185
hookDataPairs = hookSupport.getHookDataPairs(mergedHooks, type);
186-
var mergedCtx = hookSupport.beforeHooks(type, hookContext, hookDataPairs, hints);
186+
var mergedCtx = hookSupport.beforeHooks(hookContext, hookDataPairs, hints);
187187
hookContext.setCtx(mergedCtx);
188188

189189
// "short circuit" if the provider is in NOT_READY or FATAL state
@@ -202,9 +202,9 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(
202202
var error =
203203
ExceptionUtils.instantiateErrorByErrorCode(details.getErrorCode(), details.getErrorMessage());
204204
enrichDetailsWithErrorDefaults(defaultValue, details);
205-
hookSupport.errorHooks(type, hookContext, error, hookDataPairs, hints);
205+
hookSupport.errorHooks(hookContext, error, hookDataPairs, hints);
206206
} else {
207-
hookSupport.afterHooks(type, hookContext, details, hookDataPairs, hints);
207+
hookSupport.afterHooks(hookContext, details, hookDataPairs, hints);
208208
}
209209
} catch (Exception e) {
210210
if (details == null) {
@@ -217,9 +217,9 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(
217217
}
218218
details.setErrorMessage(e.getMessage());
219219
enrichDetailsWithErrorDefaults(defaultValue, details);
220-
hookSupport.errorHooks(type, hookContext, e, hookDataPairs, hints);
220+
hookSupport.errorHooks(hookContext, e, hookDataPairs, hints);
221221
} finally {
222-
hookSupport.afterAllHooks(type, hookContext, details, hookDataPairs, hints);
222+
hookSupport.afterAllHooks(hookContext, details, hookDataPairs, hints);
223223
}
224224

225225
return details;

‎src/main/java/dev/openfeature/sdk/Pair.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ private Pair(K key, V value) {
99
this.value = value;
1010
}
1111

12-
public K getLeft() {
12+
public K getKey() {
1313
return key;
1414
}
1515

16-
public V getRight() {
16+
public V getValue() {
1717
return value;
1818
}
1919

‎src/test/java/dev/openfeature/sdk/HookSupportTest.java‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ void shouldMergeEvaluationContextsOnBeforeHooksCorrectly() {
4040
HookSupport hookSupport = new HookSupport();
4141

4242
EvaluationContext result = hookSupport.beforeHooks(
43-
valueType,
4443
hookContext,
4544
hookSupport.getHookDataPairs(Arrays.asList(hook1, hook2), valueType),
4645
Collections.emptyMap());
@@ -68,20 +67,18 @@ void shouldAlwaysCallGenericHook(FlagValueType flagValueType) {
6867
.providerMetadata(() -> "provider")
6968
.build();
7069

71-
hookSupport.beforeHooks(flagValueType, hookContext, hookDataPairs, Collections.emptyMap());
70+
hookSupport.beforeHooks(hookContext, hookDataPairs, Collections.emptyMap());
7271
hookSupport.afterHooks(
73-
flagValueType,
7472
hookContext,
7573
FlagEvaluationDetails.builder().build(),
7674
hookDataPairs,
7775
Collections.emptyMap());
7876
hookSupport.afterAllHooks(
79-
flagValueType,
8077
hookContext,
8178
FlagEvaluationDetails.builder().build(),
8279
hookDataPairs,
8380
Collections.emptyMap());
84-
hookSupport.errorHooks(flagValueType, hookContext, expectedException, hookDataPairs, Collections.emptyMap());
81+
hookSupport.errorHooks(hookContext, expectedException, hookDataPairs, Collections.emptyMap());
8582

8683
verify(genericHook).before(any(), any());
8784
verify(genericHook).after(any(), any(), any());
@@ -115,7 +112,7 @@ void shouldIsolateDataBetweenHooks(FlagValueType flagValueType) {
115112
TestHookWithData testHook2 = new TestHookWithData("test-key", "value-2");
116113
var pairs = hookSupport.getHookDataPairs(List.of(testHook1, testHook2), flagValueType);
117114

118-
callAllHooks(flagValueType, hookSupport, hookContext, pairs);
115+
callAllHooks(hookSupport, hookContext, pairs);
119116

120117
assertHookData(testHook1, "value-1");
121118
assertHookData(testHook2, "value-2");
@@ -168,20 +165,19 @@ private static void callAllHooks(
168165
HookContext<Object> hookContext,
169166
TestHookWithData testHook) {
170167
var pairs = hookSupport.getHookDataPairs(List.of(testHook), flagValueType);
171-
callAllHooks(flagValueType, hookSupport, hookContext, pairs);
168+
callAllHooks(hookSupport, hookContext, pairs);
172169
}
173170

174171
private static void callAllHooks(
175-
FlagValueType flagValueType,
176172
HookSupport hookSupport,
177173
HookContext<Object> hookContext,
178174
List<Pair<Hook, HookData>> pairs) {
179-
hookSupport.beforeHooks(flagValueType, hookContext, pairs, Collections.emptyMap());
175+
hookSupport.beforeHooks(hookContext, pairs, Collections.emptyMap());
180176
hookSupport.afterHooks(
181-
flagValueType, hookContext, new FlagEvaluationDetails<>(), pairs, Collections.emptyMap());
182-
hookSupport.errorHooks(flagValueType, hookContext, new Exception(), pairs, Collections.emptyMap());
177+
hookContext, new FlagEvaluationDetails<>(), pairs, Collections.emptyMap());
178+
hookSupport.errorHooks(hookContext, new Exception(), pairs, Collections.emptyMap());
183179
hookSupport.afterAllHooks(
184-
flagValueType, hookContext, new FlagEvaluationDetails<>(), pairs, Collections.emptyMap());
180+
hookContext, new FlagEvaluationDetails<>(), pairs, Collections.emptyMap());
185181
}
186182

187183
private Object createDefaultValue(FlagValueType flagValueType) {

0 commit comments

Comments
 (0)