Refactor IdentifierValue (#33744)

apache · Nov 20, 2024 · 195c6a9 · 195c6a9
1 parent 8722823
commit 195c6a9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/...org/apache/shardingsphere/infra/database/core/metadata/database/enums/QuoteCharacter.java b/...org/apache/shardingsphere/infra/database/core/metadata/database/enums/QuoteCharacter.java
@@ -65,10 +65,7 @@ public enum QuoteCharacter {
      * @return value of quote character
      */
     public static QuoteCharacter getQuoteCharacter(final String value) {
-        if (Strings.isNullOrEmpty(value)) {
-            return NONE;
-        }
-        return BY_FIRST_CHAR.getOrDefault(value.charAt(0), NONE);
+        return Strings.isNullOrEmpty(value) ? NONE : BY_FIRST_CHAR.getOrDefault(value.charAt(0), NONE);
     }
 
     /**

diff --git a/...org/apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValue.java b/...org/apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValue.java
@@ -63,13 +63,6 @@ public String getValueWithQuoteCharacters() {
      * @return quote content
      */
     public static String getQuotedContent(final String text) {
-        if (Strings.isNullOrEmpty(text)) {
-            return text;
-        }
-        QuoteCharacter quoteCharacter = QuoteCharacter.getQuoteCharacter(text);
-        if (QuoteCharacter.NONE == quoteCharacter) {
-            return text.trim();
-        }
-        return text.substring(1, text.length() - 1);
+        return Strings.isNullOrEmpty(text) ? text : QuoteCharacter.getQuoteCharacter(text).unwrap(text).trim();
     }
 }
diff --git a/...apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValueTest.java b/...apache/shardingsphere/sql/parser/statement/core/value/identifier/IdentifierValueTest.java
@@ -21,6 +21,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 class IdentifierValueTest {
 
@@ -53,4 +54,26 @@ void assertGetIdentifierValueWithReservedBracket() {
         String text = "ds_${[1,2]}.t_order";
         assertThat(new IdentifierValue(text, "[]").getValue(), is("ds_${[1,2]}.t_order"));
     }
+
+    @Test
+    void assertGetValueWithQuoteCharactersWithNullValue() {
+        assertThat(new IdentifierValue(null).getValueWithQuoteCharacters(), is(""));
+    }
+
+    @Test
+    void assertGetValueWithQuoteCharactersWithValue() {
+        String text = "[foo]";
+        assertThat(new IdentifierValue(text).getValueWithQuoteCharacters(), is("[foo]"));
+    }
+
+    @Test
+    void assertGetQuotedContentWithNullValue() {
+        assertNull(IdentifierValue.getQuotedContent(null));
+    }
+
+    @Test
+    void assertGetQuotedContent() {
+        assertThat(IdentifierValue.getQuotedContent(" foo "), is("foo"));
+        assertThat(IdentifierValue.getQuotedContent("`foo`"), is("foo"));
+    }
 }