You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/06/21 04:29:06 UTC
[shardingsphere] branch master updated: Refactor ImportDatabaseConfigurationStatement.filePath from optional to required (#18480)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 1bdc967ec42 Refactor ImportDatabaseConfigurationStatement.filePath from optional to required (#18480)
1bdc967ec42 is described below
commit 1bdc967ec427744749ac085a51c7083f19fce55e
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Jun 21 12:29:01 2022 +0800
Refactor ImportDatabaseConfigurationStatement.filePath from optional to required (#18480)
---
.../updatable/ImportDatabaseConfigurationStatement.java | 13 ++-----------
.../updatable/ImportDatabaseConfigurationHandler.java | 5 +----
.../ImportDatabaseConfigurationStatementAssert.java | 7 +------
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/updatable/ImportDatabaseConfigurationStatement.java b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/updatable/ImportDatabaseConfigurationStatement.java
index 06843e5b916..4b2fa7c97ac 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/updatable/ImportDatabaseConfigurationStatement.java
+++ b/shardingsphere-distsql/shardingsphere-distsql-statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/common/updatable/ImportDatabaseConfigurationStatement.java
@@ -17,25 +17,16 @@
package org.apache.shardingsphere.distsql.parser.statement.ral.common.updatable;
+import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement;
-import java.util.Optional;
-
/**
* Import database configuration statement.
*/
@RequiredArgsConstructor
+@Getter
public final class ImportDatabaseConfigurationStatement extends UpdatableRALStatement {
private final String filePath;
-
- /**
- * Get file path.
- *
- * @return file path
- */
- public Optional<String> getFilePath() {
- return Optional.ofNullable(filePath);
- }
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java
index c80f89b2c33..7f5ce7019e2 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/updatable/ImportDatabaseConfigurationHandler.java
@@ -88,10 +88,7 @@ public final class ImportDatabaseConfigurationHandler extends UpdatableRALBacken
@Override
protected void update(final ContextManager contextManager) throws DistSQLException {
- if (!getSqlStatement().getFilePath().isPresent()) {
- return;
- }
- File yamlFile = new File(getSqlStatement().getFilePath().get());
+ File yamlFile = new File(getSqlStatement().getFilePath());
YamlProxyDatabaseConfiguration yamlConfig;
try {
yamlConfig = YamlEngine.unmarshal(yamlFile, YamlProxyDatabaseConfiguration.class);
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/common/updatable/ImportDatabaseConfigurationStatementAssert.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/common/updatable/ImportDatabaseConfigurationStatementAssert.java
index 3c6b4240c45..165a0dab8cf 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/common/updatable/ImportDatabaseConfigurationStatementAssert.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/common/updatable/ImportDatabaseConfigurationStatementAssert.java
@@ -24,10 +24,8 @@ import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAs
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.ImportDatabaseConfigurationStatementTestCase;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
/**
* Import database configuration statement assert.
@@ -47,10 +45,7 @@ public final class ImportDatabaseConfigurationStatementAssert {
if (null == expected) {
assertNull(assertContext.getText("Actual statement should not exist."), actual);
} else {
- assertNotNull(assertContext.getText("Actual statement should exist."), actual);
- assertTrue(actual.getFilePath().isPresent());
- assertNotNull(expected.getFilePath());
- assertThat(actual.getFilePath().get(), is(expected.getFilePath()));
+ assertThat(actual.getFilePath(), is(expected.getFilePath()));
}
}
}