Skip to content
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.

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

INTERNAL: change dependency of @Nullable to spring framework #103

Merged
merged 1 commit into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import java.lang.reflect.Method;

import javax.annotation.Nullable;
import org.springframework.lang.Nullable;

import org.springframework.cache.interceptor.KeyGenerator;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import java.lang.reflect.Method;

import javax.annotation.Nullable;
import org.springframework.lang.Nullable;

import org.springframework.cache.interceptor.KeyGenerator;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down