You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/03/14 02:22:49 UTC
(shardingsphere) branch master updated: Fix sonar issue on EncryptInsertCipherNameTokenGenerator (#34986)
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 ce1f59cdf41 Fix sonar issue on EncryptInsertCipherNameTokenGenerator (#34986)
ce1f59cdf41 is described below
commit ce1f59cdf4130a1d10008baa688de1ec0d145c4c
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Mar 14 10:22:43 2025 +0800
Fix sonar issue on EncryptInsertCipherNameTokenGenerator (#34986)
---
.../generator/insert/EncryptInsertCipherNameTokenGenerator.java | 5 +++--
.../generator/insert/EncryptInsertDerivedColumnsTokenGenerator.java | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java
index de801569e3f..34c8db35c6e 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertCipherNameTokenGenerator.java
@@ -68,15 +68,16 @@ public final class EncryptInsertCipherNameTokenGenerator implements CollectionSQ
public Collection<SQLToken> generateSQLTokens(final InsertStatementContext insertStatementContext) {
Optional<InsertColumnsSegment> insertColumnsSegment = insertStatementContext.getSqlStatement().getInsertColumns();
Preconditions.checkState(insertColumnsSegment.isPresent());
- QuoteCharacter quoteCharacter = new DatabaseTypeRegistry(insertStatementContext.getDatabaseType()).getDialectDatabaseMetaData().getQuoteCharacter();
Collection<ColumnSegment> insertColumns = insertColumnsSegment.get().getColumns();
if (null != insertStatementContext.getInsertSelectContext()) {
checkInsertSelectEncryptor(insertStatementContext.getInsertSelectContext().getSelectStatementContext(), insertColumns);
}
- Optional<EncryptTable> encryptTable = rule.findEncryptTable(insertStatementContext.getSqlStatement().getTable().map(optional -> optional.getTableName().getIdentifier().getValue()).orElse(""));
+ Optional<EncryptTable> encryptTable = rule.findEncryptTable(insertStatementContext.getSqlStatement().getTable()
+ .map(optional -> optional.getTableName().getIdentifier().getValue()).orElse(""));
if (!encryptTable.isPresent()) {
return Collections.emptyList();
}
+ QuoteCharacter quoteCharacter = new DatabaseTypeRegistry(insertStatementContext.getDatabaseType()).getDialectDatabaseMetaData().getQuoteCharacter();
Collection<SQLToken> result = new LinkedList<>();
for (ColumnSegment each : insertColumns) {
String columnName = each.getIdentifier().getValue();
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDerivedColumnsTokenGenerator.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDerivedColumnsTokenGenerator.java
index 3c5cdd35faf..4f51e99d6cd 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDerivedColumnsTokenGenerator.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/insert/EncryptInsertDerivedColumnsTokenGenerator.java
@@ -55,7 +55,8 @@ public final class EncryptInsertDerivedColumnsTokenGenerator implements Collecti
@Override
public Collection<SQLToken> generateSQLTokens(final InsertStatementContext insertStatementContext) {
- Optional<EncryptTable> encryptTable = rule.findEncryptTable(insertStatementContext.getSqlStatement().getTable().map(optional -> optional.getTableName().getIdentifier().getValue()).orElse(""));
+ Optional<EncryptTable> encryptTable = rule.findEncryptTable(insertStatementContext.getSqlStatement().getTable()
+ .map(optional -> optional.getTableName().getIdentifier().getValue()).orElse(""));
if (!encryptTable.isPresent()) {
return Collections.emptyList();
}