Skip to content

fix: Add nullability annotations and fix kotlin-stdlib transitive leak #10979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
obabichevjb wants to merge 1 commit into
base: develop
Choose a base branch
from
+27 −0
Open

fix: Add nullability annotations and fix kotlin-stdlib transitive leak #10979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions common/src/main/java/org/apache/rocketmq/common/message/Message.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import org.apache.commons.lang3.math.NumberUtils;

import javax.annotation.Nullable;

import java.io.Serializable;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -98,10 +100,12 @@ public void putUserProperty(final String name, final String value) {
this.putProperty(name, value);
}

@Nullable
public String getUserProperty(final String name) {
return this.getProperty(name);
}

@Nullable
public String getProperty(final String name) {
if (null == this.properties) {
this.properties = new HashMap<>();
Expand All @@ -125,6 +129,7 @@ public void setTopic(String topic) {
this.topic = topic;
}

@Nullable
public String getTags() {
return this.getProperty(MessageConst.PROPERTY_TAGS);
}
Expand All @@ -133,6 +138,7 @@ public void setTags(String tags) {
this.putProperty(MessageConst.PROPERTY_TAGS, tags);
}

@Nullable
public String getKeys() {
return this.getProperty(MessageConst.PROPERTY_KEYS);
}
Expand Down Expand Up @@ -200,6 +206,7 @@ public void setBody(byte[] body) {
this.body = body;
}

@Nullable
public Map<String, String> getProperties() {
return properties;
}
Expand All @@ -208,6 +215,7 @@ void setProperties(Map<String, String> properties) {
this.properties = properties;
}

@Nullable
public String getBuyerId() {
return getProperty(MessageConst.PROPERTY_BUYER_ID);
}
Expand All @@ -216,6 +224,7 @@ public void setBuyerId(String buyerId) {
putProperty(MessageConst.PROPERTY_BUYER_ID, buyerId);
}

@Nullable
public String getTransactionId() {
return transactionId;
}
Expand Down
18 changes: 18 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,24 @@
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
<version>${opentelemetry.version}</version>
<exclusions>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
</exclusion>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk7</artifactId>
</exclusion>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
Expand Down