up

RockyLOMO · Mar 25, 2024 · 64b816c · 64b816c
1 parent 7c0dae3
commit 64b816c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 25 deletions.
diff --git a/rxlib-x/src/main/java/org/rx/jdbc/ConnectionPoolKind.java b/rxlib-x/src/main/java/org/rx/jdbc/ConnectionPoolKind.java
@@ -1,11 +1,5 @@
 package org.rx.jdbc;
 
-/**
- * Created by IntelliJ IDEA.
- *
- * @author wangxiaoming
- * Date: 2019/12/10
- */
 public enum ConnectionPoolKind {
     NONE,
     HikariCP,

diff --git a/rxlib-x/src/main/java/org/rx/jdbc/ConnectionPoolMXBean.java b/rxlib-x/src/main/java/org/rx/jdbc/ConnectionPoolMXBean.java
@@ -6,12 +6,6 @@
 
 import java.io.Serializable;
 
-/**
- * Created by IntelliJ IDEA.
- *
- * @author wangxiaoming
- * Date: 2019/12/10
- */
 @NoArgsConstructor
 @AllArgsConstructor
 @Data

diff --git a/rxlib-x/src/main/java/org/rx/jdbc/DriverClassFlag.java b/rxlib-x/src/main/java/org/rx/jdbc/DriverClassFlag.java
@@ -10,12 +10,6 @@
 import java.util.Collections;
 import java.util.List;
 
-/**
- * Created by IntelliJ IDEA.
- *
- * @author wangxiaoming
- * Date: 2019/9/2
- */
 @Getter
 public enum DriverClassFlag implements NEnum<DriverClassFlag> {
     MySQL(1, "com.mysql.jdbc.Driver", "jdbc:mysql:"),

diff --git a/rxlib-x/src/main/java/org/rx/jdbc/JdbcExecutor.java b/rxlib-x/src/main/java/org/rx/jdbc/JdbcExecutor.java
@@ -30,7 +30,8 @@
 @Slf4j
 public class JdbcExecutor extends Disposable implements EventPublisher<JdbcExecutor>, JdbcExecutable {
     @RequiredArgsConstructor
-    static class DefaultDataSource extends SuperDataSource {
+    public static class DefaultDataSource extends SuperDataSource {
+        @Getter
         final DataSourceConfig config;
 
         @Override
@@ -44,7 +45,7 @@ public Connection getConnection(String username, String password) throws SQLExce
         }
     }
 
-    static final String SPLIT_SYMBOL = ";";
+    public static final String SPLIT_SYMBOL = ";";
     public static final String STRING_SYMBOL = "`";
 
     public static String buildMysqlConnectionString(String host, int port, String database, long connectTimeout, long readWriteTimeout) {
@@ -115,6 +116,7 @@ public static ResultSet behaviorClose(ResultSet resultSet, Connection conn) {
     public final Delegate<JdbcExecutor, TimeoutEventArgs> onExecuteTimeout = Delegate.create();
     @Getter
     final DataSourceConfig config;
+    @Getter
     final DataSource dataSource;
     protected boolean closeDataSource;
     @Setter

diff --git a/rxlib-x/src/main/java/org/rx/jdbc/SuperJdbc.java b/rxlib-x/src/main/java/org/rx/jdbc/SuperJdbc.java
@@ -5,11 +5,6 @@
 import java.sql.SQLException;
 import java.sql.Wrapper;
 
-/**
- * Created by IntelliJ IDEA.
- * User: wangxiaoming
- * Date: 2019/8/26
- */
 public abstract class SuperJdbc extends Disposable implements Wrapper {
     public static final String CATALOG = "def";
 

diff --git a/rxlib-x/src/main/java/org/rx/util/UrlGenerator.java b/rxlib-x/src/main/java/org/rx/util/UrlGenerator.java
@@ -0,0 +1,31 @@
+package org.rx.util;
+
+import lombok.NonNull;
+import org.rx.core.Strings;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class UrlGenerator implements Iterable<String> {
+    private final List<String> urls = new ArrayList<>();
+
+    @Override
+    public Iterator<String> iterator() {
+        return urls.iterator();
+    }
+
+    public UrlGenerator(@NonNull String urlExpression) {
+        int s = urlExpression.indexOf("["), e;
+        if (s == -1 || (e = urlExpression.indexOf("]", s)) == -1) {
+            urls.add(urlExpression);
+            return;
+        }
+        String rangeString = urlExpression.substring(s, e + 1);
+        String[] ranges = Strings.split(rangeString.substring(1, rangeString.length() - 1), "-", 2);
+        int f = Integer.parseInt(ranges[0]), t = Integer.parseInt(ranges[1]);
+        for (; f <= t; f++) {
+            urls.add(urlExpression.replace(rangeString, String.valueOf(f)));
+        }
+    }
+}