github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Code formatted according to checkstyle rules

Browse Source
pull/1923/head
Nikita Koksharov 6 years ago
parent 25a7239e42
commit 864233e40c
13 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File

1
redisson/pom.xml
Unescape Escape View File

@ -380,6 +380,7 @@
**/org/redisson/remote/**/*.java,
**/org/redisson/rx/**/*.java,
**/org/redisson/spring/**/*.java,
**/org/redisson/transaction/**/*.java,
</includes>
<consoleOutput>true</consoleOutput>

44
redisson/src/main/java/org/redisson/transaction/BaseTransactionalMap.java
Unescape Escape View File

@ -109,7 +109,7 @@ public class BaseTransactionalMap<K, V> {
}
HashValue toKeyHash(Object key) {
ByteBuf keyState = ((RedissonObject)map).encodeMapKey(key);
ByteBuf keyState = ((RedissonObject) map).encodeMapKey(key);
try {
return new HashValue(Hash.hash128(keyState));
} finally {
@ -189,7 +189,7 @@ public class BaseTransactionalMap<K, V> {
protected MapScanResult<Object, Object> scanIterator(String name, RedisClient client,
long startPos, String pattern, int count) {
MapScanResult<Object, Object> res = ((RedissonMap<?, ?>)map).scanIterator(name, client, startPos, pattern, count);
MapScanResult<Object, Object> res = ((RedissonMap<?, ?>) map).scanIterator(name, client, startPos, pattern, count);
Map<HashValue, MapEntry> newstate = new HashMap<HashValue, MapEntry>(state);
for (Iterator<Object> iterator = res.getMap().keySet().iterator(); iterator.hasNext();) {
Object entry = iterator.next();
@ -519,7 +519,7 @@ public class BaseTransactionalMap<K, V> {
if (entry == MapEntry.NULL) {
return RedissonPromise.newSucceededFuture(null);
} else {
ByteBuf valueState = ((RedissonObject)map).encodeMapValue(entry.getValue());
ByteBuf valueState = ((RedissonObject) map).encodeMapValue(entry.getValue());
try {
return RedissonPromise.newSucceededFuture(valueState.readableBytes());
} finally {
@ -538,10 +538,10 @@ public class BaseTransactionalMap<K, V> {
if (entry == MapEntry.NULL) {
return RedissonPromise.newSucceededFuture(null);
} else {
return RedissonPromise.newSucceededFuture((V)entry.getValue());
return RedissonPromise.newSucceededFuture((V) entry.getValue());
}
}
return ((RedissonMap<K, V>)map).getOperationAsync(key);
return ((RedissonMap<K, V>) map).getOperationAsync(key);
}
public RFuture<Set<K>> readAllKeySetAsync() {
@ -607,7 +607,7 @@ public class BaseTransactionalMap<K, V> {
}
public RFuture<Map<K, V>> readAllMapAsync() {
RPromise<Map<K, V>> result = new RedissonPromise<Map<K, V>>();
RPromise<Map<K, V>> result = new RedissonPromise<>();
RFuture<Map<K, V>> future = map.readAllMapAsync();
future.onComplete((map, e) -> {
if (e != null) {
@ -615,7 +615,7 @@ public class BaseTransactionalMap<K, V> {
return;
}
Map<HashValue, MapEntry> newstate = new HashMap<HashValue, MapEntry>(state);
Map<HashValue, MapEntry> newstate = new HashMap<>(state);
for (Iterator<K> iterator = map.keySet().iterator(); iterator.hasNext();) {
K key = iterator.next();
MapEntry entry = newstate.remove(toKeyHash(key));
@ -630,7 +630,7 @@ public class BaseTransactionalMap<K, V> {
if (entry == MapEntry.NULL) {
continue;
}
map.put((K)entry.getKey(), (V)entry.getValue());
map.put((K) entry.getKey(), (V) entry.getValue());
}
result.trySuccess(map);
@ -640,7 +640,7 @@ public class BaseTransactionalMap<K, V> {
}
protected RFuture<Map<K, V>> getAllOperationAsync(Set<K> keys) {
RPromise<Map<K, V>> result = new RedissonPromise<Map<K, V>>();
RPromise<Map<K, V>> result = new RedissonPromise<>();
Set<K> keysToLoad = new HashSet<K>(keys);
Map<K, V> map = new HashMap<K, V>();
for (K key : keys) {
@ -649,14 +649,14 @@ public class BaseTransactionalMap<K, V> {
MapEntry entry = state.get(keyHash);
if (entry != null) {
if (entry != MapEntry.NULL) {
map.put(key, (V)entry.getValue());
map.put(key, (V) entry.getValue());
}
} else {
keysToLoad.add(key);
}
}
RFuture<Map<K, V>> future = ((RedissonMap<K, V>)this.map).getAllOperationAsync(keysToLoad);
RFuture<Map<K, V>> future = ((RedissonMap<K, V>) this.map).getAllOperationAsync(keysToLoad);
future.onComplete((res, e) -> {
if (e != null) {
result.tryFailure(e);
@ -671,7 +671,7 @@ public class BaseTransactionalMap<K, V> {
}
protected RFuture<V> removeOperationAsync(K key) {
RPromise<V> result = new RedissonPromise<V>();
RPromise<V> result = new RedissonPromise<>();
executeLocked(result, key, new Runnable() {
@Override
public void run() {
@ -706,8 +706,8 @@ public class BaseTransactionalMap<K, V> {
}
protected RFuture<Boolean> removeOperationAsync(Object key, Object value) {
RPromise<Boolean> result = new RedissonPromise<Boolean>();
executeLocked(result, (K)key, new Runnable() {
RPromise<Boolean> result = new RedissonPromise<>();
executeLocked(result, (K) key, new Runnable() {
@Override
public void run() {
HashValue keyHash = toKeyHash(key);
@ -729,7 +729,7 @@ public class BaseTransactionalMap<K, V> {
return;
}
map.getAsync((K)key).onComplete((r, e) -> {
map.getAsync((K) key).onComplete((r, e) -> {
if (e != null) {
result.tryFailure(e);
return;
@ -747,8 +747,8 @@ public class BaseTransactionalMap<K, V> {
}
private boolean isEqual(Object value, Object oldValue) {
ByteBuf valueBuf = ((RedissonObject)map).encodeMapValue(value);
ByteBuf oldValueBuf = ((RedissonObject)map).encodeMapValue(oldValue);
ByteBuf valueBuf = ((RedissonObject) map).encodeMapValue(value);
ByteBuf oldValueBuf = ((RedissonObject) map).encodeMapValue(oldValue);
try {
return valueBuf.equals(oldValueBuf);
@ -759,7 +759,7 @@ public class BaseTransactionalMap<K, V> {
}
protected RFuture<Void> putAllOperationAsync(Map<? extends K, ? extends V> entries) {
RPromise<Void> result = new RedissonPromise<Void>();
RPromise<Void> result = new RedissonPromise<>();
executeLocked(result, new Runnable() {
@Override
public void run() {
@ -775,12 +775,12 @@ public class BaseTransactionalMap<K, V> {
result.trySuccess(null);
}
}, (Collection<K>)entries.keySet());
}, (Collection<K>) entries.keySet());
return result;
}
protected RFuture<Boolean> replaceOperationAsync(K key, V oldValue, V newValue) {
RPromise<Boolean> result = new RedissonPromise<Boolean>();
RPromise<Boolean> result = new RedissonPromise<>();
executeLocked(result, key, new Runnable() {
@Override
public void run() {
@ -822,7 +822,7 @@ public class BaseTransactionalMap<K, V> {
}
protected RFuture<V> replaceOperationAsync(K key, V value) {
RPromise<V> result = new RedissonPromise<V>();
RPromise<V> result = new RedissonPromise<>();
executeLocked(result, key, new Runnable() {
@Override
public void run() {
@ -878,7 +878,7 @@ public class BaseTransactionalMap<K, V> {
}
protected <R> void executeLocked(RPromise<R> promise, Runnable runnable, Collection<K> keys) {
List<RLock> locks = new ArrayList<RLock>(keys.size());
List<RLock> locks = new ArrayList<>(keys.size());
for (K key : keys) {
RLock lock = getLock(key);
locks.add(lock);

8
redisson/src/main/java/org/redisson/transaction/BaseTransactionalSet.java
Unescape Escape View File

@ -78,7 +78,7 @@ public abstract class BaseTransactionalSet<V> extends BaseTransactionalObject {
}
private HashValue toHash(Object value) {
ByteBuf state = ((RedissonObject)set).encode(value);
ByteBuf state = ((RedissonObject) set).encode(value);
try {
return new HashValue(Hash.hash128(state));
} finally {
@ -330,7 +330,7 @@ public abstract class BaseTransactionalSet<V> extends BaseTransactionalObject {
public RFuture<Boolean> removeAsync(Object value) {
RPromise<Boolean> result = new RedissonPromise<Boolean>();
executeLocked(result, (V)value, new Runnable() {
executeLocked(result, (V) value, new Runnable() {
@Override
public void run() {
HashValue keyHash = toHash(value);
@ -508,8 +508,8 @@ public abstract class BaseTransactionalSet<V> extends BaseTransactionalObject {
}
private boolean isEqual(Object value, Object oldValue) {
ByteBuf valueBuf = ((RedissonObject)set).encode(value);
ByteBuf oldValueBuf = ((RedissonObject)set).encode(oldValue);
ByteBuf valueBuf = ((RedissonObject) set).encode(value);
ByteBuf oldValueBuf = ((RedissonObject) set).encode(oldValue);
try {
return valueBuf.equals(oldValueBuf);

1
redisson/src/main/java/org/redisson/transaction/HashKey.java
Unescape Escape View File

@ -41,6 +41,7 @@ public class HashKey {
}
@Override
@SuppressWarnings("AvoidInlineConditionals")
public int hashCode() {
final int prime = 31;
int result = 1;

4
redisson/src/main/java/org/redisson/transaction/RedissonTransaction.java
Unescape Escape View File

@ -333,7 +333,7 @@ public class RedissonTransaction implements RTransaction {
for (TransactionalOperation transactionalOperation : operations) {
if (localCaches.contains(transactionalOperation.getName())) {
MapOperation mapOperation = (MapOperation) transactionalOperation;
RedissonLocalCachedMap<?, ?> map = (RedissonLocalCachedMap<?, ?>)mapOperation.getMap();
RedissonLocalCachedMap<?, ?> map = (RedissonLocalCachedMap<?, ?>) mapOperation.getMap();
HashKey hashKey = new HashKey(transactionalOperation.getName(), transactionalOperation.getCodec());
byte[] key = map.toCacheKey(mapOperation.getKey()).getKeyHash();
@ -427,7 +427,7 @@ public class RedissonTransaction implements RTransaction {
for (TransactionalOperation transactionalOperation : operations) {
if (localCaches.contains(transactionalOperation.getName())) {
MapOperation mapOperation = (MapOperation) transactionalOperation;
RedissonLocalCachedMap<?, ?> map = (RedissonLocalCachedMap<?, ?>)mapOperation.getMap();
RedissonLocalCachedMap<?, ?> map = (RedissonLocalCachedMap<?, ?>) mapOperation.getMap();
HashKey hashKey = new HashKey(transactionalOperation.getName(), transactionalOperation.getCodec());
byte[] key = map.toCacheKey(mapOperation.getKey()).getKeyHash();

2
redisson/src/main/java/org/redisson/transaction/RedissonTransactionalBucket.java
Unescape Escape View File

@ -231,7 +231,7 @@ public class RedissonTransactionalBucket<V> extends RedissonBucket<V> {
if (state == NULL) {
return RedissonPromise.newSucceededFuture(null);
} else {
return RedissonPromise.newSucceededFuture((V)state);
return RedissonPromise.newSucceededFuture((V) state);
}
}

10
redisson/src/main/java/org/redisson/transaction/TransactionalSet.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class TransactionalSet<V> extends BaseTransactionalSet<V> {
@Override
protected ListScanResult<Object> scanIteratorSource(String name, RedisClient client, long startPos,
String pattern, int count) {
return ((RedissonSet<?>)set).scanIterator(name, client, startPos, pattern, count);
return ((RedissonSet<?>) set).scanIterator(name, client, startPos, pattern, count);
}
@Override
@ -61,23 +61,23 @@ public class TransactionalSet<V> extends BaseTransactionalSet<V> {
}
@Override
protected TransactionalOperation createAddOperation(final V value) {
protected TransactionalOperation createAddOperation(V value) {
return new AddOperation(set, value, transactionId);
}
@Override
protected MoveOperation createMoveOperation(final String destination, final V value, final long threadId) {
protected MoveOperation createMoveOperation(String destination, V value, long threadId) {
return new MoveOperation(set, destination, threadId, value, transactionId);
}
@Override
protected TransactionalOperation createRemoveOperation(final Object value) {
protected TransactionalOperation createRemoveOperation(Object value) {
return new RemoveOperation(set, value, transactionId);
}
@Override
protected RLock getLock(RCollectionAsync<V> set, V value) {
String lockName = ((RedissonSet<V>)set).getLockName(value, "lock");
String lockName = ((RedissonSet<V>) set).getLockName(value, "lock");
return new RedissonTransactionalLock(commandExecutor, lockName, transactionId);
}

10
redisson/src/main/java/org/redisson/transaction/TransactionalSetCache.java
Unescape Escape View File

@ -53,7 +53,7 @@ public class TransactionalSetCache<V> extends BaseTransactionalSet<V> {
@Override
protected ListScanResult<Object> scanIteratorSource(String name, RedisClient client, long startPos,
String pattern, int count) {
return ((RedissonSetCache<?>)set).scanIterator(name, client, startPos, pattern, count);
return ((RedissonSetCache<?>) set).scanIterator(name, client, startPos, pattern, count);
}
@Override
@ -66,23 +66,23 @@ public class TransactionalSetCache<V> extends BaseTransactionalSet<V> {
}
@Override
protected TransactionalOperation createAddOperation(final V value) {
protected TransactionalOperation createAddOperation(V value) {
return new AddCacheOperation(set, value, transactionId);
}
@Override
protected MoveOperation createMoveOperation(final String destination, final V value, final long threadId) {
protected MoveOperation createMoveOperation(String destination, V value, long threadId) {
throw new UnsupportedOperationException();
}
@Override
protected TransactionalOperation createRemoveOperation(final Object value) {
protected TransactionalOperation createRemoveOperation(Object value) {
return new RemoveCacheOperation(set, value, transactionId);
}
@Override
protected RLock getLock(RCollectionAsync<V> set, V value) {
String lockName = ((RedissonSetCache<V>)set).getLockName(value, "lock");
String lockName = ((RedissonSetCache<V>) set).getLockName(value, "lock");
return new RedissonTransactionalLock(commandExecutor, lockName, transactionId);
}

2
redisson/src/main/java/org/redisson/transaction/operation/map/MapCacheFastPutIfAbsentOperation.java
Unescape Escape View File

@ -43,7 +43,7 @@ public class MapCacheFastPutIfAbsentOperation extends MapOperation {
@Override
public void commit(RMap<Object, Object> map) {
((RMapCache<Object, Object>)map).fastPutIfAbsentAsync(key, value, ttl, ttlUnit, maxIdleTime, maxIdleUnit);
((RMapCache<Object, Object>) map).fastPutIfAbsentAsync(key, value, ttl, ttlUnit, maxIdleTime, maxIdleUnit);
}
public long getTTL() {

2
redisson/src/main/java/org/redisson/transaction/operation/map/MapCacheFastPutOperation.java
Unescape Escape View File

@ -45,7 +45,7 @@ public class MapCacheFastPutOperation extends MapOperation {
@Override
public void commit(RMap<Object, Object> map) {
((RMapCache<Object, Object>)map).fastPutAsync(key, value, ttl, ttlUnit, maxIdleTime, maxIdleUnit);
((RMapCache<Object, Object>) map).fastPutAsync(key, value, ttl, ttlUnit, maxIdleTime, maxIdleUnit);
}
public long getTTL() {

2
redisson/src/main/java/org/redisson/transaction/operation/map/MapCachePutIfAbsentOperation.java
Unescape Escape View File

@ -50,7 +50,7 @@ public class MapCachePutIfAbsentOperation extends MapOperation {
@Override
public void commit(RMap<Object, Object> map) {
((RMapCache<Object, Object>)map).putIfAbsentAsync(key, value, ttl, unit, maxIdleTime, maxIdleUnit);
((RMapCache<Object, Object>) map).putIfAbsentAsync(key, value, ttl, unit, maxIdleTime, maxIdleUnit);
}
public long getTTL() {

2
redisson/src/main/java/org/redisson/transaction/operation/map/MapCachePutOperation.java
Unescape Escape View File

@ -45,7 +45,7 @@ public class MapCachePutOperation extends MapOperation {
@Override
public void commit(RMap<Object, Object> map) {
((RMapCache<Object, Object>)map).putAsync(key, value, ttlTimeout, ttlUnit, maxIdleTimeout, maxIdleUnit);
((RMapCache<Object, Object>) map).putAsync(key, value, ttlTimeout, ttlUnit, maxIdleTimeout, maxIdleUnit);
}
public long getTTL() {

4
redisson/src/main/java/org/redisson/transaction/operation/set/SetOperation.java
Unescape Escape View File

@ -40,12 +40,12 @@ public abstract class SetOperation extends TransactionalOperation {
}
protected RLock getLock(RSetCache<?> setCache, CommandAsyncExecutor commandExecutor, Object value) {
String lockName = ((RedissonSetCache<?>)setCache).getLockName(value, "lock");
String lockName = ((RedissonSetCache<?>) setCache).getLockName(value, "lock");
return new RedissonTransactionalLock(commandExecutor, lockName, transactionId);
}
protected RLock getLock(RSet<?> setCache, CommandAsyncExecutor commandExecutor, Object value) {
String lockName = ((RedissonSet<?>)setCache).getLockName(value, "lock");
String lockName = ((RedissonSet<?>) setCache).getLockName(value, "lock");
return new RedissonTransactionalLock(commandExecutor, lockName, transactionId);
}

Write Preview
Loading…
Cancel
Save