This is an automated email from the ASF dual-hosted git repository.
panjuan 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 da28546ff9a Remove useless methods (#19151)
da28546ff9a is described below
commit da28546ff9adf27191e4c659ff62605041330bac
Author: zhaojinchao <[email protected]>
AuthorDate: Thu Jul 14 18:28:02 2022 +0800
Remove useless methods (#19151)
* Remove useless methods
* Add it
* Fix ci
---
.../metadata/persist/MetaDataPersistService.java | 20 --------------------
.../persist/MetaDataPersistServiceTest.java | 22 ----------------------
2 files changed, 42 deletions(-)
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
index ce1ed1a22a1..c28c24c38ce 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.mode.metadata.persist;
-import com.google.common.base.Preconditions;
import lombok.Getter;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.database.DatabaseConfiguration;
@@ -32,14 +31,12 @@ import
org.apache.shardingsphere.mode.metadata.persist.service.impl.DatabaseRule
import
org.apache.shardingsphere.mode.metadata.persist.service.impl.GlobalRulePersistService;
import
org.apache.shardingsphere.mode.metadata.persist.service.impl.PropertiesPersistService;
import org.apache.shardingsphere.mode.persist.PersistRepository;
-import
org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
import javax.sql.DataSource;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Optional;
import java.util.Properties;
/**
@@ -136,21 +133,4 @@ public final class MetaDataPersistService {
}
return result;
}
-
- /**
- * Persist transaction rule.
- *
- * @param props transaction props
- * @param isOverwrite whether overwrite registry center's configuration if
existed
- */
- public void persistTransactionRule(final Properties props, final boolean
isOverwrite) {
- Collection<RuleConfiguration> ruleConfigs = globalRuleService.load();
- Optional<RuleConfiguration> ruleConfig =
ruleConfigs.stream().filter(each -> each instanceof
TransactionRuleConfiguration).findFirst();
- Preconditions.checkState(ruleConfig.isPresent());
- if (!props.equals(((TransactionRuleConfiguration)
ruleConfig.get()).getProps())) {
- ((TransactionRuleConfiguration)
ruleConfig.get()).getProps().clear();
- ((TransactionRuleConfiguration)
ruleConfig.get()).getProps().putAll(props);
- globalRuleService.persist(ruleConfigs, isOverwrite);
- }
- }
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
index 621f4910734..bfb1fd1dabb 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
@@ -32,8 +32,6 @@ import
org.apache.shardingsphere.mode.metadata.persist.service.impl.GlobalRulePe
import
org.apache.shardingsphere.mode.metadata.persist.service.impl.PropertiesPersistService;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import org.apache.shardingsphere.test.mock.MockedDataSource;
-import
org.apache.shardingsphere.transaction.config.TransactionRuleConfiguration;
-import org.apache.shardingsphere.transaction.core.TransactionType;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -51,16 +49,12 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Optional;
import java.util.Properties;
import java.util.stream.Collectors;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class MetaDataPersistServiceTest {
@@ -159,20 +153,4 @@ public final class MetaDataPersistServiceTest {
Map<String, DataSource> resultEffectiveDataSources =
metaDataPersistService.getEffectiveDataSources("foo_db", databaseConfigs);
assertTrue(resultEffectiveDataSources.isEmpty());
}
-
- @Test
- public void assertPersistTransactionRule() {
- when(globalRuleService.load()).thenReturn(Collections.singleton(new
TransactionRuleConfiguration(TransactionType.LOCAL.name(), null, new
Properties())));
- Properties props = createTransactionProperties();
- metaDataPersistService.persistTransactionRule(props, true);
- Optional<RuleConfiguration> actual =
globalRuleService.load().stream().filter(each -> each instanceof
TransactionRuleConfiguration).findFirst();
- assertTrue(actual.isPresent());
- assertThat(actual.get(), is(new
TransactionRuleConfiguration(TransactionType.LOCAL.name(), null,
createTransactionProperties())));
- }
-
- private Properties createTransactionProperties() {
- Properties result = new Properties();
- result.setProperty("type", TransactionType.LOCAL.name());
- return result;
- }
}
