INTERNAL: Adjust new auto import setting.

brido4125 · Apr 25, 2024 · ba93538 · ba93538
1 parent 83fa941
commit ba93538
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,4 @@ junit*
 !.idea
 .idea/*
 !.idea/codeStyles
-.idea/codeStyles/*
-!.idea/codeStyles/Project.xml
+!.idea/codeStyles/**
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/src/main/java/net/spy/memcached/plugin/LocalCacheManager.java b/src/main/java/net/spy/memcached/plugin/LocalCacheManager.java
@@ -24,16 +24,16 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import net.spy.memcached.compat.log.Logger;
-import net.spy.memcached.compat.log.LoggerFactory;
-
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
 import net.sf.ehcache.config.CacheConfiguration;
 import net.sf.ehcache.config.PersistenceConfiguration;
 import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
 
+import net.spy.memcached.compat.log.Logger;
+import net.spy.memcached.compat.log.LoggerFactory;
+
 /**
  * Local cache storage based on ehcache.
  */

diff --git a/src/main/java/net/spy/memcached/protocol/ascii/StoreOperationImpl.java b/src/main/java/net/spy/memcached/protocol/ascii/StoreOperationImpl.java
@@ -19,7 +19,6 @@
 
 package net.spy.memcached.protocol.ascii;
 
-
 import net.spy.memcached.ops.APIType;
 import net.spy.memcached.ops.OperationCallback;
 import net.spy.memcached.ops.StoreOperation;

diff --git a/src/main/java/net/spy/memcached/util/BTreeUtil.java b/src/main/java/net/spy/memcached/util/BTreeUtil.java
@@ -17,7 +17,6 @@
  */
 package net.spy.memcached.util;
 
-
 import net.spy.memcached.CachedData;
 import net.spy.memcached.collection.BKeyObject;
 import net.spy.memcached.collection.Element;

diff --git a/src/test/java/net/spy/memcached/ProtocolBaseCase.java b/src/test/java/net/spy/memcached/ProtocolBaseCase.java
@@ -37,7 +37,6 @@
 import net.spy.memcached.transcoders.SerializingTranscoder;
 import net.spy.memcached.transcoders.Transcoder;
 
-
 public abstract class ProtocolBaseCase extends ClientBaseCase {
 
   public void testAssertions() {

diff --git a/src/test/java/net/spy/memcached/RedistributeFailureModeTest.java b/src/test/java/net/spy/memcached/RedistributeFailureModeTest.java
@@ -7,7 +7,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-
 public class RedistributeFailureModeTest extends ClientBaseCase {
 
   private String serverList;

diff --git a/src/test/java/net/spy/memcached/TimeoutTest.java b/src/test/java/net/spy/memcached/TimeoutTest.java
@@ -1,9 +1,9 @@
 package net.spy.memcached;
 
-import junit.framework.TestCase;
-
 import java.util.Arrays;
 
+import junit.framework.TestCase;
+
 public class TimeoutTest extends TestCase {
   private MemcachedClient client = null;
 

diff --git a/src/test/manual/net/spy/memcached/test/MultiNodeFailureTest.java b/src/test/manual/net/spy/memcached/test/MultiNodeFailureTest.java
@@ -1,10 +1,10 @@
 package net.spy.memcached.test;
 
+import java.util.Arrays;
+
 import net.spy.memcached.AddrUtil;
 import net.spy.memcached.MemcachedClient;
 
-import java.util.Arrays;
-
 /**
  * This is an attempt to reproduce a problem where a server fails during a
  * series of gets.