Skip to content

Commit cd7470d

Browse files
fix: removed javax.nullable annotations (#921)
removing nullable annotation Signed-off-by: DBlanchard88 <[email protected]> Co-authored-by: Todd Baert <[email protected]>
1 parent 3f8c009 commit cd7470d

File tree

7 files changed

+13
-28
lines changed

7 files changed

+13
-28
lines changed

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

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

3-
import edu.umd.cs.findbugs.annotations.Nullable;
43
import lombok.Data;
54
import lombok.experimental.SuperBuilder;
65

@@ -19,8 +18,8 @@ static EventDetails fromProviderEventDetails(ProviderEventDetails providerEventD
1918

2019
static EventDetails fromProviderEventDetails(
2120
ProviderEventDetails providerEventDetails,
22-
@Nullable String providerName,
23-
@Nullable String clientName) {
21+
String providerName,
22+
String clientName) {
2423
return EventDetails.builder()
2524
.clientName(clientName)
2625
.providerName(providerName)

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

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

33
import lombok.extern.slf4j.Slf4j;
44

5-
import javax.annotation.Nullable;
65
import java.util.ArrayList;
76
import java.util.List;
87
import java.util.Map;
@@ -41,7 +40,7 @@ class EventSupport {
4140
* @param event the event type
4241
* @param eventDetails the event details
4342
*/
44-
public void runClientHandlers(@Nullable String clientName, ProviderEvent event, EventDetails eventDetails) {
43+
public void runClientHandlers(String clientName, ProviderEvent event, EventDetails eventDetails) {
4544
clientName = Optional.ofNullable(clientName)
4645
.orElse(defaultClientUuid);
4746

@@ -74,7 +73,7 @@ public void runGlobalHandlers(ProviderEvent event, EventDetails eventDetails) {
7473
* @param event the event type
7574
* @param handler the handler function to run
7675
*/
77-
public void addClientHandler(@Nullable String clientName, ProviderEvent event, Consumer<EventDetails> handler) {
76+
public void addClientHandler(String clientName, ProviderEvent event, Consumer<EventDetails> handler) {
7877
final String name = Optional.ofNullable(clientName)
7978
.orElse(defaultClientUuid);
8079

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

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

33
import java.util.Optional;
44

5-
import javax.annotation.Nullable;
6-
75
import lombok.AllArgsConstructor;
86
import lombok.Builder;
97
import lombok.Data;
@@ -23,12 +21,9 @@ public class FlagEvaluationDetails<T> implements BaseEvaluation<T> {
2321

2422
private String flagKey;
2523
private T value;
26-
@Nullable
2724
private String variant;
28-
@Nullable
2925
private String reason;
3026
private ErrorCode errorCode;
31-
@Nullable
3227
private String errorMessage;
3328
@Builder.Default
3429
private ImmutableMetadata flagMetadata = ImmutableMetadata.builder().build();

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import java.util.Set;
88
import java.util.function.Consumer;
99

10-
import javax.annotation.Nullable;
11-
1210
import dev.openfeature.sdk.exceptions.OpenFeatureError;
1311
import dev.openfeature.sdk.internal.AutoCloseableLock;
1412
import dev.openfeature.sdk.internal.AutoCloseableReentrantReadWriteLock;
@@ -67,14 +65,14 @@ public Client getClient() {
6765
/**
6866
* {@inheritDoc}
6967
*/
70-
public Client getClient(@Nullable String name) {
68+
public Client getClient(String name) {
7169
return getClient(name, null);
7270
}
7371

7472
/**
7573
* {@inheritDoc}
7674
*/
77-
public Client getClient(@Nullable String name, @Nullable String version) {
75+
public Client getClient(String name, String version) {
7876
return new OpenFeatureClient(this,
7977
name,
8078
version);

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

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

3-
import javax.annotation.Nullable;
4-
53
import lombok.AllArgsConstructor;
64
import lombok.Builder;
75
import lombok.Data;
@@ -18,10 +16,10 @@
1816
@AllArgsConstructor
1917
public class ProviderEvaluation<T> implements BaseEvaluation<T> {
2018
T value;
21-
@Nullable String variant;
22-
@Nullable private String reason;
19+
String variant;
20+
private String reason;
2321
ErrorCode errorCode;
24-
@Nullable private String errorMessage;
22+
private String errorMessage;
2523
@Builder.Default
2624
private ImmutableMetadata flagMetadata = ImmutableMetadata.builder().build();
2725
}

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

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

33
import java.util.List;
44

5-
import javax.annotation.Nullable;
6-
75
import lombok.Data;
86
import lombok.experimental.SuperBuilder;
97

@@ -12,7 +10,7 @@
1210
*/
1311
@Data @SuperBuilder(toBuilder = true)
1412
public class ProviderEventDetails {
15-
@Nullable private List<String> flagsChanged;
16-
@Nullable private String message;
17-
@Nullable private ImmutableMetadata eventMetadata;
13+
private List<String> flagsChanged;
14+
private String message;
15+
private ImmutableMetadata eventMetadata;
1816
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import java.util.stream.Collectors;
1414
import java.util.stream.Stream;
1515

16-
import javax.annotation.Nullable;
17-
1816
import dev.openfeature.sdk.exceptions.GeneralError;
1917
import dev.openfeature.sdk.exceptions.OpenFeatureError;
2018
import lombok.extern.slf4j.Slf4j;
@@ -100,7 +98,7 @@ public void setProvider(String clientName,
10098
prepareAndInitializeProvider(clientName, provider, afterSet, afterInit, afterShutdown, afterError, waitForInit);
10199
}
102100

103-
private void prepareAndInitializeProvider(@Nullable String clientName,
101+
private void prepareAndInitializeProvider(String clientName,
104102
FeatureProvider newProvider,
105103
Consumer<FeatureProvider> afterSet,
106104
Consumer<FeatureProvider> afterInit,

0 commit comments

Comments
 (0)