diff --git a/base-third-project/base-third-step8/pom.xml b/base-third-project/base-third-step8/pom.xml
index f863d94ce..af1c0c7cc 100644
--- a/base-third-project/base-third-step8/pom.xml
+++ b/base-third-project/base-third-step8/pom.xml
@@ -7,14 +7,16 @@
com.fr.third
base-third
- ${revision}
+ 10.0-FEATURE-SNAPSHOT
step8
${revision}
+ pom
../../fine-ehcache
+ ../../fine-transmittable-thread-local
diff --git a/fine-transmittable-thread-local/pom.xml b/fine-transmittable-thread-local/pom.xml
index 4d324253f..b8226410a 100644
--- a/fine-transmittable-thread-local/pom.xml
+++ b/fine-transmittable-thread-local/pom.xml
@@ -30,11 +30,6 @@
${revision}
-
- com.fr.third
- fine-jetbrains
- ${revision}
-
diff --git a/fine-transmittable-thread-local/src/main/java/com/fr/third/alibaba/ttl/TransmittableThreadLocal.java b/fine-transmittable-thread-local/src/main/java/com/fr/third/alibaba/ttl/TransmittableThreadLocal.java
index f4d423503..5ce678ed0 100644
--- a/fine-transmittable-thread-local/src/main/java/com/fr/third/alibaba/ttl/TransmittableThreadLocal.java
+++ b/fine-transmittable-thread-local/src/main/java/com/fr/third/alibaba/ttl/TransmittableThreadLocal.java
@@ -3,8 +3,6 @@ package com.fr.third.alibaba.ttl;
import com.fr.third.alibaba.ttl.threadpool.TtlExecutors;
import com.fr.third.alibaba.ttl.threadpool.TtlForkJoinPoolHelper;
import com.fr.third.alibaba.ttl.threadpool.agent.TtlAgent;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.Iterator;
@@ -244,7 +242,7 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple
/**
* Debug only method!
*/
- static void dump(@Nullable String title) {
+ static void dump( String title) {
if (title != null && title.length() > 0) {
System.out.printf("Start TransmittableThreadLocal[%s] Dump...%n", title);
} else {
@@ -370,7 +368,7 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple
* @return the captured {@link TransmittableThreadLocal} values
* @since 2.3.0
*/
- @NotNull
+
public static Object capture() {
return new Snapshot(captureTtlValues(), captureThreadLocalValues());
}
@@ -403,14 +401,14 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple
* @see #capture()
* @since 2.3.0
*/
- @NotNull
- public static Object replay(@NotNull Object captured) {
+
+ public static Object replay(Object captured) {
final Snapshot capturedSnapshot = (Snapshot) captured;
return new Snapshot(replayTtlValues(capturedSnapshot.ttl2Value), replayThreadLocalValues(capturedSnapshot.threadLocal2Value));
}
- @NotNull
- private static HashMap, Object> replayTtlValues(@NotNull HashMap, Object> captured) {
+
+ private static HashMap, Object> replayTtlValues(HashMap, Object> captured) {
HashMap, Object> backup = new HashMap, Object>();
for (final Iterator> iterator = holder.get().keySet().iterator(); iterator.hasNext(); ) {
@@ -436,7 +434,7 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple
return backup;
}
- private static HashMap, Object> replayThreadLocalValues(@NotNull HashMap, Object> captured) {
+ private static HashMap, Object> replayThreadLocalValues(HashMap, Object> captured) {
final HashMap, Object> backup = new HashMap, Object>();
for (Map.Entry, Object> entry : captured.entrySet()) {
@@ -458,7 +456,7 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple
* @return the backup {@link TransmittableThreadLocal} values before clear
* @since 2.9.0
*/
- @NotNull
+
public static Object clear() {
final HashMap, Object> ttl2Value = new HashMap, Object>();
@@ -480,13 +478,13 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple
* @see #clear()
* @since 2.3.0
*/
- public static void restore(@NotNull Object backup) {
+ public static void restore(Object backup) {
final Snapshot backupSnapshot = (Snapshot) backup;
restoreTtlValues(backupSnapshot.ttl2Value);
restoreThreadLocalValues(backupSnapshot.threadLocal2Value);
}
- private static void restoreTtlValues(@NotNull HashMap, Object> backup) {
+ private static void restoreTtlValues(HashMap, Object> backup) {
// call afterExecute callback
doExecuteCallback(false);
@@ -505,14 +503,14 @@ public class TransmittableThreadLocal extends InheritableThreadLocal imple
setTtlValuesTo(backup);
}
- private static void setTtlValuesTo(@NotNull HashMap, Object> ttlValues) {
+ private static void setTtlValuesTo(HashMap, Object> ttlValues) {
for (Map.Entry, Object> entry : ttlValues.entrySet()) {
TransmittableThreadLocal