This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 9c6dd4e For code format and package adjust (#16398)
9c6dd4e is described below
commit 9c6dd4ef402950b0d8a718903b477ae41d379649
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Mar 26 23:01:13 2022 +0800
For code format and package adjust (#16398)
* Refactor ShardingSphereSQLParserEngine
* Fix license
* Remove useless code
* Remove useless code
* For code format
* Add generate.core package
* Add generate.core.impl package
---
.../example/generator/ExampleGeneratorMain.java | 1 +
.../example/generator/{ => core}/ExampleGenerator.java | 5 ++---
.../generator/{ => core}/ExampleGeneratorFactory.java | 2 +-
.../example/generator/{ => core}/GenerateUtil.java | 18 +-----------------
.../{ => core/impl}/JDBCExampleGenerator.java | 4 +++-
.../{ => core/impl}/ProxyExampleGenerator.java | 4 +++-
...dingsphere.example.generator.core.ExampleGenerator} | 4 ++--
.../src/main/resources/config.yaml | 6 +++---
.../src/main/resources/template/jdbc/pom.ftl | 1 -
.../infra/parser/ShardingSphereSQLParserEngine.java | 12 ------------
10 files changed, 16 insertions(+), 41 deletions(-)
diff --git
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorMain.java
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorMain.java
index 80a6cec..a3104bd 100644
---
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorMain.java
+++
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorMain.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.example.generator;
import freemarker.template.TemplateException;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.example.generator.core.ExampleGeneratorFactory;
import java.io.IOException;
diff --git
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/ExampleGenerator.java
similarity index 88%
rename from
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java
rename to
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/ExampleGenerator.java
index c435914..351c365 100644
---
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java
+++
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/ExampleGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.generator;
+package org.apache.shardingsphere.example.generator.core;
import freemarker.template.Configuration;
import freemarker.template.TemplateException;
@@ -28,8 +28,7 @@ import java.util.Map;
*/
public interface ExampleGenerator {
- String OUTPUT_PATH =
"./examples/shardingsphere-example-generator/target/generated-sources"
- + "/shardingsphere-${product}-sample/${feature?replace(',',
'-')}--${framework}--${mode}--${transaction}/";
+ String OUTPUT_PATH =
"./examples/shardingsphere-example-generator/target/generated-sources/shardingsphere-${product}-sample/${feature?replace(',',
'-')}--${framework}--${mode}--${transaction}/";
String RESOURCES_PATH = "src/main/resources";
diff --git
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorFactory.java
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/ExampleGeneratorFactory.java
similarity index 97%
rename from
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorFactory.java
rename to
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/ExampleGeneratorFactory.java
index c0b640b..d49c49e 100644
---
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorFactory.java
+++
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/ExampleGeneratorFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.generator;
+package org.apache.shardingsphere.example.generator.core;
import freemarker.template.Configuration;
import freemarker.template.TemplateException;
diff --git
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/GenerateUtil.java
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/GenerateUtil.java
similarity index 86%
rename from
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/GenerateUtil.java
rename to
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/GenerateUtil.java
index 80a1382..0bfb69b 100644
---
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/GenerateUtil.java
+++
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/GenerateUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.generator;
+package org.apache.shardingsphere.example.generator.core;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -78,22 +78,6 @@ public final class GenerateUtil {
}
/**
- * Generate file.
- *
- * @param templateConfig template configuration
- * @param dataModel data model
- * @param path paths
- * @throws IOException IO exception
- * @throws TemplateException template exception
- */
- public static void generateFile(final Configuration templateConfig, final
Map<String, String> dataModel, final Map<String, String> templateMap, final
String path) throws IOException, TemplateException {
- String outputPath = generatePath(templateConfig, dataModel, path);
- for (Entry<String, String> entry : templateMap.entrySet()) {
- processFile(templateConfig, dataModel, entry.getKey(), outputPath
+ "/" + entry.getValue());
- }
- }
-
- /**
* Generate path.
*
* @param templateConfig template configuration
diff --git
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/JDBCExampleGenerator.java
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/JDBCExampleGenerator.java
similarity index 93%
rename from
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/JDBCExampleGenerator.java
rename to
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/JDBCExampleGenerator.java
index 37e5ffd..5d4fa5e 100644
---
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/JDBCExampleGenerator.java
+++
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/JDBCExampleGenerator.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.generator;
+package org.apache.shardingsphere.example.generator.core.impl;
import freemarker.template.Configuration;
import freemarker.template.TemplateException;
+import org.apache.shardingsphere.example.generator.core.ExampleGenerator;
+import org.apache.shardingsphere.example.generator.core.GenerateUtil;
import
org.apache.shardingsphere.example.generator.scenario.ExampleScenarioFactory;
import java.io.IOException;
diff --git
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ProxyExampleGenerator.java
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/ProxyExampleGenerator.java
similarity index 93%
rename from
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ProxyExampleGenerator.java
rename to
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/ProxyExampleGenerator.java
index 358cd8b..3e342e5 100644
---
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ProxyExampleGenerator.java
+++
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/ProxyExampleGenerator.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.generator;
+package org.apache.shardingsphere.example.generator.core.impl;
import freemarker.template.Configuration;
import freemarker.template.TemplateException;
+import org.apache.shardingsphere.example.generator.core.ExampleGenerator;
+import org.apache.shardingsphere.example.generator.core.GenerateUtil;
import java.io.IOException;
import java.util.Collections;
diff --git
a/examples/shardingsphere-example-generator/src/main/resources/META-INF/services/org.apache.shardingsphere.example.generator.ExampleGenerator
b/examples/shardingsphere-example-generator/src/main/resources/META-INF/services/org.apache.shardingsphere.example.generator.core.ExampleGenerator
similarity index 83%
rename from
examples/shardingsphere-example-generator/src/main/resources/META-INF/services/org.apache.shardingsphere.example.generator.ExampleGenerator
rename to
examples/shardingsphere-example-generator/src/main/resources/META-INF/services/org.apache.shardingsphere.example.generator.core.ExampleGenerator
index 50e3c41..b606c02 100644
---
a/examples/shardingsphere-example-generator/src/main/resources/META-INF/services/org.apache.shardingsphere.example.generator.ExampleGenerator
+++
b/examples/shardingsphere-example-generator/src/main/resources/META-INF/services/org.apache.shardingsphere.example.generator.core.ExampleGenerator
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.shardingsphere.example.generator.JDBCExampleGenerator
-org.apache.shardingsphere.example.generator.ProxyExampleGenerator
+org.apache.shardingsphere.example.generator.core.impl.JDBCExampleGenerator
+org.apache.shardingsphere.example.generator.core.impl.ProxyExampleGenerator
diff --git
a/examples/shardingsphere-example-generator/src/main/resources/config.yaml
b/examples/shardingsphere-example-generator/src/main/resources/config.yaml
index 78c0e23..d504437 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/config.yaml
+++ b/examples/shardingsphere-example-generator/src/main/resources/config.yaml
@@ -2,15 +2,15 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License,Version 2.0
+# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
-# Unless required by applicable law or agreed to in writing,software
+# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,either express or implied.
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
diff --git
a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
index f16674c..f4fd0d4 100644
---
a/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
+++
b/examples/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
@@ -20,7 +20,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<groupId>org.apache.shardingsphere.example</groupId>
<artifactId>${feature?replace(',',
'-')}--${framework}--${mode}--${transaction}</artifactId>
<name>${r'${project.artifactId}'}</name>
diff --git
a/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/ShardingSphereSQLParserEngine.java
b/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/ShardingSphereSQLParserEngine.java
index 3e66f78..5396140 100644
---
a/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/ShardingSphereSQLParserEngine.java
+++
b/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/ShardingSphereSQLParserEngine.java
@@ -53,20 +53,8 @@ public final class ShardingSphereSQLParserEngine {
* @param useCache whether use cache
* @return SQL statement
*/
- @SuppressWarnings("OverlyBroadCatchBlock")
public SQLStatement parse(final String sql, final boolean useCache) {
try {
- return parse0(sql, useCache);
- // CHECKSTYLE:OFF
- // TODO check whether throw SQLParsingException only
- } catch (final Exception ex) {
- // CHECKSTYLE:ON
- throw ex;
- }
- }
-
- private SQLStatement parse0(final String sql, final boolean useCache) {
- try {
return sqlStatementParserEngine.parse(sql, useCache);
} catch (final SQLParsingException | ParseCancellationException |
UncheckedExecutionException originalEx) {
try {
