From 42019487565421f1265fe70733816553e1f211fd Mon Sep 17 00:00:00 2001 From: Jiwe Guo Date: Wed, 2 Aug 2023 23:42:21 +0800 Subject: [PATCH 1/3] Fix generating javadoc issue --- .../client/impl/conf/ReaderConfigurationData.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java index a038383564da2..cf6bef1184d74 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java @@ -27,8 +27,6 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import org.apache.pulsar.client.api.ConsumerCryptoFailureAction; import org.apache.pulsar.client.api.CryptoKeyReader; import org.apache.pulsar.client.api.MessageCrypto; @@ -118,8 +116,6 @@ public class ReaderConfigurationData implements Serializable, Cloneable { private ConsumerCryptoFailureAction cryptoFailureAction = ConsumerCryptoFailureAction.FAIL; @JsonIgnore - @Setter(onMethod_ = @SuppressFBWarnings({"EI_EXPOSE_REP2"})) - @Getter(onMethod_ = @SuppressFBWarnings({"EI_EXPOSE_REP"})) private transient MessageCrypto messageCrypto = null; @ApiModelProperty( @@ -193,4 +189,14 @@ public ReaderConfigurationData clone() { throw new RuntimeException("Failed to clone ReaderConfigurationData"); } } + + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) + public MessageCrypto getMessageCrypto() { + return messageCrypto; + } + + @SuppressFBWarnings({"EI_EXPOSE_REP"}) + public void setMessageCrypto(MessageCrypto messageCrypto) { + this.messageCrypto = messageCrypto; + } } From 09a523e8abfaec2b63988e61a31ec01c768306cd Mon Sep 17 00:00:00 2001 From: Jiwe Guo Date: Thu, 3 Aug 2023 01:15:17 +0800 Subject: [PATCH 2/3] fix --- .../apache/pulsar/client/impl/conf/ReaderConfigurationData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java index cf6bef1184d74..d148a4b25885f 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java @@ -190,7 +190,7 @@ public ReaderConfigurationData clone() { } } - @SuppressFBWarnings({"EI_EXPOSE_REP2"}) + @SuppressFBWarnings({"EI_EXPOSE_REP2", "EI_EXPOSE_REP"}) public MessageCrypto getMessageCrypto() { return messageCrypto; } From a97e6bdcbf4db4795dec8fe93da18e2aa22166be Mon Sep 17 00:00:00 2001 From: Jiwe Guo Date: Thu, 3 Aug 2023 01:30:01 +0800 Subject: [PATCH 3/3] fix --- .../pulsar/client/impl/conf/ReaderConfigurationData.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java index d148a4b25885f..73d97f1f33607 100644 --- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java +++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ReaderConfigurationData.java @@ -190,12 +190,12 @@ public ReaderConfigurationData clone() { } } - @SuppressFBWarnings({"EI_EXPOSE_REP2", "EI_EXPOSE_REP"}) + @SuppressFBWarnings({"EI_EXPOSE_REP"}) public MessageCrypto getMessageCrypto() { return messageCrypto; } - @SuppressFBWarnings({"EI_EXPOSE_REP"}) + @SuppressFBWarnings({"EI_EXPOSE_REP2"}) public void setMessageCrypto(MessageCrypto messageCrypto) { this.messageCrypto = messageCrypto; }