Skip to content

Commit 2410dc9

Browse files
aepfliaepfli
committed
fixup: some sonar issues
Signed-off-by: Simon Schrottner <[email protected]>
1 parent 898c4a7 commit 2410dc9

22 files changed

+112
-62
lines changed

‎openfeature-api/src/main/java/dev/openfeature/api/AbstractEventProvider.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
import dev.openfeature.api.internal.TriConsumer;
88
import java.util.ArrayList;
99
import java.util.List;
10-
import java.util.concurrent.ExecutorService;
11-
import java.util.concurrent.Executors;
12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
1410

1511
/**
1612
* Abstract EventProvider. Providers must extend this class to support events.
@@ -25,9 +21,7 @@
2521
* @see Provider
2622
*/
2723
public abstract class AbstractEventProvider implements EventProvider {
28-
private static final Logger log = LoggerFactory.getLogger(AbstractEventProvider.class);
2924
private EventEmitter eventEmitter;
30-
private final ExecutorService emitterExecutor = Executors.newCachedThreadPool();
3125
private List<Hook<?>> hooks;
3226

3327
public void setEventEmitter(EventEmitter eventEmitter) {

‎openfeature-api/src/test/java/dev/openfeature/api/DefaultEvaluationEventTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.openfeature.api;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
34
import static org.junit.jupiter.api.Assertions.assertEquals;
45
import static org.junit.jupiter.api.Assertions.assertFalse;
56
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -140,14 +141,13 @@ void equals_shouldWorkCorrectly() {
140141
assertNotEquals(event1, event4);
141142
assertNotEquals(event4, event1);
142143

143-
// Self-equality
144-
assertEquals(event1, event1);
145-
146-
// Null comparison
147-
assertNotEquals(event1, null);
148-
149-
// Different class comparison
150-
assertNotEquals(event1, "not an event");
144+
assertThat(event1)
145+
// Self-equality
146+
.isEqualTo(event1)
147+
// Null comparison
148+
.isNotEqualTo(null)
149+
// Different class comparison
150+
.isNotEqualTo("not an event");
151151
}
152152

153153
@Test

‎openfeature-api/src/test/java/dev/openfeature/api/EnhancedImmutableMetadataTest.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.openfeature.api;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
34
import static org.junit.jupiter.api.Assertions.assertEquals;
4-
import static org.junit.jupiter.api.Assertions.assertNotEquals;
55
import static org.junit.jupiter.api.Assertions.assertNotNull;
66
import static org.junit.jupiter.api.Assertions.assertNull;
77
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -217,20 +217,21 @@ void equals_shouldWorkCorrectly() {
217217
.build();
218218

219219
// Same content should be equal
220-
assertEquals(metadata1, metadata2);
221-
assertEquals(metadata2, metadata1);
220+
assertThat(metadata2).isEqualTo(metadata1);
221+
assertThat(metadata1)
222+
.isEqualTo(metadata2)
222223

223-
// Different content should not be equal
224-
assertNotEquals(metadata1, metadata3);
224+
// Different content should not be equal
225+
.isNotEqualTo(metadata3)
225226

226-
// Self-equality
227-
assertEquals(metadata1, metadata1);
227+
// Self-equality
228+
.isEqualTo(metadata1)
228229

229-
// Null comparison
230-
assertNotEquals(metadata1, null);
230+
// Null comparison
231+
.isNotEqualTo(null)
231232

232-
// Different class comparison
233-
assertNotEquals(metadata1, "not metadata");
233+
// Different class comparison
234+
.isNotEqualTo("not metadata");
234235
}
235236

236237
@Test

‎openfeature-api/src/test/java/dev/openfeature/api/EnumTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,6 @@ void providerState_matchesEvent_shouldHandleAllStatesAndEvents() {
187187
for (ProviderEvent event : ProviderEvent.values()) {
188188
boolean result = state.matchesEvent(event);
189189

190-
// Assert the method doesn't throw exceptions and returns a boolean
191-
assertNotNull(result);
192-
193190
// Verify the expected matches
194191
if ((state == ProviderState.READY && event == ProviderEvent.PROVIDER_READY)
195192
|| (state == ProviderState.STALE && event == ProviderEvent.PROVIDER_STALE)

‎openfeature-api/src/test/java/dev/openfeature/api/evaluation/DefaultFlagEvaluationDetailsTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ class DefaultFlagEvaluationDetailsTest {
1313

1414
@Test
1515
@DisplayName("Should create empty evaluation details with builder")
16-
public void empty() {
16+
void empty() {
1717
FlagEvaluationDetails<Integer> details = new DefaultFlagEvaluationDetails<>();
1818
assertNotNull(details);
1919
}
2020

2121
@Test
2222
@DisplayName("Should create evaluation details with all fields using builder")
23-
public void builderWithAllFields() {
23+
void builderWithAllFields() {
2424

2525
String flagKey = "my-flag";
2626
Integer value = 100;
@@ -44,9 +44,9 @@ public void builderWithAllFields() {
4444

4545
@Test
4646
@DisplayName("should be able to compare 2 FlagEvaluationDetails")
47-
public void compareFlagEvaluationDetails() {
47+
void compareFlagEvaluationDetails() {
4848
String flagKey = "my-flag";
49-
FlagEvaluationDetails fed1 = new DefaultFlagEvaluationDetails<>(
49+
FlagEvaluationDetails<Boolean> fed1 = new DefaultFlagEvaluationDetails<>(
5050
flagKey,
5151
false,
5252
null,
@@ -55,7 +55,7 @@ public void compareFlagEvaluationDetails() {
5555
"error XXX",
5656
Metadata.immutableBuilder().add("metadata", "1").build());
5757

58-
FlagEvaluationDetails fed2 = new DefaultFlagEvaluationDetails<>(
58+
FlagEvaluationDetails<Boolean> fed2 = new DefaultFlagEvaluationDetails<>(
5959
flagKey,
6060
false,
6161
null,

‎openfeature-api/src/test/java/dev/openfeature/api/lifecycle/DefaultHookDataTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.assertj.core.api.Assertions.assertThatThrownBy;
5-
import static org.junit.jupiter.api.Assertions.*;
65

76
import org.junit.jupiter.api.Test;
87

‎openfeature-api/src/test/java/dev/openfeature/api/types/ImmutableStructureTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.openfeature.api.types;
22

3+
import static org.assertj.core.api.Assertions.assertThatCode;
34
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
45
import static org.junit.jupiter.api.Assertions.assertEquals;
56
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -157,7 +158,7 @@ void objectMapTest() {
157158
void constructorHandlesNullValue() {
158159
HashMap<String, Value> attrs = new HashMap<>();
159160
attrs.put("null", null);
160-
new ImmutableStructure(attrs);
161+
assertThatCode(()-> new ImmutableStructure(attrs)).doesNotThrowAnyException();
161162
}
162163

163164
@Test

‎openfeature-sdk/src/main/java/dev/openfeature/sdk/EventEmitter.java‎ renamed to ‎openfeature-sdk/src/main/java/dev/openfeature/sdk/DefaultEventEmitter.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import dev.openfeature.api.Provider;
55
import dev.openfeature.api.ProviderEvent;
66
import dev.openfeature.api.evaluation.EvaluationContext;
7+
import dev.openfeature.api.events.EventEmitter;
78
import dev.openfeature.api.events.EventProvider;
89
import dev.openfeature.api.events.ProviderEventDetails;
910
import dev.openfeature.api.internal.TriConsumer;
@@ -25,13 +26,13 @@
2526
*
2627
* @see Provider
2728
*/
28-
class EventEmitter implements dev.openfeature.api.events.EventEmitter {
29-
private static final Logger log = LoggerFactory.getLogger(EventEmitter.class);
29+
class DefaultEventEmitter implements EventEmitter {
30+
private static final Logger log = LoggerFactory.getLogger(DefaultEventEmitter.class);
3031
private final EventProviderListener eventProviderListener;
3132
private final ExecutorService emitterExecutor = Executors.newCachedThreadPool();
3233
private final EventProvider provider;
3334

34-
protected EventEmitter(EventProvider provider, EventProviderListener eventProviderListener) {
35+
protected DefaultEventEmitter(EventProvider provider, EventProviderListener eventProviderListener) {
3536
this.provider = provider;
3637
this.eventProviderListener = eventProviderListener;
3738
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public FeatureProviderStateManager(Provider delegate) {
2323
this.delegate = delegate;
2424
if (delegate instanceof AbstractEventProvider) {
2525
((AbstractEventProvider) delegate)
26-
.setEventEmitter(new EventEmitter((AbstractEventProvider) delegate, this));
26+
.setEventEmitter(new DefaultEventEmitter((AbstractEventProvider) delegate, this));
2727
}
2828
}
2929

‎openfeature-sdk/src/main/java/dev/openfeature/sdk/providers/memory/ContextEvaluator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
*/
1010
public interface ContextEvaluator<T> {
1111

12-
T evaluate(Flag flag, EvaluationContext evaluationContext);
12+
T evaluate(Flag<T> flag, EvaluationContext evaluationContext);
1313
}

0 commit comments

Comments
 (0)