Skip to content

Commit 53dae87

Browse files
committed
minor refactorings, update readme
Signed-off-by: christian.lutnik <[email protected]>
1 parent b0d66a5 commit 53dae87

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,9 @@ public class MyProvider implements FeatureProvider {
318318
}
319319

320320
@Override
321+
@Deprecated
321322
public ProviderState getState() {
322-
// optionally indicate your provider's state (assumed to be READY if not implemented)
323+
// the state of a FeatureProvider is managed by the SDK
323324
}
324325

325326
@Override
@@ -369,8 +370,9 @@ class MyEventProvider extends EventProvider {
369370
}
370371

371372
@Override
373+
@Deprecated
372374
public ProviderState getState() {
373-
// indicate your provider's state (required for EventProviders)
375+
// the state of an EventProvider is managed by the SDK
374376
}
375377

376378
@Override

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -193,57 +193,57 @@ private FeatureProviderStateManager getExistingStateManagerForProvider(FeaturePr
193193
return null;
194194
}
195195

196-
private void initializeProvider(FeatureProviderStateManager newProvider,
196+
private void initializeProvider(FeatureProviderStateManager newManager,
197197
Consumer<FeatureProvider> afterInit,
198198
Consumer<FeatureProvider> afterShutdown,
199199
BiConsumer<FeatureProvider, OpenFeatureError> afterError,
200-
FeatureProviderStateManager oldProvider) {
200+
FeatureProviderStateManager oldManager) {
201201
try {
202-
if (ProviderState.NOT_READY.equals(newProvider.getState())) {
203-
newProvider.initialize(OpenFeatureAPI.getInstance().getEvaluationContext());
204-
afterInit.accept(newProvider.getProvider());
202+
if (ProviderState.NOT_READY.equals(newManager.getState())) {
203+
newManager.initialize(OpenFeatureAPI.getInstance().getEvaluationContext());
204+
afterInit.accept(newManager.getProvider());
205205
}
206-
shutDownOld(oldProvider, afterShutdown);
206+
shutDownOld(oldManager, afterShutdown);
207207
} catch (OpenFeatureError e) {
208208
log.error(
209209
"Exception when initializing feature provider {}",
210-
newProvider.getProvider().getClass().getName(),
210+
newManager.getProvider().getClass().getName(),
211211
e
212212
);
213-
afterError.accept(newProvider.getProvider(), e);
213+
afterError.accept(newManager.getProvider(), e);
214214
} catch (Exception e) {
215215
log.error(
216216
"Exception when initializing feature provider {}",
217-
newProvider.getProvider().getClass().getName(),
217+
newManager.getProvider().getClass().getName(),
218218
e
219219
);
220-
afterError.accept(newProvider.getProvider(), new GeneralError(e));
220+
afterError.accept(newManager.getProvider(), new GeneralError(e));
221221
}
222222
}
223223

224-
private void shutDownOld(FeatureProviderStateManager oldProvider, Consumer<FeatureProvider> afterShutdown) {
225-
if (oldProvider != null && !isStateManagerRegistered(oldProvider)) {
226-
shutdownProvider(oldProvider);
227-
afterShutdown.accept(oldProvider.getProvider());
224+
private void shutDownOld(FeatureProviderStateManager oldManager, Consumer<FeatureProvider> afterShutdown) {
225+
if (oldManager != null && !isStateManagerRegistered(oldManager)) {
226+
shutdownProvider(oldManager);
227+
afterShutdown.accept(oldManager.getProvider());
228228
}
229229
}
230230

231231
/**
232-
* Helper to check if provider is already known (registered).
232+
* Helper to check if manager is already known (registered).
233233
*
234-
* @param provider provider to check for registration
234+
* @param manager manager to check for registration
235235
* @return boolean true if already registered, false otherwise
236236
*/
237-
private boolean isStateManagerRegistered(FeatureProviderStateManager provider) {
238-
return provider != null
239-
&& (this.stateManagers.containsValue(provider) || this.defaultStateManger.get().equals(provider));
237+
private boolean isStateManagerRegistered(FeatureProviderStateManager manager) {
238+
return manager != null
239+
&& (this.stateManagers.containsValue(manager) || this.defaultStateManger.get().equals(manager));
240240
}
241241

242-
private void shutdownProvider(FeatureProviderStateManager provider) {
243-
if (provider == null) {
242+
private void shutdownProvider(FeatureProviderStateManager manager) {
243+
if (manager == null) {
244244
return;
245245
}
246-
shutdownProvider(provider.getProvider());
246+
shutdownProvider(manager.getProvider());
247247
}
248248

249249
private void shutdownProvider(FeatureProvider provider) {

src/test/java/dev/openfeature/sdk/EventsTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,6 @@ void removedEventsShouldNotRun() {
606606
final Consumer<EventDetails> handler2 = mockHandler();
607607

608608
TestEventsProvider provider = new TestEventsProvider(INIT_DELAY);
609-
provider.initialize(null);
610609
OpenFeatureAPI.getInstance().setProviderAndWait(name, provider);
611610
Client client = OpenFeatureAPI.getInstance().getClient(name);
612611

0 commit comments

Comments
 (0)