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 2024/06/24 16:09:04 UTC
(shardingsphere) branch master updated: Rename SQLHintTokenEnum to SQLHintTokenType (#31832)
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 befde4be637 Rename SQLHintTokenEnum to SQLHintTokenType (#31832)
befde4be637 is described below
commit befde4be6378ba7e5b6cbfb2e511097e4657f364
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Jun 25 00:08:58 2024 +0800
Rename SQLHintTokenEnum to SQLHintTokenType (#31832)
* Fix sonar issue of DropDefaultShardingStrategyExecutor
* Rename SQLHintTokenType
---
.../hint/{SQLHintTokenEnum.java => SQLHintTokenType.java} | 2 +-
.../org/apache/shardingsphere/infra/hint/SQLHintUtils.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintTokenEnum.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintTokenType.java
similarity index 97%
rename from infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintTokenEnum.java
rename to infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintTokenType.java
index 258724d3f88..39e8612f533 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintTokenEnum.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintTokenType.java
@@ -25,7 +25,7 @@ import lombok.RequiredArgsConstructor;
*/
@RequiredArgsConstructor
@Getter
-public enum SQLHintTokenEnum {
+public enum SQLHintTokenType {
/**
* SQL start hint token.
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintUtils.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintUtils.java
index b9f6bfc558a..626f2112a12 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintUtils.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/hint/SQLHintUtils.java
@@ -53,7 +53,7 @@ public final class SQLHintUtils {
* @return hint value context
*/
public static HintValueContext extractHint(final String sql) {
- if (!startWithHint(sql, SQLHintTokenEnum.SQL_START_HINT_TOKEN)) {
+ if (!startWithHint(sql, SQLHintTokenType.SQL_START_HINT_TOKEN)) {
return new HintValueContext();
}
HintValueContext result = new HintValueContext();
@@ -94,12 +94,12 @@ public final class SQLHintUtils {
* @return SQL after remove hint
*/
public static String removeHint(final String sql) {
- return startWithHint(sql, SQLHintTokenEnum.SQL_START_HINT_TOKEN) ? sql.substring(sql.indexOf(SQL_COMMENT_SUFFIX) + 2).trim() : sql;
+ return startWithHint(sql, SQLHintTokenType.SQL_START_HINT_TOKEN) ? sql.substring(sql.indexOf(SQL_COMMENT_SUFFIX) + 2).trim() : sql;
}
private static Properties getSQLHintProps(final String comment) {
Properties result = new Properties();
- int startIndex = getStartIndex(comment, SQLHintTokenEnum.SQL_START_HINT_TOKEN, SQLHintTokenEnum.SQL_HINT_TOKEN);
+ int startIndex = getStartIndex(comment, SQLHintTokenType.SQL_START_HINT_TOKEN, SQLHintTokenType.SQL_HINT_TOKEN);
if (startIndex < 0) {
return result;
}
@@ -114,7 +114,7 @@ public final class SQLHintUtils {
return result;
}
- private static int getStartIndex(final String comment, final SQLHintTokenEnum sqlStartHintToken, final SQLHintTokenEnum sqlHintToken) {
+ private static int getStartIndex(final String comment, final SQLHintTokenType sqlStartHintToken, final SQLHintTokenType sqlHintToken) {
String lowerCaseComment = comment.toLowerCase();
int result = lowerCaseComment.startsWith(sqlStartHintToken.getAlias().toLowerCase())
? lowerCaseComment.indexOf(sqlHintToken.getAlias())
@@ -133,7 +133,7 @@ public final class SQLHintUtils {
}
}
- private static boolean startWithHint(final String sql, final SQLHintTokenEnum sqlStartHintToken) {
+ private static boolean startWithHint(final String sql, final SQLHintTokenType sqlStartHintToken) {
return null != sql && (sql.startsWith(sqlStartHintToken.getKey()) || sql.startsWith(sqlStartHintToken.getAlias()));
}