Repository: ignite Updated Branches: refs/heads/master 24cf2de79 -> 375ccb629
IGNITE-9597 'size() == 0' replaced with 'isEmpty()' according inspections profile - Fixes #4758. Signed-off-by: Dmitriy Pavlov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/375ccb62 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/375ccb62 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/375ccb62 Branch: refs/heads/master Commit: 375ccb6291986abfce17f66cf05874ce27fd5f3e Parents: 24cf2de Author: Maxim Muzafarov <[email protected]> Authored: Thu Sep 20 21:00:49 2018 +0300 Committer: Dmitriy Pavlov <[email protected]> Committed: Thu Sep 20 21:00:49 2018 +0300 ---------------------------------------------------------------------- .../ignite/internal/client/thin/ClientBinary.java | 12 ++++++------ .../ignite/internal/client/thin/ClientUtils.java | 2 +- .../internal/client/thin/ReliableChannel.java | 2 +- .../ignite/internal/client/thin/TcpClientCache.java | 6 +++--- .../internal/client/thin/TcpClientChannel.java | 12 ++++++------ .../internal/client/thin/TcpIgniteClient.java | 2 +- .../ignite/internal/jdbc/thin/JdbcThinSSLUtil.java | 2 +- .../internal/jdbc/thin/JdbcThinStatement.java | 2 +- .../internal/managers/discovery/DiscoCache.java | 2 +- .../internal/mem/unsafe/UnsafeMemoryProvider.java | 2 +- .../internal/mxbean/IgniteStandardMXBean.java | 10 +++++----- .../processors/affinity/GridAffinityAssignment.java | 4 ++-- .../cache/CacheAffinitySharedManager.java | 10 +++++----- .../processors/cache/GridCacheProcessor.java | 2 +- .../distributed/dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +- .../processors/cache/mvcc/MvccProcessorImpl.java | 2 +- .../cache/mvcc/msg/MvccWaitTxsRequest.java | 2 +- .../cache/persistence/tree/BPlusTree.java | 2 +- .../JdbcQueryExecuteMultipleStatementsResult.java | 2 +- .../internal/processors/odbc/odbc/OdbcUtils.java | 2 +- .../processors/service/GridServiceProcessor.java | 2 +- .../ignite/internal/util/GridArgumentCheck.java | 2 +- .../apache/ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/internal/util/io/GridFilenameUtils.java | 6 +++--- .../apache/ignite/client/LocalIgniteCluster.java | 4 ++-- .../ignite/internal/GridAffinitySelfTest.java | 2 +- .../internal/binary/BinaryMarshallerSelfTest.java | 6 +++--- ...rceptorPartitionCounterRandomOperationsTest.java | 2 +- .../cache/CacheSerializableTransactionsTest.java | 2 +- .../cache/CacheStoreUsageMultinodeAbstractTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheVersionTopologyChangeTest.java | 2 +- .../IgniteCacheConfigVariationsFullApiTest.java | 2 +- .../cache/IgniteCacheEntryListenerAbstractTest.java | 2 +- .../cache/IgniteCachePeekModesAbstractTest.java | 8 ++++---- .../cache/distributed/CacheExchangeMergeTest.java | 6 +++--- .../CacheLateAffinityAssignmentTest.java | 12 ++++++------ .../IgniteCachePartitionLossPolicySelfTest.java | 2 +- .../dht/GridCacheDhtEvictionsDisabledSelfTest.java | 4 ++-- .../db/checkpoint/IgniteMassLoadSandboxTest.java | 2 +- .../db/wal/WalDeletionArchiveAbstractTest.java | 2 +- ...acheContinuousQueryFailoverAbstractSelfTest.java | 2 +- .../GridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../IgniteMessagingConfigVariationFullApiTest.java | 16 ++++++++-------- ...ssionSetFutureAttributeWaitListenerSelfTest.java | 2 +- ...dSessionSetJobAttributeWaitListenerSelfTest.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 2 +- 48 files changed, 92 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinary.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinary.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinary.java index 4164532..6024f55 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinary.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientBinary.java @@ -65,7 +65,7 @@ class ClientBinary implements IgniteBinary { /** {@inheritDoc} */ @Override public BinaryObjectBuilder builder(String typeName) { - if (typeName == null || typeName.length() == 0) + if (typeName == null || typeName.isEmpty()) throw new IllegalArgumentException("typeName"); return new BinaryObjectBuilderImpl(marsh.context(), typeName); @@ -89,7 +89,7 @@ class ClientBinary implements IgniteBinary { /** {@inheritDoc} */ @Override public BinaryType type(String typeName) { - if (typeName == null || typeName.length() == 0) + if (typeName == null || typeName.isEmpty()) throw new IllegalArgumentException("typeName"); int typeId = marsh.context().typeId(typeName); @@ -109,7 +109,7 @@ class ClientBinary implements IgniteBinary { /** {@inheritDoc} */ @Override public BinaryObject buildEnum(String typeName, int ord) { - if (typeName == null || typeName.length() == 0) + if (typeName == null || typeName.isEmpty()) throw new IllegalArgumentException("typeName"); BinaryContext ctx = marsh.context(); @@ -121,10 +121,10 @@ class ClientBinary implements IgniteBinary { /** {@inheritDoc} */ @Override public BinaryObject buildEnum(String typeName, String name) { - if (typeName == null || typeName.length() == 0) + if (typeName == null || typeName.isEmpty()) throw new IllegalArgumentException("typeName"); - if (name == null || name.length() == 0) + if (name == null || name.isEmpty()) throw new IllegalArgumentException("name"); BinaryContext ctx = marsh.context(); @@ -153,7 +153,7 @@ class ClientBinary implements IgniteBinary { /** {@inheritDoc} */ @Override public BinaryType registerEnum(String typeName, Map<String, Integer> vals) { - if (typeName == null || typeName.length() == 0) + if (typeName == null || typeName.isEmpty()) throw new IllegalArgumentException("typeName"); BinaryContext ctx = marsh.context(); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java index 3114fc0..d218e45 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientUtils.java @@ -91,7 +91,7 @@ final class ClientUtils { Collection<E> col, BinaryOutputStream out, BiConsumer<BinaryOutputStream, E> elemWriter ) { - if (col == null || col.size() == 0) + if (col == null || col.isEmpty()) out.writeInt(0); else { out.writeInt(col.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java index 537ce75..c23bf84 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java @@ -199,7 +199,7 @@ final class ReliableChannel implements AutoCloseable { /** */ private void changeServer() { - if (backups.size() > 0) { + if (!backups.isEmpty()) { backups.addLast(primary); primary = backups.removeFirst(); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java index 6f79442..2da3b8f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientCache.java @@ -160,7 +160,7 @@ class TcpClientCache<K, V> implements ClientCache<K, V> { if (keys == null) throw new NullPointerException("keys"); - if (keys.size() == 0) + if (keys.isEmpty()) return new HashMap<>(); return ch.service( @@ -181,7 +181,7 @@ class TcpClientCache<K, V> implements ClientCache<K, V> { if (map == null) throw new NullPointerException("map"); - if (map.size() == 0) + if (map.isEmpty()) return; ch.request( @@ -280,7 +280,7 @@ class TcpClientCache<K, V> implements ClientCache<K, V> { if (keys == null) throw new NullPointerException("keys"); - if (keys.size() == 0) + if (keys.isEmpty()) return; ch.request( http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java index fa1efee..d6097f2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpClientChannel.java @@ -257,7 +257,7 @@ class TcpClientChannel implements ClientChannel { req.writeShort(ver.patch()); req.writeByte((byte)2); // client code, always 2 - if (ver.compareTo(V1_1_0) >= 0 && user != null && user.length() > 0) { + if (ver.compareTo(V1_1_0) >= 0 && user != null && !user.isEmpty()) { req.writeByteArray(marshalString(user)); req.writeByteArray(marshalString(pwd)); } @@ -294,7 +294,7 @@ class TcpClientChannel implements ClientChannel { else if (ver.equals(srvVer)) throw new ClientProtocolError(err); else if (!supportedVers.contains(srvVer) || - (srvVer.compareTo(V1_1_0) < 0 && user != null && user.length() > 0)) + (srvVer.compareTo(V1_1_0) < 0 && user != null && !user.isEmpty())) // Server version is not supported by this client OR server version is less than 1.1.0 supporting // authentication and authentication is required. throw new ClientProtocolError(String.format( @@ -398,7 +398,7 @@ class TcpClientChannel implements ClientChannel { } } - BiFunction<String, String, String> or = (val, dflt) -> val == null || val.length() == 0 ? dflt : val; + BiFunction<String, String, String> or = (val, dflt) -> val == null || val.isEmpty() ? dflt : val; String keyStore = or.apply( cfg.getSslClientCertificateKeyStorePath(), @@ -435,7 +435,7 @@ class TcpClientChannel implements ClientChannel { String proto = toString(cfg.getSslProtocol()); if (Stream.of(keyStore, keyStorePwd, keyStoreType, trustStore, trustStorePwd, trustStoreType) - .allMatch(s -> s == null || s.length() == 0) + .allMatch(s -> s == null || s.isEmpty()) ) { try { return SSLContext.getDefault().getSocketFactory(); @@ -498,7 +498,7 @@ class TcpClientChannel implements ClientChannel { throw new ClientError("Key manager cryptographic algorithm is not available", e); } - Predicate<String> empty = s -> s == null || s.length() == 0; + Predicate<String> empty = s -> s == null || s.isEmpty(); if (!empty.test(keyStore) && !empty.test(keyStoreType)) { char[] pwd = (keyStorePwd == null) ? new char[0] : keyStorePwd.toCharArray(); @@ -541,7 +541,7 @@ class TcpClientChannel implements ClientChannel { throw new ClientError("Trust manager cryptographic algorithm is not available", e); } - Predicate<String> empty = s -> s == null || s.length() == 0; + Predicate<String> empty = s -> s == null || s.isEmpty(); if (!empty.test(trustStore) && !empty.test(trustStoreType)) { char[] pwd = (trustStorePwd == null) ? new char[0] : trustStorePwd.toCharArray(); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java index c4af5ee..5040816 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/TcpIgniteClient.java @@ -207,7 +207,7 @@ public class TcpIgniteClient implements IgniteClient { /** @throws IllegalArgumentException if the specified cache name is invalid. */ private static void ensureCacheName(String name) { - if (name == null || name.length() == 0) + if (name == null || name.isEmpty()) throw new IllegalArgumentException("Cache name must be specified"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java index 28878df..a39c8cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java @@ -295,7 +295,7 @@ public class JdbcThinSSLUtil { } } - assert tms.size() != 0; + assert !tms.isEmpty(); try { SSLContext sslContext = SSLContext.getInstance(sslProtocol); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java index f0f7337..d1605b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java @@ -255,7 +255,7 @@ public class JdbcThinStatement implements Statement { else throw new SQLException("Unexpected result [res=" + res0 + ']'); - assert resultSets.size() > 0 : "At least one results set is expected"; + assert !resultSets.isEmpty() : "At least one results set is expected"; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java index 84bcab1..70e2013 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java @@ -327,7 +327,7 @@ public class DiscoCache { * @return Oldest server node. */ @Nullable public ClusterNode oldestServerNode(){ - if (srvNodes.size() > 0) + if (!srvNodes.isEmpty()) return srvNodes.get(0); return null; http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java b/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java index 7eb58cb..d964648 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java @@ -93,7 +93,7 @@ public class UnsafeMemoryProvider implements DirectMemoryProvider { String msg = "Failed to allocate next memory chunk: " + U.readableSize(chunkSize, true) + ". Check if chunkSize is too large and 32-bit JVM is used."; - if (regions.size() == 0) + if (regions.isEmpty()) throw new IgniteException(msg, e); U.error(log, msg); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java b/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java index 1aad4b5..3fdc89a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/mxbean/IgniteStandardMXBean.java @@ -95,7 +95,7 @@ public class IgniteStandardMXBean extends StandardMBean { str = desc.value(); assert str != null : "Failed to find method: " + mtd; - assert str.trim().length() > 0 : "Method description cannot be empty: " + mtd; + assert !str.trim().isEmpty() : "Method description cannot be empty: " + mtd; // Enforce proper English. assert Character.isUpperCase(str.charAt(0)) == true : @@ -123,7 +123,7 @@ public class IgniteStandardMXBean extends StandardMBean { str = desc.value(); assert str != null; - assert str.trim().length() > 0; + assert !str.trim().isEmpty(); // Enforce proper English. assert Character.isUpperCase(str.charAt(0)) == true : str; @@ -146,7 +146,7 @@ public class IgniteStandardMXBean extends StandardMBean { str = desc.value(); assert str != null; - assert str.trim().length() > 0; + assert !str.trim().isEmpty(); // Enforce proper English. assert Character.isUpperCase(str.charAt(0)) == true : str; @@ -176,7 +176,7 @@ public class IgniteStandardMXBean extends StandardMBean { str = decsAnn.value()[seq]; assert str != null; - assert str.trim().length() > 0; + assert !str.trim().isEmpty(); // Enforce proper English. assert Character.isUpperCase(str.charAt(0)) == true : str; @@ -206,7 +206,7 @@ public class IgniteStandardMXBean extends StandardMBean { str = namesAnn.value()[seq]; assert str != null; - assert str.trim().length() > 0; + assert !str.trim().isEmpty(); } } catch (SecurityException | ClassNotFoundException ignored) { http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java index 8ba2a06..fe51036 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignment.java @@ -189,7 +189,7 @@ public class GridAffinityAssignment implements AffinityAssignment, Serializable for (int p = 0; p < assignment.size(); p++) { List<ClusterNode> nodes = assignment.get(p); - if (nodes.size() > 0) + if (!nodes.isEmpty()) res.addAll(nodes); } @@ -209,7 +209,7 @@ public class GridAffinityAssignment implements AffinityAssignment, Serializable for (int p = 0; p < assignment.size(); p++) { List<ClusterNode> nodes = assignment.get(p); - if (nodes.size() > 0) + if (!nodes.isEmpty()) res.add(nodes.get(0)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java index 5859452..1dfccdd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java @@ -1684,7 +1684,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap fetchFuts.add(fetchFut); } else { - if (fut.events().discoveryCache().serverNodes().size() > 0) + if (!fut.events().discoveryCache().serverNodes().isEmpty()) fut.context().addGroupAffinityRequestOnJoin(grp.groupId()); else calculateAndInit(fut.events(), grp.affinity(), topVer); @@ -2084,8 +2084,8 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap List<ClusterNode> newNodes = idealAssignment.get(p); List<ClusterNode> curNodes = curAff.get(p); - ClusterNode curPrimary = curNodes.size() > 0 ? curNodes.get(0) : null; - ClusterNode newPrimary = newNodes.size() > 0 ? newNodes.get(0) : null; + ClusterNode curPrimary = !curNodes.isEmpty() ? curNodes.get(0) : null; + ClusterNode newPrimary = !newNodes.isEmpty() ? newNodes.get(0) : null; if (curPrimary != null && newPrimary != null && !curPrimary.equals(newPrimary)) { assert cctx.discovery().node(evts.topologyVersion(), curPrimary.id()) != null : curPrimary; @@ -2255,8 +2255,8 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap ", topVer=" + fut.context().events().discoveryCache().version() + ", evts=" + fut.context().events().events() + "]"; - ClusterNode curPrimary = curNodes.size() > 0 ? curNodes.get(0) : null; - ClusterNode newPrimary = newNodes.size() > 0 ? newNodes.get(0) : null; + ClusterNode curPrimary = !curNodes.isEmpty() ? curNodes.get(0) : null; + ClusterNode newPrimary = !newNodes.isEmpty() ? newNodes.get(0) : null; List<ClusterNode> newNodes0 = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 2a40845..7311300 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2322,7 +2322,7 @@ public class GridCacheProcessor extends GridProcessorAdapter implements Metastor */ private void processCacheStopRequestOnExchangeDone(ExchangeActions exchActions) { // Force checkpoint if there is any cache stop request - if (exchActions.cacheStopRequests().size() > 0) { + if (!exchActions.cacheStopRequests().isEmpty()) { try { sharedCtx.database().waitForCheckpoint("caches stop"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 7bc04dc..4c42315 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -3568,7 +3568,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { private void processDhtAtomicDeferredUpdateResponse(UUID nodeId, GridDhtAtomicDeferredUpdateResponse res) { GridLongList futIds = res.futureIds(); - assert futIds != null && futIds.size() > 0 : futIds; + assert futIds != null && !futIds.isEmpty() : futIds; for (int i = 0; i < futIds.size(); i++) { long id = futIds.get(i); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index 31439d6..30be9dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -449,7 +449,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque @Override public int partition() { assert !F.isEmpty(keys) || !F.isEmpty(nearKeys); - int p = keys.size() > 0 ? keys.get(0).partition() : nearKeys.get(0).partition(); + int p = !keys.isEmpty() ? keys.get(0).partition() : nearKeys.get(0).partition(); assert p >= 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java index d1e2dc5..5df9bb1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java @@ -728,7 +728,7 @@ public class MvccProcessorImpl extends GridProcessorAdapter implements MvccProce /** {@inheritDoc} */ @Override public IgniteInternalFuture<Void> waitTxsFuture(UUID crdId, GridLongList txs) { assert crdId != null; - assert txs != null && txs.size() > 0; + assert txs != null && !txs.isEmpty(); WaitAckFuture fut = new WaitAckFuture(futIdCntr.incrementAndGet(), crdId, false); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccWaitTxsRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccWaitTxsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccWaitTxsRequest.java index ae57507..5c6d4aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccWaitTxsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccWaitTxsRequest.java @@ -49,7 +49,7 @@ public class MvccWaitTxsRequest implements MvccMessage { * @param txs Transactions to wait for. */ public MvccWaitTxsRequest(long futId, GridLongList txs) { - assert txs != null && txs.size() > 0 : txs; + assert txs != null && !txs.isEmpty() : txs; this.futId = futId; this.txs = txs; http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java index 55c0ef2..fd7fba6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java @@ -2384,7 +2384,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements reuseList.addForRecycle(bag); - assert bag.size() == 0 : bag.size(); + assert bag.isEmpty() : bag.size(); return pagesCnt; } http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteMultipleStatementsResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteMultipleStatementsResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteMultipleStatementsResult.java index 44a56aa..fd3e980 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteMultipleStatementsResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteMultipleStatementsResult.java @@ -85,7 +85,7 @@ public class JdbcQueryExecuteMultipleStatementsResult extends JdbcResult { ClientListenerProtocolVersion ver) throws BinaryObjectException { super.writeBinary(writer, ver); - if (results != null && results.size() > 0) { + if (results != null && !results.isEmpty()) { writer.writeInt(results.size()); for (JdbcResultInfo r : results) http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java index 4aa864d..a1c67aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java @@ -202,7 +202,7 @@ public class OdbcUtils { if (iter.hasNext()) { List<?> res = iter.next(); - if (res.size() > 0) { + if (!res.isEmpty()) { Long affected = (Long) res.get(0); if (affected != null) http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index 2dc7e31..271204c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@ -1567,7 +1567,7 @@ public class GridServiceProcessor extends GridProcessorAdapter implements Ignite */ public void onUtilityCacheStarted() { synchronized (pendingJobCtxs) { - if (pendingJobCtxs.size() == 0) + if (pendingJobCtxs.isEmpty()) return; Iterator<ComputeJobContext> iter = pendingJobCtxs.iterator(); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java index 5da56d3..5b523f6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridArgumentCheck.java @@ -170,7 +170,7 @@ public class GridArgumentCheck { public static void notNullOrEmpty(String value, String name) { notNull(value, name); - if (value.trim().length() == 0) + if (value.trim().isEmpty()) throw new IllegalArgumentException(INVALID_ARG_MSG_PREFIX + name + NOT_NULL_OR_EMPTY_SUFFIX); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index d2d2b89..2e1f27e 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -1319,7 +1319,7 @@ public abstract class IgniteUtils { final Set<Long> deadlockedThreadsIds = getDeadlockedThreadIds(mxBean); - if (deadlockedThreadsIds.size() == 0) + if (deadlockedThreadsIds.isEmpty()) warn(log, "No deadlocked threads detected."); else warn(log, "Deadlocked threads detected (see thread dump below) " + http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java index 7f4bcb6..460d3b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridFilenameUtils.java @@ -1097,7 +1097,7 @@ public class GridFilenameUtils { public static boolean isExtension(String filename, String extension) { if (filename == null) return false; - if (extension == null || extension.length() == 0) + if (extension == null || extension.isEmpty()) return indexOfExtension(filename) == -1; String fileExt = getExtension(filename); return fileExt.equals(extension); @@ -1233,7 +1233,7 @@ public class GridFilenameUtils { // loop around a backtrack stack, to handle complex * matching do { - if (backtrack.size() > 0) { + if (!backtrack.isEmpty()) { int[] array = backtrack.pop(); wcsIdx = array[0]; textIdx = array[1]; @@ -1288,7 +1288,7 @@ public class GridFilenameUtils { if (wcsIdx == wcs.length && textIdx == filename.length()) return true; - } while (backtrack.size() > 0); + } while (!backtrack.isEmpty()); return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/client/LocalIgniteCluster.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/client/LocalIgniteCluster.java b/modules/core/src/test/java/org/apache/ignite/client/LocalIgniteCluster.java index 5120b5a..18ff338 100644 --- a/modules/core/src/test/java/org/apache/ignite/client/LocalIgniteCluster.java +++ b/modules/core/src/test/java/org/apache/ignite/client/LocalIgniteCluster.java @@ -87,7 +87,7 @@ public class LocalIgniteCluster implements AutoCloseable { * Remove one random node. */ public void failNode() { - if (srvs.size() == 0) + if (srvs.isEmpty()) throw new IllegalStateException("Cannot remove node from empty cluster"); Ignite srv = srvs.get(rnd.nextInt(srvs.size())); @@ -110,7 +110,7 @@ public class LocalIgniteCluster implements AutoCloseable { * Restore one of the failed nodes. */ public void restoreNode() { - if (failedCfgs.size() == 0) + if (failedCfgs.isEmpty()) throw new IllegalStateException("Cannot restore nodes in healthy cluster"); NodeConfiguration nodeCfg = failedCfgs.get(rnd.nextInt(failedCfgs.size())); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java index db49729..f85b2c0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java @@ -88,7 +88,7 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest { Ignite g1 = grid(1); Ignite g2 = grid(2); - assert caches(g1).size() == 0; + assert caches(g1).isEmpty(); assert F.first(caches(g2)).getCacheMode() == PARTITIONED; awaitPartitionMapExchange(); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java index 81a087d..1ba6edc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java @@ -1937,7 +1937,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest { Map<Integer, BinaryClassDescriptor> map = (Map<Integer, BinaryClassDescriptor>)field.get(ctx); - assertTrue(map.size() > 0); + assertTrue(!map.isEmpty()); assertNotNull(map.get(typeId)); @@ -1948,7 +1948,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest { Map<String, Integer> map2 = (Map<String, Integer>)field.get(ctx); - assertTrue(map2.size() > 0); + assertTrue(!map2.isEmpty()); assertNull(map2.get(ctx.userTypeName(Value.class.getName()))); } @@ -2908,7 +2908,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest { Map<String, Integer> map = (Map<String, Integer>)field.get(bCtx); - assertTrue(map.size() > 0); + assertTrue(!map.isEmpty()); for (Map.Entry<String, Integer> entry : map.entrySet()) { int id = entry.getValue(); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java index f21608c..74170a6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java @@ -583,7 +583,7 @@ public class CacheInterceptorPartitionCounterRandomOperationsTest extends GridCo affinity(cache).mapKeyToPrimaryAndBackups(key) : Collections.singletonList(affinity(cache).mapKeyToNode(key)); - assert nodes.size() > 0; + assert !nodes.isEmpty(); List<BlockingQueue<Cache.Entry<TestKey, TestValue>>> queues = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java index 3564b2c..714ae6a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java @@ -4672,7 +4672,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { if (FAST) return; - assert updateNodes.size() > 0; + assert !updateNodes.isEmpty(); final Ignite srv = ignite(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java index 5af7b07..b75500f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java @@ -234,7 +234,7 @@ public abstract class CacheStoreUsageMultinodeAbstractTest extends GridCommonAbs boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - return writeMap.size() > 0; + return !writeMap.isEmpty(); } }, 1000); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index b872d2a..f238786 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -5754,7 +5754,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertTrue(storeStgy.getStoreSize() != 0); try (Transaction tx = txs.txStart(txConcurrency, txIsolation)) { - assertTrue(cacheSkipStore.getAll(data.keySet()).size() == 0); + assertTrue(cacheSkipStore.getAll(data.keySet()).isEmpty()); for (String key : keys) { assertNull(cacheSkipStore.get(key)); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java index 85963d2..5c9ecd7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java @@ -84,7 +84,7 @@ public class GridCacheVersionTopologyChangeTest extends GridCommonAbstractTest { */ private void checkVersionIncrease(List<CacheConfiguration<Object, Object>> ccfgs) throws Exception { try { - assert ccfgs.size() > 0; + assert !ccfgs.isEmpty(); Ignite ignite = startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java index 3600c05..84d0a98 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java @@ -5758,7 +5758,7 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar assertTrue(storeStgy.getStoreSize() != 0); try (Transaction tx = txs.txStart(txConcurrency, txIsolation)) { - assertTrue(cacheSkipStore.getAll(data.keySet()).size() == 0); + assertTrue(cacheSkipStore.getAll(data.keySet()).isEmpty()); for (String key : keys) { assertNull(cacheSkipStore.get(key)); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java index 74b4253..b4e564f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java @@ -139,7 +139,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - return syncMsgFuts.size() == 0; + return syncMsgFuts.isEmpty(); } }, 5000); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java index 7725b19..ae1cf88 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java @@ -1407,13 +1407,13 @@ public abstract class IgniteCachePeekModesAbstractTest extends IgniteCacheAbstra T2<List<Integer>, List<Integer>> swapKeys = swapKeys(nodeIdx); - assertTrue(swapKeys.get1().size() > 0); - assertTrue(swapKeys.get2().size() > 0); + assertTrue(!swapKeys.get1().isEmpty()); + assertTrue(!swapKeys.get2().isEmpty()); T2<List<Integer>, List<Integer>> offheapKeys = offheapKeys(nodeIdx); - assertTrue(offheapKeys.get1().size() > 0); - assertTrue(offheapKeys.get2().size() > 0); + assertTrue(!offheapKeys.get1().isEmpty()); + assertTrue(!offheapKeys.get2().isEmpty()); List<Integer> swap = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java index 1183634..d95a7bf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java @@ -595,13 +595,13 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { private void checkHistorySize(int histSize) { List<Ignite> nodes = G.allGrids(); - assertTrue(nodes.size() > 0); + assertTrue(!nodes.isEmpty()); for (Ignite node : nodes) { List<GridDhtPartitionsExchangeFuture> exchFuts = ((IgniteEx)node).context().cache().context().exchange().exchangeFutures(); - assertTrue("Unexpected size: " + exchFuts.size(), exchFuts.size() > 0 && exchFuts.size() <= histSize); + assertTrue("Unexpected size: " + exchFuts.size(), !exchFuts.isEmpty() && exchFuts.size() <= histSize); } } @@ -1220,7 +1220,7 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { private void checkCaches0() throws Exception { List<Ignite> nodes = G.allGrids(); - assertTrue(nodes.size() > 0); + assertTrue(!nodes.isEmpty()); for (Ignite node : nodes) checkNodeCaches(node); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java index db4a0da..c777aba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java @@ -1847,7 +1847,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { } case 4: { - if (caches.size() > 0) { + if (!caches.isEmpty()) { String cacheName = caches.get(rnd.nextInt(caches.size())); Ignite node = randomNode(rnd, srvs, clients); @@ -1887,7 +1887,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { } case 6: { - if (caches.size() > 0) { + if (!caches.isEmpty()) { for (int j = 0; j < 3; j++) { String cacheName = caches.get(rnd.nextInt(caches.size())); @@ -2289,7 +2289,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { String name = null; if (rnd.nextBoolean()) { - if (clients.size() > 0) + if (!clients.isEmpty()) name = clients.get(rnd.nextInt(clients.size())); } @@ -2350,7 +2350,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { Set<String> exclude = new HashSet<>(); for (int i = 0; i < 10; i++) { - if (i % 2 == 0 && srvs.size() > 0) + if (i % 2 == 0 && !srvs.isEmpty()) exclude.add(srvs.get(rnd.nextInt(srvs.size()))); else exclude.add("server-" + (srvIdx + rnd.nextInt(10))); @@ -2777,7 +2777,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { } }); - assert all.size() > 0; + assert !all.isEmpty(); Map<Integer, List<List<ClusterNode>>> assignments = idealAff.get(topVer); @@ -2868,7 +2868,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { List<ClusterNode> nodes0 = prev.get(p); List<ClusterNode> nodes1 = assignment.get(p); - if (nodes0.size() > 0 && nodes1.size() > 0) { + if (!nodes0.isEmpty() && !nodes1.isEmpty()) { ClusterNode p0 = nodes0.get(0); ClusterNode p1 = nodes1.get(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java index 1aacc9c..1616e8f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java @@ -484,7 +484,7 @@ public class IgniteCachePartitionLossPolicySelfTest extends GridCommonAbstractTe final List<Integer> parts = noPrimaryOrBackupPartition(aliveNodes); - if (parts.size() == 0) + if (parts.isEmpty()) throw new IllegalStateException("No partition on nodes: " + killNodes); final List<Map<Integer, Semaphore>> lostMap = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java index dbf5978..d31015d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java @@ -84,7 +84,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes public void testTwoNodes() throws Exception { checkNodes(startGridsMultiThreaded(2)); - assertTrue(colocated(0, "test").size() > 0); + assertTrue(!colocated(0, "test").isEmpty()); assertTrue(jcache(0, "test").localSize() > 0); } @@ -92,7 +92,7 @@ public class GridCacheDhtEvictionsDisabledSelfTest extends GridCommonAbstractTes public void testThreeNodes() throws Exception { checkNodes(startGridsMultiThreaded(3)); - assertTrue(colocated(0, "test").size() > 0); + assertTrue(!colocated(0, "test").isEmpty()); assertTrue(jcache(0, "test").localSize() > 0); } http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java index 79dc48e..f38db0a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java @@ -376,7 +376,7 @@ public class IgniteMassLoadSandboxTest extends GridCommonAbstractTest { final String coveredMatcherGrp = coveredMatcher.group(1); - final long[] covered = coveredMatcherGrp.length() > 0 ? + final long[] covered = !coveredMatcherGrp.isEmpty() ? Arrays.stream(coveredMatcherGrp.split(" - ")).mapToLong(e -> Integer.valueOf(e.trim())).toArray() : new long[0]; http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java index 1cf237c..f8aeb6a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalDeletionArchiveAbstractTest.java @@ -159,7 +159,7 @@ public abstract class WalDeletionArchiveAbstractTest extends GridCommonAbstractT CheckpointHistory hist = dbMgr.checkpointHistory(); - assertTrue(hist.checkpoints().size() > 0); + assertTrue(!hist.checkpoints().isEmpty()); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java index a17e48c..240c39e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java @@ -1466,7 +1466,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC assertTrue("Backup queue is not cleared: " + backupQueue(ignite(0)), backupQueue(ignite(0)).size() < BACKUP_ACK_THRESHOLD); - if (backupQueue(ignite(0)).size() != 0) { + if (!backupQueue(ignite(0)).isEmpty()) { for (Object o : backupQueue(ignite(0))) { CacheContinuousQueryEntry e = (CacheContinuousQueryEntry)o; http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index d09aea3..0ace0ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -199,7 +199,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo for (int i = 0; i < gridCount(); i++) { GridContinuousProcessor proc = grid(i).context().continuous(); - if(((Map)U.field(proc, "rmtInfos")).size() > 0) + if(!((Map)U.field(proc, "rmtInfos")).isEmpty()) return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java index 3e547d0..33a8a73 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/messaging/IgniteMessagingConfigVariationFullApiTest.java @@ -302,7 +302,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria ClusterGroup grp = ignite.cluster().forClients(); - assert grp.nodes().size() > 0; + assert !grp.nodes().isEmpty(); registerListenerAndSendMessages(ignite, grp, async); } @@ -318,7 +318,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria ClusterGroup grp = ignite.cluster().forClients(); - assert grp.nodes().size() > 0; + assert !grp.nodes().isEmpty(); registerListenerAndSendMessages(ignite, grp, async); } @@ -334,7 +334,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria ClusterGroup grp = ignite.cluster().forServers(); - assert grp.nodes().size() > 0; + assert !grp.nodes().isEmpty(); registerListenerAndSendMessages(ignite, grp, async); } @@ -373,7 +373,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria ClusterGroup grp = gridCount() > 1 ? ignite.cluster().forRemotes() : ignite.cluster().forLocal(); - assert grp.nodes().size() > 0; + assert !grp.nodes().isEmpty(); int messages = MSGS; @@ -404,7 +404,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria ClusterGroup grp = gridCount() > 1 ? ignite.cluster().forRemotes() : ignite.cluster().forLocal(); - assert grp.nodes().size() > 0; + assert !grp.nodes().isEmpty(); registerListenerAndSendOrderedMessages(ignite, grp); } @@ -417,7 +417,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria ClusterGroup grp = ignite.cluster().forServers(); - assert grp.nodes().size() > 0; + assert !grp.nodes().isEmpty(); registerListenerAndSendOrderedMessages(ignite, grp); } @@ -430,7 +430,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria ClusterGroup grp = ignite.cluster().forClients(); - assert grp.nodes().size() > 0; + assert !grp.nodes().isEmpty(); registerListenerAndSendOrderedMessages(ignite, grp); } @@ -443,7 +443,7 @@ public class IgniteMessagingConfigVariationFullApiTest extends IgniteConfigVaria ClusterGroup grp = ignite.cluster().forClients(); - assert grp.nodes().size() > 0; + assert !grp.nodes().isEmpty(); registerListenerAndSendOrderedMessages(ignite, grp); } http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java index d354839..078a7a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java @@ -117,7 +117,7 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo assert (Integer)res == SPLIT_COUNT : "Invalid result [i=" + i + ", fut=" + fut + ']'; - assert lsnr.getAttributes().size() != 0 : "No attributes found."; + assert !lsnr.getAttributes().isEmpty() : "No attributes found."; } finally { // We must wait for the jobs to be sure that they have completed http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java index c9e0537..d94ca49 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java @@ -167,7 +167,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb lsnr.wait(WAIT_TIME); } - return lsnr.getAttributes().size() == 0 ? 0 : 1; + return lsnr.getAttributes().isEmpty() ? 0 : 1; } catch (InterruptedException e) { throw new IgniteException("Failed to wait for listener due to interruption.", e); http://git-wip-us.apache.org/repos/asf/ignite/blob/375ccb62/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index 273456a..1b09c3f 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -1798,7 +1798,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { if (nodesCnt == -1) { nodes = G.allGrids(); - assertTrue(nodes.size() > 0); + assertTrue(!nodes.isEmpty()); } else { nodes = new ArrayList<>(nodesCnt);
