IGNITE-16900 Checkstyle LeftCurly rule added (apache#9999)

Sega76 · May 5, 2022 · de436d6 · de436d6
1 parent 7357847
commit de436d6
Show file tree

Hide file tree

Showing 197 changed files with 767 additions and 644 deletions.
diff --git 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|MethodParamPad|SingleSpaceSeparator"
+    <suppress checks="LeftCurly|EmptyLineSeparator|MethodParamPad|SingleSpaceSeparator"
               files="BCrypt\.java|ConcurrentLinkedDeque8\.java"/>
     <suppress checks="NoWhitespaceBefore" files="ConcurrentLinkedHashMap\.java"/>
     <suppress checks="LineLength"

diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
@@ -185,6 +185,8 @@
         </module>
 
         <module name="Indentation" />
+
+        <module name="LeftCurly"/>
     </module>
 
     <!--

diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/util/MLSandboxDatasets.java b/examples/src/main/java/org/apache/ignite/examples/ml/util/MLSandboxDatasets.java
@@ -99,7 +99,9 @@ public enum MLSandboxDatasets {
     }
 
     /** */
-    public String getFileName() { return filename; }
+    public String getFileName() {
+        return filename;
+    }
 
     /** */
     public boolean hasHeader() {

diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java
@@ -762,7 +762,9 @@ private static final class TestEventListener implements IgnitePredicate<Event> {
         /**
          * @param cnt Deploy counter.
          */
-        private TestEventListener(AtomicInteger cnt) { this.cnt = cnt; }
+        private TestEventListener(AtomicInteger cnt) {
+            this.cnt = cnt;
+        }
 
         /** {@inheritDoc} */
         @Override public boolean apply(Event evt) {

diff --git a/...in/java/org/apache/ignite/internal/processors/query/calcite/prepare/BaseQueryContext.java b/...in/java/org/apache/ignite/internal/processors/query/calcite/prepare/BaseQueryContext.java
@@ -116,8 +116,7 @@ public final class BaseQueryContext extends AbstractQueryContext {
             new RelMetadataProvider() {
                 @Override public <M extends Metadata> UnboundMetadata<M> apply(
                     Class<? extends RelNode> relCls,
-                    Class<? extends M> metadataCls)
-                {
+                    Class<? extends M> metadataCls) {
                     throw new AssertionError(cantBeUsedMsg);
                 }
 
@@ -131,7 +130,9 @@ public final class BaseQueryContext extends AbstractQueryContext {
             }
         );
 
-        CLUSTER.setMetadataQuerySupplier(() -> { throw new AssertionError(cantBeUsedMsg); });
+        CLUSTER.setMetadataQuerySupplier(() -> {
+            throw new AssertionError(cantBeUsedMsg);
+        });
     }
 
     /** */

diff --git a/.../java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteTypeCoercion.java b/.../java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteTypeCoercion.java
@@ -48,8 +48,8 @@ public IgniteTypeCoercion(RelDataTypeFactory typeFactory, SqlValidator validator
         SqlValidatorScope scope,
         SqlCall call,
         int idx,
-        RelDataType targetType)
-    {
+        RelDataType targetType
+    ) {
         if (targetType instanceof IgniteCustomType) {
             SqlNode operand = call.getOperandList().get(idx);
 

diff --git a/...e/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/TraitUtils.java b/...e/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/TraitUtils.java
@@ -442,8 +442,7 @@ private static boolean fillRecursive(
         Set<Pair<RelTraitSet, List<RelTraitSet>>> result,
         RelTraitSet[] combination,
         int idx
-    ) throws ControlFlowException
-    {
+    ) throws ControlFlowException {
         boolean processed = false, last = idx == inTraits.size() - 1;
         for (RelTraitSet t : inTraits.get(idx)) {
             assert t.getConvention() == IgniteConvention.INSTANCE;

diff --git a/...a/org/apache/ignite/internal/processors/query/calcite/exec/LogicalRelImplementorTest.java b/...a/org/apache/ignite/internal/processors/query/calcite/exec/LogicalRelImplementorTest.java
@@ -319,8 +319,8 @@ public ScanAwareTable(RelDataType rowType) {
             ColocationGroup grp,
             Predicate<Row> filter,
             Function<Row, Row> transformer,
-            ImmutableBitSet bitSet)
-        {
+            ImmutableBitSet bitSet
+        ) {
             lastScanHasFilter = filter != null;
             lastScanHasProject = transformer != null;
             return Collections.emptyList();

diff --git a/...ts/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java b/...ts/src/test/java/org/apache/ignite/internal/client/util/ClientConsistentHashSelfTest.java
@@ -104,8 +104,16 @@ public void testTreeSetRestrictions() throws Exception {
 
         try {
             // Add several objects with the same hash without neither natural ordering nor comparator.
-            hash.addNode(new Object() { @Override public int hashCode() { return 0; } }, 1);
-            hash.addNode(new Object() { @Override public int hashCode() { return 0; } }, 1);
+            hash.addNode(new Object() {
+                @Override public int hashCode() {
+                    return 0;
+                }
+            }, 1);
+            hash.addNode(new Object() {
+                @Override public int hashCode() {
+                    return 0;
+                }
+            }, 1);
 
             fail("Expects failed due to internal TreeSet requires comparator or natural ordering.");
         }
@@ -122,8 +130,16 @@ public void testTreeSetRestrictions() throws Exception {
         }, null);
 
         // Add several objects with the same hash into consistent hash with explicit comparator.
-        hash.addNode(new Object() { @Override public int hashCode() { return 0; } }, 1);
-        hash.addNode(new Object() { @Override public int hashCode() { return 0; } }, 1);
+        hash.addNode(new Object() {
+            @Override public int hashCode() {
+                return 0;
+            }
+        }, 1);
+        hash.addNode(new Object() {
+            @Override public int hashCode() {
+                return 0;
+            }
+        }, 1);
 
         info("Expected pass due to internal TreeSet has explicit comparator.");
     }

diff --git a/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java b/modules/clients/src/test/java/org/apache/ignite/loadtests/client/ClientCacheBenchmark.java
@@ -136,7 +136,9 @@ private void countAndPrintSummary(Collection<TestThread> workers, long startTime
 
         int thCnt = workers.size();
 
-        for (TestThread t : workers) { total += t.iters; }
+        for (TestThread t : workers) {
+            total += t.iters;
+        }
 
         double timeSpent = ((double)(System.currentTimeMillis() - startTime)) / 1000;
 

diff --git a/...in/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java b/...in/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinder.java
@@ -411,8 +411,7 @@ private void initComputeService() {
             finally {
                 initLatch.countDown();
             }
-        else
-        {
+        else {
             try {
                 U.await(initLatch);
             }

diff --git a/...ntrol-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheViewer.java b/...ntrol-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheViewer.java
@@ -133,7 +133,9 @@ public UUID nodeId() {
         /**
          * @return Output format.
          */
-        public OutputFormat outputFormat() { return outputFormat; }
+        public OutputFormat outputFormat() {
+            return outputFormat;
+        }
 
         /**
          * @return Cache view command.
@@ -145,7 +147,9 @@ public VisorViewCacheCmd cacheCommand() {
         /**
          * @return Full config flag.
          */
-        public boolean fullConfig() { return fullConfig; }
+        public boolean fullConfig() {
+            return fullConfig;
+        }
     }
 
     /** Command parsed arguments */

diff --git a/.../java/org/apache/ignite/internal/commandline/meta/subcommands/MetadataDetailsCommand.java b/.../java/org/apache/ignite/internal/commandline/meta/subcommands/MetadataDetailsCommand.java
@@ -36,8 +36,7 @@
 
 /** */
 public class MetadataDetailsCommand
-    extends MetadataAbstractSubCommand<MetadataTypeArgs, MetadataListResult>
-{
+    extends MetadataAbstractSubCommand<MetadataTypeArgs, MetadataListResult> {
     /** {@inheritDoc} */
     @Override protected String taskName() {
         return MetadataInfoTask.class.getName();

diff --git a/...ain/java/org/apache/ignite/internal/commandline/meta/subcommands/MetadataListCommand.java b/...ain/java/org/apache/ignite/internal/commandline/meta/subcommands/MetadataListCommand.java
@@ -26,8 +26,7 @@
 
 /** */
 public class MetadataListCommand
-    extends MetadataAbstractSubCommand<VoidDto, MetadataListResult>
-{
+    extends MetadataAbstractSubCommand<VoidDto, MetadataListResult> {
     /** {@inheritDoc} */
     @Override protected String taskName() {
         return MetadataInfoTask.class.getName();

diff --git a/...n/java/org/apache/ignite/internal/commandline/meta/subcommands/MetadataUpdateCommand.java b/...n/java/org/apache/ignite/internal/commandline/meta/subcommands/MetadataUpdateCommand.java
@@ -32,8 +32,7 @@
 
 /** */
 public class MetadataUpdateCommand
-    extends MetadataAbstractSubCommand<MetadataMarshalled, MetadataMarshalled>
-{
+    extends MetadataAbstractSubCommand<MetadataMarshalled, MetadataMarshalled> {
     /** Output file name. */
     public static final String IN_FILE_NAME = "--in";
 

diff --git a/.../java/org/apache/ignite/internal/commandline/property/subcommands/PropertyGetCommand.java b/.../java/org/apache/ignite/internal/commandline/property/subcommands/PropertyGetCommand.java
@@ -25,8 +25,7 @@
 import org.apache.ignite.internal.commandline.property.tasks.PropertyTask;
 
 /** */
-public class PropertyGetCommand extends PropertyAbstractSubCommand<PropertyArgs, PropertyOperationResult>
-{
+public class PropertyGetCommand extends PropertyAbstractSubCommand<PropertyArgs, PropertyOperationResult> {
     /** {@inheritDoc} */
     @Override protected String taskName() {
         return PropertyTask.class.getName();

diff --git a/...java/org/apache/ignite/internal/commandline/property/subcommands/PropertyListCommand.java b/...java/org/apache/ignite/internal/commandline/property/subcommands/PropertyListCommand.java
@@ -25,8 +25,7 @@
 import org.apache.ignite.internal.commandline.property.tasks.PropertiesListTask;
 
 /** */
-public class PropertyListCommand extends PropertyAbstractSubCommand<VoidDto, PropertiesListResult>
-{
+public class PropertyListCommand extends PropertyAbstractSubCommand<VoidDto, PropertiesListResult> {
     /** {@inheritDoc} */
     @Override protected String taskName() {
         return PropertiesListTask.class.getName();

diff --git a/.../java/org/apache/ignite/internal/commandline/property/subcommands/PropertySetCommand.java b/.../java/org/apache/ignite/internal/commandline/property/subcommands/PropertySetCommand.java
@@ -25,8 +25,7 @@
 import org.apache.ignite.internal.commandline.property.tasks.PropertyTask;
 
 /** */
-public class PropertySetCommand extends PropertyAbstractSubCommand<PropertyArgs, PropertyOperationResult>
-{
+public class PropertySetCommand extends PropertyAbstractSubCommand<PropertyArgs, PropertyOperationResult> {
     /** {@inheritDoc} */
     @Override protected String taskName() {
         return PropertyTask.class.getName();

diff --git a/...utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexForceRebuildTest.java b/...utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexForceRebuildTest.java
@@ -657,8 +657,7 @@ private boolean waitForIndexesRebuild(IgniteEx ignite) throws IgniteInterruptedC
      * @throws IgniteInterruptedCheckedException if failed.
      */
     private boolean waitForIndexesRebuild(IgniteEx ignite, long timeout, Collection<String> excludedCacheNames)
-        throws IgniteInterruptedCheckedException
-    {
+        throws IgniteInterruptedCheckedException {
         return GridTestUtils.waitForCondition(
             () -> ignite.context().cache().publicCaches()
                 .stream()

diff --git a/...control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingUtils.java b/...control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingUtils.java
@@ -298,8 +298,8 @@ static void createAndFillThreeFieldsEntryCache(
         final Ignite ignite,
         final String cacheName,
         final String grpName,
-        final Collection<QueryEntity> entities)
-    {
+        final Collection<QueryEntity> entities
+    ) {
         assert nonNull(ignite);
         assert nonNull(cacheName);
 

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java
@@ -176,8 +176,8 @@ public static <R> ComputeTaskInternalFuture<R> finishedFuture(final GridKernalCo
             @Override public void saveCheckpoint(String key,
                 Object state,
                 ComputeTaskSessionScope scope,
-                long timeout)
-            {
+                long timeout
+            ) {
                 throw new IgniteException("Session was closed.");
             }
 

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
@@ -110,8 +110,8 @@ public GridJobExecuteResponse(UUID nodeId,
         byte[] jobAttrsBytes,
         Map<Object, Object> jobAttrs,
         boolean isCancelled,
-        AffinityTopologyVersion retry)
-    {
+        AffinityTopologyVersion retry
+    ) {
         assert nodeId != null;
         assert sesId != null;
         assert jobId != null;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java
@@ -86,9 +86,8 @@ public IgniteDiagnosticMessage() {
      */
     public static IgniteDiagnosticMessage createRequest(Marshaller marsh,
         IgniteClosure<GridKernalContext, IgniteDiagnosticInfo> c,
-        long futId)
-        throws IgniteCheckedException
-    {
+        long futId
+    ) throws IgniteCheckedException {
         byte[] cBytes = U.marshal(marsh, c);
 
         IgniteDiagnosticMessage msg = new IgniteDiagnosticMessage();

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -315,9 +315,11 @@ public void checkHasClassName(String clsName, ClassLoader ldr, String fileName)
     }
 
     /** {@inheritDoc} */
-    @Override public boolean registerClassNameLocally(byte platformId, int typeId, String clsName)
-        throws IgniteCheckedException
-    {
+    @Override public boolean registerClassNameLocally(
+        byte platformId,
+        int typeId,
+        String clsName
+    ) throws IgniteCheckedException {
         ConcurrentMap<Integer, MappedName> cache = getCacheFor(platformId);
 
         fileStore.mergeAndWriteMapping(platformId, typeId, clsName);

diff --git a/...c/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyTypeSettings.java b/...c/main/java/org/apache/ignite/internal/cache/query/index/sorted/IndexKeyTypeSettings.java
@@ -78,7 +78,9 @@ public IndexKeyTypeSettings stringOptimizedCompare(boolean strOptimizedCompare)
     }
 
     /** */
-    public boolean binaryUnsigned() { return binaryUnsigned; }
+    public boolean binaryUnsigned() {
+        return binaryUnsigned;
+    }
 
     /** */
     public IndexKeyTypeSettings binaryUnsigned(boolean binaryUnsigned) {

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
@@ -105,8 +105,8 @@ public IgniteClusterAsyncImpl(IgniteClusterImpl cluster) {
     @Override public Collection<ClusterStartNodeResult> startNodes(File file,
         boolean restart,
         int timeout,
-        int maxConn)
-    {
+        int maxConn
+    ) {
         try {
             return saveOrGet(cluster.startNodesAsync0(file, restart, timeout, maxConn));
         }
@@ -127,8 +127,8 @@ public IgniteClusterAsyncImpl(IgniteClusterImpl cluster) {
         @Nullable Map<String, Object> dflts,
         boolean restart,
         int timeout,
-        int maxConn)
-    {
+        int maxConn
+    ) {
         try {
             return saveOrGet(cluster.startNodesAsync0(hosts, dflts, restart, timeout, maxConn));
         }

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/maintenance/MaintenanceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/maintenance/MaintenanceProcessor.java
@@ -198,8 +198,7 @@ public MaintenanceProcessor(GridKernalContext ctx) {
     /** {@inheritDoc} */
     @Override public void prepareAndExecuteMaintenance() {
         if (isMaintenanceMode()) {
-            workflowCallbacks.entrySet().removeIf(cbE ->
-                {
+            workflowCallbacks.entrySet().removeIf(cbE -> {
                     if (!cbE.getValue().shouldProceedWithMaintenance()) {
                         unregisterMaintenanceTask(cbE.getKey());
 

diff --git a/...e/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/...e/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java
@@ -157,9 +157,8 @@ public boolean storeCheckpoint(GridTaskSessionInternal ses,
         Object state,
         ComputeTaskSessionScope scope,
         long timeout,
-        boolean override)
-        throws IgniteCheckedException
-    {
+        boolean override
+    ) throws IgniteCheckedException {
         if (!enabled())
             return false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -411,8 +411,7 @@ private void initComputeService() { @@
                 finally {
                     initLatch.countDown();
                 }
-            else
-            {
+            else {
                 try {
                     U.await(initLatch);
                 }
@@ Expand Down @@