This is an automated email from the ASF dual-hosted git repository.
totalo 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 d593108 Add success message after generate success (#16399)
d593108 is described below
commit d593108f2fd0e75266d446ca47b4d1b4d2db067d
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Mar 26 23:40:38 2022 +0800
Add success message after generate success (#16399)
* Refactor JDBCExampleGenerator
* Refactor JDBCExampleGenerator
* Add success message after generate success
---
.../example/generator/ExampleGeneratorMain.java | 8 +++++++
.../generator/core/impl/JDBCExampleGenerator.java | 26 ++++++++++++----------
.../generator/core/impl/ProxyExampleGenerator.java | 20 +++++++++--------
.../src/main/resources/logback.xml | 2 +-
4 files changed, 34 insertions(+), 22 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 a3104bd..00ac135 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 lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.example.generator.core.ExampleGeneratorFactory;
import java.io.IOException;
@@ -28,6 +29,7 @@ import java.io.IOException;
* Example generator entrance.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Slf4j
public final class ExampleGeneratorMain {
/**
@@ -39,5 +41,11 @@ public final class ExampleGeneratorMain {
*/
public static void main(final String[] args) throws IOException,
TemplateException {
new ExampleGeneratorFactory().generate();
+ printMessages();
+ }
+
+ private static void printMessages() {
+ log.info("Example codes are generated successful!");
+ log.info("Please find them in folder
`target/generated-sources/shardingsphere-${product}-sample`.");
}
}
diff --git
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/JDBCExampleGenerator.java
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/JDBCExampleGenerator.java
index 5d4fa5e..5e18efd 100644
---
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/JDBCExampleGenerator.java
+++
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/JDBCExampleGenerator.java
@@ -37,22 +37,24 @@ public final class JDBCExampleGenerator implements
ExampleGenerator {
@Override
public void generate(final Configuration templateConfig, final Map<String,
String> dataModel) throws IOException, TemplateException {
- String features = dataModel.get("features");
- String frameworks = dataModel.get("frameworks");
- for (String eachFramework : frameworks.split(",")) {
- for (String eachFeature :
GenerateUtil.generateCombination(features.split(","))) {
- dataModel.put("feature", eachFeature);
- dataModel.put("framework", eachFramework);
- GenerateUtil.generateDirs(templateConfig, dataModel, new
ExampleScenarioFactory(eachFeature, eachFramework).getJavaClassPaths(),
OUTPUT_PATH + JAVA_CLASS_PATH);
- GenerateUtil.generateDirs(templateConfig, dataModel, new
ExampleScenarioFactory(eachFeature, eachFramework).getResourcePaths(),
OUTPUT_PATH + RESOURCES_PATH);
- GenerateUtil.generateFile(templateConfig, getType(),
dataModel, new ExampleScenarioFactory(eachFeature,
eachFramework).getJavaClassTemplateMap(), OUTPUT_PATH + JAVA_CLASS_PATH);
- GenerateUtil.generateFile(templateConfig, getType(),
dataModel, new ExampleScenarioFactory(eachFeature,
eachFramework).getResourceTemplateMap(), OUTPUT_PATH + RESOURCES_PATH);
- String outputPath = GenerateUtil.generatePath(templateConfig,
dataModel, OUTPUT_PATH);
- GenerateUtil.processFile(templateConfig, dataModel, getType()
+ "/pom.ftl", outputPath + "pom.xml");
+ for (String eachFramework : dataModel.get("frameworks").split(",")) {
+ for (String eachFeature :
GenerateUtil.generateCombination(dataModel.get("features").split(","))) {
+ generate(templateConfig, dataModel, eachFramework,
eachFeature);
}
}
}
+ private void generate(final Configuration templateConfig, final
Map<String, String> dataModel, final String framework, final String feature)
throws IOException, TemplateException {
+ dataModel.put("feature", feature);
+ dataModel.put("framework", framework);
+ GenerateUtil.generateDirs(templateConfig, dataModel, new
ExampleScenarioFactory(feature, framework).getJavaClassPaths(), OUTPUT_PATH +
JAVA_CLASS_PATH);
+ GenerateUtil.generateDirs(templateConfig, dataModel, new
ExampleScenarioFactory(feature, framework).getResourcePaths(), OUTPUT_PATH +
RESOURCES_PATH);
+ GenerateUtil.generateFile(templateConfig, getType(), dataModel, new
ExampleScenarioFactory(feature, framework).getJavaClassTemplateMap(),
OUTPUT_PATH + JAVA_CLASS_PATH);
+ GenerateUtil.generateFile(templateConfig, getType(), dataModel, new
ExampleScenarioFactory(feature, framework).getResourceTemplateMap(),
OUTPUT_PATH + RESOURCES_PATH);
+ String outputPath = GenerateUtil.generatePath(templateConfig,
dataModel, OUTPUT_PATH);
+ GenerateUtil.processFile(templateConfig, dataModel, getType() +
"/pom.ftl", outputPath + "pom.xml");
+ }
+
@Override
public String getType() {
return "jdbc";
diff --git
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/ProxyExampleGenerator.java
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/ProxyExampleGenerator.java
index 3e342e5..db6c005 100644
---
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/ProxyExampleGenerator.java
+++
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/impl/ProxyExampleGenerator.java
@@ -33,19 +33,21 @@ public final class ProxyExampleGenerator implements
ExampleGenerator {
@Override
public void generate(final Configuration templateConfig, final Map<String,
String> dataModel) throws IOException, TemplateException {
- String features = dataModel.get("features");
- String frameworks = dataModel.get("frameworks");
- for (String eachFramework : frameworks.split(",")) {
- for (String eachFeature :
GenerateUtil.generateCombination(features.split(","))) {
- dataModel.put("feature", eachFeature);
- dataModel.put("framework", eachFramework);
- GenerateUtil.generateDirs(templateConfig, dataModel,
Collections.singleton("conf"), OUTPUT_PATH + RESOURCES_PATH);
- String outputPath = GenerateUtil.generatePath(templateConfig,
dataModel, OUTPUT_PATH);
- processFile(eachFeature, templateConfig, dataModel,
outputPath);
+ for (String eachFramework : dataModel.get("frameworks").split(",")) {
+ for (String eachFeature :
GenerateUtil.generateCombination(dataModel.get("features").split(","))) {
+ generate(templateConfig, dataModel, eachFramework,
eachFeature);
}
}
}
+ private void generate(final Configuration templateConfig, final
Map<String, String> dataModel, final String framework, final String feature)
throws IOException, TemplateException {
+ dataModel.put("feature", feature);
+ dataModel.put("framework", framework);
+ GenerateUtil.generateDirs(templateConfig, dataModel,
Collections.singleton("conf"), OUTPUT_PATH + RESOURCES_PATH);
+ String outputPath = GenerateUtil.generatePath(templateConfig,
dataModel, OUTPUT_PATH);
+ processFile(feature, templateConfig, dataModel, outputPath);
+ }
+
private void processFile(final String feature, final Configuration
templateConfig, final Map<String, String> dataModel,
final String baseOutputPath) throws
TemplateException, IOException {
String outputPath = baseOutputPath + RESOURCES_PATH + "/conf/";
diff --git
a/examples/shardingsphere-example-generator/src/main/resources/logback.xml
b/examples/shardingsphere-example-generator/src/main/resources/logback.xml
index db4313c..2c9638b 100644
--- a/examples/shardingsphere-example-generator/src/main/resources/logback.xml
+++ b/examples/shardingsphere-example-generator/src/main/resources/logback.xml
@@ -19,7 +19,7 @@
<configuration>
<property name="log.context.name" value="shardingsphere-example-generator"
/>
<property name="log.charset" value="UTF-8" />
- <property name="log.pattern" value="[%-5level] %date --%thread-- [%logger]
%msg %n" />
+ <property name="log.pattern" value="%msg %n" />
<contextName>${log.context.name}</contextName>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
