This is an automated email from the ASF dual-hosted git repository. mmuzaf pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push: new 757fba8 IGNITE-12947: Add support for MethodParamPad to the checkstyle (#7729) 757fba8 is described below commit 757fba823b338b5b35d297637476384e9ef97130 Author: Nikita Amelchev <nsamelc...@gmail.com> AuthorDate: Sun Apr 26 22:53:03 2020 +0300 IGNITE-12947: Add support for MethodParamPad to the checkstyle (#7729) --- checkstyle/checkstyle-suppressions.xml | 4 +- checkstyle/checkstyle.xml | 7 ++ .../java/org/apache/ignite/internal/GridTopic.java | 2 +- .../managers/communication/GridIoManager.java | 2 +- .../internal/pagemem/wal/record/WALRecord.java | 120 ++++++++++----------- .../pagemem/PagesWriteThrottlePolicy.java | 4 +- .../processors/metric/impl/MetricUtils.java | 2 +- .../processors/platform/client/ClientFlag.java | 2 +- .../processors/platform/client/ClientStatus.java | 2 +- .../platform/messaging/PlatformMessaging.java | 2 +- .../affinity/PartitionResultMarshaler.java | 2 +- .../apache/ignite/internal/util/GridUnsafe.java | 4 +- .../util/tostring/CircularStringBuilder.java | 2 +- .../test/java/org/apache/ignite/GridTestTask.java | 2 +- .../RendezvousAffinityFunctionSimpleBenchmark.java | 2 +- .../internal/binary/BinaryEnumsSelfTest.java | 8 +- .../IgniteAbstractTxSuspendResumeTest.java | 2 +- .../cache/transactions/TxOnCachesStopTest.java | 2 +- .../util/tostring/GridToStringBuilderSelfTest.java | 2 +- .../communication/GridIoManagerBenchmark.java | 4 +- .../messaging/IgniteMessagingSendAsyncTest.java | 10 +- .../ignite/p2p/GridP2PLocalDeploymentSelfTest.java | 10 +- .../internal/processors/query/h2/H2Utils.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 8 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +- .../cache/IgniteCacheUpdateSqlQuerySelfTest.java | 2 +- .../ignite/yardstick/upload/InsertBenchmark.java | 2 +- 27 files changed, 111 insertions(+), 104 deletions(-) diff --git a/checkstyle/checkstyle-suppressions.xml b/checkstyle/checkstyle-suppressions.xml index 3f593f9..166967b 100644 --- a/checkstyle/checkstyle-suppressions.xml +++ b/checkstyle/checkstyle-suppressions.xml @@ -21,7 +21,7 @@ "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd"> <suppressions> - <suppress checks="EmptyLineSeparator" files="BCrypt\.java|ConcurrentLinkedDeque8\.java"/> + <suppress checks="EmptyLineSeparator|MethodParamPad" files="BCrypt\.java|ConcurrentLinkedDeque8\.java"/> - <suppress checks="EmptyLineSeparator" files="XGBoostModelLexer\.java|XGBoostModelParser\.java"/> + <suppress checks="EmptyLineSeparator|MethodParamPad" files="XGBoostModelLexer\.java|XGBoostModelParser\.java"/> </suppressions> diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml index 1fee7cd..a14b4c2 100644 --- a/checkstyle/checkstyle.xml +++ b/checkstyle/checkstyle.xml @@ -68,5 +68,12 @@ <!-- @Override annotations on the same line with a method declaration check. --> <module name="org.apache.ignite.tools.checkstyle.OverrideAnnotationOnTheSameLineCheck"/> + + <!-- + Checks the padding between the identifier of a method definition, constructor definition, method call, or + constructor invocation; and the left parenthesis of the parameter list. + See: https://checkstyle.sourceforge.io/config_whitespace.html#MethodParamPad + --> + <module name="MethodParamPad"/> </module> </module> diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java index a76ce4a..1110091 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java @@ -627,7 +627,7 @@ public enum GridTopic { /** {@inheritDoc} */ @Override public int hashCode() { - return topic.ordinal() + id1.hashCode () + (int)(id2 ^ (id2 >>> 32)); + return topic.ordinal() + id1.hashCode() + (int)(id2 ^ (id2 >>> 32)); } /** {@inheritDoc} */ 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 9f35c06..037f808 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 @@ -3168,7 +3168,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa syncMeta = (TransmissionMeta)in.readObject(); } catch (ClassNotFoundException e) { - throw new IgniteException (e); + throw new IgniteException(e); } return syncMeta; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java index 4758dc5..21388bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java @@ -39,126 +39,126 @@ public abstract class WALRecord { */ public enum RecordType { /** */ - TX_RECORD (0, LOGICAL), + TX_RECORD(0, LOGICAL), /** */ - PAGE_RECORD (1, PHYSICAL), + PAGE_RECORD(1, PHYSICAL), /** */ - DATA_RECORD (2, LOGICAL), + DATA_RECORD(2, LOGICAL), /** Checkpoint (begin) record */ - CHECKPOINT_RECORD (3, PHYSICAL), + CHECKPOINT_RECORD(3, PHYSICAL), /** WAL segment header record. */ - HEADER_RECORD (4, INTERNAL), + HEADER_RECORD(4, INTERNAL), // Delta records. /** */ - INIT_NEW_PAGE_RECORD (5, PHYSICAL), + INIT_NEW_PAGE_RECORD(5, PHYSICAL), /** */ - DATA_PAGE_INSERT_RECORD (6, PHYSICAL), + DATA_PAGE_INSERT_RECORD(6, PHYSICAL), /** */ - DATA_PAGE_INSERT_FRAGMENT_RECORD (7, PHYSICAL), + DATA_PAGE_INSERT_FRAGMENT_RECORD(7, PHYSICAL), /** */ - DATA_PAGE_REMOVE_RECORD (8, PHYSICAL), + DATA_PAGE_REMOVE_RECORD(8, PHYSICAL), /** */ - DATA_PAGE_SET_FREE_LIST_PAGE (9, PHYSICAL), + DATA_PAGE_SET_FREE_LIST_PAGE(9, PHYSICAL), /** */ - BTREE_META_PAGE_INIT_ROOT (10, PHYSICAL), + BTREE_META_PAGE_INIT_ROOT(10, PHYSICAL), /** */ - BTREE_META_PAGE_ADD_ROOT (11, PHYSICAL), + BTREE_META_PAGE_ADD_ROOT(11, PHYSICAL), /** */ - BTREE_META_PAGE_CUT_ROOT (12, PHYSICAL), + BTREE_META_PAGE_CUT_ROOT(12, PHYSICAL), /** */ - BTREE_INIT_NEW_ROOT (13, PHYSICAL), + BTREE_INIT_NEW_ROOT(13, PHYSICAL), /** */ - BTREE_PAGE_RECYCLE (14, PHYSICAL), + BTREE_PAGE_RECYCLE(14, PHYSICAL), /** */ - BTREE_PAGE_INSERT (15, PHYSICAL), + BTREE_PAGE_INSERT(15, PHYSICAL), /** */ - BTREE_FIX_LEFTMOST_CHILD (16, PHYSICAL), + BTREE_FIX_LEFTMOST_CHILD(16, PHYSICAL), /** */ - BTREE_FIX_COUNT (17, PHYSICAL), + BTREE_FIX_COUNT(17, PHYSICAL), /** */ - BTREE_PAGE_REPLACE (18, PHYSICAL), + BTREE_PAGE_REPLACE(18, PHYSICAL), /** */ - BTREE_PAGE_REMOVE (19, PHYSICAL), + BTREE_PAGE_REMOVE(19, PHYSICAL), /** */ - BTREE_PAGE_INNER_REPLACE (20, PHYSICAL), + BTREE_PAGE_INNER_REPLACE(20, PHYSICAL), /** */ - BTREE_FIX_REMOVE_ID (21, PHYSICAL), + BTREE_FIX_REMOVE_ID(21, PHYSICAL), /** */ - BTREE_FORWARD_PAGE_SPLIT (22, PHYSICAL), + BTREE_FORWARD_PAGE_SPLIT(22, PHYSICAL), /** */ - BTREE_EXISTING_PAGE_SPLIT (23, PHYSICAL), + BTREE_EXISTING_PAGE_SPLIT(23, PHYSICAL), /** */ - BTREE_PAGE_MERGE (24, PHYSICAL), + BTREE_PAGE_MERGE(24, PHYSICAL), /** */ - PAGES_LIST_SET_NEXT (25, PHYSICAL), + PAGES_LIST_SET_NEXT(25, PHYSICAL), /** */ - PAGES_LIST_SET_PREVIOUS (26, PHYSICAL), + PAGES_LIST_SET_PREVIOUS(26, PHYSICAL), /** */ - PAGES_LIST_INIT_NEW_PAGE (27, PHYSICAL), + PAGES_LIST_INIT_NEW_PAGE(27, PHYSICAL), /** */ - PAGES_LIST_ADD_PAGE (28, PHYSICAL), + PAGES_LIST_ADD_PAGE(28, PHYSICAL), /** */ - PAGES_LIST_REMOVE_PAGE (29, PHYSICAL), + PAGES_LIST_REMOVE_PAGE(29, PHYSICAL), /** */ - META_PAGE_INIT (30, PHYSICAL), + META_PAGE_INIT(30, PHYSICAL), /** */ - PARTITION_META_PAGE_UPDATE_COUNTERS (31, PHYSICAL), + PARTITION_META_PAGE_UPDATE_COUNTERS(31, PHYSICAL), /** Memory recovering start marker */ - MEMORY_RECOVERY (32), + MEMORY_RECOVERY(32), /** */ - TRACKING_PAGE_DELTA (33, PHYSICAL), + TRACKING_PAGE_DELTA(33, PHYSICAL), /** Meta page update last successful snapshot id. */ - META_PAGE_UPDATE_LAST_SUCCESSFUL_SNAPSHOT_ID (34, MIXED), + META_PAGE_UPDATE_LAST_SUCCESSFUL_SNAPSHOT_ID(34, MIXED), /** Meta page update last successful full snapshot id. */ - META_PAGE_UPDATE_LAST_SUCCESSFUL_FULL_SNAPSHOT_ID (35, MIXED), + META_PAGE_UPDATE_LAST_SUCCESSFUL_FULL_SNAPSHOT_ID(35, MIXED), /** Meta page update next snapshot id. */ - META_PAGE_UPDATE_NEXT_SNAPSHOT_ID (36, MIXED), + META_PAGE_UPDATE_NEXT_SNAPSHOT_ID(36, MIXED), /** Meta page update last allocated index. */ - META_PAGE_UPDATE_LAST_ALLOCATED_INDEX (37, MIXED), + META_PAGE_UPDATE_LAST_ALLOCATED_INDEX(37, MIXED), /** Partition meta update state. */ - PART_META_UPDATE_STATE (38, MIXED), + PART_META_UPDATE_STATE(38, MIXED), /** Page list meta reset count record. */ - PAGE_LIST_META_RESET_COUNT_RECORD (39, PHYSICAL), + PAGE_LIST_META_RESET_COUNT_RECORD(39, PHYSICAL), /** Switch segment record. * Marker record for indicate end of segment. @@ -167,61 +167,61 @@ public abstract class WALRecord { * that one byte in the end,then we write SWITCH_SEGMENT_RECORD as marker end of segment. * No need write CRC or WAL pointer for this record. It is byte marker record. * */ - SWITCH_SEGMENT_RECORD (40, INTERNAL), + SWITCH_SEGMENT_RECORD(40, INTERNAL), /** */ - DATA_PAGE_UPDATE_RECORD (41, PHYSICAL), + DATA_PAGE_UPDATE_RECORD(41, PHYSICAL), /** init */ - BTREE_META_PAGE_INIT_ROOT2 (42, PHYSICAL), + BTREE_META_PAGE_INIT_ROOT2(42, PHYSICAL), /** Partition destroy. */ - PARTITION_DESTROY (43, PHYSICAL), + PARTITION_DESTROY(43, PHYSICAL), /** Snapshot record. */ - SNAPSHOT (44), + SNAPSHOT(44), /** Metastore data record. */ - METASTORE_DATA_RECORD (45, LOGICAL), + METASTORE_DATA_RECORD(45, LOGICAL), /** Exchange record. */ - EXCHANGE (46), + EXCHANGE(46), /** Reserved for future record. */ - RESERVED (47), + RESERVED(47), /** Rotated id part record. */ - ROTATED_ID_PART_RECORD (48, PHYSICAL), + ROTATED_ID_PART_RECORD(48, PHYSICAL), /** */ - MVCC_DATA_PAGE_MARK_UPDATED_RECORD (49, PHYSICAL), + MVCC_DATA_PAGE_MARK_UPDATED_RECORD(49, PHYSICAL), /** */ - MVCC_DATA_PAGE_TX_STATE_HINT_UPDATED_RECORD (50, PHYSICAL), + MVCC_DATA_PAGE_TX_STATE_HINT_UPDATED_RECORD(50, PHYSICAL), /** */ - MVCC_DATA_PAGE_NEW_TX_STATE_HINT_UPDATED_RECORD (51, PHYSICAL), + MVCC_DATA_PAGE_NEW_TX_STATE_HINT_UPDATED_RECORD(51, PHYSICAL), /** Encrypted WAL-record. */ - ENCRYPTED_RECORD (52, PHYSICAL), + ENCRYPTED_RECORD(52, PHYSICAL), /** Ecnrypted data record. */ - ENCRYPTED_DATA_RECORD (53, LOGICAL), + ENCRYPTED_DATA_RECORD(53, LOGICAL), /** Mvcc data record. */ - MVCC_DATA_RECORD (54, LOGICAL), + MVCC_DATA_RECORD(54, LOGICAL), /** Mvcc Tx state change record. */ - MVCC_TX_RECORD (55, LOGICAL), + MVCC_TX_RECORD(55, LOGICAL), /** Consistent cut record. */ - CONSISTENT_CUT (56), + CONSISTENT_CUT(56), /** Rollback tx record. */ - ROLLBACK_TX_RECORD (57, LOGICAL), + ROLLBACK_TX_RECORD(57, LOGICAL), /** Partition meta page containing update counter gaps. */ - PARTITION_META_PAGE_UPDATE_COUNTERS_V2 (58, PHYSICAL), + PARTITION_META_PAGE_UPDATE_COUNTERS_V2(58, PHYSICAL), /** Init root meta page (with flags and created version) */ BTREE_META_PAGE_INIT_ROOT_V3(59, PHYSICAL), @@ -230,7 +230,7 @@ public abstract class WALRecord { MASTER_KEY_CHANGE_RECORD(60, LOGICAL), /** Record that indicates that "corrupted" flag should be removed from tracking page. */ - TRACKING_PAGE_REPAIR_DELTA (61, PHYSICAL); + TRACKING_PAGE_REPAIR_DELTA(61, PHYSICAL); /** Index for serialization. Should be consistent throughout all versions. */ private final int idx; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottlePolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottlePolicy.java index 9b68acd..23db7e0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottlePolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottlePolicy.java @@ -27,8 +27,8 @@ import static org.apache.ignite.IgniteSystemProperties.IGNITE_THROTTLE_LOG_THRES */ public interface PagesWriteThrottlePolicy { /** Max park time. */ - public long LOGGING_THRESHOLD = TimeUnit.SECONDS.toNanos(IgniteSystemProperties.getInteger - (IGNITE_THROTTLE_LOG_THRESHOLD, 10)); + public long LOGGING_THRESHOLD = TimeUnit.SECONDS.toNanos( + IgniteSystemProperties.getInteger(IGNITE_THROTTLE_LOG_THRESHOLD, 10)); /** * Callback to apply throttling delay. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/impl/MetricUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/impl/MetricUtils.java index 39dff4a..ab64a47 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/impl/MetricUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/impl/MetricUtils.java @@ -63,7 +63,7 @@ public class MetricUtils { * @return Array consist of registry name and metric name. */ public static T2<String, String> fromFullName(String name) { - return new T2<> ( + return new T2<>( name.substring(0, name.lastIndexOf(SEPARATOR)), name.substring(name.lastIndexOf(SEPARATOR) + 1) ); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientFlag.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientFlag.java index 33003eb..0471339 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientFlag.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientFlag.java @@ -24,7 +24,7 @@ public class ClientFlag { /** * No-op constructor to prevent instantiation. */ - private ClientFlag () { + private ClientFlag() { // No-op. } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientStatus.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientStatus.java index 8c421cf..f5c7886 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientStatus.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientStatus.java @@ -24,7 +24,7 @@ public final class ClientStatus { /** * No-op constructor to prevent instantiation. */ - private ClientStatus (){ + private ClientStatus() { // No-op. } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java index 0d176e9..2fc045a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/messaging/PlatformMessaging.java @@ -201,7 +201,7 @@ public class PlatformMessaging extends PlatformAbstractTarget { if (messaging.isAsync()) return this; - return new PlatformMessaging (platformCtx, messaging.withAsync()); + return new PlatformMessaging(platformCtx, messaging.withAsync()); } return super.processOutObject(type); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResultMarshaler.java b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResultMarshaler.java index 7b52a97..c01658d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResultMarshaler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResultMarshaler.java @@ -269,7 +269,7 @@ public class PartitionResultMarshaler { int idx = reader.readInt(); - PartitionParameterType clientType = PartitionParameterType.fromOrdinal (reader.readInt()); + PartitionParameterType clientType = PartitionParameterType.fromOrdinal(reader.readInt()); return new PartitionParameterNode(null, null, idx, -1, clientType); } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java index 2197c7f..f496ad9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUnsafe.java @@ -1527,8 +1527,8 @@ public abstract class GridUnsafe { } catch (SecurityException ignored) { try { - return AccessController.doPrivileged - (new PrivilegedExceptionAction<Unsafe>() { + return AccessController.doPrivileged( + new PrivilegedExceptionAction<Unsafe>() { @Override public Unsafe run() throws Exception { Field f = Unsafe.class.getDeclaredField("theUnsafe"); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/CircularStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/CircularStringBuilder.java index 856da80..3107116 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/CircularStringBuilder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/CircularStringBuilder.java @@ -41,7 +41,7 @@ public class CircularStringBuilder { * * @param capacity Capacity. */ - CircularStringBuilder (int capacity) { + CircularStringBuilder(int capacity) { assert capacity > 0 : "Can't allocate CircularStringBuilder with capacity: " + capacity; value = new char[capacity]; diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestTask.java b/modules/core/src/test/java/org/apache/ignite/GridTestTask.java index ceae2c8..dcfac9c 100644 --- a/modules/core/src/test/java/org/apache/ignite/GridTestTask.java +++ b/modules/core/src/test/java/org/apache/ignite/GridTestTask.java @@ -40,7 +40,7 @@ public class GridTestTask extends ComputeTaskSplitAdapter<Object, Object> { */ CountDownLatch latch; - public GridTestTask (CountDownLatch latch) { + public GridTestTask(CountDownLatch latch) { super(); this.latch = latch; } diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java index 097051a..fd2ad57 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java @@ -589,7 +589,7 @@ public class RendezvousAffinityFunctionSimpleBenchmark extends GridCommonAbstrac List<Integer> structure1 = structureOf(assignPartitions(aff1, nodes, null, backups, 0).get2()); - assertEquals (structure0, structure1); + assertEquals(structure0, structure1); } } 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 ea26f2d..6140c9c 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 @@ -474,7 +474,7 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest { public void testEnumWrongBinaryConfig() throws Exception { this.register = true; - GridTestUtils.assertThrows(log, new Callable<Object> () { + GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { startGrid(WRONG_CONF_NODE_NAME); @@ -492,7 +492,7 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest { public void testEnumValidation() throws Exception { startUp(false); - GridTestUtils.assertThrows(log, new Callable<Object> () { + GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -519,7 +519,7 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest { node1.binary().registerEnum(enumName, F.asMap(EnumType.ONE.name(), EnumType.ONE.ordinal())); - GridTestUtils.assertThrows(log, new Callable<Object> () { + GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -530,7 +530,7 @@ public class BinaryEnumsSelfTest extends GridCommonAbstractTest { } }, BinaryObjectException.class, "Conflicting enum values. Name "); - GridTestUtils.assertThrows(log, new Callable<Object> () { + GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { node2.binary().registerEnum(enumName, diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteAbstractTxSuspendResumeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteAbstractTxSuspendResumeTest.java index 16c0566..55e9170 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteAbstractTxSuspendResumeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteAbstractTxSuspendResumeTest.java @@ -347,7 +347,7 @@ public abstract class IgniteAbstractTxSuspendResumeTest extends GridCommonAbstra } GridTestUtils.runMultiThreaded(new CI1<Integer>() { - @Override public void apply (Integer idx) { + @Override public void apply(Integer idx) { Transaction tx = clientTxs.get(idx); assertEquals(SUSPENDED, tx.state()); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java index 1db5053..822ba59 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOnCachesStopTest.java @@ -445,7 +445,7 @@ public class TxOnCachesStopTest extends GridCommonAbstractTest { * @param isolation Transaction isolation. * @return TxLoad future. */ - private IgniteInternalFuture startTxLoad ( + private IgniteInternalFuture startTxLoad( final AtomicBoolean stopTxLoad, final AtomicInteger cacheIdxToBeDestroyed, final List<Ignite> clients, diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java index c9dc08f..c09d349 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/tostring/GridToStringBuilderSelfTest.java @@ -67,7 +67,7 @@ public class GridToStringBuilderSelfTest extends GridCommonAbstractTest { log.info(obj.toStringManual()); log.info(obj.toStringAutomatic()); - assertEquals (obj.toStringManual(), obj.toStringAutomatic()); + assertEquals(obj.toStringManual(), obj.toStringAutomatic()); } /** diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java index d32b20d..11045de 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark.java @@ -194,8 +194,8 @@ public class GridIoManagerBenchmark { try { X.println("Saving results to output file: " + outputFilename); - appendLineToFile(outputFilename, "%s,%d", GridLoadTestUtils.DATE_TIME_FORMAT.format(new Date - ()), qpsAvg.get()); + appendLineToFile(outputFilename, "%s,%d", GridLoadTestUtils.DATE_TIME_FORMAT.format( + new Date()), qpsAvg.get()); } catch (IOException e) { X.println("Failed to record results to a file: " + e.getMessage()); diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java index b647b6a..2ea6300 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingSendAsyncTest.java @@ -64,7 +64,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme public void testSendDefaultMode() throws Exception { Ignite ignite1 = startGrid(1); - send(ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread> () { + send(ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread>() { @Override public void apply(String msg, Thread thread) { Assert.assertEquals(Thread.currentThread(), thread); Assert.assertEquals(msgStr, msg); @@ -81,7 +81,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme public void testSendAsyncMode() throws Exception { Ignite ignite1 = startGrid(1); - send(ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread> () { + send(ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread>() { @Override public void apply(String msg, Thread thread) { Assert.assertTrue(!Thread.currentThread().equals(thread)); Assert.assertEquals(msgStr, msg); @@ -99,7 +99,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); - sendWith2Nodes(ignite2, ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread> () { + sendWith2Nodes(ignite2, ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread>() { @Override public void apply(String msg, Thread thread) { Assert.assertEquals(Thread.currentThread(), thread); Assert.assertEquals(msgStr, msg); @@ -117,7 +117,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme Ignite ignite1 = startGrid(1); Ignite ignite2 = startGrid(2); - sendWith2Nodes(ignite2, ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread> () { + sendWith2Nodes(ignite2, ignite1.message(), msgStr, new IgniteBiInClosure<String, Thread>() { @Override public void apply(String msg, Thread thread) { Assert.assertTrue(!Thread.currentThread().equals(thread)); Assert.assertEquals(msgStr, msg); @@ -136,7 +136,7 @@ public class IgniteMessagingSendAsyncTest extends GridCommonAbstractTest impleme final List<String> msgs = orderedMessages(); - sendOrdered(ignite1.message(), msgs, new IgniteBiInClosure< List<String>, List<Thread>> () { + sendOrdered(ignite1.message(), msgs, new IgniteBiInClosure< List<String>, List<Thread>>() { @Override public void apply(List<String> received, List<Thread> threads) { assertFalse(threads.contains(Thread.currentThread())); assertTrue(msgs.equals(received)); diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java index 3c8adb4..6b2dbd4 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PLocalDeploymentSelfTest.java @@ -117,11 +117,11 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { Ignite ignite3 = startGrid(3); ClassLoader ldr1 = new URLClassLoader( - new URL[] {new URL ( GridTestProperties.getProperty("p2p.uri.cls")) }, getClass().getClassLoader()); + new URL[] {new URL(GridTestProperties.getProperty("p2p.uri.cls"))}, getClass().getClassLoader()); ClassLoader ldr2 = new URLClassLoader( - new URL[] {new URL ( GridTestProperties.getProperty("p2p.uri.cls")) }, getClass().getClassLoader()); + new URL[] {new URL(GridTestProperties.getProperty("p2p.uri.cls"))}, getClass().getClassLoader()); ClassLoader ldr3 = new URLClassLoader( - new URL[] {new URL ( GridTestProperties.getProperty("p2p.uri.cls")) }, getClass().getClassLoader()); + new URL[] {new URL(GridTestProperties.getProperty("p2p.uri.cls"))}, getClass().getClassLoader()); Class taskCls = ldr1.loadClass("org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"); @@ -158,9 +158,9 @@ public class GridP2PLocalDeploymentSelfTest extends GridCommonAbstractTest { Ignite ignite2 = startGrid(2); ClassLoader ldr1 = new URLClassLoader( - new URL[] {new URL ( GridTestProperties.getProperty("p2p.uri.cls")) }, getClass().getClassLoader()); + new URL[] {new URL(GridTestProperties.getProperty("p2p.uri.cls"))}, getClass().getClassLoader()); ClassLoader ldr2 = new URLClassLoader( - new URL[] {new URL ( GridTestProperties.getProperty("p2p.uri.cls")) }, getClass().getClassLoader()); + new URL[] {new URL(GridTestProperties.getProperty("p2p.uri.cls"))}, getClass().getClassLoader()); Class task1 = ldr1.loadClass("org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"); Class task2 = ldr2.loadClass("org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"); diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java index 6a69c30..fcd27ce 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java @@ -534,8 +534,8 @@ public class H2Utils { */ @SuppressWarnings("unchecked") public static QueryCursorImpl<List<?>> zeroCursor() { - QueryCursorImpl<List<?>> resCur = (QueryCursorImpl<List<?>>)new QueryCursorImpl(Collections.singletonList - (Collections.singletonList(0L)), null, false, false); + QueryCursorImpl<List<?>> resCur = (QueryCursorImpl<List<?>>)new QueryCursorImpl(Collections.singletonList( + Collections.singletonList(0L)), null, false, false); resCur.fieldsMeta(UPDATE_RESULT_META); diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 8ad1814..6a19359 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -2666,8 +2666,8 @@ public class IgniteH2Indexing implements GridQueryIndexing { for (UpdateResult res : ress) { res.throwIfError(); - QueryCursorImpl<List<?>> resCur = (QueryCursorImpl<List<?>>)new QueryCursorImpl(singletonList - (singletonList(res.counter())), cancel, false, false); + QueryCursorImpl<List<?>> resCur = (QueryCursorImpl<List<?>>)new QueryCursorImpl(singletonList( + singletonList(res.counter())), cancel, false, false); resCur.fieldsMeta(UPDATE_RESULT_META); @@ -2688,8 +2688,8 @@ public class IgniteH2Indexing implements GridQueryIndexing { res.throwIfError(); - QueryCursorImpl<List<?>> resCur = (QueryCursorImpl<List<?>>)new QueryCursorImpl(singletonList - (singletonList(res.counter())), cancel, false, false); + QueryCursorImpl<List<?>> resCur = (QueryCursorImpl<List<?>>)new QueryCursorImpl(singletonList( + singletonList(res.counter())), cancel, false, false); resCur.fieldsMeta(UPDATE_RESULT_META); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java index d44df57..efb02f2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java @@ -583,7 +583,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA * @param fldsQry Query. * @throws Exception if failed. */ - private void doTestExecute (IgniteCache<?, ?> cache, SqlFieldsQuery fldsQry) throws Exception { + private void doTestExecute(IgniteCache<?, ?> cache, SqlFieldsQuery fldsQry) throws Exception { QueryCursor<List<?>> qry = cache.query(fldsQry); List<List<?>> res = new ArrayList<>(qry.getAll()); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUpdateSqlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUpdateSqlQuerySelfTest.java index a48b37c..95925ff 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUpdateSqlQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUpdateSqlQuerySelfTest.java @@ -196,7 +196,7 @@ public class IgniteCacheUpdateSqlQuerySelfTest extends IgniteCacheAbstractSqlDml cache.query(new SqlFieldsQuery("INSERT INTO \"AllTypes\" (_key, _val) VALUES(2, ?)") .setArgs(new AllTypes(2L))).getAll(); - cache.query (new SqlFieldsQuery( + cache.query(new SqlFieldsQuery( "UPDATE \"AllTypes\" " + "SET " + "\"dateCol\" = '2016-11-30 12:00:00', " + diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/InsertBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/InsertBenchmark.java index ecf5412..0dfd8ef 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/InsertBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/upload/InsertBenchmark.java @@ -40,7 +40,7 @@ public class InsertBenchmark extends AbstractUploadBenchmark { /** * Sequence of single inserts. */ - @Override public void upload (Connection uploadConn) throws Exception { + @Override public void upload(Connection uploadConn) throws Exception { try (PreparedStatement insert = uploadConn.prepareStatement(queries.insert())) { for (long id = 1; id <= insertRowsCnt; id++) { queries.setRandomInsertArgs(insert, id);