This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new c9777f9fda0 Enforce Entry usage instead of Map.Entry (#38073)
c9777f9fda0 is described below
commit c9777f9fda0c09424e4336238ab04d46798c840f
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Feb 18 00:00:01 2026 +0800
Enforce Entry usage instead of Map.Entry (#38073)
---
.../agent/core/plugin/classloader/AgentPluginClassLoaderTest.java | 3 ++-
.../connector/firebird/metadata/data/FirebirdBlobInfoRegistry.java | 3 ++-
.../metadata/data/FirebirdNonFixedLengthColumnSizeRegistry.java | 3 ++-
.../connector/hive/metadata/data/loader/HiveMetaDataLoader.java | 3 ++-
.../proxy/backend/util/DatabaseExportMetaDataGeneratorTest.java | 3 ++-
.../query/extended/describe/PostgreSQLComDescribeExecutorTest.java | 3 ++-
src/resources/checkstyle.xml | 5 +++++
7 files changed, 17 insertions(+), 6 deletions(-)
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/classloader/AgentPluginClassLoaderTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/classloader/AgentPluginClassLoaderTest.java
index 09bd543fedd..93a619757ee 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/classloader/AgentPluginClassLoaderTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/classloader/AgentPluginClassLoaderTest.java
@@ -34,6 +34,7 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -154,7 +155,7 @@ class AgentPluginClassLoaderTest {
private JarFile createJar(final String fileName, final Map<String, byte[]>
entries, final Manifest manifest) throws IOException {
Path jarPath = tempDir.resolve(fileName);
try (JarOutputStream out = null == manifest ? new
JarOutputStream(Files.newOutputStream(jarPath)) : new
JarOutputStream(Files.newOutputStream(jarPath), manifest)) {
- for (Map.Entry<String, byte[]> each : entries.entrySet()) {
+ for (Entry<String, byte[]> each : entries.entrySet()) {
out.putNextEntry(new JarEntry(each.getKey()));
out.write(each.getValue());
out.closeEntry();
diff --git
a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/FirebirdBlobInfoRegistry.java
b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/FirebirdBlobInfoRegistry.java
index 3e05c2d4e34..13987445e04 100644
---
a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/FirebirdBlobInfoRegistry.java
+++
b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/FirebirdBlobInfoRegistry.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.OptionalInt;
import java.util.concurrent.ConcurrentHashMap;
@@ -52,7 +53,7 @@ public final class FirebirdBlobInfoRegistry {
return;
}
Map<String, Integer> normalizedColumns = new
HashMap<>(blobColumns.size(), 1F);
- for (Map.Entry<String, Integer> entry : blobColumns.entrySet()) {
+ for (Entry<String, Integer> entry : blobColumns.entrySet()) {
if (null != entry.getKey()) {
normalizedColumns.put(toKey(entry.getKey()), entry.getValue());
}
diff --git
a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/FirebirdNonFixedLengthColumnSizeRegistry.java
b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/FirebirdNonFixedLengthColumnSizeRegistry.java
index 2a66ecb99e6..3bb859957db 100644
---
a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/FirebirdNonFixedLengthColumnSizeRegistry.java
+++
b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/FirebirdNonFixedLengthColumnSizeRegistry.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.OptionalInt;
import java.util.concurrent.ConcurrentHashMap;
@@ -52,7 +53,7 @@ public final class FirebirdNonFixedLengthColumnSizeRegistry {
return;
}
Map<String, Integer> normalizedColumnSizes = new
HashMap<>(columnSizes.size(), 1F);
- for (Map.Entry<String, Integer> entry : columnSizes.entrySet()) {
+ for (Entry<String, Integer> entry : columnSizes.entrySet()) {
if (null == entry.getKey()) {
continue;
}
diff --git
a/database/connector/dialect/hive/src/main/java/org/apache/shardingsphere/database/connector/hive/metadata/data/loader/HiveMetaDataLoader.java
b/database/connector/dialect/hive/src/main/java/org/apache/shardingsphere/database/connector/hive/metadata/data/loader/HiveMetaDataLoader.java
index 66e0fc57acf..aacc80c7d25 100644
---
a/database/connector/dialect/hive/src/main/java/org/apache/shardingsphere/database/connector/hive/metadata/data/loader/HiveMetaDataLoader.java
+++
b/database/connector/dialect/hive/src/main/java/org/apache/shardingsphere/database/connector/hive/metadata/data/loader/HiveMetaDataLoader.java
@@ -36,6 +36,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.stream.Collectors;
/**
@@ -52,7 +53,7 @@ public final class HiveMetaDataLoader implements
DialectMetaDataLoader {
if (loadInformationSchemaFlag(material)) {
try (Connection connection =
material.getDataSource().getConnection()) {
Map<String, Collection<ColumnMetaData>> columnMetaDataMap =
loadColumnMetaDataMap(connection, material.getActualTableNames());
- for (Map.Entry<String, Collection<ColumnMetaData>> entry :
columnMetaDataMap.entrySet()) {
+ for (Entry<String, Collection<ColumnMetaData>> entry :
columnMetaDataMap.entrySet()) {
tableMetaData.add(new TableMetaData(entry.getKey(),
entry.getValue(), Collections.emptyList(), Collections.emptyList()));
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGeneratorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGeneratorTest.java
index 37447e3d302..3cf28298cf7 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGeneratorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGeneratorTest.java
@@ -33,6 +33,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Map.Entry;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
@@ -89,7 +90,7 @@ class DatabaseExportMetaDataGeneratorTest {
private Map<String, StorageUnit> mockStorageUnits(final Map<String,
DataSourcePoolProperties> props) {
Map<String, StorageUnit> result = new LinkedHashMap<>(props.size(),
1F);
- for (Map.Entry<String, DataSourcePoolProperties> entry :
props.entrySet()) {
+ for (Entry<String, DataSourcePoolProperties> entry : props.entrySet())
{
StorageUnit storageUnit = mock(StorageUnit.class);
when(storageUnit.getDataSourcePoolProperties()).thenReturn(entry.getValue());
result.put(entry.getKey(), storageUnit);
diff --git
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
index e01f6dee237..7793202f7bf 100644
---
a/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
+++
b/proxy/frontend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutorTest.java
@@ -83,6 +83,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Optional;
import java.util.Properties;
import java.util.stream.Collectors;
@@ -357,7 +358,7 @@ class PostgreSQLComDescribeExecutorTest {
verify(mockPayload).writeInt2(expectedParamTypes.size());
Map<Integer, Long> expectedTypeCounts = expectedParamTypes.stream()
.collect(Collectors.groupingBy(PostgreSQLColumnType::getValue,
Collectors.counting()));
- for (Map.Entry<Integer, Long> entry : expectedTypeCounts.entrySet()) {
+ for (Entry<Integer, Long> entry : expectedTypeCounts.entrySet()) {
verify(mockPayload,
times(entry.getValue().intValue())).writeInt4(entry.getKey());
}
PostgreSQLRowDescriptionPacket rowDescriptionPacket =
(PostgreSQLRowDescriptionPacket) actualIterator.next();
diff --git a/src/resources/checkstyle.xml b/src/resources/checkstyle.xml
index c6eb20efd2c..76ced07bcd9 100644
--- a/src/resources/checkstyle.xml
+++ b/src/resources/checkstyle.xml
@@ -144,6 +144,11 @@
<module name="UnnecessarySemicolonInTryWithResources" />
<module name="UnusedLocalVariable" />
<module name="VariableDeclarationUsageDistance" />
+ <module name="RegexpSinglelineJava">
+ <property name="format"
value="^(?!\s*import\s+java\.util\.Map\.Entry\s*;).*\b(?:java\.util\.)?Map\.Entry\b"
/>
+ <property name="ignoreComments" value="true" />
+ <property name="message" value="Use Entry instead of Map.Entry
(import java.util.Map.Entry)." />
+ </module>
<!-- Imports -->
<module name="AvoidStarImport" />
