ShardingProxyClient => BackendNettyClient

sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/netty/ShardingProxyClient.java → sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/netty/BackendNettyClient.java

@@ -34,26 +34,30 @@ import io.netty.channel.pool.SimpleChannelPool;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.shardingsphere.core.rule.DataSourceParameter;
 import io.shardingsphere.proxy.config.RuleRegistry;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
- * Sharding-Proxy Client.
+ * Backend connection client for netty.
  *
  * @author wangkai
  * @author linjiaqi
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 @Slf4j
-public final class ShardingProxyClient {
+public final class BackendNettyClient {
     
-    private static final ShardingProxyClient INSTANCE = new ShardingProxyClient();
+    private static final BackendNettyClient INSTANCE = new BackendNettyClient();
     
     private static final RuleRegistry RULE_REGISTRY = RuleRegistry.getInstance();
     
@@ -71,23 +75,28 @@ public final class ShardingProxyClient {
     private ChannelPoolMap<String, SimpleChannelPool> poolMap;
     
     /**
-     * Start Sharding-Proxy.
+     * Get instance of backend connection client for netty.
      *
-     * @throws MalformedURLException url is illegal.
+     * @return instance of backend connection client for netty
+     */
+    public static BackendNettyClient getInstance() {
+        return INSTANCE;
+    }
+    
+    /**
+     * Start backend connection client for netty.
+     *
+     * @throws MalformedURLException URL is illegal
      * @throws InterruptedException  interrupted exception
      */
     public void start() throws MalformedURLException, InterruptedException {
         Map<String, DataSourceParameter> dataSourceConfigurationMap = RULE_REGISTRY.getDataSourceConfigurationMap();
-        for (Map.Entry<String, DataSourceParameter> each : dataSourceConfigurationMap.entrySet()) {
+        for (Entry<String, DataSourceParameter> each : dataSourceConfigurationMap.entrySet()) {
             URL url = new URL(each.getValue().getUrl().replaceAll("jdbc:mysql:", "http:"));
-            final String ip = url.getHost();
-            final int port = url.getPort();
-            final String database = url.getPath().substring(1);
-            final String username = (each.getValue()).getUsername();
-            final String password = (each.getValue()).getPassword();
-            dataSourceConfigMap.put(each.getKey(), new DataSourceConfig(ip, port, database, username, password));
+            dataSourceConfigMap.put(each.getKey(), new DataSourceConfig(url.getHost(), url.getPort(), url.getPath().substring(1), each.getValue().getUsername(), each.getValue().getPassword()));
         }
-        final Bootstrap bootstrap = new Bootstrap();
+        Bootstrap bootstrap = new Bootstrap();
+        // TODO :jiaqi where to init workerGroup?
         if (workerGroup instanceof EpollEventLoopGroup) {
             groupsEpoll(bootstrap);
         } else {
@@ -97,10 +106,10 @@ public final class ShardingProxyClient {
     }
     
     /**
-     * Stop Sharding-Proxy.
+     * Stop backend connection client for netty.
      */
     public void stop() {
-        if (workerGroup != null) {
+        if (null != workerGroup) {
             workerGroup.shutdownGracefully();
         }
     }
@@ -149,13 +158,4 @@ public final class ShardingProxyClient {
             }
         }
     }
-    
-    /**
-     * Get instance of sharding-proxy client.
-     *
-     * @return instance of sharding-proxy client
-     */
-    public static ShardingProxyClient getInstance() {
-        return INSTANCE;
-    }
 }

sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/netty/ClientHandlerInitializer.java → sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/netty/BackendNettyClientChannelInitializer.java

@@ -25,13 +25,13 @@ import io.shardingsphere.proxy.transport.common.codec.PacketCodecFactory;
 import lombok.RequiredArgsConstructor;
 
 /**
- * Channel initializer.
+ * Channel initializer for backend connection netty client.
  *
  * @author wangkai
  * @author linjiaqi
  */
 @RequiredArgsConstructor
-public final class ClientHandlerInitializer extends ChannelInitializer<Channel> {
+public final class BackendNettyClientChannelInitializer extends ChannelInitializer<Channel> {
     
     private final DataSourceConfig dataSourceConfig;
     

sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/netty/NettyBackendHandler.java

@@ -148,7 +148,7 @@ public final class NettyBackendHandler extends AbstractBackendHandler {
         if (!channelMap.containsKey(dataSourceName)) {
             channelMap.put(dataSourceName, new ArrayList<Channel>());
         }
-        SimpleChannelPool pool = ShardingProxyClient.getInstance().getPoolMap().get(dataSourceName);
+        SimpleChannelPool pool = BackendNettyClient.getInstance().getPoolMap().get(dataSourceName);
         Channel channel = pool.acquire().get(RULE_REGISTRY.getBackendNIOConfig().getConnectionTimeoutSeconds(), TimeUnit.SECONDS);
         channelMap.get(dataSourceName).add(channel);
         ChannelRegistry.getInstance().putConnectionId(channel.id().asShortText(), connectionId);
@@ -208,7 +208,7 @@ public final class NettyBackendHandler extends AbstractBackendHandler {
         if (null == mergedResult || !mergedResult.next()) {
             for (Entry<String, List<Channel>> entry : channelMap.entrySet()) {
                 for (Channel each : entry.getValue()) {
-                    ShardingProxyClient.getInstance().getPoolMap().get(entry.getKey()).release(each);
+                    BackendNettyClient.getInstance().getPoolMap().get(entry.getKey()).release(each);
                 }
             }
             return false;

sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/netty/NettyChannelPoolHandler.java

@@ -46,6 +46,6 @@ public class NettyChannelPoolHandler implements ChannelPoolHandler {
     @Override
     public void channelCreated(final Channel channel) {
         log.info("channelCreated. Channel ID: {}" + channel.id().asShortText());
-        channel.pipeline().addLast(new ClientHandlerInitializer(dataSourceConfig));
+        channel.pipeline().addLast(new BackendNettyClientChannelInitializer(dataSourceConfig));
     }
 }

sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/ShardingProxy.java

@@ -30,7 +30,7 @@ import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
-import io.shardingsphere.proxy.backend.netty.ShardingProxyClient;
+import io.shardingsphere.proxy.backend.netty.BackendNettyClient;
 import io.shardingsphere.proxy.config.RuleRegistry;
 import io.shardingsphere.proxy.frontend.common.netty.ServerHandlerInitializer;
 import io.shardingsphere.proxy.backend.BackendExecutorContext;
@@ -70,7 +70,7 @@ public final class ShardingProxy {
     public void start(final int port) throws InterruptedException, MalformedURLException {
         try {
             if (RULE_REGISTRY.getBackendNIOConfig().isUseNIO()) {
-                ShardingProxyClient.getInstance().start();
+                BackendNettyClient.getInstance().start();
             }
             ServerBootstrap bootstrap = new ServerBootstrap();
             bossGroup = createEventLoopGroup();
@@ -87,7 +87,7 @@ public final class ShardingProxy {
             frontendExecutorContext.getExecutorService().shutdown();
             backendExecutorContext.getExecutorService().shutdown();
             if (RULE_REGISTRY.getBackendNIOConfig().isUseNIO()) {
-                ShardingProxyClient.getInstance().stop();
+                BackendNettyClient.getInstance().stop();
             }
         }
     }