Skip to content

Commit

Permalink
INTERNAL: Adjust new auto import setting.
Browse files Browse the repository at this point in the history
  • Loading branch information
uhm0311 authored and jhpark816 committed May 9, 2024
1 parent 1a91ad3 commit 4d96278
Show file tree
Hide file tree
Showing 27 changed files with 200 additions and 55 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@ target/
reports/
junit*
*.iml
*~
*~
!.idea
.idea/*
!.idea/codeStyles
!.idea/codeStyles/**
109 changes: 109 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

package com.navercorp.arcus.spring;

import javax.annotation.Nullable;

import net.spy.memcached.ArcusClient;
import net.spy.memcached.ArcusClientPool;
import net.spy.memcached.ConnectionFactoryBuilder;
import net.spy.memcached.DefaultConnectionFactory;
import net.spy.memcached.transcoders.Transcoder;

import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;

import javax.annotation.Nullable;

public class ArcusClientFactoryBean implements FactoryBean<ArcusClientPool>,
DisposableBean, InitializingBean {

Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/navercorp/arcus/spring/ArcusTemplate.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@

package com.navercorp.arcus.spring;

import net.spy.memcached.ArcusClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import net.spy.memcached.ArcusClient;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Deprecated
public class ArcusTemplate {

Expand Down
14 changes: 9 additions & 5 deletions src/main/java/com/navercorp/arcus/spring/cache/ArcusCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,25 @@
import com.navercorp.arcus.spring.cache.front.ArcusFrontCache;
import com.navercorp.arcus.spring.concurrent.DefaultKeyLockProvider;
import com.navercorp.arcus.spring.concurrent.KeyLockProvider;

import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;

import javax.annotation.Nullable;

import net.spy.memcached.ArcusClientPool;
import net.spy.memcached.transcoders.Transcoder;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.InitializingBean;
import org.springframework.cache.Cache;
import org.springframework.cache.support.SimpleValueWrapper;
import org.springframework.util.Assert;
import org.springframework.util.DigestUtils;

import javax.annotation.Nullable;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;

/**
* 스프링 Cache의 Arcus 구현체.
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
package com.navercorp.arcus.spring.cache;

import com.navercorp.arcus.spring.cache.front.ArcusFrontCache;

import javax.annotation.Nullable;

import net.spy.memcached.transcoders.Transcoder;

import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;

import javax.annotation.Nullable;

public class ArcusCacheConfiguration implements InitializingBean {

private String serviceId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@

package com.navercorp.arcus.spring.cache;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;

import net.spy.memcached.ArcusClient;
import net.spy.memcached.ArcusClientPool;
import net.spy.memcached.ConnectionFactoryBuilder;

import org.springframework.beans.factory.DisposableBean;
import org.springframework.cache.Cache;
import org.springframework.cache.support.AbstractCacheManager;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;

/**
* 스프링 CacheManager의 Arcus 구현체.
* 미리 정의하지 않은 이름의 캐시에 대해 get 요청을 받으면 (SimpleCacheManager와 다르게) 기본 설정으로 새 캐시를 생성하고 저장합니다.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@

package com.navercorp.arcus.spring.cache;

import org.springframework.cache.interceptor.KeyGenerator;
import java.lang.reflect.Method;

import javax.annotation.Nullable;
import java.lang.reflect.Method;

import org.springframework.cache.interceptor.KeyGenerator;

public class SimpleStringKeyGenerator implements KeyGenerator {
private static final String DEFAULT_SEPARATOR = ",";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@

package com.navercorp.arcus.spring.cache;

import org.springframework.cache.interceptor.KeyGenerator;
import java.lang.reflect.Method;

import javax.annotation.Nullable;
import java.lang.reflect.Method;

import org.springframework.cache.interceptor.KeyGenerator;

/**
* 스프링 Cache의 KeyGenerator 구현체.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

package com.navercorp.arcus.spring.cache.front;

import javax.annotation.Nullable;

import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;

import javax.annotation.Nullable;

public class EhArcusFrontCache implements ArcusFrontCache {

private final Cache cache;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package com.navercorp.arcus.spring.callback;

import net.spy.memcached.ArcusClient;

import java.util.concurrent.Future;

import net.spy.memcached.ArcusClient;

@Deprecated
public interface ArcusCallBack<T> {
Future<T> doInArcus(ArcusClient arcusClient);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package com.navercorp.arcus.spring.callback;

import net.spy.memcached.ArcusClient;

import java.util.concurrent.Future;

import net.spy.memcached.ArcusClient;

@Deprecated
public class AsycGetMethod implements ArcusCallBack<Object> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package com.navercorp.arcus.spring.callback;

import net.spy.memcached.ArcusClient;

import java.util.concurrent.Future;

import net.spy.memcached.ArcusClient;

@Deprecated
public class AsyncLopDeleteByIndexMethod implements ArcusCallBack<Boolean> {
private final String key;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package com.navercorp.arcus.spring.callback;

import net.spy.memcached.ArcusClient;

import java.util.concurrent.Future;

import net.spy.memcached.ArcusClient;

@Deprecated
public class AsyncLopDeleteByRangeMethod implements ArcusCallBack<Boolean> {
private final String key;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package com.navercorp.arcus.spring.callback;

import net.spy.memcached.ArcusClient;

import java.util.concurrent.Future;

import net.spy.memcached.ArcusClient;

@Deprecated
public class DeleteMethod implements ArcusCallBack<Boolean> {
private final String key;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package com.navercorp.arcus.spring.callback;

import net.spy.memcached.ArcusClient;

import java.util.concurrent.Future;

import net.spy.memcached.ArcusClient;

@Deprecated
public class SetMethod implements ArcusCallBack<Boolean> {
private final String key;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@

import net.spy.memcached.ArcusClient;
import net.spy.memcached.ArcusClientPool;

import org.junit.Test;
import org.junit.runner.RunWith;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ContextConfiguration;
Expand Down
Loading

0 comments on commit 4d96278

Please sign in to comment.