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

Author: weisun123

src/com/xxdb/streaming/client/cep/EventClient.java

@@ -28,9 +28,9 @@ public class EventClient extends AbstractClient {
 
     private static final Logger log = LoggerFactory.getLogger(DBConnection.class);
 
-    public EventClient(List<EventScheme> eventSchemes, List<String> eventTimeKeys, List<String> commonKeys) throws SocketException {
+    public EventClient(List<EventSchema> eventSchemas, List<String> eventTimeKeys, List<String> commonKeys) throws SocketException {
         super(0);
-        eventHandler = new EventHandler(eventSchemes, eventTimeKeys, commonKeys);
+        eventHandler = new EventHandler(eventSchemas, eventTimeKeys, commonKeys);
     }
 
     public void subscribe(String host, int port, String tableName, String actionName, MessageHandler handler, long offset, boolean reconnect, String userName, String password) throws IOException {

src/com/xxdb/streaming/client/cep/EventHandler.java

@@ -5,18 +5,18 @@
 public class EventInfo {
 
     private List<AttributeSerializer> attributeSerializers;
-    private EventSchemeEx eventScheme;
+    private EventSchemaEx eventSchema;
 
-    public EventInfo(List<AttributeSerializer> attributeSerializers, EventSchemeEx eventScheme) {
+    public EventInfo(List<AttributeSerializer> attributeSerializers, EventSchemaEx eventSchema) {
         this.attributeSerializers = attributeSerializers;
-        this.eventScheme = eventScheme;
+        this.eventSchema = eventSchema;
     }
 
     public List<AttributeSerializer> getAttributeSerializers() {
         return this.attributeSerializers;
     }
 
-    public EventSchemeEx getEventScheme() {
-        return this.eventScheme;
+    public EventSchemaEx getEventSchema() {
+        return this.eventSchema;
     }
 }

src/com/xxdb/streaming/client/cep/EventInfo.java

@@ -0,0 +1,61 @@
+package com.xxdb.streaming.client.cep;
+
+import com.xxdb.data.Entity;
+import java.util.ArrayList;
+import java.util.List;
+
+public class EventSchema {
+
+    private String eventType;
+    private List<String> fieldNames;
+    private List<Entity.DATA_TYPE> fieldTypes;
+    private List<Entity.DATA_FORM> fieldForms;
+    private List<Integer> fieldExtraParams;
+
+    public EventSchema() {
+        this.fieldNames = new ArrayList<>();
+        this.fieldTypes = new ArrayList<>();
+        this.fieldForms = new ArrayList<>();
+        this.fieldExtraParams = new ArrayList<>();
+    }
+
+    public List<String> getFieldNames() {
+        return fieldNames;
+    }
+
+    public String getEventType() {
+        return this.eventType;
+    }
+
+    public List<Entity.DATA_TYPE> getFieldTypes() {
+        return this.fieldTypes;
+    }
+
+    public List<Entity.DATA_FORM> getFieldForms() {
+        return this.fieldForms;
+    }
+
+    public List<Integer> getFieldExtraParams() {
+        return this.fieldExtraParams;
+    }
+
+    public void setFieldExtraParams(List<Integer> fieldExtraParams) {
+        this.fieldExtraParams = fieldExtraParams;
+    }
+
+    public void setEventType(String eventType) {
+        this.eventType = eventType;
+    }
+
+    public void setFieldNames(List<String> fieldNames) {
+        this.fieldNames = fieldNames;
+    }
+
+    public void setFieldTypes(List<Entity.DATA_TYPE> fieldTypes) {
+        this.fieldTypes = fieldTypes;
+    }
+
+    public void setFieldForms(List<Entity.DATA_FORM> fieldForms) {
+        this.fieldForms = fieldForms;
+    }
+}

src/com/xxdb/streaming/client/cep/EventSchema.java

@@ -3,23 +3,23 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class EventSchemeEx {
+public class EventSchemaEx {
 
-    private EventScheme scheme;
+    private EventSchema schema;
     private int timeIndex;
     private List<Integer> commonKeyIndex;
 
-    public EventSchemeEx() {
-        this.scheme = new EventScheme();
+    public EventSchemaEx() {
+        this.schema = new EventSchema();
         this.commonKeyIndex = new ArrayList<>();
     }
 
-    public EventScheme getScheme() {
-        return this.scheme;
+    public EventSchema getSchema() {
+        return this.schema;
     }
 
-    public void setScheme(EventScheme scheme) {
-        this.scheme = scheme;
+    public void setSchema(EventSchema schema) {
+        this.schema = schema;
     }
 
     public int getTimeIndex() {

src/com/xxdb/streaming/client/cep/EventSchemeEx.java renamed to src/com/xxdb/streaming/client/cep/EventSchemaEx.java

@@ -12,20 +12,9 @@ public class EventSender {
     private String insertScript;
     private EventHandler eventHandler;
     private DBConnection conn;
-    private boolean isConnected;
-
-    public EventSender(List<EventScheme> eventSchemes, List<String> eventTimeKeys, List<String> commonKeys) {
-        this.eventHandler = new EventHandler(eventSchemes, eventTimeKeys, commonKeys);
-        this.isConnected = false;
-    }
-
-    public void connect(DBConnection conn, String tableName) throws IOException {
-        if (this.isConnected)
-            throw new RuntimeException("The eventSender has already been called.");
-
-        if (!conn.isConnected())
-            throw new RuntimeException("The connection to dolphindb has not been established.");
 
+    public EventSender(DBConnection conn, String tableName, List<EventSchema> eventSchemas, List<String> eventTimeKeys, List<String> commonKeys) throws IOException {
+        this.eventHandler = new EventHandler(eventSchemas, eventTimeKeys, commonKeys);
         this.conn = conn;
 
         String sql = "select top 0 * from " + tableName;
@@ -35,13 +24,9 @@ public void connect(DBConnection conn, String tableName) throws IOException {
             throw new RuntimeException(errMsg.toString());
 
         this.insertScript = "tableInsert{" + tableName + "}";
-        this.isConnected = true;
     }
 
     public void sendEvent(String eventType, List<Entity> attributes) {
-        if (!isConnected)
-            throw new RuntimeException("This eventSender has not connected to the dolphindb");
-
         List<Entity> args = new ArrayList<>();
         StringBuilder errMsg = new StringBuilder();
 
@@ -55,8 +40,4 @@ public void sendEvent(String eventType, List<Entity> attributes) {
         }
     }
 
-    public static EventSender createEventSender(List<EventScheme> eventSchemes, List<String> eventTimeKeys, List<String> commonKeys) {
-        return new EventSender(eventSchemes, eventTimeKeys, commonKeys);
-    }
-
 }