You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/02/24 03:23:53 UTC
[shardingsphere] branch master updated: Fix example generator spi and adjust build directory (#15582)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 a3aecf9 Fix example generator spi and adjust build directory (#15582)
a3aecf9 is described below
commit a3aecf934d7117a20c7dbdc9d451705bd02f11fa
Author: Guocheng Tang <to...@qq.com>
AuthorDate: Thu Feb 24 11:22:44 2022 +0800
Fix example generator spi and adjust build directory (#15582)
* Fix example generator spi and adjust build directory
* update path
---
.../apache/shardingsphere/example/generator/ExampleGenerator.java | 5 +++++
.../shardingsphere/example/generator/JDBCExampleGenerator.java | 7 +------
.../shardingsphere/example/generator/ProxyExampleGenerator.java | 5 -----
...> org.apache.shardingsphere.example.generator.ExampleGenerator} | 0
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java
index f9f73ad..dd75c5c 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java
+++ b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java
@@ -28,6 +28,11 @@ import java.util.Map;
*/
public interface ExampleGenerator {
+ String OUTPUT_PATH = "./examples/shardingsphere-sample/shardingsphere-example-generator/target/shardingsphere-example-generated"
+ + "/shardingsphere-${product}-sample/${feature?replace(',', '-')}--${framework}--${mode}--${transaction}/";
+
+ String RESOURCES_PATH = "src/main/resources";
+
/**
* Generate file.
*
diff --git a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/JDBCExampleGenerator.java b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/JDBCExampleGenerator.java
index 5677d1b..e692512 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/JDBCExampleGenerator.java
+++ b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/JDBCExampleGenerator.java
@@ -29,9 +29,6 @@ import java.util.Map;
*/
public final class JDBCExampleGenerator implements ExampleGenerator {
- private static final String OUTPUT_PATH = "./examples/shardingsphere-sample/shardingsphere-example-generator/target/shardingsphere-example-generated"
- + "/shardingsphere-${product}-sample/${feature?replace(',', '-')}--${framework}--${mode}--${transaction}/";
-
private static final String JAVA_CLASS_PATH = "src/main/java/org/apache/shardingsphere/example/"
+ "<#assign package=\"\">"
+ "<#if feature?split(\",\")?size gt 1>"
@@ -41,8 +38,6 @@ public final class JDBCExampleGenerator implements ExampleGenerator {
+ "</#if>"
+ "${package}/${framework?replace('-', '/')}";
- private static final String RESOURCES_PATH = "src/main/resources";
-
@Override
public void generate(final Configuration templateConfig, final Map<String, String> dataModel) throws IOException, TemplateException {
String features = dataModel.get("features");
@@ -56,7 +51,7 @@ public final class JDBCExampleGenerator implements ExampleGenerator {
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, "pom.ftl", outputPath + "pom.xml");
+ GenerateUtil.processFile(templateConfig, dataModel, getType() + "/pom.ftl", outputPath + "pom.xml");
}
}
}
diff --git a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ProxyExampleGenerator.java b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ProxyExampleGenerator.java
index 9bb119f..e6e39c1 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ProxyExampleGenerator.java
+++ b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ProxyExampleGenerator.java
@@ -30,11 +30,6 @@ import java.util.Map;
*/
public final class ProxyExampleGenerator implements ExampleGenerator {
- private static final String OUTPUT_PATH = "./examples/shardingsphere-sample/shardingsphere-example-generator/target/shardingsphere-example-generated"
- + "/shardingsphere-${product}-sample/${feature?replace(',', '-')}--${framework}--${mode}--${transaction}/";
-
- private static final String RESOURCES_PATH = "src/main/resources";
-
@Override
public void generate(final Configuration templateConfig, final Map<String, String> dataModel) throws IOException, TemplateException {
String features = dataModel.get("features");
diff --git a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/META-INF/services/org.apache.shardingsphere.example.generator.scenario.feature.ExampleGenerator b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/META-INF/services/org.apache.shardingsphere.example.generator.ExampleGenerator
similarity index 100%
rename from examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/META-INF/services/org.apache.shardingsphere.example.generator.scenario.feature.ExampleGenerator
rename to examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/META-INF/services/org.apache.shardingsphere.example.generator.ExampleGenerator