This is an automated email from the ASF dual-hosted git repository.
apkhmv pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new b7a31da88c IGNITE-21652 Extend codestyle checks made by PMD (#3431)
b7a31da88c is described below
commit b7a31da88c202c10ac0596516e1f4ed91c9b4b8a
Author: Viacheslav Blinov <[email protected]>
AuthorDate: Mon Mar 18 18:33:18 2024 +0300
IGNITE-21652 Extend codestyle checks made by PMD (#3431)
---
check-rules/pmd-rules.xml | 31 +++++-----------------
.../apache/ignite/internal/cli/core/flow/Flow.java | 2 +-
.../client/proto/ClientBinaryTupleUtils.java | 2 +-
.../client/handler/JdbcQueryCursorHandlerImpl.java | 5 ++--
.../tree/TraversableTreeNodeTest.java | 3 +--
.../ignite/internal/util/CollectionUtilsTest.java | 3 +--
.../IgniteUnsafeDataInputOutputByteOrderTest.java | 12 ++++-----
.../distributionzones/DistributionZoneManager.java | 3 +--
.../network/file/FileTransferServiceImplTest.java | 6 ++---
.../index/IndexAvailabilityControllerTest.java | 3 +--
.../ignite/internal/jdbc/JdbcDatabaseMetadata.java | 3 +--
.../serialization/marshal/BuiltInMarshalling.java | 4 +--
.../internal/network/netty/InboundDecoderTest.java | 2 +-
...erObjectMarshallerWithArbitraryObjectsTest.java | 4 +--
.../persistence/PersistentPageMemory.java | 2 +-
.../store/AbstractFilePageStoreIoTest.java | 3 +--
.../placementdriver/PlacementDriverTest.java | 2 +-
.../internal/sql/engine/exec/exp/RexImpTable.java | 2 +-
.../sql/engine/prepare/IgniteSqlValidator.java | 2 +-
.../internal/sql/engine/rel/IgniteMergeJoin.java | 3 +--
.../sql/engine/trait/DistributionTrait.java | 4 +--
.../internal/storage/DataStorageModulesTest.java | 3 +--
.../internal/table/distributed/TableManager.java | 3 +--
.../distributed/storage/InternalTableImpl.java | 3 +--
.../internal/table/MutableRowTupleAdapterTest.java | 14 +++++-----
.../table/RecordBinaryViewOperationsTest.java | 4 +--
.../internal/table/RecordViewOperationsTest.java | 2 +-
.../replication/PartitionReplicaListenerTest.java | 4 +--
28 files changed, 53 insertions(+), 81 deletions(-)
diff --git a/check-rules/pmd-rules.xml b/check-rules/pmd-rules.xml
index 2f1627fca7..42833bf2c7 100644
--- a/check-rules/pmd-rules.xml
+++ b/check-rules/pmd-rules.xml
@@ -26,11 +26,6 @@
PMD Ruleset for Apache Ignite
</description>
- <rule ref="category/java/errorprone.xml/AvoidCatchingNPE"/>
- <rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
- <rule ref="category/java/codestyle.xml/EmptyControlStatement" />
- <rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/>
-
<rule ref="category/java/bestpractices.xml/UnusedLocalVariable"/>
<rule ref="category/java/bestpractices.xml/UnusedPrivateField"/>
<rule ref="category/java/bestpractices.xml/AvoidPrintStackTrace" />
@@ -46,6 +41,10 @@
<rule ref="category/java/bestpractices.xml/SimplifiableTestAssertion" />
<rule ref="category/java/bestpractices.xml/UseCollectionIsEmpty" />
+
+ <rule ref="category/java/errorprone.xml/AvoidCatchingNPE"/>
+ <rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
+ <rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/>
<rule ref="category/java/errorprone.xml/AvoidCallingFinalize" />
<rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices" />
<rule ref="category/java/errorprone.xml/EqualsNull" />
@@ -68,38 +67,22 @@
<rule ref="category/java/errorprone.xml/UseEqualsToCompareStrings" />
<rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode" />
+ <rule ref="category/java/codestyle.xml/EmptyControlStatement" />
<rule ref="category/java/codestyle.xml/AvoidProtectedFieldInFinalClass" />
<rule
ref="category/java/codestyle.xml/AvoidProtectedMethodInFinalClassNotExtending"
/>
<rule ref="category/java/codestyle.xml/ExtendsObject" />
<rule ref="category/java/codestyle.xml/ForLoopShouldBeWhileLoop" />
-
<rule ref="category/java/codestyle.xml/FormalParameterNamingConventions" />
-
<rule ref="category/java/codestyle.xml/NoPackage" />
<rule ref="category/java/codestyle.xml/PackageCase" />
<rule ref="category/java/codestyle.xml/UnnecessaryCast" />
<rule ref="category/java/codestyle.xml/UnnecessaryReturn" />
<rule ref="category/java/codestyle.xml/UnnecessarySemicolon" />
<rule ref="category/java/codestyle.xml/UseDiamondOperator" />
+ <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName" />
+ <rule ref="category/java/codestyle.xml/UselessQualifiedThis" />
- <!-- TODO: https://issues.apache.org/jira/browse/IGNITE-21652 -->
- <!-- <rule ref="category/java/codestyle.xml/IdenticalCatchBranches"
/>-->
- <!-- <rule
ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName" />-->
- <!-- <rule ref="category/java/codestyle.xml/UselessQualifiedThis"
/>-->
- <!-- <rule
ref="category/java/codestyle.xml/LocalVariableNamingConventions" />-->
- <!-- <rule ref="category/java/codestyle.xml/BooleanGetMethodName"
/>-->
- <!-- <rule ref="category/java/codestyle.xml/UnnecessaryConstructor"
/>-->
- <!-- <rule ref="category/java/codestyle.xml/GenericsNaming" />-->
- <!-- <rule
ref="category/java/codestyle.xml/UnnecessaryAnnotationValueElement" />-->
- <!-- <rule
ref="category/java/codestyle.xml/UseShortArrayInitializer" />-->
- <!-- <rule ref="category/java/codestyle.xml/UselessParentheses"
/>-->
- <!-- <rule
ref="category/java/codestyle.xml/FieldDeclarationsShouldBeAtStartOfClass" />-->
- <!-- <rule
ref="category/java/codestyle.xml/UseUnderscoresInNumericLiterals" />-->
- <!-- <rule ref="category/java/codestyle.xml/FieldNamingConventions"
/>-->
- <!-- <rule ref="category/java/codestyle.xml/ConfusingTernary" />-->
- <!-- <rule ref="category/java/codestyle.xml/PrematureDeclaration"
/>-->
-
<rule ref="category/java/performance.xml/AppendCharacterWithChar" />
<rule ref="category/java/performance.xml/AvoidArrayLoops" />
<rule ref="category/java/performance.xml/AvoidCalendarDateCreation" />
diff --git
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/Flow.java
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/Flow.java
index 586b1c2b81..5beba9742f 100644
---
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/Flow.java
+++
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/flow/Flow.java
@@ -42,7 +42,7 @@ public interface Flow<I, O> {
*/
default <OT> Flow<I, OT> composite(Flow<O, OT> next) {
return input -> {
- Flowable<O> outputFlowable = Flow.this.start(input);
+ Flowable<O> outputFlowable = this.start(input);
return next.start(outputFlowable);
};
}
diff --git
a/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientBinaryTupleUtils.java
b/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientBinaryTupleUtils.java
index e5e3220eb7..b965f2d9e8 100644
---
a/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientBinaryTupleUtils.java
+++
b/modules/client-common/src/main/java/org/apache/ignite/internal/client/proto/ClientBinaryTupleUtils.java
@@ -155,7 +155,7 @@ public class ClientBinaryTupleUtils {
BigDecimal bigDecimal = (BigDecimal) obj;
appendTypeAndScale(builder, ColumnType.DECIMAL,
bigDecimal.scale());
builder.appendDecimal(bigDecimal, bigDecimal.scale());
- } else if (obj instanceof java.util.UUID) {
+ } else if (obj instanceof UUID) {
appendTypeAndScale(builder, ColumnType.UUID);
builder.appendUuid((UUID) obj);
} else if (obj instanceof String) {
diff --git
a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/JdbcQueryCursorHandlerImpl.java
b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/JdbcQueryCursorHandlerImpl.java
index 71f62f8b69..b01aaf6608 100644
---
a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/JdbcQueryCursorHandlerImpl.java
+++
b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/JdbcQueryCursorHandlerImpl.java
@@ -17,7 +17,6 @@
package org.apache.ignite.client.handler;
-import static java.util.concurrent.CompletableFuture.completedFuture;
import static
org.apache.ignite.client.handler.JdbcQueryEventHandlerImpl.buildSingleRequest;
import static
org.apache.ignite.internal.jdbc.proto.IgniteQueryErrorCode.UNSUPPORTED_OPERATION;
@@ -170,13 +169,13 @@ public class JdbcQueryCursorHandlerImpl implements
JdbcQueryCursorHandler {
if (cur.hasNextResult()) {
return cur.nextResult().thenCompose(this);
} else {
- return completedFuture(cur);
+ return CompletableFuture.completedFuture(cur);
}
});
}
};
- completedFuture(cursor).thenCompose(traverser);
+ CompletableFuture.completedFuture(cursor).thenCompose(traverser);
}
/** {@inheritDoc} */
diff --git
a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/TraversableTreeNodeTest.java
b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/TraversableTreeNodeTest.java
index 021131896c..7e58074d7d 100644
---
a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/TraversableTreeNodeTest.java
+++
b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/TraversableTreeNodeTest.java
@@ -42,7 +42,6 @@ import
org.apache.ignite.configuration.annotation.NamedConfigValue;
import org.apache.ignite.configuration.annotation.Value;
import org.apache.ignite.configuration.validation.Immutable;
import org.apache.ignite.internal.configuration.asm.ConfigurationAsmGenerator;
-import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -241,7 +240,7 @@ public class TraversableTreeNodeTest {
elementsNode.delete("keyPut");
- assertThat(elementsNode.namedListKeys(),
CoreMatchers.hasItem("keyPut"));
+ assertThat(elementsNode.namedListKeys(), hasItem("keyPut"));
assertNull(elementsNode.get("keyPut"));
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/CollectionUtilsTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/CollectionUtilsTest.java
index c4728a95ed..9f7e418c75 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/CollectionUtilsTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/CollectionUtilsTest.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.util;
import static java.util.Collections.emptyIterator;
-import static java.util.Collections.emptyList;
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.toList;
import static org.apache.ignite.internal.util.CollectionUtils.concat;
@@ -304,7 +303,7 @@ public class CollectionUtilsTest {
@Test
void testMapIterableWithPredicate() {
assertFalse(mapIterable(null, null, null).iterator().hasNext());
- assertFalse(mapIterable(emptyList(), null, null).iterator().hasNext());
+ assertFalse(mapIterable(Collections.emptyList(), null,
null).iterator().hasNext());
assertEquals(List.of(1), collect(mapIterable(List.of(1), null, null)));
assertEquals(List.of(1), collect(mapIterable(List.of(1), identity(),
null)));
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/util/io/IgniteUnsafeDataInputOutputByteOrderTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/util/io/IgniteUnsafeDataInputOutputByteOrderTest.java
index 5e91e53212..fabbb56ba9 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/util/io/IgniteUnsafeDataInputOutputByteOrderTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/util/io/IgniteUnsafeDataInputOutputByteOrderTest.java
@@ -70,7 +70,7 @@ class IgniteUnsafeDataInputOutputByteOrderTest {
out.writeShort(val);
- assertEquals(val,
IgniteTestIoUtils.getShortByByteLittleEndian(out.internalArray()));
+ assertEquals(val, getShortByByteLittleEndian(out.internalArray()));
assertEquals(val, in.readShort());
}
@@ -99,7 +99,7 @@ class IgniteUnsafeDataInputOutputByteOrderTest {
out.writeChar(val);
- assertEquals(val,
IgniteTestIoUtils.getCharByByteLittleEndian(out.internalArray()));
+ assertEquals(val, getCharByByteLittleEndian(out.internalArray()));
assertEquals(val, in.readChar());
}
@@ -128,7 +128,7 @@ class IgniteUnsafeDataInputOutputByteOrderTest {
out.writeInt(val);
- assertEquals(val,
IgniteTestIoUtils.getIntByByteLittleEndian(out.internalArray()));
+ assertEquals(val, getIntByByteLittleEndian(out.internalArray()));
assertEquals(val, in.readInt());
}
@@ -157,7 +157,7 @@ class IgniteUnsafeDataInputOutputByteOrderTest {
out.writeLong(val);
- assertEquals(val,
IgniteTestIoUtils.getLongByByteLittleEndian(out.internalArray()));
+ assertEquals(val, getLongByByteLittleEndian(out.internalArray()));
assertEquals(val, in.readLong());
}
@@ -186,7 +186,7 @@ class IgniteUnsafeDataInputOutputByteOrderTest {
out.writeFloat(val);
- assertEquals(val,
IgniteTestIoUtils.getFloatByByteLittleEndian(out.internalArray()), 0);
+ assertEquals(val, getFloatByByteLittleEndian(out.internalArray()), 0);
assertEquals(val, in.readFloat(), 0);
}
@@ -215,7 +215,7 @@ class IgniteUnsafeDataInputOutputByteOrderTest {
out.writeDouble(val);
- assertEquals(val,
IgniteTestIoUtils.getDoubleByByteLittleEndian(out.internalArray()), 0);
+ assertEquals(val, getDoubleByByteLittleEndian(out.internalArray()), 0);
assertEquals(val, in.readDouble(), 0);
}
diff --git
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
index d4895d3a13..ce7eeee373 100644
---
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
+++
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
@@ -81,7 +81,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import java.util.function.LongFunction;
@@ -300,7 +299,7 @@ public class DistributionZoneManager implements
IgniteComponent {
metaStorageManager.unregisterWatch(topologyWatchListener);
shutdownAndAwaitTermination(executor, 10, SECONDS);
- shutdownAndAwaitTermination(rebalanceScheduler, 10, TimeUnit.SECONDS);
+ shutdownAndAwaitTermination(rebalanceScheduler, 10, SECONDS);
}
/**
diff --git
a/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileTransferServiceImplTest.java
b/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileTransferServiceImplTest.java
index db7e9bbf6a..110cb825b3 100644
---
a/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileTransferServiceImplTest.java
+++
b/modules/file-transfer/src/test/java/org/apache/ignite/internal/network/file/FileTransferServiceImplTest.java
@@ -197,7 +197,7 @@ class FileTransferServiceImplTest extends
BaseIgniteAbstractTest {
RuntimeException testException = new RuntimeException("Test
exception");
doReturn(failedFuture(testException))
.when(messagingService)
- .respond(eq(TARGET_CONSISTENT_ID),
eq(Channel.FILE_TRANSFER_CHANNEL), any(FileTransferInitResponse.class),
+ .respond(eq(TARGET_CONSISTENT_ID), eq(FILE_TRANSFER_CHANNEL),
any(FileTransferInitResponse.class),
eq(correlationId));
// Set file receiver to complete transfer registration.
@@ -241,7 +241,7 @@ class FileTransferServiceImplTest extends
BaseIgniteAbstractTest {
RuntimeException testException = new RuntimeException("Test
exception");
doReturn(failedFuture(testException))
.when(messagingService)
- .invoke(eq(SOURCE_CONSISTENT_ID),
eq(Channel.FILE_TRANSFER_CHANNEL), any(FileDownloadRequest.class),
any(Long.class));
+ .invoke(eq(SOURCE_CONSISTENT_ID), eq(FILE_TRANSFER_CHANNEL),
any(FileDownloadRequest.class), any(Long.class));
CompletableFuture<List<Path>> downloaded =
fileTransferService.download(SOURCE_CONSISTENT_ID,
messageFactory.identifier().build(),
@@ -262,7 +262,7 @@ class FileTransferServiceImplTest extends
BaseIgniteAbstractTest {
.build();
doReturn(completedFuture(response))
.when(messagingService)
- .invoke(eq(SOURCE_CONSISTENT_ID),
eq(Channel.FILE_TRANSFER_CHANNEL), any(FileDownloadRequest.class),
any(Long.class));
+ .invoke(eq(SOURCE_CONSISTENT_ID), eq(FILE_TRANSFER_CHANNEL),
any(FileDownloadRequest.class), any(Long.class));
CompletableFuture<List<Path>> downloaded =
fileTransferService.download(SOURCE_CONSISTENT_ID,
messageFactory.identifier().build(),
workDir.resolve("download"));
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerTest.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerTest.java
index f9922a67d3..4f8c5e04cd 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerTest.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerTest.java
@@ -29,7 +29,6 @@ import static
org.apache.ignite.internal.index.TestIndexManagementUtils.INDEX_NA
import static
org.apache.ignite.internal.index.TestIndexManagementUtils.NODE_NAME;
import static
org.apache.ignite.internal.index.TestIndexManagementUtils.TABLE_NAME;
import static
org.apache.ignite.internal.index.TestIndexManagementUtils.createTable;
-import static org.apache.ignite.internal.table.TableTestUtils.getIndexStrict;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.apache.ignite.internal.util.ArrayUtils.BYTE_EMPTY_ARRAY;
@@ -434,6 +433,6 @@ public class IndexAvailabilityControllerTest extends
BaseIgniteAbstractTest {
}
private int indexCreationCatalogVersion(String indexName) {
- return getIndexStrict(catalogManager, indexName,
clock.nowLong()).txWaitCatalogVersion();
+ return TableTestUtils.getIndexStrict(catalogManager, indexName,
clock.nowLong()).txWaitCatalogVersion();
}
}
diff --git
a/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
b/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
index 5f592fdd04..719e540a4b 100644
---
a/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
+++
b/modules/jdbc/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
@@ -32,7 +32,6 @@ import java.sql.RowIdLifetime;
import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -1186,7 +1185,7 @@ public class JdbcDatabaseMetadata implements
DatabaseMetaData {
public ResultSet getTypeInfo() throws SQLException {
List<List<Object>> types = new ArrayList<>(21);
- types.add(Arrays.asList("BOOLEAN", Types.BOOLEAN, 1, null, null, null,
+ types.add(asList("BOOLEAN", Types.BOOLEAN, 1, null, null, null,
(short) typeNullable, false, (short) typeSearchable, false,
false, false, "BOOLEAN", 0, 0,
Types.BOOLEAN, 0, 10));
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/BuiltInMarshalling.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/BuiltInMarshalling.java
index 3e247a88dc..ee45273c64 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/BuiltInMarshalling.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/serialization/marshal/BuiltInMarshalling.java
@@ -365,7 +365,7 @@ class BuiltInMarshalling {
}
static <T, C extends Collection<T>> C preInstantiateCollection(DataInput
input, IntFunction<C> collectionFactory) throws IOException {
- int length = ProtocolMarshalling.readLength(input);
+ int length = readLength(input);
return collectionFactory.apply(length);
}
@@ -414,7 +414,7 @@ class BuiltInMarshalling {
}
static <K, V, M extends Map<K, V>> M preInstantiateMap(DataInput input,
IntFunction<M> mapFactory) throws IOException {
- int length = ProtocolMarshalling.readLength(input);
+ int length = readLength(input);
return mapFactory.apply(length);
}
diff --git
a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/InboundDecoderTest.java
b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/InboundDecoderTest.java
index 4eb769f58c..7a390bc22e 100644
---
a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/InboundDecoderTest.java
+++
b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/InboundDecoderTest.java
@@ -166,7 +166,7 @@ public class InboundDecoderTest extends
BaseIgniteAbstractTest {
*/
@Test
public void testPartialReadWithReuseBuffer() throws Exception {
- ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
+ ChannelHandlerContext ctx = mock(ChannelHandlerContext.class);
var channel = new EmbeddedChannel();
diff --git
a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshallerWithArbitraryObjectsTest.java
b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshallerWithArbitraryObjectsTest.java
index 4cc11dea73..0762532959 100644
---
a/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshallerWithArbitraryObjectsTest.java
+++
b/modules/network/src/test/java/org/apache/ignite/internal/network/serialization/marshal/DefaultUserObjectMarshallerWithArbitraryObjectsTest.java
@@ -281,7 +281,7 @@ class DefaultUserObjectMarshallerWithArbitraryObjectsTest {
}
private Runnable capturingNonSerializableLambda() {
- return () ->
System.out.println(DefaultUserObjectMarshallerWithArbitraryObjectsTest.this);
+ return () -> System.out.println(this);
}
@Test
@@ -292,7 +292,7 @@ class DefaultUserObjectMarshallerWithArbitraryObjectsTest {
}
private Runnable capturingSerializableLambda() {
- return (Runnable & Serializable) () ->
System.out.println(DefaultUserObjectMarshallerWithArbitraryObjectsTest.this);
+ return (Runnable & Serializable) () -> System.out.println(this);
}
@Test
diff --git
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/PersistentPageMemory.java
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/PersistentPageMemory.java
index 64d65266a9..7f425266c9 100644
---
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/PersistentPageMemory.java
+++
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/PersistentPageMemory.java
@@ -1097,7 +1097,7 @@ public class PersistentPageMemory implements PageMemory {
long tmpRelPtr =
checkpointPool.borrowOrAllocateFreePage(tag(fullId.pageId()));
if (tmpRelPtr == INVALID_REL_PTR) {
- rwLock.writeUnlock(absPtr + PAGE_LOCK_OFFSET,
OffheapReadWriteLock.TAG_LOCK_ALWAYS);
+ rwLock.writeUnlock(absPtr + PAGE_LOCK_OFFSET, TAG_LOCK_ALWAYS);
throw new IgniteInternalException(
"Failed to allocate temporary buffer for checkpoint
(increase checkpointPageBufferSize configuration property): "
diff --git
a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/AbstractFilePageStoreIoTest.java
b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/AbstractFilePageStoreIoTest.java
index dc6b95057f..6a4a7d2ba8 100644
---
a/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/AbstractFilePageStoreIoTest.java
+++
b/modules/page-memory/src/test/java/org/apache/ignite/internal/pagememory/persistence/store/AbstractFilePageStoreIoTest.java
@@ -41,7 +41,6 @@ import org.apache.ignite.internal.fileio.AsyncFileIoFactory;
import org.apache.ignite.internal.fileio.FileIo;
import org.apache.ignite.internal.fileio.FileIoFactory;
import org.apache.ignite.internal.fileio.RandomAccessFileIoFactory;
-import org.apache.ignite.internal.pagememory.io.PageIo;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
@@ -239,7 +238,7 @@ public abstract class AbstractFilePageStoreIoTest extends
BaseIgniteAbstractTest
assertEquals(2 * PAGE_SIZE, testFilePath.toFile().length());
- assertEquals(0, PageIo.getCrc(pageByteBuffer));
+ assertEquals(0, getCrc(pageByteBuffer));
}
}
diff --git
a/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/PlacementDriverTest.java
b/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/PlacementDriverTest.java
index a269346a2d..c58569fea0 100644
---
a/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/PlacementDriverTest.java
+++
b/modules/placement-driver/src/test/java/org/apache/ignite/internal/placementdriver/PlacementDriverTest.java
@@ -455,7 +455,7 @@ public class PlacementDriverTest extends
BaseIgniteAbstractTest {
assertFalse(primaryReplicaFuture2.isDone());
// Timeout first waiter, and assert that timeout occurred.
- primaryReplicaFuture1.orTimeout(1, TimeUnit.MILLISECONDS);
+ primaryReplicaFuture1.orTimeout(1, MILLISECONDS);
// noinspection ThrowableNotThrown
assertThrowsWithCause(primaryReplicaFuture1::get,
TimeoutException.class);
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/RexImpTable.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/RexImpTable.java
index b4c33b1074..48db266aad 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/RexImpTable.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/RexImpTable.java
@@ -420,7 +420,6 @@ import
org.apache.calcite.sql.fun.SqlJsonArrayAggAggFunction;
import org.apache.calcite.sql.fun.SqlJsonObjectAggAggFunction;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.apache.calcite.sql.fun.SqlTrimFunction;
-import org.apache.calcite.sql.type.SqlTypeFamily;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.calcite.sql.type.SqlTypeUtil;
import org.apache.calcite.sql.validate.SqlUserDefinedAggFunction;
@@ -442,6 +441,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
*
* <p>Immutable.
*/
+@SuppressWarnings("PMD.UnnecessaryFullyQualifiedName")
public class RexImpTable {
/** The singleton instance. */
public static final RexImpTable INSTANCE =
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/IgniteSqlValidator.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/IgniteSqlValidator.java
index cd6011a76b..a2f8093f93 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/IgniteSqlValidator.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/IgniteSqlValidator.java
@@ -687,7 +687,7 @@ public class IgniteSqlValidator extends SqlValidatorImpl {
BigDecimal max = (BigDecimal)
toType.getSqlTypeName().getLimit(true, Limit.OVERFLOW, false, precision, scale);
BigDecimal min = (BigDecimal)
toType.getSqlTypeName().getLimit(false, Limit.OVERFLOW, false, precision,
scale);
- String litValue = Objects.requireNonNull(literal.toValue());
+ String litValue = requireNonNull(literal.toValue());
BigDecimal litValueToDecimal = null;
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/IgniteMergeJoin.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/IgniteMergeJoin.java
index 17e9e4d253..264548957d 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/IgniteMergeJoin.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/IgniteMergeJoin.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.sql.engine.rel;
-import static org.apache.calcite.rel.RelCollations.EMPTY;
import static org.apache.calcite.rel.RelCollations.containsOrderless;
import static org.apache.calcite.rel.core.JoinRelType.FULL;
import static org.apache.calcite.rel.core.JoinRelType.LEFT;
@@ -328,7 +327,7 @@ public class IgniteMergeJoin extends AbstractIgniteJoin {
RelTraitSet rightInputTraits
) {
return Pair.of(
- nodeTraits.replace(EMPTY),
+ nodeTraits.replace(RelCollations.EMPTY),
List.of(
leftInputTraits.replace(RelCollations.of(joinInfo.leftKeys)),
rightInputTraits.replace(RelCollations.of(joinInfo.rightKeys))
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionTrait.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionTrait.java
index 12bd13d77c..23be8bea2e 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionTrait.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionTrait.java
@@ -197,7 +197,7 @@ public final class DistributionTrait implements
IgniteDistribution {
/** {@inheritDoc} */
@Override
public boolean isTop() {
- return getType() == Type.ANY;
+ return getType() == ANY;
}
/** {@inheritDoc} */
@@ -205,7 +205,7 @@ public final class DistributionTrait implements
IgniteDistribution {
public int compareTo(RelMultipleTrait o) {
final IgniteDistribution distribution = (IgniteDistribution) o;
- if (getType() == distribution.getType() && getType() ==
Type.HASH_DISTRIBUTED) {
+ if (getType() == distribution.getType() && getType() ==
HASH_DISTRIBUTED) {
int cmp = ORDERING.compare(getKeys(), distribution.getKeys());
if (cmp == 0) {
diff --git
a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
index e9ac3998c5..7619829a23 100644
---
a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
+++
b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/DataStorageModulesTest.java
@@ -42,7 +42,6 @@ import
org.apache.ignite.internal.storage.engine.StorageEngine;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
-import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -94,7 +93,7 @@ public class DataStorageModulesTest extends
BaseIgniteAbstractTest {
))
);
- assertThat(exception.getMessage(), Matchers.startsWith("Duplicate
name"));
+ assertThat(exception.getMessage(), startsWith("Duplicate name"));
}
@Test
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index 90fd8c21a2..d0827a05d1 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@ -129,7 +129,6 @@ import
org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.metastorage.WatchEvent;
import org.apache.ignite.internal.metastorage.WatchListener;
import org.apache.ignite.internal.metastorage.dsl.Condition;
-import org.apache.ignite.internal.metastorage.dsl.Conditions;
import org.apache.ignite.internal.metastorage.dsl.Operation;
import org.apache.ignite.internal.network.MessagingService;
import
org.apache.ignite.internal.network.serialization.MessageSerializationRegistry;
@@ -677,7 +676,7 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
newAssignments.get(i).toBytes()));
}
- Condition condition = Conditions.notExists(new
ByteArray(partitionAssignments.get(0).key()));
+ Condition condition = notExists(new
ByteArray(partitionAssignments.get(0).key()));
return metaStorageMgr
.invoke(condition, partitionAssignments,
Collections.emptyList())
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
index 17c453636a..aaa32b6284 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
@@ -53,7 +53,6 @@ import java.util.concurrent.CompletionException;
import java.util.concurrent.Flow.Publisher;
import java.util.concurrent.Flow.Subscriber;
import java.util.concurrent.Flow.Subscription;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
@@ -691,7 +690,7 @@ public class InternalTableImpl implements InternalTable {
tablePartitionId,
tx.startTimestamp(),
AWAIT_PRIMARY_REPLICA_TIMEOUT,
- TimeUnit.SECONDS
+ SECONDS
);
CompletableFuture<R> fut =
primaryReplicaFuture.thenCompose(primaryReplica -> {
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/MutableRowTupleAdapterTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/MutableRowTupleAdapterTest.java
index cb0e6667e6..e62dca893b 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/MutableRowTupleAdapterTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/MutableRowTupleAdapterTest.java
@@ -81,8 +81,8 @@ public class MutableRowTupleAdapterTest {
/** Schema descriptor. */
private final SchemaDescriptor schema = new SchemaDescriptor(
42,
- new Column[]{new Column("id".toUpperCase(), NativeTypes.INT64,
false)},
- new Column[]{new Column("name".toUpperCase(), NativeTypes.STRING,
false)}
+ new Column[]{new Column("id".toUpperCase(), INT64, false)},
+ new Column[]{new Column("name".toUpperCase(), STRING, false)}
);
/** Schema descriptor. */
@@ -556,11 +556,11 @@ public class MutableRowTupleAdapterTest {
@Test
void testTemporalValuesPrecisionConstraint() throws Exception {
SchemaDescriptor schemaDescriptor = new SchemaDescriptor(1,
- new Column[]{new Column("key", NativeTypes.INT32, false)},
+ new Column[]{new Column("key", INT32, false)},
new Column[]{
- new Column("time", NativeTypes.time(2), true),
- new Column("datetime", NativeTypes.datetime(2), true),
- new Column("timestamp", NativeTypes.timestamp(2), true)
+ new Column("time", time(2), true),
+ new Column("datetime", datetime(2), true),
+ new Column("timestamp", timestamp(2), true)
}
);
@@ -585,7 +585,7 @@ public class MutableRowTupleAdapterTest {
@Test
void testVarlenValuesLengthConstraints() throws Exception {
SchemaDescriptor schemaDescriptor = new SchemaDescriptor(1,
- new Column[]{new Column("key", NativeTypes.INT32, false)},
+ new Column[]{new Column("key", INT32, false)},
new Column[]{
new Column("string", NativeTypes.stringOf(5), true),
new Column("bytes", NativeTypes.blobOf(5), true),
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/RecordBinaryViewOperationsTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/RecordBinaryViewOperationsTest.java
index 57b3d165fb..691b688b7b 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/RecordBinaryViewOperationsTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/RecordBinaryViewOperationsTest.java
@@ -661,7 +661,7 @@ public class RecordBinaryViewOperationsTest extends
TableKvOperationsTestBase {
final Object val1 = expected.value(col.name());
final Object val2 = actual.value(col.name());
- Assertions.assertEquals(val1, val2, "Value columns equality check
failed: " + col);
+ assertEquals(val1, val2, "Value columns equality check failed: " +
col);
if (col.positionInKey() != -1 && val1 != null) {
nonNullKey++;
@@ -688,7 +688,7 @@ public class RecordBinaryViewOperationsTest extends
TableKvOperationsTestBase {
if (val1 instanceof byte[] && val2 instanceof byte[]) {
Assertions.assertArrayEquals((byte[]) val1, (byte[]) val2,
"Equality check failed: colIdx=" + col.positionInRow());
} else {
- Assertions.assertEquals(val1, val2, "Equality check failed:
colIdx=" + col.positionInRow());
+ assertEquals(val1, val2, "Equality check failed: colIdx=" +
col.positionInRow());
}
}
}
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/RecordViewOperationsTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/RecordViewOperationsTest.java
index f3918d3a96..1bf869a0f8 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/RecordViewOperationsTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/RecordViewOperationsTest.java
@@ -117,7 +117,7 @@ public class RecordViewOperationsTest extends
TableKvOperationsTestBase {
private final SchemaDescriptor schema = new SchemaDescriptor(
SCHEMA_VERSION,
- new Column[]{new Column("primitiveLongCol".toUpperCase(),
NativeTypes.INT64, false)},
+ new Column[]{new Column("primitiveLongCol".toUpperCase(), INT64,
false)},
valCols
);
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
index d8c39e3540..c19510262f 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
@@ -801,11 +801,11 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
BinaryRow testBinaryKey = nextBinaryKey();
BinaryRow testBinaryRow = binaryRow(key(testBinaryKey), new
TestValue(1, "v1"));
var rowId = new RowId(PART_ID);
- txState = TxState.ABORTED;
+ txState = ABORTED;
pkStorage().put(testBinaryRow, rowId);
testMvPartitionStorage.addWrite(rowId, testBinaryRow, txId, TABLE_ID,
PART_ID);
- txManager.updateTxMeta(txId, old -> new TxStateMeta(TxState.ABORTED,
localNode.id(), commitPartitionId, null));
+ txManager.updateTxMeta(txId, old -> new TxStateMeta(ABORTED,
localNode.id(), commitPartitionId, null));
CompletableFuture<ReplicaResult> fut =
doReadOnlySingleGet(testBinaryKey);
