You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2022/01/19 23:07:16 UTC
[shardingsphere] branch master updated: Add .ftl suffix on template map (#14926)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 c824778 Add .ftl suffix on template map (#14926)
c824778 is described below
commit c824778c6cd3e19456ad2f2ce4f3b257b22dad88
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Jan 20 07:05:59 2022 +0800
Add .ftl suffix on template map (#14926)
* Add .ftl suffix on template map
* use template path in freemarker's configuration
---
.../example/generator/ExampleGenerateEngine.java | 9 ++--
.../example/generator/ExampleTemplateFactory.java | 50 +++++++++++-----------
2 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerateEngine.java b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerateEngine.java
index 11131a2..3d33ccd 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerateEngine.java
+++ b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerateEngine.java
@@ -83,7 +83,7 @@ public final class ExampleGenerateEngine {
static {
try {
- TEMPLATE_CONFIG.setDirectoryForTemplateLoading(new File(Objects.requireNonNull(ExampleGenerateEngine.class.getClassLoader().getResource("")).getFile()));
+ TEMPLATE_CONFIG.setDirectoryForTemplateLoading(new File(Objects.requireNonNull(ExampleGenerateEngine.class.getClassLoader().getResource("template")).getFile()));
TEMPLATE_CONFIG.setDefaultEncoding("UTF-8");
} catch (final IOException ex) {
ex.printStackTrace();
@@ -117,17 +117,17 @@ public final class ExampleGenerateEngine {
String fileName = processString(dataModel, FILE_NAME_PREFIX);
String outputPath = processString(dataModel, OUTPUT_PATH + JAVA_CLASS_PATH);
for (String each : renameTemplateMap.keySet()) {
- processFile(dataModel, "/template/" + renameTemplateMap.get(each), outputPath + "/" + fileName + each + ".java");
+ processFile(dataModel, renameTemplateMap.get(each), outputPath + "/" + fileName + each + ".java");
}
for (String each : unRenameTemplateMap.keySet()) {
- processFile(dataModel, "/template/" + each + ".ftl", outputPath + "/" + unRenameTemplateMap.get(each));
+ processFile(dataModel, each, outputPath + "/" + unRenameTemplateMap.get(each));
}
}
private static void generateResourcesFile(final Map<String, String> dataModel) throws IOException, TemplateException {
String outputPath = processString(dataModel, OUTPUT_PATH + RESOURCES_PATH);
for (String each : resourceTemplateMap.keySet()) {
- processFile(dataModel, "/template/" + each + ".ftl", outputPath + "/" + resourceTemplateMap.get(each));
+ processFile(dataModel, each, outputPath + "/" + resourceTemplateMap.get(each));
}
}
@@ -145,4 +145,3 @@ public final class ExampleGenerateEngine {
}
}
}
-
diff --git a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleTemplateFactory.java b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleTemplateFactory.java
index a3faf6f..b8d4599 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleTemplateFactory.java
+++ b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleTemplateFactory.java
@@ -54,32 +54,32 @@ public final class ExampleTemplateFactory {
public static Map<String, String> getUnReNameTemplate(final Map<String, String> dataModel) {
Map<String, String> result = new HashMap<>(7, 1);
if (dataModel.getOrDefault(FEATURE_KEY, "").contains(FeatureType.ENCRYPT.getFeature())) {
- result.put("java/TestQueryAssistedShardingEncryptAlgorithm", "TestQueryAssistedShardingEncryptAlgorithm.java");
+ result.put("java/TestQueryAssistedShardingEncryptAlgorithm.ftl", "TestQueryAssistedShardingEncryptAlgorithm.java");
}
- result.put("java/entity/Order", "entity/Order.java");
- result.put("java/entity/OrderItem", "entity/OrderItem.java");
- result.put("java/entity/Address", "entity/Address.java");
+ result.put("java/entity/Order.ftl", "entity/Order.java");
+ result.put("java/entity/OrderItem.ftl", "entity/OrderItem.java");
+ result.put("java/entity/Address.ftl", "entity/Address.java");
switch (dataModel.get(FRAMEWORK_KEY)) {
case "jdbc":
case "springboot-starter-jdbc":
case "spring-namespace-jdbc":
- result.put("java/repository/jdbc/OrderItemRepository", "repository/OrderItemRepository.java");
- result.put("java/repository/jdbc/OrderRepository", "repository/OrderRepository.java");
- result.put("java/repository/jdbc/AddressRepository", "repository/AddressRepository.java");
+ result.put("java/repository/jdbc/OrderItemRepository.ftl", "repository/OrderItemRepository.java");
+ result.put("java/repository/jdbc/OrderRepository.ftl", "repository/OrderRepository.java");
+ result.put("java/repository/jdbc/AddressRepository.ftl", "repository/AddressRepository.java");
break;
case "jpa":
case "springboot-starter-jpa":
case "spring-namespace-jpa":
- result.put("java/repository/jpa/OrderItemRepository", "repository/OrderItemRepository.java");
- result.put("java/repository/jpa/OrderRepository", "repository/OrderRepository.java");
- result.put("java/repository/jpa/AddressRepository", "repository/AddressRepository.java");
+ result.put("java/repository/jpa/OrderItemRepository.ftl", "repository/OrderItemRepository.java");
+ result.put("java/repository/jpa/OrderRepository.ftl", "repository/OrderRepository.java");
+ result.put("java/repository/jpa/AddressRepository.ftl", "repository/AddressRepository.java");
break;
case "mybatis":
case "springboot-starter-mybatis":
case "spring-namespace-mybatis":
- result.put("java/repository/mybatis/OrderItemRepository", "repository/OrderItemRepository.java");
- result.put("java/repository/mybatis/OrderRepository", "repository/OrderRepository.java");
- result.put("java/repository/mybatis/AddressRepository", "repository/AddressRepository.java");
+ result.put("java/repository/mybatis/OrderItemRepository.ftl", "repository/OrderItemRepository.java");
+ result.put("java/repository/mybatis/OrderRepository.ftl", "repository/OrderRepository.java");
+ result.put("java/repository/mybatis/AddressRepository.ftl", "repository/AddressRepository.java");
break;
default:
break;
@@ -96,33 +96,33 @@ public final class ExampleTemplateFactory {
public static Map<String, String> getResourceTemplate(final Map<String, String> dataModel) {
Map<String, String> result = new HashMap<>(6, 1);
if (dataModel.getOrDefault(FEATURE_KEY, "").contains(FeatureType.ENCRYPT.getFeature())) {
- result.put("resources/spi/encryptAlgorithm", "META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm");
+ result.put("resources/spi/encryptAlgorithm.ftl", "META-INF/services/org.apache.shardingsphere.encrypt.spi.EncryptAlgorithm");
}
switch (dataModel.get(FRAMEWORK_KEY)) {
case "springboot-starter-jdbc":
case "springboot-starter-jpa":
- result.put("resources/properties/application", "application.properties");
+ result.put("resources/properties/application.ftl", "application.properties");
break;
case "spring-namespace-jdbc":
case "spring-namespace-jpa":
- result.put("resources/xml/application", "application.xml");
+ result.put("resources/xml/application.ftl", "application.xml");
break;
case "spring-namespace-mybatis":
- result.put("resources/xml/application", "application.xml");
- result.put("resources/mappers/OrderItemMapper", "mappers/OrderItemMapper.xml");
- result.put("resources/mappers/OrderMapper", "mappers/OrderMapper.xml");
- result.put("resources/mappers/AddressMapper", "mappers/AddressMapper.xml");
+ result.put("resources/xml/application.ftl", "application.xml");
+ result.put("resources/mappers/OrderItemMapper.ftl", "mappers/OrderItemMapper.xml");
+ result.put("resources/mappers/OrderMapper.ftl", "mappers/OrderMapper.xml");
+ result.put("resources/mappers/AddressMapper.ftl", "mappers/AddressMapper.xml");
break;
case "springboot-starter-mybatis":
- result.put("resources/properties/application", "application.properties");
- result.put("resources/mappers/OrderItemMapper", "mappers/OrderItemMapper.xml");
- result.put("resources/mappers/OrderMapper", "mappers/OrderMapper.xml");
- result.put("resources/mappers/AddressMapper", "mappers/AddressMapper.xml");
+ result.put("resources/properties/application.ftl", "application.properties");
+ result.put("resources/mappers/OrderItemMapper.ftl", "mappers/OrderItemMapper.xml");
+ result.put("resources/mappers/OrderMapper.ftl", "mappers/OrderMapper.xml");
+ result.put("resources/mappers/AddressMapper.ftl", "mappers/AddressMapper.xml");
break;
default:
break;
}
- result.put("resources/logback", "logback.xml");
+ result.put("resources/logback.ftl", "logback.xml");
return result;
}
}