From d1d9f8d7405616dcbcf2ccd3d94594d4e744da28 Mon Sep 17 00:00:00 2001 From: Pepe Lu Date: Fri, 31 Aug 2018 10:27:53 +0800 Subject: [PATCH] prevent star import --- .../src/main/java/org/redisson/RedissonList.java | 15 ++++++++++++--- .../org/redisson/RedissonScoredSortedSet.java | 5 ++++- .../src/main/java/org/redisson/RedissonSet.java | 6 +++++- .../org/redisson/RedissonSetMultimapValues.java | 5 ++++- .../transaction/BaseTransactionalSet.java | 7 ++++++- .../transaction/RedissonTransactionalSet.java | 5 ++++- .../test/java/org/redisson/RedissonListTest.java | 10 ++++++++-- .../org/redisson/RedissonScoredSortedSetTest.java | 7 ++++++- .../test/java/org/redisson/RedissonSetTest.java | 6 +++++- 9 files changed, 54 insertions(+), 12 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonList.java b/redisson/src/main/java/org/redisson/RedissonList.java index 799700321..5a2b5e587 100644 --- a/redisson/src/main/java/org/redisson/RedissonList.java +++ b/redisson/src/main/java/org/redisson/RedissonList.java @@ -24,9 +24,18 @@ import static org.redisson.client.protocol.RedisCommands.LRANGE; import static org.redisson.client.protocol.RedisCommands.LREM_SINGLE; import static org.redisson.client.protocol.RedisCommands.RPUSH_BOOLEAN; -import java.util.*; - -import org.redisson.api.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.NoSuchElementException; + +import org.redisson.api.RFuture; +import org.redisson.api.RList; +import org.redisson.api.RedissonClient; +import org.redisson.api.SortOrder; import org.redisson.api.mapreduce.RCollectionMapReduce; import org.redisson.client.RedisException; import org.redisson.client.codec.Codec; diff --git a/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java b/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java index eb9618925..823920e94 100644 --- a/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java +++ b/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java @@ -27,7 +27,10 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.redisson.api.*; +import org.redisson.api.RFuture; +import org.redisson.api.RScoredSortedSet; +import org.redisson.api.RedissonClient; +import org.redisson.api.SortOrder; import org.redisson.api.mapreduce.RCollectionMapReduce; import org.redisson.client.RedisClient; import org.redisson.client.codec.Codec; diff --git a/redisson/src/main/java/org/redisson/RedissonSet.java b/redisson/src/main/java/org/redisson/RedissonSet.java index 9747ab26f..0730983cc 100644 --- a/redisson/src/main/java/org/redisson/RedissonSet.java +++ b/redisson/src/main/java/org/redisson/RedissonSet.java @@ -23,7 +23,11 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.redisson.api.*; +import org.redisson.api.RFuture; +import org.redisson.api.RLock; +import org.redisson.api.RSet; +import org.redisson.api.RedissonClient; +import org.redisson.api.SortOrder; import org.redisson.api.mapreduce.RCollectionMapReduce; import org.redisson.client.RedisClient; import org.redisson.client.codec.Codec; diff --git a/redisson/src/main/java/org/redisson/RedissonSetMultimapValues.java b/redisson/src/main/java/org/redisson/RedissonSetMultimapValues.java index 012e451c8..14c5a3620 100644 --- a/redisson/src/main/java/org/redisson/RedissonSetMultimapValues.java +++ b/redisson/src/main/java/org/redisson/RedissonSetMultimapValues.java @@ -23,7 +23,10 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.redisson.api.*; +import org.redisson.api.RFuture; +import org.redisson.api.RLock; +import org.redisson.api.RSet; +import org.redisson.api.SortOrder; import org.redisson.api.mapreduce.RCollectionMapReduce; import org.redisson.client.RedisClient; import org.redisson.client.codec.Codec; diff --git a/redisson/src/main/java/org/redisson/transaction/BaseTransactionalSet.java b/redisson/src/main/java/org/redisson/transaction/BaseTransactionalSet.java index 7817434a7..ab8201c22 100644 --- a/redisson/src/main/java/org/redisson/transaction/BaseTransactionalSet.java +++ b/redisson/src/main/java/org/redisson/transaction/BaseTransactionalSet.java @@ -28,7 +28,12 @@ import java.util.concurrent.TimeUnit; import org.redisson.RedissonMultiLock; import org.redisson.RedissonObject; import org.redisson.RedissonSet; -import org.redisson.api.*; +import org.redisson.api.RCollectionAsync; +import org.redisson.api.RFuture; +import org.redisson.api.RLock; +import org.redisson.api.RObject; +import org.redisson.api.RSet; +import org.redisson.api.SortOrder; import org.redisson.client.RedisClient; import org.redisson.client.protocol.decoder.ListScanResult; import org.redisson.command.CommandAsyncExecutor; diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java index e5f3326b1..1dd666a80 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransactionalSet.java @@ -15,7 +15,10 @@ */ package org.redisson.transaction; -import java.util.*; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/redisson/src/test/java/org/redisson/RedissonListTest.java b/redisson/src/test/java/org/redisson/RedissonListTest.java index 7425dde11..86d14c1c8 100644 --- a/redisson/src/test/java/org/redisson/RedissonListTest.java +++ b/redisson/src/test/java/org/redisson/RedissonListTest.java @@ -2,12 +2,18 @@ package org.redisson; import static org.assertj.core.api.Assertions.assertThat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; import org.junit.Assert; import org.junit.Test; import org.redisson.api.RList; -import org.redisson.api.RSortableAsync; import org.redisson.api.SortOrder; import org.redisson.client.RedisException; import org.redisson.client.codec.IntegerCodec; diff --git a/redisson/src/test/java/org/redisson/RedissonScoredSortedSetTest.java b/redisson/src/test/java/org/redisson/RedissonScoredSortedSetTest.java index 097f85b94..269ca40bc 100644 --- a/redisson/src/test/java/org/redisson/RedissonScoredSortedSetTest.java +++ b/redisson/src/test/java/org/redisson/RedissonScoredSortedSetTest.java @@ -18,7 +18,12 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; -import org.redisson.api.*; +import org.redisson.api.RFuture; +import org.redisson.api.RLexSortedSet; +import org.redisson.api.RList; +import org.redisson.api.RScoredSortedSet; +import org.redisson.api.RSortedSet; +import org.redisson.api.SortOrder; import org.redisson.client.codec.IntegerCodec; import org.redisson.client.codec.StringCodec; import org.redisson.client.protocol.ScoredEntry; diff --git a/redisson/src/test/java/org/redisson/RedissonSetTest.java b/redisson/src/test/java/org/redisson/RedissonSetTest.java index c1355346d..63962f6eb 100644 --- a/redisson/src/test/java/org/redisson/RedissonSetTest.java +++ b/redisson/src/test/java/org/redisson/RedissonSetTest.java @@ -16,7 +16,11 @@ import org.junit.Assert; import org.junit.Test; import org.redisson.ClusterRunner.ClusterProcesses; import org.redisson.RedisRunner.FailedToStartRedisException; -import org.redisson.api.*; +import org.redisson.api.RFuture; +import org.redisson.api.RList; +import org.redisson.api.RSet; +import org.redisson.api.RedissonClient; +import org.redisson.api.SortOrder; import org.redisson.client.codec.IntegerCodec; import org.redisson.client.codec.StringCodec; import org.redisson.config.Config;