INTERNAL: change dependency of @Nullable to spring framework

naver · Sep 13, 2024 · a0faab9 · a0faab9
1 parent 4d8f4c2
commit a0faab9
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/src/main/java/com/navercorp/arcus/spring/ArcusClientFactoryBean.java b/src/main/java/com/navercorp/arcus/spring/ArcusClientFactoryBean.java
@@ -18,7 +18,7 @@
 
 package com.navercorp.arcus.spring;
 
-import javax.annotation.Nullable;
+import org.springframework.lang.Nullable;
 
 import net.spy.memcached.ArcusClient;
 import net.spy.memcached.ArcusClientPool;

diff --git a/src/main/java/com/navercorp/arcus/spring/cache/ArcusCache.java b/src/main/java/com/navercorp/arcus/spring/cache/ArcusCache.java
@@ -25,8 +25,8 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.springframework.lang.Nullable;
+import org.springframework.lang.NonNull;
 
 import net.spy.memcached.ArcusClientPool;
 import net.spy.memcached.internal.GetFuture;
@@ -116,13 +116,13 @@ private static ArcusCacheConfiguration requireNonNull(ArcusCacheConfiguration ca
   }
 
   @Override
-  @Nonnull
+  @NonNull
   public String getName() {
     return this.name;
   }
 
   @Override
-  @Nonnull
+  @NonNull
   public Object getNativeCache() {
     return this.arcusClient;
   }

diff --git a/src/main/java/com/navercorp/arcus/spring/cache/ArcusCacheConfiguration.java b/src/main/java/com/navercorp/arcus/spring/cache/ArcusCacheConfiguration.java
@@ -19,7 +19,7 @@
 
 import com.navercorp.arcus.spring.cache.front.ArcusFrontCache;
 
-import javax.annotation.Nullable;
+import org.springframework.lang.Nullable;
 
 import net.spy.memcached.transcoders.Transcoder;
 

diff --git a/src/main/java/com/navercorp/arcus/spring/cache/SimpleStringKeyGenerator.java b/src/main/java/com/navercorp/arcus/spring/cache/SimpleStringKeyGenerator.java
@@ -19,7 +19,7 @@
 
 import java.lang.reflect.Method;
 
-import javax.annotation.Nullable;
+import org.springframework.lang.Nullable;
 
 import org.springframework.cache.interceptor.KeyGenerator;
 

diff --git a/src/main/java/com/navercorp/arcus/spring/cache/StringKeyGenerator.java b/src/main/java/com/navercorp/arcus/spring/cache/StringKeyGenerator.java
@@ -20,7 +20,7 @@
 
 import java.lang.reflect.Method;
 
-import javax.annotation.Nullable;
+import org.springframework.lang.Nullable;
 
 import org.springframework.cache.interceptor.KeyGenerator;
 

diff --git a/src/main/java/com/navercorp/arcus/spring/cache/front/EhArcusFrontCache.java b/src/main/java/com/navercorp/arcus/spring/cache/front/EhArcusFrontCache.java
@@ -17,7 +17,7 @@
 
 package com.navercorp.arcus.spring.cache.front;
 
-import javax.annotation.Nullable;
+import org.springframework.lang.Nullable;
 
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;

diff --git a/src/test/java/com/navercorp/arcus/spring/cache/ArcusCacheTest.java b/src/test/java/com/navercorp/arcus/spring/cache/ArcusCacheTest.java
@@ -21,7 +21,6 @@
 import com.navercorp.arcus.spring.concurrent.KeyLockProvider;
 
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -133,9 +132,7 @@ public void testGet_WantToGetException() {
         .thenThrow(new TestException());
 
     // when
-    assertThrows(TestException.class, () -> {
-      arcusCache.get(ARCUS_STRING_KEY);
-    });
+    assertThrows(TestException.class, () -> arcusCache.get(ARCUS_STRING_KEY));
   }
 
   @Test