From cb99d1599277b419ea1f50f6d22dadedbdaa19b1 Mon Sep 17 00:00:00 2001 From: Andrew Bell <115623869+andybharness@users.noreply.github.com> Date: Mon, 30 Oct 2023 12:59:27 +0000 Subject: [PATCH 1/3] [FFM-9482] - Mark private attributes for removal What Add deprecated tags to private attributes so they can be removed in a future release --- examples/code_cleanup_examples/SampleClass.java | 1 - .../main/java/io/harness/ff/examples/EventExample.java | 1 - .../src/main/java/io/harness/ff/examples/Example.java | 1 - .../java/io/harness/ff/examples/ExcessiveLogs.java | 1 - .../src/main/java/io/harness/ff/examples/Local.java | 1 - .../src/main/java/io/harness/ff/examples/Simple.java | 1 - .../main/java/io/harness/ff/examples/Singleton.java | 1 - .../main/java/io/harness/ff/examples/StressTest.java | 1 - .../main/java/io/harness/ff/examples/TryWithRes.java | 1 - src/main/java/io/harness/cf/client/api/BaseConfig.java | 4 ++-- src/main/java/io/harness/cf/client/dto/Target.java | 10 +++++----- 11 files changed, 7 insertions(+), 16 deletions(-) diff --git a/examples/code_cleanup_examples/SampleClass.java b/examples/code_cleanup_examples/SampleClass.java index 83870ffc..55021be2 100644 --- a/examples/code_cleanup_examples/SampleClass.java +++ b/examples/code_cleanup_examples/SampleClass.java @@ -19,7 +19,6 @@ public static void main(String... args) throws FeatureFlagInitializeException, I final Target target = Target.builder() .identifier("target1") - .isPrivate(false) .attribute("testKey", "TestValue") .name("target1") .build(); diff --git a/examples/src/main/java/io/harness/ff/examples/EventExample.java b/examples/src/main/java/io/harness/ff/examples/EventExample.java index 9411236d..f2713ce0 100644 --- a/examples/src/main/java/io/harness/ff/examples/EventExample.java +++ b/examples/src/main/java/io/harness/ff/examples/EventExample.java @@ -39,7 +39,6 @@ public static void main(String... args) { final Target target = Target.builder() .identifier("target1") - .isPrivate(false) .attribute("testKey", "TestValue") .name("target1") .build(); diff --git a/examples/src/main/java/io/harness/ff/examples/Example.java b/examples/src/main/java/io/harness/ff/examples/Example.java index e561115f..65a99c9c 100644 --- a/examples/src/main/java/io/harness/ff/examples/Example.java +++ b/examples/src/main/java/io/harness/ff/examples/Example.java @@ -65,7 +65,6 @@ public static void main(String... args) { final Target target = Target.builder() .identifier("Target_" + random) - .isPrivate(false) .attribute("Test_key_" + getRandom(), getRandom()) .attribute("Test_key_" + getRandom(), getRandom()) .attribute("Test_key_" + getRandom(), getRandom()) diff --git a/examples/src/main/java/io/harness/ff/examples/ExcessiveLogs.java b/examples/src/main/java/io/harness/ff/examples/ExcessiveLogs.java index f57f4bfc..af88ff34 100644 --- a/examples/src/main/java/io/harness/ff/examples/ExcessiveLogs.java +++ b/examples/src/main/java/io/harness/ff/examples/ExcessiveLogs.java @@ -44,7 +44,6 @@ public static void main(String... args) throws FeatureFlagInitializeException, I final Target target = Target.builder() .identifier("target1") - .isPrivate(false) .attribute("testKey", "TestValue") .name("target1") .build(); diff --git a/examples/src/main/java/io/harness/ff/examples/Local.java b/examples/src/main/java/io/harness/ff/examples/Local.java index b706d2a4..e2f82236 100644 --- a/examples/src/main/java/io/harness/ff/examples/Local.java +++ b/examples/src/main/java/io/harness/ff/examples/Local.java @@ -37,7 +37,6 @@ public static void main(String... args) throws InterruptedException { final Target target = Target.builder() .identifier("target1") - .isPrivate(false) .attribute("testKey", "TestValue") .name("target1") .build(); diff --git a/examples/src/main/java/io/harness/ff/examples/Simple.java b/examples/src/main/java/io/harness/ff/examples/Simple.java index d03c0eb9..45ae1b7b 100644 --- a/examples/src/main/java/io/harness/ff/examples/Simple.java +++ b/examples/src/main/java/io/harness/ff/examples/Simple.java @@ -34,7 +34,6 @@ public static void main(String... args) throws FeatureFlagInitializeException, I final Target target = Target.builder() .identifier("target1") - .isPrivate(false) .attribute("testKey", "TestValue") .name("target1") .build(); diff --git a/examples/src/main/java/io/harness/ff/examples/Singleton.java b/examples/src/main/java/io/harness/ff/examples/Singleton.java index dbe8da6c..86d39e48 100644 --- a/examples/src/main/java/io/harness/ff/examples/Singleton.java +++ b/examples/src/main/java/io/harness/ff/examples/Singleton.java @@ -38,7 +38,6 @@ public static void main(String... args) final Target target = Target.builder() .identifier("target1") - .isPrivate(false) .attribute("testKey", "TestValue") .name("target1") .build(); diff --git a/examples/src/main/java/io/harness/ff/examples/StressTest.java b/examples/src/main/java/io/harness/ff/examples/StressTest.java index 80ccad70..640aa8cf 100644 --- a/examples/src/main/java/io/harness/ff/examples/StressTest.java +++ b/examples/src/main/java/io/harness/ff/examples/StressTest.java @@ -53,7 +53,6 @@ public static void main(String... args) { final Target target = Target.builder() .identifier("Target_" + random) - .isPrivate(false) .name("Target_" + random) .build(); diff --git a/examples/src/main/java/io/harness/ff/examples/TryWithRes.java b/examples/src/main/java/io/harness/ff/examples/TryWithRes.java index 6c0329f3..53d85ca5 100644 --- a/examples/src/main/java/io/harness/ff/examples/TryWithRes.java +++ b/examples/src/main/java/io/harness/ff/examples/TryWithRes.java @@ -21,7 +21,6 @@ public static void main(String... args) throws InterruptedException { final Target target = Target.builder() .identifier("target1") - .isPrivate(false) .attribute("testKey", "TestValue") .name("target1") .build(); diff --git a/src/main/java/io/harness/cf/client/api/BaseConfig.java b/src/main/java/io/harness/cf/client/api/BaseConfig.java index 7598ec2b..7ff8008e 100644 --- a/src/main/java/io/harness/cf/client/api/BaseConfig.java +++ b/src/main/java/io/harness/cf/client/api/BaseConfig.java @@ -30,9 +30,9 @@ public class BaseConfig { @Builder.Default private final int bufferSize = 2048; // Flag to set all attributes as private - @Builder.Default private final boolean allAttributesPrivate = false; + @Deprecated @Builder.Default private final boolean allAttributesPrivate = false; // Custom list to set the attributes which are private; move over to target - @Builder.Default private final Set privateAttributes = Collections.emptySet(); + @Deprecated @Builder.Default private final Set privateAttributes = Collections.emptySet(); @Builder.Default private final boolean debug = false; /** If metrics service POST call is taking > this time, we need to know about it */ diff --git a/src/main/java/io/harness/cf/client/dto/Target.java b/src/main/java/io/harness/cf/client/dto/Target.java index fa761ecf..4198bb65 100644 --- a/src/main/java/io/harness/cf/client/dto/Target.java +++ b/src/main/java/io/harness/cf/client/dto/Target.java @@ -1,9 +1,8 @@ package io.harness.cf.client.dto; +import io.harness.cf.client.common.StringUtils; import java.util.Map; import java.util.Set; - -import io.harness.cf.client.common.StringUtils; import lombok.*; @Builder @@ -18,10 +17,11 @@ public class Target { private String identifier; @Singular private Map attributes; - private boolean isPrivate; // If the target is private - @Singular - private Set privateAttributes; // Custom set to set the attributes which are private + @Deprecated // private attributes will be removed in a future release + private Boolean isPrivate = false; + + @Deprecated @Singular private Set privateAttributes; @Override public String toString() { From 9ed2db8c54fc17186def220ecfdf5b2381694679 Mon Sep 17 00:00:00 2001 From: Andrew Bell <115623869+andybharness@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:54:18 +0000 Subject: [PATCH 2/3] tell lombok not to name getter as getIsPrivate() --- src/main/java/io/harness/cf/client/dto/Target.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/io/harness/cf/client/dto/Target.java b/src/main/java/io/harness/cf/client/dto/Target.java index 4198bb65..f10be9ab 100644 --- a/src/main/java/io/harness/cf/client/dto/Target.java +++ b/src/main/java/io/harness/cf/client/dto/Target.java @@ -4,6 +4,7 @@ import java.util.Map; import java.util.Set; import lombok.*; +import lombok.experimental.Accessors; @Builder @Getter @@ -19,6 +20,8 @@ public class Target { @Singular private Map attributes; @Deprecated // private attributes will be removed in a future release + @Getter + @Accessors(fluent = true) private Boolean isPrivate = false; @Deprecated @Singular private Set privateAttributes; From b59a4320dcbeed1dd6279efad2f6318c755396ff Mon Sep 17 00:00:00 2001 From: Andrew Bell <115623869+andybharness@users.noreply.github.com> Date: Mon, 30 Oct 2023 14:09:12 +0000 Subject: [PATCH 3/3] fix failing unit tests which are throwing null pointers --- src/main/java/io/harness/cf/client/dto/Target.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/harness/cf/client/dto/Target.java b/src/main/java/io/harness/cf/client/dto/Target.java index f10be9ab..c6836689 100644 --- a/src/main/java/io/harness/cf/client/dto/Target.java +++ b/src/main/java/io/harness/cf/client/dto/Target.java @@ -22,6 +22,7 @@ public class Target { @Deprecated // private attributes will be removed in a future release @Getter @Accessors(fluent = true) + @Builder.Default private Boolean isPrivate = false; @Deprecated @Singular private Set privateAttributes;