From a36a6a965ebbc2bd3e30a29cd9e09383fa68aaa8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 18:51:17 +0000 Subject: [PATCH 1/3] chore(deps): update dependency org.apache.maven.plugins:maven-pmd-plugin to v3.22.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e008548d3..a38e5297f 100644 --- a/pom.xml +++ b/pom.xml @@ -334,7 +334,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.21.2 + 3.22.0 run-pmd From a60193910d97b2fcdef2f33f2069a9bbe0b19a44 Mon Sep 17 00:00:00 2001 From: DBlanchard88 Date: Mon, 13 May 2024 15:55:39 -0400 Subject: [PATCH 2/3] removed redundancy from eventdetails, SuppressWarnings in OpenfeatureAPI and Client Signed-off-by: DBlanchard88 --- src/main/java/dev/openfeature/sdk/EventDetails.java | 4 ++-- src/main/java/dev/openfeature/sdk/OpenFeatureAPI.java | 1 + src/main/java/dev/openfeature/sdk/OpenFeatureClient.java | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/dev/openfeature/sdk/EventDetails.java b/src/main/java/dev/openfeature/sdk/EventDetails.java index 02b1964dd..08cb7e211 100644 --- a/src/main/java/dev/openfeature/sdk/EventDetails.java +++ b/src/main/java/dev/openfeature/sdk/EventDetails.java @@ -13,14 +13,14 @@ public class EventDetails extends ProviderEventDetails { private String providerName; static EventDetails fromProviderEventDetails(ProviderEventDetails providerEventDetails, String providerName) { - return EventDetails.fromProviderEventDetails(providerEventDetails, providerName, null); + return fromProviderEventDetails(providerEventDetails, providerName, null); } static EventDetails fromProviderEventDetails( ProviderEventDetails providerEventDetails, String providerName, String clientName) { - return EventDetails.builder() + return builder() .clientName(clientName) .providerName(providerName) .flagsChanged(providerEventDetails.getFlagsChanged()) diff --git a/src/main/java/dev/openfeature/sdk/OpenFeatureAPI.java b/src/main/java/dev/openfeature/sdk/OpenFeatureAPI.java index db28555ac..d159c73de 100644 --- a/src/main/java/dev/openfeature/sdk/OpenFeatureAPI.java +++ b/src/main/java/dev/openfeature/sdk/OpenFeatureAPI.java @@ -18,6 +18,7 @@ * Configuration here will be shared across all {@link Client}s. */ @Slf4j +@SuppressWarnings("PMD.UnusedLocalVariable") public class OpenFeatureAPI implements EventBus { // package-private multi-read/single-write lock static AutoCloseableReentrantReadWriteLock lock = new AutoCloseableReentrantReadWriteLock(); diff --git a/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java b/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java index ce763a34b..3ae64dabd 100644 --- a/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java +++ b/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java @@ -19,7 +19,8 @@ * {@inheritDoc} */ @Slf4j -@SuppressWarnings({ "PMD.DataflowAnomalyAnalysis", "PMD.BeanMembersShouldSerialize", "unchecked", "rawtypes" }) +@SuppressWarnings({ "PMD.DataflowAnomalyAnalysis", "PMD.BeanMembersShouldSerialize", + "PMD.UnusedLocalVariable", "unchecked", "rawtypes" }) public class OpenFeatureClient implements Client { private final OpenFeatureAPI openfeatureApi; @@ -107,7 +108,8 @@ private FlagEvaluationDetails evaluateFlag(FlagValueType type, String key FeatureProvider provider; try { - // openfeatureApi.getProvider() must be called once to maintain a consistent reference + // openfeatureApi.getProvider() must be called once to maintain a consistent + // reference provider = openfeatureApi.getProvider(this.name); mergedHooks = ObjectUtils.merge(provider.getProviderHooks(), flagOptions.getHooks(), clientHooks, From 15678c828658e1f1a7a05a7b0283847c7eeb0895 Mon Sep 17 00:00:00 2001 From: Todd Baert Date: Tue, 14 May 2024 16:05:47 -0400 Subject: [PATCH 3/3] Update src/main/java/dev/openfeature/sdk/OpenFeatureClient.java Signed-off-by: Todd Baert --- src/main/java/dev/openfeature/sdk/OpenFeatureClient.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java b/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java index 3ae64dabd..b03ef6aa6 100644 --- a/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java +++ b/src/main/java/dev/openfeature/sdk/OpenFeatureClient.java @@ -108,8 +108,7 @@ private FlagEvaluationDetails evaluateFlag(FlagValueType type, String key FeatureProvider provider; try { - // openfeatureApi.getProvider() must be called once to maintain a consistent - // reference + // openfeatureApi.getProvider() must be called once to maintain a consistent reference provider = openfeatureApi.getProvider(this.name); mergedHooks = ObjectUtils.merge(provider.getProviderHooks(), flagOptions.getHooks(), clientHooks,