From c3df8efe0b7a115e8e1e6d3c62f454706dff5d40 Mon Sep 17 00:00:00 2001 From: Khvatov-Alexey Date: Fri, 25 Aug 2023 17:20:21 +0300 Subject: [PATCH] update 'Collection.toArray()' call style to improve performance in JDK6+ --- .../org/apache/ignite/internal/commandline/TxCommands.java | 3 ++- .../ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java | 3 ++- .../ignite/configuration/TransactionConfiguration.java | 3 ++- .../main/java/org/apache/ignite/internal/IgnitionEx.java | 7 +++---- .../ignite/internal/binary/BinaryClassDescriptor.java | 2 +- .../internal/jdbc/thin/JdbcThinPreparedStatement.java | 4 ++-- .../ignite/internal/jdbc/thin/JdbcThinStatement.java | 2 +- .../internal/managers/communication/GridIoManager.java | 2 +- .../cache/distributed/dht/GridDhtCacheEntry.java | 2 +- .../dotnet/PlatformDotNetConfigurationClosure.java | 2 +- .../platform/utils/PlatformConfigurationUtils.java | 4 ++-- .../internal/processors/platform/utils/PlatformUtils.java | 2 +- .../internal/processors/resource/GridResourceField.java | 2 +- .../internal/processors/resource/GridResourceIoc.java | 2 +- .../internal/processors/resource/GridResourceMethod.java | 2 +- .../java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +- .../apache/ignite/internal/util/io/GridFilenameUtils.java | 4 +++- .../internal/util/nio/GridNioRecoveryDescriptor.java | 4 ++-- .../java/org/apache/ignite/internal/util/typedef/X.java | 2 +- .../communication/tcp/internal/GridNioServerWrapper.java | 2 +- .../apache/ignite/spi/metric/jmx/MetricRegistryMBean.java | 2 +- .../jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java | 2 +- .../ignite/internal/GridProjectionForCachesSelfTest.java | 2 +- .../ignite/internal/SensitiveInfoTestLoggerProxy.java | 2 +- .../apache/ignite/internal/binary/BinaryEnumsSelfTest.java | 2 +- .../cache/CacheExchangeMessageDuplicatedStateTest.java | 2 +- .../CacheWithDifferentDataRegionConfigurationTest.java | 4 ++-- .../cache/IgniteCachePartitionMapUpdateTest.java | 2 +- .../datastructures/IgniteSequenceInternalCleanupTest.java | 2 +- .../cache/distributed/GridCacheTransformEventSelfTest.java | 2 +- .../baseline/ClientAffinityAssignmentWithBaselineTest.java | 4 ++-- .../IgniteCheckpointDirtyPagesForLowLoadTest.java | 2 +- .../GridServiceProcessorMultiNodeConfigSelfTest.java | 2 +- .../utils/IgniteWalConverterSensitiveDataTest.java | 3 ++- .../PlatformTestPluginConfigurationClosureFactory.java | 2 +- .../cache/PlatformTestCachePluginConfigurationClosure.java | 2 +- .../internal/processors/query/h2/H2IndexFactory.java | 2 +- .../internal/processors/query/h2/opt/GridH2ProxyIndex.java | 3 ++- .../cache/IgniteBinaryObjectQueryArgumentsTest.java | 2 +- .../IgniteCacheDistributedJoinCollocatedAndNotTest.java | 2 +- .../IgniteCacheDistributedJoinCustomAffinityMapper.java | 2 +- .../cache/IgniteCacheDistributedJoinNoIndexTest.java | 2 +- .../cache/IgniteCacheJoinPartitionedAndReplicatedTest.java | 2 +- .../index/DynamicColumnsAbstractConcurrentSelfTest.java | 2 +- .../processors/query/IgniteSqlKeyValueFieldsTest.java | 2 +- .../processors/query/IgniteSqlNotNullConstraintTest.java | 2 +- .../internal/processors/query/IgniteSqlRoutingTest.java | 2 +- .../query/IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java | 2 +- .../query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java | 2 +- .../processors/query/h2/TableStatisticsAbstractTest.java | 3 ++- .../processors/query/stat/StatisticsAbstractTest.java | 4 ++-- .../org/apache/ignite/ml/clustering/gmm/GmmTrainer.java | 2 +- .../src/main/java/org/apache/ignite/tools/junit/X.java | 2 +- .../uri/GridUriDeploymentClassLoaderFactory.java | 3 ++- .../spi/deployment/uri/GridUriDeploymentJarVerifier.java | 2 +- .../apache/ignite/spi/deployment/uri/UriDeploymentSpi.java | 2 +- .../org/apache/ignite/cache/websession/WebSession.java | 2 +- .../org/apache/ignite/cache/websession/WebSessionV2.java | 2 +- 58 files changed, 75 insertions(+), 67 deletions(-) diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/TxCommands.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/TxCommands.java index 60c8d6554b72a..3092f152ee4cd 100644 --- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/TxCommands.java +++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/TxCommands.java @@ -34,6 +34,7 @@ import org.apache.ignite.internal.commandline.argument.CommandArgUtils; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.internal.visor.tx.FetchNearXidVersionTask; import org.apache.ignite.internal.visor.tx.TxKeyLockType; import org.apache.ignite.internal.visor.tx.TxMappingType; @@ -95,7 +96,7 @@ private String[] getTxOptions() { list.add(optional(TX_INFO)); list.add(optional(CMD_AUTO_CONFIRMATION)); - return list.toArray(new String[list.size()]); + return list.toArray(U.EMPTY_STRS); } /** {@inheritDoc} */ diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java index 4a434f5b98d9a..dd9f577ef0a84 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java @@ -21,6 +21,7 @@ import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.SB; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Basic implementation of dialect based on JDBC specification. @@ -175,7 +176,7 @@ private static String where(Collection keyCols, int keyCnt) { SB sb = new SB(); - String[] cols = keyCols.toArray(new String[keyCols.size()]); + String[] cols = keyCols.toArray(U.EMPTY_STRS); if (appendLowerBound) { sb.a("("); diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java index 19f22fb0bec09..85f270479190d 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java @@ -23,6 +23,7 @@ import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.internal.util.TransientSerializable; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteExperimental; import org.apache.ignite.lang.IgniteProductVersion; import org.apache.ignite.transactions.Transaction; @@ -477,6 +478,6 @@ private static String[] transientSerializableFields(IgniteProductVersion ver) { if (DEADLOCK_TIMEOUT_SINCE.compareToIgnoreTimestamp(ver) >= 0) transients.add("deadlockTimeout"); - return transients.isEmpty() ? null : transients.toArray(new String[transients.size()]); + return transients.isEmpty() ? null : transients.toArray(U.EMPTY_STRS); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index dffb30f6167b8..7c6169bf11f50 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -2010,7 +2010,7 @@ public void initializeDefaultCacheConfiguration(IgniteConfiguration cfg) throws } } - cfg.setCacheConfiguration(cacheCfgs.toArray(new CacheConfiguration[cacheCfgs.size()])); + cfg.setCacheConfiguration(cacheCfgs.toArray(new CacheConfiguration[0])); assert cfg.getCacheConfiguration() != null; } @@ -2067,7 +2067,7 @@ private void initializeDefaultSpi(IgniteConfiguration cfg) { if (!dfltLoadBalancingSpi) spis.add(new RoundRobinLoadBalancingSpi()); - cfg.setLoadBalancingSpi(spis.toArray(new LoadBalancingSpi[spis.size()])); + cfg.setLoadBalancingSpi(spis.toArray(new LoadBalancingSpi[0])); } if (cfg.getIndexingSpi() == null) @@ -2682,8 +2682,7 @@ private static void convertLegacyDataStorageConfigurationToNew( } if (!optionalDataRegions.isEmpty()) - dsCfg.setDataRegionConfigurations(optionalDataRegions.toArray( - new DataRegionConfiguration[optionalDataRegions.size()])); + dsCfg.setDataRegionConfigurations(optionalDataRegions.toArray(new DataRegionConfiguration[0])); if (!customDfltPlc) { if (!DFLT_MEM_PLC_DEFAULT_NAME.equals(memCfg.getDefaultMemoryPolicyName())) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java index be1ffc3cb5707..ef681f887cb8d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java @@ -377,7 +377,7 @@ else if (useOptMarshaller) } } - fields = fields0.values().toArray(new BinaryFieldAccessor[fields0.size()]); + fields = fields0.values().toArray(new BinaryFieldAccessor[0]); BinarySchema.Builder schemaBuilder = BinarySchema.Builder.newBuilder(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPreparedStatement.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPreparedStatement.java index 6c795ddc4bb02..f24beda438d0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPreparedStatement.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPreparedStatement.java @@ -274,10 +274,10 @@ private void executeWithArguments(JdbcStatementType stmtType) throws SQLExceptio if (batch == null) { batch = new ArrayList<>(); - batch.add(new JdbcQuery(sql, args.toArray(new Object[args.size()]))); + batch.add(new JdbcQuery(sql, args.toArray(new Object[0]))); } else - batch.add(new JdbcQuery(null, args.toArray(new Object[args.size()]))); + batch.add(new JdbcQuery(null, args.toArray(new Object[0]))); } args = null; 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 13ae9b596d664..3df26f7050771 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 @@ -229,7 +229,7 @@ protected void execute0(JdbcStatementType stmtType, String sql, List arg } JdbcQueryExecuteRequest req = new JdbcQueryExecuteRequest(stmtType, schema, pageSize, - maxRows, conn.getAutoCommit(), explicitTimeout, sql, args == null ? null : args.toArray(new Object[args.size()])); + maxRows, conn.getAutoCommit(), explicitTimeout, sql, args == null ? null : args.toArray(new Object[0])); JdbcResultWithIo resWithIo = conn.sendRequest(req, this, null); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 1fc734d3f126c..f60ba27359239 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -478,7 +478,7 @@ public void resetMetrics() { } if (!compMsgs.isEmpty()) - msgs = F.concat(msgs, compMsgs.toArray(new MessageFactory[compMsgs.size()])); + msgs = F.concat(msgs, compMsgs.toArray(new MessageFactory[0])); msgFactory = new IgniteMessageFactoryImpl(msgs); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java index f66602d68de92..7df8130c4e983 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java @@ -759,7 +759,7 @@ else if (newRdrs != null) } if (newRdrs != null) { - rdrs = newRdrs.toArray(new ReaderId[newRdrs.size()]); + rdrs = newRdrs.toArray(ReaderId.EMPTY_ARRAY); this.rdrs = rdrs; } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java index 1de616272f2d8..591cddfce5567 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java @@ -210,7 +210,7 @@ private void processPrepareResult(BinaryReaderExImpl in) { } if (!newBeans.isEmpty()) { - LifecycleBean[] newBeans0 = newBeans.toArray(new LifecycleBean[newBeans.size()]); + LifecycleBean[] newBeans0 = newBeans.toArray(new LifecycleBean[0]); // New beans were added. Let's append them to the tail of the rest configured lifecycle beans. LifecycleBean[] oldBeans = cfg.getLifecycleBeans(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java index baf18e59b82e0..573885acabf4d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java @@ -289,7 +289,7 @@ public static CacheConfiguration readCacheConfiguration(BinaryRawReaderEx in) { if (ccfg.getPluginConfigurations() != null) Collections.addAll(plugins, ccfg.getPluginConfigurations()); - ccfg.setPluginConfigurations(plugins.toArray(new CachePluginConfiguration[plugins.size()])); + ccfg.setPluginConfigurations(plugins.toArray(new CachePluginConfiguration[0])); } return ccfg; @@ -979,7 +979,7 @@ private static void readCacheConfigurations(BinaryRawReaderEx in, IgniteConfigur caches.add(readCacheConfiguration(in)); CacheConfiguration[] oldCaches = cfg.getCacheConfiguration(); - CacheConfiguration[] caches0 = caches.toArray(new CacheConfiguration[caches.size()]); + CacheConfiguration[] caches0 = caches.toArray(new CacheConfiguration[0]); if (oldCaches == null) cfg.setCacheConfiguration(caches0); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java index 8462a5d24feb0..e24fb9948a1f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java @@ -481,7 +481,7 @@ public static CachePeekMode[] decodeCachePeekModes(int modes) { res0.add(CachePeekMode.fromOrdinal((byte)i)); } - res = res0.toArray(new CachePeekMode[res0.size()]); + res = res0.toArray(new CachePeekMode[0]); synchronized (PlatformUtils.class) { CACHE_PEEK_MODES[modes] = res; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java index 3a7e1d661a7d4..be42850938932 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceField.java @@ -82,7 +82,7 @@ public static GridResourceField[] toArray(Collection c) { if (c.isEmpty()) return EMPTY_ARRAY; - return c.toArray(new GridResourceField[c.size()]); + return c.toArray(EMPTY_ARRAY); } /** {@inheritDoc} */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java index e748be67b0e09..dd2d9bf037cf5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceIoc.java @@ -307,7 +307,7 @@ class ClassDescriptor { } recursiveFields = recursiveFieldsList.isEmpty() ? U.EMPTY_FIELDS - : recursiveFieldsList.toArray(new Field[recursiveFieldsList.size()]); + : recursiveFieldsList.toArray(U.EMPTY_FIELDS); this.annMap = IgniteUtils.limitedMap(annMap.size()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java index 4d7e2ba04bab6..dd3f4df14e2a4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceMethod.java @@ -77,7 +77,7 @@ public static GridResourceMethod[] toArray(Collection c) { if (c.isEmpty()) return EMPTY_ARRAY; - return c.toArray(new GridResourceMethod[c.size()]); + return c.toArray(EMPTY_ARRAY); } /** {@inheritDoc} */ 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 d7afb88b012ec..f0dba7c904058 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 @@ -635,7 +635,7 @@ public abstract class IgniteUtils { private static final boolean assertionsEnabled; /** Empty URL array. */ - private static final URL[] EMPTY_URL_ARR = new URL[0]; + public static final URL[] EMPTY_URL_ARR = new URL[0]; /** Builtin class loader class. * 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 7130cd47d4148..722c75821ee6c 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 @@ -17,6 +17,8 @@ package org.apache.ignite.internal.util.io; +import org.apache.ignite.internal.util.typedef.internal.U; + import java.io.File; import java.io.IOException; import java.io.Serializable; @@ -1337,7 +1339,7 @@ else if (list.isEmpty() || if (buffer.length() != 0) list.add(buffer.toString()); - return list.toArray( new String[ list.size() ] ); + return list.toArray(U.EMPTY_STRS); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java index 04d05e93cb95f..d76555ed0b1bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java @@ -254,7 +254,7 @@ public boolean onNodeLeft() { return false; if (!msgReqs.isEmpty()) { - reqs = msgReqs.toArray(new SessionWriteRequest[msgReqs.size()]); + reqs = msgReqs.toArray(new SessionWriteRequest[0]); msgReqs.clear(); } @@ -401,7 +401,7 @@ public void release() { } if (nodeLeft && !msgReqs.isEmpty()) { - futs = msgReqs.toArray(new SessionWriteRequest[msgReqs.size()]); + futs = msgReqs.toArray(new SessionWriteRequest[0]); msgReqs.clear(); } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java index c5890dfda3595..522d6ac8148b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/typedef/X.java @@ -826,7 +826,7 @@ public static List getThrowableList(Throwable throwable) { public static Throwable[] getThrowables(Throwable throwable) { List list = getThrowableList(throwable); - return list.toArray(new Throwable[list.size()]); + return list.toArray(new Throwable[0]); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java index 8302b1c950885..1548765ac1733 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java @@ -911,7 +911,7 @@ public GridNioServer resetNioServer() throws IgniteCheckedException { .directMode(true) .writeTimeout(cfg.socketWriteTimeout()) .selectorSpins(cfg.selectorSpins()) - .filters(filters.toArray(new GridNioFilter[filters.size()])) + .filters(filters.toArray(new GridNioFilter[0])) .writerFactory(writerFactory) .skipRecoveryPredicate(skipRecoveryPred) .messageQueueSizeListener(queueSizeMonitor) diff --git a/modules/core/src/main/java/org/apache/ignite/spi/metric/jmx/MetricRegistryMBean.java b/modules/core/src/main/java/org/apache/ignite/spi/metric/jmx/MetricRegistryMBean.java index cd8fb5e374849..4f8963da7dc4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/metric/jmx/MetricRegistryMBean.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/metric/jmx/MetricRegistryMBean.java @@ -115,7 +115,7 @@ else if (metric instanceof ObjectMetric) return new MBeanInfo( ReadOnlyMetricManager.class.getName(), mreg.name(), - attributes.toArray(new MBeanAttributeInfo[attributes.size()]), + attributes.toArray(new MBeanAttributeInfo[0]), null, null, null); diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java index 784fbdee64156..246a84023763e 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java @@ -101,7 +101,7 @@ public abstract class CacheJdbcStoreAbstractMultithreadedSelfTest types = new ArrayList<>(springCtx.getBeansOfType(JdbcType.class).values()); - store.setTypes(types.toArray(new JdbcType[types.size()])); + store.setTypes(types.toArray(new JdbcType[0])); } catch (BeansException e) { if (X.hasCause(e, ClassNotFoundException.class)) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java index ebec6bd4ddf0a..211131512aea1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java @@ -60,7 +60,7 @@ else if (igniteInstanceName.equals(getTestIgniteInstanceName(2)) || ccfgs.add(cacheConfiguration(CACHE_NAME, new AttributeFilter(getTestIgniteInstanceName(2), getTestIgniteInstanceName(3)), true)); - cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); return cfg; } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/SensitiveInfoTestLoggerProxy.java b/modules/core/src/test/java/org/apache/ignite/internal/SensitiveInfoTestLoggerProxy.java index 09bc8c5c27af4..648135813baf9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/SensitiveInfoTestLoggerProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/SensitiveInfoTestLoggerProxy.java @@ -212,7 +212,7 @@ private static Pattern[] readFromResource(String suffix) { ex.printStackTrace(); } - return lst.toArray(new Pattern[lst.size()]); + return lst.toArray(new Pattern[0]); } /** diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java index 0ded707d3a79d..0296c3f87ab47 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryEnumsSelfTest.java @@ -549,7 +549,7 @@ public void testEnumMerge() throws Exception { EnumType.TWO.name(), EnumType.TWO.ordinal())); Collection vals = node1.binary().type(enumName).enumValues(); - BinaryObject[] values = vals.toArray(new BinaryObject[vals.size()]); + BinaryObject[] values = vals.toArray(new BinaryObject[0]); assertEquals(2, values.length); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java index 0c52154537264..49539b6d0121d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java @@ -122,7 +122,7 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT ccfgs.add(ccfg); } - cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); return cfg; } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheWithDifferentDataRegionConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheWithDifferentDataRegionConfigurationTest.java index f52a991a44250..3507c2e9fa768 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheWithDifferentDataRegionConfigurationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheWithDifferentDataRegionConfigurationTest.java @@ -400,13 +400,13 @@ public IgniteEx start() throws Exception { cfg.setConsistentId(gridName); DataStorageConfiguration storageCfg = new DataStorageConfiguration(); - storageCfg.setDataRegionConfigurations(regions.toArray(new DataRegionConfiguration[regions.size()])); + storageCfg.setDataRegionConfigurations(regions.toArray(new DataRegionConfiguration[0])); cfg.setDataStorageConfiguration(storageCfg); if (dfltRegionConfiguration != null) storageCfg.setDefaultDataRegionConfiguration(dfltRegionConfiguration); - cfg.setCacheConfiguration(caches.toArray(new CacheConfiguration[caches.size()])); + cfg.setCacheConfiguration(caches.toArray(new CacheConfiguration[0])); return startGrid(cfg); } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionMapUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionMapUpdateTest.java index 7c52d5364f6a0..c6084ad7d7643 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionMapUpdateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionMapUpdateTest.java @@ -95,7 +95,7 @@ public class IgniteCachePartitionMapUpdateTest extends GridCommonAbstractTest { cfg.setUserAttributes(attrs); - cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); return cfg; } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java index 9fa58f363c308..9ff09102353fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSequenceInternalCleanupTest.java @@ -68,7 +68,7 @@ public class IgniteSequenceInternalCleanupTest extends GridCommonAbstractTest { setAffinity(new RendezvousAffinityFunction(false, 16))); } - cfg.setCacheConfiguration(cacheCfg.toArray(new CacheConfiguration[cacheCfg.size()])); + cfg.setCacheConfiguration(cacheCfg.toArray(new CacheConfiguration[0])); return cfg; } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index 00905940ca395..e23389719b165 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -571,7 +571,7 @@ else if (cacheMode == REPLICATED) { } } - return res.toArray(new UUID[res.size()]); + return res.toArray(new UUID[0]); } /** diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java index f4e09c09b376b..934f9c00af165 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/ClientAffinityAssignmentWithBaselineTest.java @@ -149,9 +149,9 @@ public class ClientAffinityAssignmentWithBaselineTest extends GridCommonAbstract clientConfigs.add(cacheConfig(PARTITIONED_TX_CLIENT_CACHE_NAME)); if (igniteInstanceName.startsWith(CLIENT_GRID_NAME)) - cfg.setCacheConfiguration(clientConfigs.toArray(new CacheConfiguration[clientConfigs.size()])); + cfg.setCacheConfiguration(clientConfigs.toArray(new CacheConfiguration[0])); else - cfg.setCacheConfiguration(srvConfigs.toArray(new CacheConfiguration[srvConfigs.size()])); + cfg.setCacheConfiguration(srvConfigs.toArray(new CacheConfiguration[0])); // Enforce different mac adresses to emulate distributed environment by default. cfg.setUserAttributes(Collections.singletonMap( diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java index 2f3cfdba0ddcd..6e239e9279bfc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteCheckpointDirtyPagesForLowLoadTest.java @@ -69,7 +69,7 @@ public class IgniteCheckpointDirtyPagesForLowLoadTest extends GridCommonAbstract ccfgs.add(ccfg); } } - cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); DataStorageConfiguration dsCfg = new DataStorageConfiguration(); dsCfg.setDefaultDataRegionConfiguration( diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java index e3f17c712d94f..87440856e2eb9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java @@ -107,7 +107,7 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc cfgs.add(cfg); - return cfgs.toArray(new ServiceConfiguration[cfgs.size()]); + return cfgs.toArray(new ServiceConfiguration[0]); } /** {@inheritDoc} */ diff --git a/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterSensitiveDataTest.java b/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterSensitiveDataTest.java index 75ed5432fa68b..13fa4b6df5637 100644 --- a/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterSensitiveDataTest.java +++ b/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterSensitiveDataTest.java @@ -46,6 +46,7 @@ import org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.typedef.internal.CU; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.junit.Test; @@ -249,7 +250,7 @@ private void exeWithCheck( if (processSensitiveData != null) args.add("processSensitiveData=" + processSensitiveData.name()); - IgniteWalConverter.main(args.toArray(new String[args.size()])); + IgniteWalConverter.main(args.toArray(U.EMPTY_STRS)); String testOutStr = testOut.toString(); diff --git a/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfigurationClosureFactory.java b/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfigurationClosureFactory.java index 98372c8965428..8732671f9b610 100644 --- a/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfigurationClosureFactory.java +++ b/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/PlatformTestPluginConfigurationClosureFactory.java @@ -55,6 +55,6 @@ public class PlatformTestPluginConfigurationClosureFactory implements PlatformPl cfgs.add(plugCfg); - cfg.setPluginConfigurations(cfgs.toArray(new PluginConfiguration[cfgs.size()])); + cfg.setPluginConfigurations(cfgs.toArray(new PluginConfiguration[0])); } } diff --git a/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosure.java b/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosure.java index 376e2f0994972..bf353ba0a169d 100644 --- a/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosure.java +++ b/modules/extdata/platform/src/test/java/org/apache/ignite/platform/plugin/cache/PlatformTestCachePluginConfigurationClosure.java @@ -42,6 +42,6 @@ public class PlatformTestCachePluginConfigurationClosure implements PlatformCach cfgs.add(plugCfg); - cacheConfiguration.setPluginConfigurations(cfgs.toArray(new CachePluginConfiguration[cfgs.size()])); + cacheConfiguration.setPluginConfigurations(cfgs.toArray(new CachePluginConfiguration[0])); } } diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2IndexFactory.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2IndexFactory.java index 14250c8497231..a055320a3981b 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2IndexFactory.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2IndexFactory.java @@ -73,7 +73,7 @@ Index createIndex(GridH2Table tbl, IndexDescriptor idxDesc) { : org.h2.result.SortOrder.DESCENDING)); } - IndexColumn[] idxColsArr = idxCols.toArray(new IndexColumn[idxCols.size()]); + IndexColumn[] idxColsArr = idxCols.toArray(H2Utils.EMPTY_COLUMNS); if (idxDesc.type() == QueryIndexType.SORTED) { if (idxDesc.isProxy()) { diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java index bb72bad37fddf..ef78521b9170d 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java @@ -21,6 +21,7 @@ import java.util.List; import org.apache.ignite.internal.processors.query.GridQueryRowDescriptor; import org.apache.ignite.internal.processors.query.QueryUtils; +import org.apache.ignite.internal.processors.query.h2.H2Utils; import org.apache.ignite.internal.processors.query.h2.opt.join.ProxyDistributedLookupBatch; import org.h2.engine.Session; import org.h2.index.Cursor; @@ -59,7 +60,7 @@ public GridH2ProxyIndex(GridH2Table tbl, super(tbl, name, GridH2IndexBase.columnsArray(tbl, colsList), IndexType.createNonUnique(false, false, idx instanceof SpatialIndex)); - IndexColumn[] cols = colsList.toArray(new IndexColumn[colsList.size()]); + IndexColumn[] cols = colsList.toArray(H2Utils.EMPTY_COLUMNS); IndexColumn.mapColumns(cols, tbl); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java index d118ac114f31b..cb6f5d105d0c7 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java @@ -130,7 +130,7 @@ private CacheConfiguration[] getCacheConfigurations() { ccfgs.addAll(getCacheConfigurations(BIG_DECIMAL_CACHE, BigDecimal.class, Person.class)); ccfgs.add(getCacheConfiguration(FIELD_CACHE, Integer.class, SearchValue.class)); - return ccfgs.toArray(new CacheConfiguration[ccfgs.size()]); + return ccfgs.toArray(new CacheConfiguration[0]); } /** diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java index 403643fb2dcf7..955145ea23d23 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java @@ -112,7 +112,7 @@ public class IgniteCacheDistributedJoinCollocatedAndNotTest extends GridCommonAb ccfgs.add(ccfg); } - cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); return cfg; } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java index 52adbaa5075a1..014b7e41578ff 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java @@ -119,7 +119,7 @@ public class IgniteCacheDistributedJoinCustomAffinityMapper extends GridCommonAb ccfgs.add(ccfg); } - cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); return cfg; } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java index 0feccdbcae752..296e7b1d13df9 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java @@ -84,7 +84,7 @@ public class IgniteCacheDistributedJoinNoIndexTest extends GridCommonAbstractTes ccfgs.add(ccfg); } - cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); return cfg; } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java index fc1b87507a316..fdd238cb8fac9 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java @@ -108,7 +108,7 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest extends GridCommonAbstr ccfgs.add(ccfg); } - cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); return cfg; } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractConcurrentSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractConcurrentSelfTest.java index a950444c282e2..2671dda21af91 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractConcurrentSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractConcurrentSelfTest.java @@ -1002,7 +1002,7 @@ public void testConcurrentOperationsAndNodeStartStopMultithreaded() throws Excep String idxQry = "CREATE INDEX idx ON " + TBL_NAME + '('; - Integer[] sorted = fields.toArray(new Integer[fields.size()]); + Integer[] sorted = fields.toArray(new Integer[0]); Arrays.sort(sorted); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlKeyValueFieldsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlKeyValueFieldsTest.java index 74f784825443a..477ca4ad5a2c5 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlKeyValueFieldsTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlKeyValueFieldsTest.java @@ -94,7 +94,7 @@ public class IgniteSqlKeyValueFieldsTest extends AbstractIndexingCommonTest { ccfgs.add(buildCacheConfiguration(CACHE_JOB)); ccfgs.add(buildCacheConfiguration(CACHE_SQL)); - c.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + c.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); return c; } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java index 9abd807a5c5af..a8baa18a00302 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java @@ -118,7 +118,7 @@ public class IgniteSqlNotNullConstraintTest extends AbstractIndexingCommonTest { if (gridName.equals(INTERCEPTOR_CFG_NODE_NAME)) ccfgs.add(buildCacheConfigurationRestricted("BadCfgTestCacheINT", false, true, true)); - c.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + c.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); if (gridName.equals(NODE_CLIENT)) { // Not allowed to have local cache on client without memory config diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java index 0c7b98e7c3cbb..d20d380502ca8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java @@ -87,7 +87,7 @@ public class IgniteSqlRoutingTest extends AbstractIndexingCommonTest { ccfgs.add(buildCacheConfiguration(CACHE_PERSON)); ccfgs.add(buildCacheConfiguration(CACHE_CALL)); - c.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + c.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); c.setCacheKeyConfiguration(new CacheKeyConfiguration(CallKey.class)); c.setIncludeEventTypes(EventType.EVTS_ALL); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java index 55e038af78f50..02e0a66a7839b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java @@ -75,7 +75,7 @@ public class IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest extends AbstractIndexin ccfgs.add(buildCacheConfiguration(CACHE_REPORT)); ccfgs.add(buildCacheConfiguration(CACHE_LIST)); - c.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + c.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); return c; } diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java index 7440759e3f32b..e8b1f51965990 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java @@ -95,7 +95,7 @@ public class IgniteSqlSkipReducerOnUpdateDmlSelfTest extends AbstractIndexingCom ccfgs.add(buildCacheConfiguration(CACHE_PERSON)); ccfgs.add(buildCacheConfiguration(CACHE_POSITION)); - c.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); + c.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[0])); c.setSqlConfiguration(new SqlConfiguration().setLongQueryWarningTimeout(10000)); c.setIncludeEventTypes(EventType.EVTS_ALL); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/TableStatisticsAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/TableStatisticsAbstractTest.java index ff7b7d6cf0193..b453ae72c2e12 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/TableStatisticsAbstractTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/TableStatisticsAbstractTest.java @@ -23,6 +23,7 @@ import java.util.regex.Pattern; import org.apache.ignite.Ignite; import org.apache.ignite.cache.query.SqlFieldsQuery; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -61,7 +62,7 @@ protected void checkOptimalPlanChosenForDifferentJoinOrders(Ignite grid, String Collections.reverse(dirOrdTbls); - String reversedOrder = replaceTablePlaceholders(sql, dirOrdTbls.toArray(new String[dirOrdTbls.size()])); + String reversedOrder = replaceTablePlaceholders(sql, dirOrdTbls.toArray(U.EMPTY_STRS)); if (log.isDebugEnabled()) log.debug("Reversed join order=" + reversedOrder); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsAbstractTest.java index 7d2823c861561..f25a7ab97e593 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsAbstractTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsAbstractTest.java @@ -153,7 +153,7 @@ protected void checkOptimalPlanChosenForDifferentJoinOrders(Ignite grid, String Collections.reverse(dirOrdTbls); - String reversedOrder = replaceTablePlaceholders(sql, dirOrdTbls.toArray(new String[dirOrdTbls.size()])); + String reversedOrder = replaceTablePlaceholders(sql, dirOrdTbls.toArray(U.EMPTY_STRS)); if (log.isDebugEnabled()) log.debug("Reversed join order=" + reversedOrder); @@ -200,7 +200,7 @@ protected String[] runLocalExplainIdx(Ignite grid, String sql) { while (m.find()) result.add(m.group(1).trim()); - return result.toArray(new String[result.size()]); + return result.toArray(U.EMPTY_STRS); } /** diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/gmm/GmmTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/gmm/GmmTrainer.java index 3e47b81dd748b..736dcbd730ca8 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/clustering/gmm/GmmTrainer.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/clustering/gmm/GmmTrainer.java @@ -178,7 +178,7 @@ public GmmTrainer withInitialCountOfComponents(int numberOfComponents) { public GmmTrainer withInitialMeans(List means) { A.notEmpty(means, "GMM should start with non empty initial components list"); - this.initialMeans = means.toArray(new Vector[means.size()]); + this.initialMeans = means.toArray(new Vector[0]); this.countOfComponents = means.size(); if (countOfComponents > maxCountOfClusters) maxCountOfClusters = countOfComponents; diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/junit/X.java b/modules/tools/src/main/java/org/apache/ignite/tools/junit/X.java index e696cd9f49007..f440a96f1ac7c 100644 --- a/modules/tools/src/main/java/org/apache/ignite/tools/junit/X.java +++ b/modules/tools/src/main/java/org/apache/ignite/tools/junit/X.java @@ -306,7 +306,7 @@ private static List getThrowableList(Throwable throwable) { private static Throwable[] getThrowables(Throwable throwable) { List list = getThrowableList(throwable); - return list.toArray(new Throwable[list.size()]); + return list.toArray(new Throwable[0]); } /** diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java index 2cb21441c1ce2..6ef23f12a3b74 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.IgniteSpiException; /** @@ -79,7 +80,7 @@ public static ClassLoader create(ClassLoader parent, File file, IgniteLogger log } } - return new GridUriDeploymentClassLoader(urls.toArray(new URL[urls.size()]), parent); + return new GridUriDeploymentClassLoader(urls.toArray(U.EMPTY_URL_ARR), parent); } catch (MalformedURLException e) { throw new IgniteSpiException("Failed to create class loader for a package: " + file, e); diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentJarVerifier.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentJarVerifier.java index 320bdc533947f..e9e2e4b4d5fc0 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentJarVerifier.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentJarVerifier.java @@ -391,7 +391,7 @@ private static Certificate[] getCertificates(JarEntry entry) { certChains.addAll(signer.getSignerCertPath().getCertificates()); // Convert into a Certificate[] - return certChains.toArray(new Certificate[certChains.size()]); + return certChains.toArray(new Certificate[0]); } return certs; diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java index 2639cc62c1a43..9c50c397769ed 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java @@ -1124,7 +1124,7 @@ private void newUnitReceived(GridUriDeploymentUnitDescriptor newDesc, Collection if (clss != null && !clss.isEmpty()) { try { - addResources(newDesc.getClassLoader(), newDesc, clss.toArray(new Class[clss.size()])); + addResources(newDesc.getClassLoader(), newDesc, clss.toArray(new Class[0])); } catch (IgniteSpiException e) { U.warn(log, "Failed to register a class loader for a package [newDesc=" + newDesc + diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java index 2010f91731249..bec1477621a7c 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java @@ -266,7 +266,7 @@ protected void setId(String id) { if (!isValid) throw new IllegalStateException("Call on invalidated session!"); - return attrs.keySet().toArray(new String[attrs.size()]); + return attrs.keySet().toArray(U.EMPTY_STRS); } /** {@inheritDoc} */ diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java index 23185697224af..1e88cc03dbc3f 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java @@ -268,7 +268,7 @@ private Set attributeNames() { final Set names = attributeNames(); - return names.toArray(new String[names.size()]); + return names.toArray(U.EMPTY_STRS); } /** {@inheritDoc} */