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 2023/06/24 16:10:51 UTC
[shardingsphere] branch master updated: Refactor EncryptItemNodeConverter (#26524)
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 4651ff06745 Refactor EncryptItemNodeConverter (#26524)
4651ff06745 is described below
commit 4651ff0674539a6b1d95318b2c06dfd002704398
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Jun 25 00:10:44 2023 +0800
Refactor EncryptItemNodeConverter (#26524)
---
.../event/EncryptRuleConfigurationEventBuilder.java | 4 ++--
.../metadata/converter/EncryptItemNodeConverter.java | 8 ++++----
.../swapper/NewYamlEncryptRuleConfigurationSwapper.java | 12 ++++++------
.../metadata/converter/EncryptItemNodeConverterTest.java | 16 ++++++++--------
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleConfigurationEventBuilder.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleConfigurationEventBuilder.java
index 132d2e57f64..50eb498627f 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleConfigurationEventBuilder.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/event/EncryptRuleConfigurationEventBuilder.java
@@ -41,11 +41,11 @@ public final class EncryptRuleConfigurationEventBuilder implements RuleConfigura
if (!EncryptNodeConverter.isEncryptPath(event.getKey()) || Strings.isNullOrEmpty(event.getValue())) {
return Optional.empty();
}
- Optional<String> tableName = EncryptNodeConverter.getTableNodeConvertor().getItemNameByActiveVersionPath(event.getKey());
+ Optional<String> tableName = EncryptNodeConverter.getTableNodeConvertor().getNameByActiveVersionPath(event.getKey());
if (tableName.isPresent() && !Strings.isNullOrEmpty(event.getValue())) {
return createEncryptConfigEvent(databaseName, tableName.get(), event);
}
- Optional<String> encryptorName = EncryptNodeConverter.getEncryptorNodeConvertor().getItemNameByActiveVersionPath(event.getKey());
+ Optional<String> encryptorName = EncryptNodeConverter.getEncryptorNodeConvertor().getNameByActiveVersionPath(event.getKey());
if (encryptorName.isPresent() && !Strings.isNullOrEmpty(event.getValue())) {
return createEncryptorEvent(databaseName, encryptorName.get(), event);
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/converter/EncryptItemNodeConverter.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/converter/EncryptItemNodeConverter.java
index aff434571d5..4a977882e20 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/converter/EncryptItemNodeConverter.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/metadata/converter/EncryptItemNodeConverter.java
@@ -47,7 +47,7 @@ public final class EncryptItemNodeConverter {
* @param itemName item name
* @return item name path
*/
- public String getItemNamePath(final String itemName) {
+ public String getNamePath(final String itemName) {
return String.join("/", itemsNode, itemName);
}
@@ -57,7 +57,7 @@ public final class EncryptItemNodeConverter {
* @param rulePath rule path
* @return true or false
*/
- public boolean isItemPath(final String rulePath) {
+ public boolean isPath(final String rulePath) {
return itemsPathPattern.matcher(rulePath).find();
}
@@ -67,7 +67,7 @@ public final class EncryptItemNodeConverter {
* @param rulePath rule path
* @return item name
*/
- public Optional<String> getItemName(final String rulePath) {
+ public Optional<String> getName(final String rulePath) {
Matcher matcher = itemNamePathPattern.matcher(rulePath);
return matcher.find() ? Optional.of(matcher.group(3)) : Optional.empty();
}
@@ -78,7 +78,7 @@ public final class EncryptItemNodeConverter {
* @param rulePath rule path
* @return encrypt item version
*/
- public Optional<String> getItemNameByActiveVersionPath(final String rulePath) {
+ public Optional<String> getNameByActiveVersionPath(final String rulePath) {
Matcher matcher = itemVersionPathPattern.matcher(rulePath);
return matcher.find() ? Optional.of(matcher.group(3)) : Optional.empty();
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java
index 709bb79c4dd..c42986d7ca3 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/yaml/swapper/NewYamlEncryptRuleConfigurationSwapper.java
@@ -51,10 +51,10 @@ public final class NewYamlEncryptRuleConfigurationSwapper implements NewYamlRule
public Collection<YamlDataNode> swapToDataNodes(final EncryptRuleConfiguration data) {
Collection<YamlDataNode> result = new LinkedHashSet<>();
for (EncryptTableRuleConfiguration each : data.getTables()) {
- result.add(new YamlDataNode(EncryptNodeConverter.getTableNodeConvertor().getItemNamePath(each.getName()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(each))));
+ result.add(new YamlDataNode(EncryptNodeConverter.getTableNodeConvertor().getNamePath(each.getName()), YamlEngine.marshal(tableSwapper.swapToYamlConfiguration(each))));
}
for (Entry<String, AlgorithmConfiguration> entry : data.getEncryptors().entrySet()) {
- result.add(new YamlDataNode(EncryptNodeConverter.getEncryptorNodeConvertor().getItemNamePath(entry.getKey()),
+ result.add(new YamlDataNode(EncryptNodeConverter.getEncryptorNodeConvertor().getNamePath(entry.getKey()),
YamlEngine.marshal(algorithmSwapper.swapToYamlConfiguration(entry.getValue()))));
}
return result;
@@ -65,11 +65,11 @@ public final class NewYamlEncryptRuleConfigurationSwapper implements NewYamlRule
Collection<EncryptTableRuleConfiguration> tables = new LinkedList<>();
Map<String, AlgorithmConfiguration> encryptors = new HashMap<>();
for (YamlDataNode each : dataNodes) {
- if (EncryptNodeConverter.getTableNodeConvertor().isItemPath(each.getKey())) {
- EncryptNodeConverter.getTableNodeConvertor().getItemName(each.getKey())
+ if (EncryptNodeConverter.getTableNodeConvertor().isPath(each.getKey())) {
+ EncryptNodeConverter.getTableNodeConvertor().getName(each.getKey())
.ifPresent(tableName -> tables.add(tableSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlEncryptTableRuleConfiguration.class))));
- } else if (EncryptNodeConverter.getEncryptorNodeConvertor().isItemPath(each.getKey())) {
- EncryptNodeConverter.getEncryptorNodeConvertor().getItemName(each.getKey())
+ } else if (EncryptNodeConverter.getEncryptorNodeConvertor().isPath(each.getKey())) {
+ EncryptNodeConverter.getEncryptorNodeConvertor().getName(each.getKey())
.ifPresent(encryptorName -> encryptors.put(encryptorName, algorithmSwapper.swapToObject(YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class))));
}
}
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/converter/EncryptItemNodeConverterTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/converter/EncryptItemNodeConverterTest.java
index e99f12cb73f..1deef0614aa 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/converter/EncryptItemNodeConverterTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/metadata/converter/EncryptItemNodeConverterTest.java
@@ -30,25 +30,25 @@ class EncryptItemNodeConverterTest {
private final EncryptItemNodeConverter itemNodeConverter = new EncryptItemNodeConverter("tables");
@Test
- void assertGetItemNamePath() {
- assertThat(itemNodeConverter.getItemNamePath("foo_table"), is("tables/foo_table"));
+ void assertGetNamePath() {
+ assertThat(itemNodeConverter.getNamePath("foo_table"), is("tables/foo_table"));
}
@Test
- void assertIsItemPath() {
- assertTrue(itemNodeConverter.isItemPath("/metadata/foo_db/rules/encrypt/tables/foo_table"));
+ void assertIsPath() {
+ assertTrue(itemNodeConverter.isPath("/metadata/foo_db/rules/encrypt/tables/foo_table"));
}
@Test
- void assertGetItemName() {
- Optional<String> actual = itemNodeConverter.getItemName("/metadata/foo_db/rules/encrypt/tables/foo_table");
+ void assertGetName() {
+ Optional<String> actual = itemNodeConverter.getName("/metadata/foo_db/rules/encrypt/tables/foo_table");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("foo_table"));
}
@Test
- void assertGetItemNameByActiveVersionPath() {
- Optional<String> actual = itemNodeConverter.getItemNameByActiveVersionPath("/metadata/foo_db/rules/encrypt/tables/foo_table/active_version");
+ void assertGetNameByActiveVersionPath() {
+ Optional<String> actual = itemNodeConverter.getNameByActiveVersionPath("/metadata/foo_db/rules/encrypt/tables/foo_table/active_version");
assertTrue(actual.isPresent());
assertThat(actual.get(), is("foo_table"));
}