Skip to content

Commit 891b5ae

Browse files
committed
fixup: update
Signed-off-by: Simon Schrottner <[email protected]>
1 parent b3aba9f commit 891b5ae

File tree

10 files changed

+92
-71
lines changed

10 files changed

+92
-71
lines changed

src/main/java/dev/openfeature/sdk/Client.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public interface Client extends Features, EventBus<Client> {
3939

4040
/**
4141
* Returns the current state of the associated provider.
42+
*
4243
* @return the provider state
4344
*/
4445
ProviderState getProviderState();

src/main/java/dev/openfeature/sdk/FeatureProviderStateManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package dev.openfeature.sdk;
22

33
import dev.openfeature.sdk.exceptions.OpenFeatureError;
4-
import lombok.Getter;
5-
64
import java.util.concurrent.atomic.AtomicBoolean;
5+
import lombok.Getter;
76

87
class FeatureProviderStateManager implements EventProviderListener {
98
private final FeatureProvider delegate;

src/main/java/dev/openfeature/sdk/FlagValueType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
@SuppressWarnings("checkstyle:MissingJavadocType")
44
public enum FlagValueType {
5-
STRING, INTEGER, DOUBLE, OBJECT, BOOLEAN;
5+
STRING, INTEGER, DOUBLE, OBJECT, BOOLEAN
66
}

src/main/java/dev/openfeature/sdk/NoOpProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public ProviderEvaluation<Double> getDoubleEvaluation(String key, Double default
5959

6060
@Override
6161
public ProviderEvaluation<Value> getObjectEvaluation(String key, Value defaultValue,
62-
EvaluationContext invocationContext) {
62+
EvaluationContext invocationContext) {
6363
return ProviderEvaluation.<Value>builder()
6464
.value(defaultValue)
6565
.variant(PASSED_IN_DEFAULT)

src/main/java/dev/openfeature/sdk/OpenFeatureAPI.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
import dev.openfeature.sdk.exceptions.OpenFeatureError;
44
import dev.openfeature.sdk.internal.AutoCloseableLock;
55
import dev.openfeature.sdk.internal.AutoCloseableReentrantReadWriteLock;
6-
import lombok.extern.slf4j.Slf4j;
7-
8-
import java.util.*;
6+
import java.util.ArrayList;
7+
import java.util.Arrays;
8+
import java.util.List;
9+
import java.util.Optional;
10+
import java.util.Set;
911
import java.util.function.Consumer;
12+
import lombok.extern.slf4j.Slf4j;
1013

1114
/**
1215
* A global singleton which holds base configuration for the OpenFeature

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

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
package dev.openfeature.sdk;
22

3-
import dev.openfeature.sdk.exceptions.*;
3+
import dev.openfeature.sdk.exceptions.ExceptionUtils;
4+
import dev.openfeature.sdk.exceptions.FatalError;
5+
import dev.openfeature.sdk.exceptions.GeneralError;
6+
import dev.openfeature.sdk.exceptions.OpenFeatureError;
7+
import dev.openfeature.sdk.exceptions.ProviderNotReadyError;
48
import dev.openfeature.sdk.internal.AutoCloseableLock;
59
import dev.openfeature.sdk.internal.AutoCloseableReentrantReadWriteLock;
610
import dev.openfeature.sdk.internal.ObjectUtils;
11+
import java.util.ArrayList;
12+
import java.util.Arrays;
13+
import java.util.Collections;
14+
import java.util.List;
15+
import java.util.Map;
16+
import java.util.function.Consumer;
717
import lombok.Getter;
818
import lombok.extern.slf4j.Slf4j;
919

10-
import java.util.*;
11-
import java.util.function.Consumer;
12-
1320
/**
1421
* OpenFeature Client implementation.
1522
* You should not instantiate this or reference this class.
@@ -42,8 +49,8 @@ public class OpenFeatureClient implements Client {
4249
* @param domain An identifier which logically binds clients with providers (used by observability tools).
4350
* @param version Version of the client (used by observability tools).
4451
* @deprecated Do not use this constructor. It's for internal use only.
45-
* Clients created using it will not run event handlers.
46-
* Use the OpenFeatureAPI's getClient factory method instead.
52+
* Clients created using it will not run event handlers.
53+
* Use the OpenFeatureAPI's getClient factory method instead.
4754
*/
4855
@Deprecated() // TODO: eventually we will make this non-public. See issue #872
4956
public OpenFeatureClient(
@@ -106,7 +113,7 @@ public EvaluationContext getEvaluationContext() {
106113
}
107114

108115
private <T> FlagEvaluationDetails<T> evaluateFlag(FlagValueType type, String key, T defaultValue,
109-
EvaluationContext ctx, FlagEvaluationOptions options) {
116+
EvaluationContext ctx, FlagEvaluationOptions options) {
110117
FlagEvaluationOptions flagOptions = ObjectUtils.defaultIfNull(options,
111118
() -> FlagEvaluationOptions.builder().build());
112119
Map<String, Object> hints = Collections.unmodifiableMap(flagOptions.getHookHints());
@@ -230,7 +237,7 @@ public Boolean getBooleanValue(String key, Boolean defaultValue, EvaluationConte
230237

231238
@Override
232239
public Boolean getBooleanValue(String key, Boolean defaultValue, EvaluationContext ctx,
233-
FlagEvaluationOptions options) {
240+
FlagEvaluationOptions options) {
234241
return getBooleanDetails(key, defaultValue, ctx, options).getValue();
235242
}
236243

@@ -246,7 +253,7 @@ public FlagEvaluationDetails<Boolean> getBooleanDetails(String key, Boolean defa
246253

247254
@Override
248255
public FlagEvaluationDetails<Boolean> getBooleanDetails(String key, Boolean defaultValue, EvaluationContext ctx,
249-
FlagEvaluationOptions options) {
256+
FlagEvaluationOptions options) {
250257
return this.evaluateFlag(FlagValueType.BOOLEAN, key, defaultValue, ctx, options);
251258
}
252259

@@ -262,7 +269,7 @@ public String getStringValue(String key, String defaultValue, EvaluationContext
262269

263270
@Override
264271
public String getStringValue(String key, String defaultValue, EvaluationContext ctx,
265-
FlagEvaluationOptions options) {
272+
FlagEvaluationOptions options) {
266273
return getStringDetails(key, defaultValue, ctx, options).getValue();
267274
}
268275

@@ -278,7 +285,7 @@ public FlagEvaluationDetails<String> getStringDetails(String key, String default
278285

279286
@Override
280287
public FlagEvaluationDetails<String> getStringDetails(String key, String defaultValue, EvaluationContext ctx,
281-
FlagEvaluationOptions options) {
288+
FlagEvaluationOptions options) {
282289
return this.evaluateFlag(FlagValueType.STRING, key, defaultValue, ctx, options);
283290
}
284291

@@ -294,7 +301,7 @@ public Integer getIntegerValue(String key, Integer defaultValue, EvaluationConte
294301

295302
@Override
296303
public Integer getIntegerValue(String key, Integer defaultValue, EvaluationContext ctx,
297-
FlagEvaluationOptions options) {
304+
FlagEvaluationOptions options) {
298305
return getIntegerDetails(key, defaultValue, ctx, options).getValue();
299306
}
300307

@@ -310,7 +317,7 @@ public FlagEvaluationDetails<Integer> getIntegerDetails(String key, Integer defa
310317

311318
@Override
312319
public FlagEvaluationDetails<Integer> getIntegerDetails(String key, Integer defaultValue, EvaluationContext ctx,
313-
FlagEvaluationOptions options) {
320+
FlagEvaluationOptions options) {
314321
return this.evaluateFlag(FlagValueType.INTEGER, key, defaultValue, ctx, options);
315322
}
316323

@@ -326,7 +333,7 @@ public Double getDoubleValue(String key, Double defaultValue, EvaluationContext
326333

327334
@Override
328335
public Double getDoubleValue(String key, Double defaultValue, EvaluationContext ctx,
329-
FlagEvaluationOptions options) {
336+
FlagEvaluationOptions options) {
330337
return this.evaluateFlag(FlagValueType.DOUBLE, key, defaultValue, ctx, options).getValue();
331338
}
332339

@@ -342,7 +349,7 @@ public FlagEvaluationDetails<Double> getDoubleDetails(String key, Double default
342349

343350
@Override
344351
public FlagEvaluationDetails<Double> getDoubleDetails(String key, Double defaultValue, EvaluationContext ctx,
345-
FlagEvaluationOptions options) {
352+
FlagEvaluationOptions options) {
346353
return this.evaluateFlag(FlagValueType.DOUBLE, key, defaultValue, ctx, options);
347354
}
348355

@@ -358,7 +365,7 @@ public Value getObjectValue(String key, Value defaultValue, EvaluationContext ct
358365

359366
@Override
360367
public Value getObjectValue(String key, Value defaultValue, EvaluationContext ctx,
361-
FlagEvaluationOptions options) {
368+
FlagEvaluationOptions options) {
362369
return getObjectDetails(key, defaultValue, ctx, options).getValue();
363370
}
364371

@@ -369,13 +376,13 @@ public FlagEvaluationDetails<Value> getObjectDetails(String key, Value defaultVa
369376

370377
@Override
371378
public FlagEvaluationDetails<Value> getObjectDetails(String key, Value defaultValue,
372-
EvaluationContext ctx) {
379+
EvaluationContext ctx) {
373380
return getObjectDetails(key, defaultValue, ctx, FlagEvaluationOptions.builder().build());
374381
}
375382

376383
@Override
377384
public FlagEvaluationDetails<Value> getObjectDetails(String key, Value defaultValue, EvaluationContext ctx,
378-
FlagEvaluationOptions options) {
385+
FlagEvaluationOptions options) {
379386
return this.evaluateFlag(FlagValueType.OBJECT, key, defaultValue, ctx, options);
380387
}
381388

src/main/java/dev/openfeature/sdk/ProviderEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
* Provider event types.
55
*/
66
public enum ProviderEvent {
7-
PROVIDER_READY, PROVIDER_CONFIGURATION_CHANGED, PROVIDER_ERROR, PROVIDER_STALE;
7+
PROVIDER_READY, PROVIDER_CONFIGURATION_CHANGED, PROVIDER_ERROR, PROVIDER_STALE
88
}

src/main/java/dev/openfeature/sdk/ProviderRepository.java

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import dev.openfeature.sdk.exceptions.GeneralError;
44
import dev.openfeature.sdk.exceptions.OpenFeatureError;
5-
import lombok.extern.slf4j.Slf4j;
6-
75
import java.util.List;
86
import java.util.Map;
97
import java.util.Optional;
@@ -16,6 +14,7 @@
1614
import java.util.function.Consumer;
1715
import java.util.stream.Collectors;
1816
import java.util.stream.Stream;
17+
import lombok.extern.slf4j.Slf4j;
1918

2019
@Slf4j
2120
class ProviderRepository {
@@ -111,11 +110,11 @@ public boolean isDefaultProvider(FeatureProvider provider) {
111110
* Set the default provider.
112111
*/
113112
public void setProvider(FeatureProvider provider,
114-
Consumer<FeatureProvider> afterSet,
115-
Consumer<FeatureProvider> afterInit,
116-
Consumer<FeatureProvider> afterShutdown,
117-
BiConsumer<FeatureProvider, OpenFeatureError> afterError,
118-
boolean waitForInit) {
113+
Consumer<FeatureProvider> afterSet,
114+
Consumer<FeatureProvider> afterInit,
115+
Consumer<FeatureProvider> afterShutdown,
116+
BiConsumer<FeatureProvider, OpenFeatureError> afterError,
117+
boolean waitForInit) {
119118
if (provider == null) {
120119
throw new IllegalArgumentException("Provider cannot be null");
121120
}
@@ -131,12 +130,12 @@ public void setProvider(FeatureProvider provider,
131130
* Otherwise, initialization happens in the background.
132131
*/
133132
public void setProvider(String domain,
134-
FeatureProvider provider,
135-
Consumer<FeatureProvider> afterSet,
136-
Consumer<FeatureProvider> afterInit,
137-
Consumer<FeatureProvider> afterShutdown,
138-
BiConsumer<FeatureProvider, OpenFeatureError> afterError,
139-
boolean waitForInit) {
133+
FeatureProvider provider,
134+
Consumer<FeatureProvider> afterSet,
135+
Consumer<FeatureProvider> afterInit,
136+
Consumer<FeatureProvider> afterShutdown,
137+
BiConsumer<FeatureProvider, OpenFeatureError> afterError,
138+
boolean waitForInit) {
140139
if (provider == null) {
141140
throw new IllegalArgumentException("Provider cannot be null");
142141
}
@@ -147,12 +146,12 @@ public void setProvider(String domain,
147146
}
148147

149148
private void prepareAndInitializeProvider(String domain,
150-
FeatureProvider newProvider,
151-
Consumer<FeatureProvider> afterSet,
152-
Consumer<FeatureProvider> afterInit,
153-
Consumer<FeatureProvider> afterShutdown,
154-
BiConsumer<FeatureProvider, OpenFeatureError> afterError,
155-
boolean waitForInit) {
149+
FeatureProvider newProvider,
150+
Consumer<FeatureProvider> afterSet,
151+
Consumer<FeatureProvider> afterInit,
152+
Consumer<FeatureProvider> afterShutdown,
153+
BiConsumer<FeatureProvider, OpenFeatureError> afterError,
154+
boolean waitForInit) {
156155
final FeatureProviderStateManager newStateManager;
157156
final FeatureProviderStateManager oldStateManager;
158157

@@ -196,10 +195,10 @@ private FeatureProviderStateManager getExistingStateManagerForProvider(FeaturePr
196195
}
197196

198197
private void initializeProvider(FeatureProviderStateManager newManager,
199-
Consumer<FeatureProvider> afterInit,
200-
Consumer<FeatureProvider> afterShutdown,
201-
BiConsumer<FeatureProvider, OpenFeatureError> afterError,
202-
FeatureProviderStateManager oldManager) {
198+
Consumer<FeatureProvider> afterInit,
199+
Consumer<FeatureProvider> afterShutdown,
200+
BiConsumer<FeatureProvider, OpenFeatureError> afterError,
201+
FeatureProviderStateManager oldManager) {
203202
try {
204203
if (ProviderState.NOT_READY.equals(newManager.getState())) {
205204
newManager.initialize(OpenFeatureAPI.getInstance().getEvaluationContext());

src/main/java/dev/openfeature/sdk/internal/ObjectUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package dev.openfeature.sdk.internal;
22

3+
import lombok.experimental.UtilityClass;
34
import java.util.Arrays;
45
import java.util.Collection;
56
import java.util.List;
67
import java.util.Map;
78
import java.util.function.Supplier;
89
import java.util.stream.Collectors;
9-
import lombok.experimental.UtilityClass;
1010

1111
@SuppressWarnings("checkstyle:MissingJavadocType")
1212
@UtilityClass

0 commit comments

Comments
 (0)