Skip to content

Commit 68f5e29

Browse files
committed
Keep JSR-305 nullness annotations
1 parent f590473 commit 68f5e29

189 files changed

Lines changed: 208 additions & 226 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

integration-test/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@
164164
<artifactId>slf4j-api</artifactId>
165165
</dependency>
166166
<dependency>
167-
<groupId>jakarta.annotation</groupId>
168-
<artifactId>jakarta.annotation-api</artifactId>
167+
<groupId>com.google.code.findbugs</groupId>
168+
<artifactId>jsr305</artifactId>
169169
</dependency>
170170
<dependency>
171171
<groupId>org.apache.thrift</groupId>

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppBaseConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020
package org.apache.iotdb.it.env.cluster.config;
2121

22-
import jakarta.annotation.Nullable;
2322
import jakarta.validation.constraints.NotNull;
2423

24+
import javax.annotation.Nullable;
25+
2526
import java.io.FileWriter;
2627
import java.io.IOException;
2728
import java.io.InputStream;

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppJVMConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import org.apache.iotdb.itbase.env.JVMConfig;
2323

24-
import jakarta.annotation.Nullable;
24+
import javax.annotation.Nullable;
2525

2626
public class MppJVMConfig implements JVMConfig {
2727

integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AbstractNodeWrapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
import org.apache.tsfile.external.commons.lang3.SystemUtils;
3434
import org.slf4j.Logger;
3535

36-
import jakarta.annotation.Nullable;
37-
36+
import javax.annotation.Nullable;
3837
import javax.management.MBeanServerConnection;
3938
import javax.management.remote.JMXConnector;
4039
import javax.management.remote.JMXConnectorFactory;

iotdb-core/calc-commons/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
<artifactId>units</artifactId>
8181
</dependency>
8282
<dependency>
83-
<groupId>jakarta.annotation</groupId>
84-
<artifactId>jakarta.annotation-api</artifactId>
83+
<groupId>com.google.code.findbugs</groupId>
84+
<artifactId>jsr305</artifactId>
8585
</dependency>
8686
<dependency>
8787
<groupId>org.slf4j</groupId>

iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/operator/source/relational/aggregation/AggregationMask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.tsfile.block.column.Column;
2323
import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn;
2424

25-
import jakarta.annotation.Nullable;
25+
import javax.annotation.Nullable;
2626

2727
import java.util.Arrays;
2828

iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/execution/relational/ColumnTransformerBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
import org.apache.tsfile.read.common.type.TypeEnum;
218218
import org.apache.tsfile.utils.Binary;
219219

220-
import jakarta.annotation.Nullable;
220+
import javax.annotation.Nullable;
221221

222222
import java.time.ZoneId;
223223
import java.util.ArrayList;

iotdb-core/calc-commons/src/main/java/org/apache/iotdb/calc/transformation/dag/util/CastFunctionUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.tsfile.utils.BytesUtils;
3131
import org.apache.tsfile.utils.DateUtils;
3232

33-
import jakarta.annotation.Nonnull;
33+
import javax.annotation.Nonnull;
3434

3535
import java.time.ZoneId;
3636
import java.time.format.DateTimeParseException;

iotdb-core/confignode/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,6 @@
148148
<groupId>com.google.code.findbugs</groupId>
149149
<artifactId>jsr305</artifactId>
150150
</dependency>
151-
<dependency>
152-
<groupId>jakarta.annotation</groupId>
153-
<artifactId>jakarta.annotation-api</artifactId>
154-
</dependency>
155151
<dependency>
156152
<groupId>junit</groupId>
157153
<artifactId>junit</artifactId>

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/pipe/payload/PipeAlterEncodingCompressorPlan.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import org.apache.tsfile.utils.ReadWriteIOUtils;
2626

27-
import jakarta.annotation.Nonnull;
27+
import javax.annotation.Nonnull;
2828

2929
import java.io.DataOutputStream;
3030
import java.io.IOException;

0 commit comments

Comments
 (0)