You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@submarine.apache.org by by...@apache.org on 2021/06/29 09:56:06 UTC
[submarine] branch master updated: SUBMARINE-870. Replace &
with &
This is an automated email from the ASF dual-hosted git repository.
byronhsu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 05a8060 SUBMARINE-870. Replace & with &
05a8060 is described below
commit 05a806000e440b209e2310d8d242c86af03be22f
Author: KUAN-HSUN-LI <b0...@ntu.edu.tw>
AuthorDate: Tue Jun 29 09:59:09 2021 +0800
SUBMARINE-870. Replace & with &
### What is this PR for?
Using the link with "jdbc:mysql://127.0.0.1:3306/metastore_test?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false" will encounter the problem "Caused by: javax.net.ssl.SSLHandshakeException: No appropriate protocol (protocol is disabled or cipher suites are inappropriate)"; however, we have set the useSSL=false. This is the reason that & is the ampersand for XML file but not for Java file.
### What type of PR is it?
[Test]
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-870
### How should this be tested?
run the MetaStoreRestApiTest or run the command "mvn test" under the submarine-server folder.
### Screenshots (if appropriate)
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: KUAN-HSUN-LI <b0...@ntu.edu.tw>
Signed-off-by: byronhsu <by...@apache.org>
Closes #616 from KUAN-HSUN-LI/SUBMARINE-870 and squashes the following commits:
cbe17ca1 [KUAN-HSUN-LI] SUBMARINE-870. Replace & with &
---
.../commons/metastore/SubmarineMetaStoreTest.java | 8 ++++----
.../apache/submarine/commons/utils/SubmarineConfVars.java | 8 ++++----
.../submarine/server/database/utils/MyBatisUtil.java | 4 ++--
.../submarine/server/rest/EnvironmentRestApiTest.java | 10 +++++-----
.../server/rest/ExperimentTemplateRestApiTest.java | 14 +++++++-------
.../apache/submarine/server/rest/MetaStoreRestApiTest.java | 10 +++++-----
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/submarine-commons/commons-metastore/src/test/java/org/apache/submarine/commons/metastore/SubmarineMetaStoreTest.java b/submarine-commons/commons-metastore/src/test/java/org/apache/submarine/commons/metastore/SubmarineMetaStoreTest.java
index 3012b33..3f7ea60 100644
--- a/submarine-commons/commons-metastore/src/test/java/org/apache/submarine/commons/metastore/SubmarineMetaStoreTest.java
+++ b/submarine-commons/commons-metastore/src/test/java/org/apache/submarine/commons/metastore/SubmarineMetaStoreTest.java
@@ -55,8 +55,8 @@ public class SubmarineMetaStoreTest {
static {
submarineConf.setMetastoreJdbcUrl("jdbc:mysql://127.0.0.1:3306/metastore_test?" +
- "useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
- "failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false");
+ "useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
+ "failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false");
submarineConf.setMetastoreJdbcUserName("metastore_test");
submarineConf.setMetastoreJdbcPassword("password_test");
}
@@ -66,8 +66,8 @@ public class SubmarineMetaStoreTest {
LOG.info("listTables >>> ");
String url = "jdbc:mysql://127.0.0.1:3306/metastore_test?" +
- "useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
- "failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false";
+ "useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
+ "failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false";
String username = "metastore_test";
String password = "password_test";
boolean flag = false;
diff --git a/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java b/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java
index 3e2e547..bb3d1cd 100644
--- a/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java
+++ b/submarine-commons/commons-utils/src/main/java/org/apache/submarine/commons/utils/SubmarineConfVars.java
@@ -53,13 +53,13 @@ public class SubmarineConfVars {
JDBC_DRIVERCLASSNAME("jdbc.driverClassName", "com.mysql.jdbc.Driver"),
JDBC_URL("jdbc.url", "jdbc:mysql://127.0.0.1:3306/submarine" +
- "?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
- "failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false"),
+ "?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
+ "failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false"),
JDBC_USERNAME("jdbc.username", "submarine"),
JDBC_PASSWORD("jdbc.password", "password"),
METASTORE_JDBC_URL("metastore.jdbc.url", "jdbc:mysql://127.0.0.1:3306/metastore" +
- "?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
- "failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false"),
+ "?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
+ "failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false"),
METASTORE_JDBC_USERNAME("metastore.jdbc.username", "metastore"),
METASTORE_JDBC_PASSWORD("metastore.jdbc.password", "password"),
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/database/utils/MyBatisUtil.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/database/utils/MyBatisUtil.java
index 51b4519..9a638ef 100755
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/database/utils/MyBatisUtil.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/database/utils/MyBatisUtil.java
@@ -97,8 +97,8 @@ public class MyBatisUtil {
// Run the test unit using the test database
SubmarineConfiguration conf = SubmarineConfiguration.getInstance();
conf.setJdbcUrl("jdbc:mysql://127.0.0.1:3306/submarine_test?" +
- "useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
- "failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false");
+ "useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&" +
+ "failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false");
conf.setJdbcUserName("submarine_test");
conf.setJdbcPassword("password_test");
}
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java
index d2aadb8..6688c0e 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java
@@ -66,11 +66,11 @@ public class EnvironmentRestApiTest {
public static void init() {
SubmarineConfiguration submarineConf = SubmarineConfiguration.getInstance();
submarineConf.setMetastoreJdbcUrl("jdbc:mysql://127.0.0.1:3306/submarine_test?" +
- "useUnicode=true&" +
- "characterEncoding=UTF-8&" +
- "autoReconnect=true&" +
- "failOverReadOnly=false&" +
- "zeroDateTimeBehavior=convertToNull&" +
+ "useUnicode=true&" +
+ "characterEncoding=UTF-8&" +
+ "autoReconnect=true&" +
+ "failOverReadOnly=false&" +
+ "zeroDateTimeBehavior=convertToNull&" +
"useSSL=false");
submarineConf.setMetastoreJdbcUserName("submarine_test");
submarineConf.setMetastoreJdbcPassword("password_test");
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentTemplateRestApiTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentTemplateRestApiTest.java
index 6945de5..fff59e0 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentTemplateRestApiTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentTemplateRestApiTest.java
@@ -54,23 +54,23 @@ public class ExperimentTemplateRestApiTest {
@BeforeClass
public static void init() {
SubmarineConfiguration submarineConf = SubmarineConfiguration.getInstance();
- submarineConf.setMetastoreJdbcUrl("jdbc:mysql://127.0.0.1:3306/submarine_test?" + "useUnicode=true&"
- + "characterEncoding=UTF-8&" + "autoReconnect=true&" + "failOverReadOnly=false&"
- + "zeroDateTimeBehavior=convertToNull&" + "useSSL=false");
+ submarineConf.setMetastoreJdbcUrl("jdbc:mysql://127.0.0.1:3306/submarine_test?" + "useUnicode=true&"
+ + "characterEncoding=UTF-8&" + "autoReconnect=true&" + "failOverReadOnly=false&"
+ + "zeroDateTimeBehavior=convertToNull&" + "useSSL=false");
submarineConf.setMetastoreJdbcUserName("submarine_test");
submarineConf.setMetastoreJdbcPassword("password_test");
- experimentTemplateStoreApi = new ExperimentTemplateRestApi();
+ experimentTemplateStoreApi = new ExperimentTemplateRestApi();
}
@Before
public void createAndUpdateExperimentTemplate() {
String body = loadContent(TPL_FILE);
experimentTemplateSpec = gson.fromJson(body, ExperimentTemplateSpec.class);
-
+
// Create ExperimentTemplate
Response createEnvResponse = experimentTemplateStoreApi.createExperimentTemplate(experimentTemplateSpec);
assertEquals(Response.Status.OK.getStatusCode(), createEnvResponse.getStatus());
-
+
// Update ExperimentTemplate
experimentTemplateSpec.setDescription("newdescription");
Response updateTplResponse = experimentTemplateStoreApi.
@@ -80,7 +80,7 @@ public class ExperimentTemplateRestApiTest {
@After
public void deleteExperimentTemplate() {
-
+
String body = loadContent(TPL_FILE);
experimentTemplateSpec = gson.fromJson(body, ExperimentTemplateSpec.class);
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/MetaStoreRestApiTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/MetaStoreRestApiTest.java
index 9c904e3..ddb93e4 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/MetaStoreRestApiTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/MetaStoreRestApiTest.java
@@ -48,11 +48,11 @@ public class MetaStoreRestApiTest {
public static void init() {
SubmarineConfiguration submarineConf = SubmarineConfiguration.getInstance();
submarineConf.setMetastoreJdbcUrl("jdbc:mysql://127.0.0.1:3306/metastore_test?" +
- "useUnicode=true&" +
- "characterEncoding=UTF-8&" +
- "autoReconnect=true&" +
- "failOverReadOnly=false&" +
- "zeroDateTimeBehavior=convertToNull&" +
+ "useUnicode=true&" +
+ "characterEncoding=UTF-8&" +
+ "autoReconnect=true&" +
+ "failOverReadOnly=false&" +
+ "zeroDateTimeBehavior=convertToNull&" +
"useSSL=false");
submarineConf.setMetastoreJdbcUserName("metastore_test");
submarineConf.setMetastoreJdbcPassword("password_test");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org