Skip to content

Commit 7723d67

Browse files
committed
build(deps): add jakarta.annotation-api and update imports
- Add jakarta.annotation-api dependency to cosid-core - Update import statements across multiple files to use jakarta.annotation instead of javax.annotation - Replace javax.annotation.concurrent with com.google.errorprone.annotations
1 parent 8f92eb3 commit 7723d67

File tree

82 files changed

+117
-119
lines changed

Some content is hidden

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

82 files changed

+117
-119
lines changed

cosid-core/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
*/
1313

1414
dependencies {
15+
api(libs.jakarta.annotation.api)
1516
testImplementation(project(":cosid-test"))
1617
}

cosid-core/src/main/java/me/ahoo/cosid/Decorator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.ahoo.cosid;
22

3-
import javax.annotation.Nonnull;
4-
import javax.annotation.concurrent.ThreadSafe;
3+
import com.google.errorprone.annotations.ThreadSafe;
4+
import jakarta.annotation.Nonnull;
55

66
/**
77
* Decorator.

cosid-core/src/main/java/me/ahoo/cosid/IdConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import me.ahoo.cosid.stat.Stat;
1717
import me.ahoo.cosid.stat.Statistical;
1818

19-
import javax.annotation.Nonnull;
20-
import javax.annotation.concurrent.ThreadSafe;
19+
import com.google.errorprone.annotations.ThreadSafe;
20+
import jakarta.annotation.Nonnull;
2121

2222
/**
2323
* ID converter.

cosid-core/src/main/java/me/ahoo/cosid/IdGenerator.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
package me.ahoo.cosid;
1515

1616
import me.ahoo.cosid.converter.Radix62IdConverter;
17-
import me.ahoo.cosid.stat.Stat;
1817
import me.ahoo.cosid.stat.Statistical;
1918
import me.ahoo.cosid.stat.generator.IdGeneratorStat;
2019

21-
import javax.annotation.Nonnull;
22-
import javax.annotation.concurrent.ThreadSafe;
20+
import com.google.errorprone.annotations.ThreadSafe;
21+
import jakarta.annotation.Nonnull;
2322

2423
/**
2524
* Id Generator.

cosid-core/src/main/java/me/ahoo/cosid/IdGeneratorDecorator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import me.ahoo.cosid.stat.generator.IdGeneratorStat;
44

5-
import javax.annotation.Nonnull;
6-
import javax.annotation.concurrent.ThreadSafe;
5+
import com.google.errorprone.annotations.ThreadSafe;
6+
import jakarta.annotation.Nonnull;
77

88
/**
99
* IdGenerator decorator.

cosid-core/src/main/java/me/ahoo/cosid/IntegerIdGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
package me.ahoo.cosid;
1515

16-
import javax.annotation.Nonnull;
17-
import javax.annotation.concurrent.ThreadSafe;
16+
import com.google.errorprone.annotations.ThreadSafe;
17+
import jakarta.annotation.Nonnull;
1818

1919
/**
2020
* Integer Id Generator.

cosid-core/src/main/java/me/ahoo/cosid/StringIdGenerator.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313

1414
package me.ahoo.cosid;
1515

16-
import javax.annotation.Nonnull;
17-
import javax.annotation.concurrent.ThreadSafe;
16+
17+
import com.google.errorprone.annotations.ThreadSafe;
18+
import jakarta.annotation.Nonnull;
1819

1920
/**
2021
* String type ID generator.

cosid-core/src/main/java/me/ahoo/cosid/StringIdGeneratorDecorator.java

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

1414
package me.ahoo.cosid;
1515

16-
import javax.annotation.Nonnull;
16+
import jakarta.annotation.Nonnull;
1717

1818
/**
1919
* used to enhance the generated string ID.

cosid-core/src/main/java/me/ahoo/cosid/accessor/IdMetadata.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
import me.ahoo.cosid.IdGenerator;
1717

18-
import javax.annotation.concurrent.Immutable;
18+
import com.google.errorprone.annotations.Immutable;
19+
1920
import java.lang.reflect.Field;
2021

2122
/**

cosid-core/src/main/java/me/ahoo/cosid/accessor/package-info.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,4 @@
1111
* limitations under the License.
1212
*/
1313

14-
@ParametersAreNonnullByDefault
1514
package me.ahoo.cosid.accessor;
16-
17-
import javax.annotation.ParametersAreNonnullByDefault;

0 commit comments

Comments
 (0)