-
+
${log.context.name}
diff --git a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLServerInfo.java b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLServerInfo.java
index 3cd51a0f9baeaf81466792dd01f471f1a2b31166..92c6458a7734c8b75ba05103b1d2515f03a2d1fa 100644
--- a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLServerInfo.java
+++ b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/constant/MySQLServerInfo.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Sharding-Proxy's information for MySQL.
+ * ShardingSphere-Proxy's information for MySQL.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class MySQLServerInfo {
@@ -34,7 +34,7 @@ public final class MySQLServerInfo {
/**
* Server version.
*/
- public static final String SERVER_VERSION = "5.6.4-Sharding-Proxy 5.0.0-RC1";
+ public static final String SERVER_VERSION = "5.6.4-ShardingSphere-Proxy 5.0.0-RC1";
/**
* Charset code 0x21 is utf8_general_ci.
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/DataSourceConfiguration.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/DataSourceConfiguration.java
index d42ecf4c9bd66b25daca5034662870b9f35a4b9e..f8db156a9dfe55e3fe2f67401a660ef2a81a112d 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/DataSourceConfiguration.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/DataSourceConfiguration.java
@@ -151,7 +151,7 @@ public final class DataSourceConfiguration {
}
/**
- * Add alias to share configuration with sharding-jdbc.
+ * Add alias to share configuration.
*
* @param alias alias for configuration
*/
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
index d5a82eb16ab12844f6d8b598662868f7a8562608..dd94c67e049ff81f73e50f5089ff85b819d1d3c1 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
@@ -84,7 +84,7 @@ public enum ConfigurationPropertyKey implements TypedPropertyKey {
QUERY_WITH_CIPHER_COLUMN("query.with.cipher.column", String.valueOf(Boolean.TRUE), boolean.class),
/**
- * Sharding-Proxy's flush threshold for every records from databases.
+ * ShardingSphere-Proxy's flush threshold for every records from databases.
*/
PROXY_FRONTEND_FLUSH_THRESHOLD("proxy.frontend.flush.threshold", String.valueOf(128), int.class),
@@ -93,33 +93,33 @@ public enum ConfigurationPropertyKey implements TypedPropertyKey {
*
*
* LOCAL:
- * Sharding-Proxy will run with LOCAL transaction.
+ * ShardingSphere-Proxy will run with LOCAL transaction.
*
*
*
* XA:
- * Sharding-Proxy will run with XA transaction.
+ * ShardingSphere-Proxy will run with XA transaction.
*
*
*
* BASE:
- * Sharding-Proxy will run with BASE transaction.
+ * ShardingSphere-Proxy will run with BASE transaction.
*
*/
PROXY_TRANSACTION_TYPE("proxy.transaction.type", "LOCAL", String.class),
/**
- * Enable opentracing for Sharding-Proxy.
+ * Enable opentracing for ShardingSphere-Proxy.
*/
PROXY_OPENTRACING_ENABLED("proxy.opentracing.enabled", String.valueOf(Boolean.FALSE), boolean.class),
/**
- * Enable metrics for Sharding-Proxy.
+ * Enable metrics for ShardingSphere-Proxy.
*/
PROXY_METRICS_ENABLED("proxy.metrics.enabled", String.valueOf(Boolean.FALSE), boolean.class),
/**
- * Enable hint for Sharding-Proxy.
+ * Enable hint for ShardingSphere-Proxy.
*/
PROXY_HINT_ENABLED("proxy.hint.enabled", String.valueOf(Boolean.FALSE), boolean.class),
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCRawBackendDataSourceFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCRawBackendDataSourceFactory.java
index 0fb3288728a4002f28472e68cdb81b73f3ebca99..944cb995cd12c425b3884017aa425e0ca6b6307a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCRawBackendDataSourceFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/datasource/JDBCRawBackendDataSourceFactory.java
@@ -78,7 +78,7 @@ public final class JDBCRawBackendDataSourceFactory implements JDBCBackendDataSou
try {
Class.forName(driverClassName);
} catch (final ClassNotFoundException ex) {
- throw new ShardingSphereException("Cannot load JDBC driver class `%s`, make sure it in Sharding-Proxy's classpath.", driverClassName);
+ throw new ShardingSphereException("Cannot load JDBC driver class `%s`, make sure it in ShardingSphere-Proxy's classpath.", driverClassName);
}
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
index 79d48a877d69ba7722499c1b6d65c932ddae2c15..87b51cc53087c45eafcc9a424bb429b155ea0f64 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.proxy.config.yaml.YamlDataSourceParameter;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxyRuleConfiguration;
import org.apache.shardingsphere.proxy.config.yaml.YamlProxyServerConfiguration;
import org.apache.shardingsphere.proxy.context.ShardingProxyContext;
-import org.apache.shardingsphere.proxy.frontend.bootstrap.ShardingProxy;
+import org.apache.shardingsphere.proxy.frontend.bootstrap.ShardingSphereProxy;
import org.apache.shardingsphere.proxy.util.DataSourceConverter;
import org.apache.shardingsphere.infra.auth.Authentication;
import org.apache.shardingsphere.infra.auth.yaml.config.YamlAuthenticationConfiguration;
@@ -59,7 +59,7 @@ import java.util.Map.Entry;
import java.util.Properties;
/**
- * Sharding-Proxy Bootstrap.
+ * ShardingSphere-Proxy Bootstrap.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class Bootstrap {
@@ -140,7 +140,7 @@ public final class Bootstrap {
final Map> schemaRules) throws SQLException {
ShardingSphereSchemas.getInstance().init(shardingSchemaNames, schemaDataSources, schemaRules);
initOpenTracing();
- ShardingProxy.getInstance().start(port);
+ ShardingSphereProxy.getInstance().start(port);
}
private static Map> getSchemaDataSourceParameterMap(final ShardingOrchestrationFacade shardingOrchestrationFacade) {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoader.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoader.java
index 9537be7a3c6c24f1b96d1b2085e53d7cfd79834e..d321242783bd870b48b7f9e4345a6ef129791b86 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoader.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoader.java
@@ -44,10 +44,10 @@ public final class ShardingConfigurationLoader {
private static final Pattern RULE_CONFIG_FILE_PATTERN = Pattern.compile("config-.+\\.yaml");
/**
- * Load configuration of Sharding-Proxy.
+ * Load configuration of ShardingSphere-Proxy.
*
- * @param path configuration path of Sharding-Proxy
- * @return configuration of Sharding-Proxy
+ * @param path configuration path of ShardingSphere-Proxy
+ * @return configuration of ShardingSphere-Proxy
* @throws IOException IO exception
*/
public ShardingConfiguration load(final String path) throws IOException {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/context/ShardingProxyContext.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/context/ShardingProxyContext.java
index 15d67788946a9eb53860a2b5474c64f15e70b234..298a958fa5560b0e882ed4f4c5769417271475b0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/context/ShardingProxyContext.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/context/ShardingProxyContext.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.infra.log.ConfigurationLogger;
import java.util.Properties;
/**
- * Context of Sharding-Proxy.
+ * Context of ShardingSphere-Proxy.
*/
@Getter
public final class ShardingProxyContext {
@@ -48,9 +48,9 @@ public final class ShardingProxyContext {
}
/**
- * Get instance of Sharding-Proxy's context.
+ * Get instance of ShardingSphere-Proxy's context.
*
- * @return instance of Sharding-Proxy's context.
+ * @return instance of ShardingSphere-Proxy's context.
*/
public static ShardingProxyContext getInstance() {
return INSTANCE;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/bootstrap/ShardingProxy.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/bootstrap/ShardingSphereProxy.java
similarity index 94%
rename from shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/bootstrap/ShardingProxy.java
rename to shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/bootstrap/ShardingSphereProxy.java
index ef73e987132c724f0b11fdc66f44107d69140e54..977a99f7fb7b01611b512f5dbc2d768d6edb34ca 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/bootstrap/ShardingProxy.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/bootstrap/ShardingSphereProxy.java
@@ -38,12 +38,12 @@ import org.apache.shardingsphere.proxy.backend.executor.BackendExecutorContext;
import org.apache.shardingsphere.proxy.frontend.netty.ServerHandlerInitializer;
/**
- * Sharding-Proxy.
+ * ShardingSphere-Proxy.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ShardingProxy {
+public final class ShardingSphereProxy {
- private static final ShardingProxy INSTANCE = new ShardingProxy();
+ private static final ShardingSphereProxy INSTANCE = new ShardingSphereProxy();
private EventLoopGroup bossGroup;
@@ -54,12 +54,12 @@ public final class ShardingProxy {
*
* @return instance of proxy context.
*/
- public static ShardingProxy getInstance() {
+ public static ShardingSphereProxy getInstance() {
return INSTANCE;
}
/**
- * Start Sharding-Proxy.
+ * Start ShardingSphere-Proxy.
*
* @param port port
*/