Skip to content

Commit 124be36

Browse files
committed
fixup: pmd fix and remove equals
Signed-off-by: Todd Baert <[email protected]>
1 parent 6bdd7ac commit 124be36

File tree

4 files changed

+12
-22
lines changed

4 files changed

+12
-22
lines changed

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,4 @@ protected void emitProviderStale(ProviderEventDetails details) {
102102
protected void emitProviderError(ProviderEventDetails details) {
103103
emit(ProviderEvent.PROVIDER_ERROR, details);
104104
}
105-
106-
@Override
107-
public boolean equals(Object obj) {
108-
if (obj == null) {
109-
return false;
110-
}
111-
if (obj instanceof FeatureProviderStateManager) {
112-
return this == ((FeatureProviderStateManager) obj).getProvider();
113-
}
114-
return this == obj;
115-
}
116105
}

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,9 @@ private void prepareAndInitializeProvider(String domain,
184184

185185
private FeatureProviderStateManager getExistingStateManagerForProvider(FeatureProvider provider) {
186186
for (FeatureProviderStateManager stateManager : stateManagers.values()) {
187-
if (stateManager.hasSameProvider(provider)) return stateManager;
187+
if (stateManager.hasSameProvider(provider)) {
188+
return stateManager;
189+
}
188190
}
189191
FeatureProviderStateManager defaultFeatureProviderStateManager = defaultStateManger.get();
190192
if (defaultFeatureProviderStateManager.hasSameProvider(provider)) {
@@ -231,19 +233,19 @@ private void shutDownOld(FeatureProviderStateManager oldProvider, Consumer<Featu
231233
/**
232234
* Helper to check if provider is already known (registered).
233235
*
234-
* @param provider provider to check for registration
236+
* @param manager manager to check for registration
235237
* @return boolean true if already registered, false otherwise
236238
*/
237-
private boolean isStateManagerRegistered(FeatureProviderStateManager provider) {
238-
return provider != null
239-
&& (this.stateManagers.containsValue(provider) || this.defaultStateManger.get().equals(provider));
239+
private boolean isStateManagerRegistered(FeatureProviderStateManager manager) {
240+
return manager != null
241+
&& (this.stateManagers.containsValue(manager) || this.defaultStateManger.get().equals(manager));
240242
}
241243

242-
private void shutdownProvider(FeatureProviderStateManager provider) {
243-
if (provider == null) {
244+
private void shutdownProvider(FeatureProviderStateManager manager) {
245+
if (manager == null) {
244246
return;
245247
}
246-
shutdownProvider(provider.getProvider());
248+
shutdownProvider(manager.getProvider());
247249
}
248250

249251
private void shutdownProvider(FeatureProvider provider) {

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

Lines changed: 1 addition & 2 deletions
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

@@ -619,7 +618,7 @@ void removedEventsShouldNotRun() {
619618

620619
// emit event
621620
provider.mockEvent(ProviderEvent.PROVIDER_CONFIGURATION_CHANGED, ProviderEventDetails.builder().build());
622-
621+
623622
// both global and client handlers should not run.
624623
verify(handler1, after(TIMEOUT).never()).accept(any());
625624
verify(handler2, never()).accept(any());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void optional_properties() {
149149
@Test
150150
void before_runs_ahead_of_evaluation() {
151151
OpenFeatureAPI api = OpenFeatureAPI.getInstance();
152-
api.setProvider(new AlwaysBrokenProvider());
152+
api.setProviderAndWait(new AlwaysBrokenProvider());
153153
Client client = api.getClient();
154154
Hook<Boolean> evalHook = mockBooleanHook();
155155

0 commit comments

Comments
 (0)