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 b61a3f146b4 Rename xxUtil to xxUtils (#24866)
b61a3f146b4 is described below
commit b61a3f146b459c71bce1b543a3f5eab072a83aa8
Author: yx9o <[email protected]>
AuthorDate: Tue Mar 28 01:01:56 2023 +0800
Rename xxUtil to xxUtils (#24866)
---
.../core/api/{DataSourceUtil.java => DataSourceUtils.java} | 2 +-
.../example/generator/core/ExampleGenerator.java | 2 +-
.../core/{GenerateUtil.java => GenerateUtils.java} | 4 ++--
.../example/generator/core/impl/JDBCExampleGenerator.java | 14 +++++++-------
.../example/generator/core/impl/ProxyExampleGenerator.java | 12 ++++++------
.../example/proxy/distsql/DistSQLFeatureExample.java | 4 ++--
.../distsql/{utils/FileUtil.java => util/FileUtils.java} | 4 ++--
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/DataSourceUtil.java
b/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/DataSourceUtils.java
similarity index 97%
rename from
examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/DataSourceUtil.java
rename to
examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/DataSourceUtils.java
index 75a6ec96127..d1f5329a263 100644
---
a/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/DataSourceUtil.java
+++
b/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/DataSourceUtils.java
@@ -21,7 +21,7 @@ import com.zaxxer.hikari.HikariDataSource;
import javax.sql.DataSource;
-public final class DataSourceUtil {
+public final class DataSourceUtils {
private static final String HOST = "localhost";
diff --git
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/ExampleGenerator.java
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/ExampleGenerator.java
index a80a6fdf1c8..22abfe4e64d 100644
---
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/ExampleGenerator.java
+++
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/ExampleGenerator.java
@@ -51,7 +51,7 @@ public interface ExampleGenerator extends TypedSPI {
for (String eachMode : exampleConfig.getModes()) {
for (String eachTransaction : exampleConfig.getTransactions()) {
for (String eachFramework : exampleConfig.getFrameworks()) {
- for (String eachFeature :
GenerateUtil.generateCombination(exampleConfig.getFeatures())) {
+ for (String eachFeature :
GenerateUtils.generateCombination(exampleConfig.getFeatures())) {
generate(templateConfig,
buildDataModel(exampleConfig.getProps(), eachMode, eachTransaction,
eachFramework, eachFeature), buildOutputPath(exampleConfig));
}
}
diff --git
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/GenerateUtil.java
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/GenerateUtils.java
similarity index 98%
rename from
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/GenerateUtil.java
rename to
examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/GenerateUtils.java
index 00eed7e507e..596940c32b2 100644
---
a/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/GenerateUtil.java
+++
b/examples/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/core/GenerateUtils.java
@@ -35,10 +35,10 @@ import java.util.Map;
import java.util.Map.Entry;
/**
- * Freemarker generate util.
+ * Freemarker generate utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class GenerateUtil {
+public final class GenerateUtils {
/**
* Generate directories.
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 3d5e358f45b..bbdc166c5aa 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
@@ -20,7 +20,7 @@ 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.core.GenerateUtils;
import
org.apache.shardingsphere.example.generator.scenario.ExampleScenarioFactory;
import java.io.IOException;
@@ -38,12 +38,12 @@ public final class JDBCExampleGenerator implements
ExampleGenerator {
@Override
public void generate(final Configuration templateConfig, final Map<String,
String> dataModel, final String relativePath) throws IOException,
TemplateException {
ExampleScenarioFactory exampleScenarioFactory = new
ExampleScenarioFactory(dataModel.get("feature"), dataModel.get("framework"),
dataModel.get("transaction"));
- GenerateUtil.generateDirs(templateConfig, dataModel,
exampleScenarioFactory.getJavaClassPaths(), relativePath + JAVA_CLASS_PATH);
- GenerateUtil.generateDirs(templateConfig, dataModel,
exampleScenarioFactory.getResourcePaths(), relativePath + RESOURCES_PATH);
- GenerateUtil.generateFile(templateConfig, getType(), dataModel,
exampleScenarioFactory.getJavaClassTemplateMap(), relativePath +
JAVA_CLASS_PATH);
- GenerateUtil.generateFile(templateConfig, getType(), dataModel,
exampleScenarioFactory.getResourceTemplateMap(), relativePath + RESOURCES_PATH);
- String outputPath = GenerateUtil.generatePath(templateConfig,
dataModel, relativePath);
- GenerateUtil.processFile(templateConfig, dataModel, getType() +
"/pom.ftl", outputPath + "pom.xml");
+ GenerateUtils.generateDirs(templateConfig, dataModel,
exampleScenarioFactory.getJavaClassPaths(), relativePath + JAVA_CLASS_PATH);
+ GenerateUtils.generateDirs(templateConfig, dataModel,
exampleScenarioFactory.getResourcePaths(), relativePath + RESOURCES_PATH);
+ GenerateUtils.generateFile(templateConfig, getType(), dataModel,
exampleScenarioFactory.getJavaClassTemplateMap(), relativePath +
JAVA_CLASS_PATH);
+ GenerateUtils.generateFile(templateConfig, getType(), dataModel,
exampleScenarioFactory.getResourceTemplateMap(), relativePath + RESOURCES_PATH);
+ String outputPath = GenerateUtils.generatePath(templateConfig,
dataModel, relativePath);
+ GenerateUtils.processFile(templateConfig, dataModel, getType() +
"/pom.ftl", outputPath + "pom.xml");
}
@Override
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 c337ad7908b..52f4973b882 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
@@ -20,7 +20,7 @@ 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.core.GenerateUtils;
import java.io.IOException;
import java.util.Collections;
@@ -33,17 +33,17 @@ public final class ProxyExampleGenerator implements
ExampleGenerator {
@Override
public void generate(final Configuration templateConfig, final Map<String,
String> dataModel, final String relativePath) throws IOException,
TemplateException {
- GenerateUtil.generateDirs(templateConfig, dataModel,
Collections.singleton("conf"), relativePath + RESOURCES_PATH);
- String outputPath = GenerateUtil.generatePath(templateConfig,
dataModel, relativePath);
+ GenerateUtils.generateDirs(templateConfig, dataModel,
Collections.singleton("conf"), relativePath + RESOURCES_PATH);
+ String outputPath = GenerateUtils.generatePath(templateConfig,
dataModel, relativePath);
processFile(templateConfig, dataModel, outputPath);
}
private void processFile(final Configuration templateConfig, final
Map<String, String> dataModel,
final String baseOutputPath) throws
TemplateException, IOException {
String outputPath = baseOutputPath + RESOURCES_PATH + "/conf/";
- GenerateUtil.processFile(templateConfig, dataModel, getType() +
"/config-example_db.ftl", outputPath + "config-example_db.yaml");
- GenerateUtil.processFile(templateConfig, dataModel, getType() +
"/server.ftl", outputPath + "server.yaml");
- GenerateUtil.processFile(templateConfig, dataModel, getType() +
"/pom.ftl", baseOutputPath + "pom.xml");
+ GenerateUtils.processFile(templateConfig, dataModel, getType() +
"/config-example_db.ftl", outputPath + "config-example_db.yaml");
+ GenerateUtils.processFile(templateConfig, dataModel, getType() +
"/server.ftl", outputPath + "server.yaml");
+ GenerateUtils.processFile(templateConfig, dataModel, getType() +
"/pom.ftl", baseOutputPath + "pom.xml");
}
public String getType() {
diff --git
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/java/org/apache/shardingsphere/example/proxy/distsql/DistSQLFeatureExample.java
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/java/org/apache/shardingsphere/example/proxy/distsql/DistSQLFeatureExample.java
index 17dd8701733..55688a8b48a 100644
---
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/java/org/apache/shardingsphere/example/proxy/distsql/DistSQLFeatureExample.java
+++
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/java/org/apache/shardingsphere/example/proxy/distsql/DistSQLFeatureExample.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.example.proxy.distsql;
import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.example.proxy.distsql.factory.DataSourceFactory;
import org.apache.shardingsphere.example.proxy.distsql.feature.FeatureType;
-import org.apache.shardingsphere.example.proxy.distsql.utils.FileUtil;
+import org.apache.shardingsphere.example.proxy.distsql.util.FileUtils;
import javax.sql.DataSource;
import java.io.IOException;
@@ -31,7 +31,7 @@ import java.sql.Statement;
public final class DistSQLFeatureExample {
public static void main(final String[] args) throws IOException {
- DataSource dataSource =
DataSourceFactory.createDataSource(FileUtil.getFile("/client/datasource-config.yaml"));
+ DataSource dataSource =
DataSourceFactory.createDataSource(FileUtils.getFile("/client/datasource-config.yaml"));
execute(dataSource);
}
diff --git
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/java/org/apache/shardingsphere/example/proxy/distsql/utils/FileUtil.java
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/java/org/apache/shardingsphere/example/proxy/distsql/util/FileUtils.java
similarity index 91%
rename from
examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/java/org/apache/shardingsphere/example/proxy/distsql/utils/FileUtil.java
rename to
examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/java/org/apache/shardingsphere/example/proxy/distsql/util/FileUtils.java
index b2d8b1ae59b..81af379e30a 100644
---
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/java/org/apache/shardingsphere/example/proxy/distsql/utils/FileUtil.java
+++
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/java/org/apache/shardingsphere/example/proxy/distsql/util/FileUtils.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.example.proxy.distsql.utils;
+package org.apache.shardingsphere.example.proxy.distsql.util;
import org.apache.shardingsphere.example.proxy.distsql.DistSQLFeatureExample;
import java.io.File;
-public final class FileUtil {
+public final class FileUtils {
public static File getFile(final String path) {
return new
File(DistSQLFeatureExample.class.getResource(path).getFile());
