Merge branch 'dev' of dolphindb.net:dolphindb/api-java

# Conflicts:
#	pom.xml
#	src/com/xxdb/data/Utils.java

Author: chengyitian

pom.xml

@@ -2,11 +2,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dolphindb</groupId>
     <artifactId>dolphindb-javaapi</artifactId>
-    <version>3.00.4.2</version>
+    <version>3.00.5.0</version>
     <packaging>jar</packaging>
 
     <properties>
-        <dolphindb.version>3.00.4.2</dolphindb.version>
+        <dolphindb.version>3.00.5.0</dolphindb.version>
     </properties>
     <name>DolphinDB Java API</name>
     <description>The messaging and data conversion protocol between Java and DolphinDB server</description>
@@ -31,7 +31,7 @@
         <connection>scm:git:git@github.com:dolphindb/api-java.git</connection>
         <developerConnection>scm:git:git@github.com:dolphindb/api-java.git</developerConnection>
         <url>git@github.com:dolphindb/api-java.git</url>
-        <tag>api-java-3.00.4.2</tag>
+        <tag>api-java-3.00.5.0</tag>
     </scm>
     <dependencies>
         <dependency>
@@ -41,9 +41,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.lz4</groupId>
+            <groupId>at.yawk.lz4</groupId>
             <artifactId>lz4-java</artifactId>
-            <version>1.7.1</version>
+            <version>1.10.2</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>

src/com/xxdb/DBConnection.java

@@ -1399,7 +1399,7 @@ public ExceptionType parseException(String msg, Node node) {
                 log.info("New leader is " + node.hostName + ":" + node.port);
                 return ExceptionType.ET_NEWLEADER;
             }
-        }else if (msg.contains("<DataNodeNotAvail>") || msg.contains("<DataNodeNotReady>")){
+        }else if (msg.contains("<DataNodeNotAvail>") || msg.contains("<DataNodeNotReady>") || msg.contains("Public key is not initialized yet")){
             node.hostName = "";
             node.port = 0;
             return ExceptionType.ET_NODENOTAVAIL;

src/com/xxdb/SimpleDBConnectionPoolConfig.java

@@ -248,7 +248,7 @@ protected void validate() {
 
         if (idleTimeout < 10000) {
             idleTimeout = 600000;
-            log.warn("The param 'idleTimeout' cannot less than 10000ms， will use the default value 600000ms(10min)");
+            log.warn("The param 'idleTimeout' cannot less than 10000ms, will use the default value 600000ms(10min)");
         }
     }
 

src/com/xxdb/comm/ConnectionState.java

@@ -0,0 +1,26 @@
+package com.xxdb.comm;
+
+/**
+ * Represents the connection state of a replication target.
+ */
+public enum ConnectionState {
+    /**
+     * The connection is being initialized.
+     */
+    Initializing,
+
+    /**
+     * The connection is active and ready for data transfer.
+     */
+    Connected,
+
+    /**
+     * The connection has been terminated.
+     */
+    Terminated,
+
+    /**
+     * The connection is attempting to reconnect.
+     */
+    Reconnecting
+}

src/com/xxdb/compression/LZ4Decoder.java

@@ -1,17 +1,13 @@
 package com.xxdb.compression;
 
-import com.xxdb.data.Entity;
 import com.xxdb.io.BigEndianDataInputStream;
 import com.xxdb.io.DdbByteArrayInputStream;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.LittleEndianDataInputStream;
 import net.jpountz.lz4.LZ4Factory;
 import net.jpountz.lz4.LZ4SafeDecompressor;
-
-import java.io.ByteArrayInputStream;
 import java.io.DataInput;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.LinkedList;
 
 public class LZ4Decoder extends AbstractDecoder {

src/com/xxdb/compression/LZ4Encoder.java

@@ -1,16 +1,12 @@
 package com.xxdb.compression;
 
 import com.xxdb.data.AbstractVector;
-
-import com.xxdb.data.BasicStringVector;
 import net.jpountz.lz4.LZ4Compressor;
 import net.jpountz.lz4.LZ4Factory;
-
 import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-
 import static com.xxdb.data.Utils.reAllocByteBuffer;
 
 public class LZ4Encoder implements Encoder {

src/com/xxdb/data/BasicAnyVector.java

@@ -133,6 +133,10 @@ public void Append(Vector value) {
 		values.add(value);
 	}
 
+    public void Append(Entity value) {
+        values.add(value);
+    }
+
 	@Override
 	public void checkCapacity(int requiredCapacity) {
 		throw new RuntimeException("BasicAnyVector not support checkCapacity.");

src/com/xxdb/data/Utils.java

@@ -16,7 +16,7 @@
 
 public class Utils {
 
-	public static final String JAVA_API_VERSION = "3.00.4.2";
+	public static final String JAVA_API_VERSION = "3.00.5.0";
 
 	public static final int DISPLAY_ROWS = 20;
 	public static final int DISPLAY_COLS = 100;

src/com/xxdb/replicator/HostInfo.java

@@ -0,0 +1,86 @@
+package com.xxdb.replicator;
+
+/**
+ * Host information for StreamReplicator connection.
+ * Contains connection details for a DolphinDB server node.
+ */
+public class HostInfo {
+    private final String host;
+    private final int port;
+    private final String userId;
+    private final String password;
+    private final String label;
+
+    /**
+     * Creates a new HostInfo with the specified connection details.
+     *
+     * @param host     The hostname or IP address of the DolphinDB server
+     * @param port     The port number of the DolphinDB server
+     * @param userId   The user ID for authentication
+     * @param password The password for authentication
+     * @param label    A unique label to identify this host
+     */
+    public HostInfo(String host, int port, String userId, String password, String label) {
+        if (host == null || host.isEmpty()) {
+            throw new IllegalArgumentException("The param 'host' cannot be null or empty.");
+        }
+
+        if (port <= 0 || port > 65535) {
+            throw new IllegalArgumentException("The param 'port' must be between 1 and 65535.");
+        }
+
+        if (label == null || label.isEmpty()) {
+            throw new IllegalArgumentException("The param 'label' cannot be null or empty.");
+        }
+
+        this.host = host;
+        this.port = port;
+        this.userId = userId;
+        this.password = password;
+        this.label = label;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("HostInfo{label='%s', host='%s', port=%d, userId='%s'}",
+            label, host, port, userId);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        HostInfo hostInfo = (HostInfo) o;
+        return port == hostInfo.port &&
+                host.equals(hostInfo.host) &&
+                label.equals(hostInfo.label);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = host.hashCode();
+        result = 31 * result + port;
+        result = 31 * result + label.hashCode();
+        return result;
+    }
+}