[refactor] remove module commons

MasonGYC · Dec 4, 2023 · 39003a2 · 39003a2
1 parent 0701386
commit 39003a2
Show file tree

Hide file tree

Showing 49 changed files with 79 additions and 190 deletions.
diff --git a/commons/pom.xml b/commons/pom.xml
diff --git a/commons/readme.md b/commons/readme.md
diff --git a/commons/src/main/resources/logback.xml b/commons/src/main/resources/logback.xml
diff --git a/core/pom.xml b/core/pom.xml
@@ -10,10 +10,14 @@
     <name>Archetype - core</name>
     <dependencies>
         <dependency>
-            <groupId>com.trilobita</groupId>
-            <artifactId>commons</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.14.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20231013</version>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/.../java/com/trilobita/core/common/Util.java → ...rc/main/java/com/trilobita/core/Util.java b/.../java/com/trilobita/core/common/Util.java → ...rc/main/java/com/trilobita/core/Util.java
@@ -1,4 +1,4 @@
-package com.trilobita.core.common;
+package com.trilobita.core;
 
 import java.io.FileInputStream;
 import java.io.IOException;

diff --git a/...ava/com/trilobita/commons/Computable.java → ...com/trilobita/core/common/Computable.java b/...ava/com/trilobita/commons/Computable.java → ...com/trilobita/core/common/Computable.java
@@ -1,4 +1,4 @@
-package com.trilobita.commons;
+package com.trilobita.core.common;
 
 import java.io.Serializable;
 

diff --git a/...main/java/com/trilobita/commons/Mail.java → .../java/com/trilobita/core/common/Mail.java b/...main/java/com/trilobita/commons/Mail.java → .../java/com/trilobita/core/common/Mail.java
@@ -1,4 +1,4 @@
-package com.trilobita.commons;
+package com.trilobita.core.common;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

diff --git a/...n/java/com/trilobita/commons/Message.java → ...va/com/trilobita/core/common/Message.java b/...n/java/com/trilobita/commons/Message.java → ...va/com/trilobita/core/common/Message.java
@@ -1,4 +1,4 @@
-package com.trilobita.commons;
+package com.trilobita.core.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/core/src/main/java/com/trilobita/core/common/Snapshot.java b/core/src/main/java/com/trilobita/core/common/Snapshot.java
@@ -1,7 +1,6 @@
 package com.trilobita.core.common;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.trilobita.commons.Mail;
 import com.trilobita.core.graph.Graph;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...lobita/deserializer/MailDeserializer.java → ...a/core/deserializer/MailDeserializer.java b/...lobita/deserializer/MailDeserializer.java → ...a/core/deserializer/MailDeserializer.java
@@ -1,7 +1,6 @@
-package com.trilobita.deserializer;
+package com.trilobita.core.deserializer;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.kafka.common.header.Headers;

diff --git a/...ilobita/exception/TrilobitaException.java → ...ta/core/exception/TrilobitaException.java b/...ilobita/exception/TrilobitaException.java → ...ta/core/exception/TrilobitaException.java
@@ -1,4 +1,4 @@
-package com.trilobita.exception;
+package com.trilobita.core.exception;
 
 public class TrilobitaException extends Exception {
     public TrilobitaException(String message) {

diff --git a/core/src/main/java/com/trilobita/core/graph/Graph.java b/core/src/main/java/com/trilobita/core/graph/Graph.java
@@ -1,6 +1,6 @@
 package com.trilobita.core.graph;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import com.trilobita.core.graph.vertex.Vertex;
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/core/src/main/java/com/trilobita/core/graph/VertexGroup.java b/core/src/main/java/com/trilobita/core/graph/VertexGroup.java
@@ -1,7 +1,7 @@
 package com.trilobita.core.graph;
 
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import com.trilobita.core.graph.vertex.Vertex;
 import lombok.Data;
 

diff --git a/core/src/main/java/com/trilobita/core/graph/vertex/Edge.java b/core/src/main/java/com/trilobita/core/graph/vertex/Edge.java
@@ -1,6 +1,6 @@
 package com.trilobita.core.graph.vertex;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/core/src/main/java/com/trilobita/core/graph/vertex/Vertex.java b/core/src/main/java/com/trilobita/core/graph/vertex/Vertex.java
@@ -1,6 +1,7 @@
 package com.trilobita.core.graph.vertex;
 
-import com.trilobita.commons.*;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Computable;
 import lombok.Data;
 
 import java.io.Serializable;

diff --git a/core/src/main/java/com/trilobita/core/messaging/MessageAdmin.java b/core/src/main/java/com/trilobita/core/messaging/MessageAdmin.java
@@ -1,6 +1,6 @@
 package com.trilobita.core.messaging;
 
-import com.trilobita.core.common.Util;
+import com.trilobita.core.Util;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.*;
 import org.apache.kafka.common.KafkaFuture;

diff --git a/core/src/main/java/com/trilobita/core/messaging/MessageConsumer.java b/core/src/main/java/com/trilobita/core/messaging/MessageConsumer.java
@@ -1,7 +1,7 @@
 package com.trilobita.core.messaging;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.*;
 

diff --git a/core/src/main/java/com/trilobita/core/messaging/MessageProducer.java b/core/src/main/java/com/trilobita/core/messaging/MessageProducer.java
@@ -1,8 +1,8 @@
 package com.trilobita.core.messaging;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
-import com.trilobita.commons.Message;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Message;
 import com.trilobita.core.common.Snapshot;
 
 import lombok.extern.slf4j.Slf4j;

diff --git a/.../trilobita/serializer/MailSerializer.java → ...obita/core/serializer/MailSerializer.java b/.../trilobita/serializer/MailSerializer.java → ...obita/core/serializer/MailSerializer.java
@@ -1,6 +1,6 @@
-package com.trilobita.serializer;
+package com.trilobita.core.serializer;
 
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.kafka.common.header.Headers;
@@ -33,4 +33,4 @@ public byte[] serialize(String topic, Headers headers, Mail data) {
 //        return Serializer.super.serialize(topic, headers, data);
     }
 
-}
+}
diff --git a/core/src/main/resources/kafka.properties b/core/src/main/resources/kafka.properties
@@ -9,6 +9,6 @@ client.dns.lookup=use_all_dns_ips
 # Best practice for Kafka producer to prevent data loss
 acks=all
 key.serializer=org.apache.kafka.common.serialization.StringSerializer
-value.serializer=com.trilobita.serializer.MailSerializer
+value.serializer=com.trilobita.core.serializer.MailSerializer
 key.deserializer=org.apache.kafka.common.serialization.StringDeserializer
-value.deserializer=com.trilobita.deserializer.MailDeserializer
+value.deserializer=com.trilobita.core.deserializer.MailDeserializer
diff --git a/docs/developer/StructureDiagram.drawio b/docs/developer/StructureDiagram.drawio
@@ -251,7 +251,7 @@
         <mxCell id="lBvt6h_ialfLkE9HlVQZ-73" value="+ sendCompleteSignal(): void" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="fkjLrEyQXUZWaJiIOoPh-28" vertex="1">
           <mxGeometry y="86" width="300" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="lBvt6h_ialfLkE9HlVQZ-20" value="+ distributeMail(com.trilobita.commons.Message): void" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="fkjLrEyQXUZWaJiIOoPh-28" vertex="1">
+        <mxCell id="lBvt6h_ialfLkE9HlVQZ-20" value="+ distributeMail(com.trilobita.core.common.Message): void" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="fkjLrEyQXUZWaJiIOoPh-28" vertex="1">
           <mxGeometry y="112" width="300" height="26" as="geometry" />
         </mxCell>
         <mxCell id="lBvt6h_ialfLkE9HlVQZ-1" value="VertexGroup" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
@@ -326,7 +326,7 @@
         <mxCell id="lBvt6h_ialfLkE9HlVQZ-46" value="+ to: Integer (vertexId)" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="lBvt6h_ialfLkE9HlVQZ-40" vertex="1">
           <mxGeometry y="52" width="240" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="lBvt6h_ialfLkE9HlVQZ-47" value="+ content: com.trilobita.commons.Message" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="lBvt6h_ialfLkE9HlVQZ-40" vertex="1">
+        <mxCell id="lBvt6h_ialfLkE9HlVQZ-47" value="+ content: com.trilobita.core.common.Message" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="lBvt6h_ialfLkE9HlVQZ-40" vertex="1">
           <mxGeometry y="78" width="240" height="26" as="geometry" />
         </mxCell>
         <mxCell id="lBvt6h_ialfLkE9HlVQZ-42" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;fontFamily=Helvetica;fontSize=11;fontColor=default;" parent="lBvt6h_ialfLkE9HlVQZ-40" vertex="1">

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -9,11 +9,6 @@
     <artifactId>engine</artifactId>
     <name>Archetype - engine</name>
     <dependencies>
-        <dependency>
-            <groupId>com.trilobita</groupId>
-            <artifactId>commons</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.trilobita</groupId>
             <artifactId>core</artifactId>

diff --git a/engine/src/main/java/com/trilobita/engine/server/AbstractServer.java b/engine/src/main/java/com/trilobita/engine/server/AbstractServer.java
@@ -1,10 +1,10 @@
 package com.trilobita.engine.server;
 
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.graph.VertexGroup;
 import com.trilobita.core.messaging.MessageConsumer;
 import com.trilobita.engine.server.masterserver.partition.strategy.PartitionStrategy;
-import com.trilobita.exception.TrilobitaException;
+import com.trilobita.core.exception.TrilobitaException;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

diff --git a/engine/src/main/java/com/trilobita/engine/server/masterserver/MasterServer.java b/engine/src/main/java/com/trilobita/engine/server/masterserver/MasterServer.java
@@ -1,6 +1,6 @@
 package com.trilobita.engine.server.masterserver;
 
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.graph.Graph;
 import com.trilobita.core.graph.vertex.Vertex;
 import com.trilobita.core.messaging.MessageProducer;

diff --git a/...ne/src/main/java/com/trilobita/engine/server/masterserver/execution/ExecutionManager.java b/...ne/src/main/java/com/trilobita/engine/server/masterserver/execution/ExecutionManager.java
@@ -1,7 +1,7 @@
 package com.trilobita.engine.server.masterserver.execution;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.graph.VertexGroup;
 import com.trilobita.core.messaging.MessageConsumer;
 import com.trilobita.core.messaging.MessageProducer;

diff --git a/...ain/java/com/trilobita/engine/server/masterserver/execution/synchronize/Synchronizer.java b/...ain/java/com/trilobita/engine/server/masterserver/execution/synchronize/Synchronizer.java
@@ -1,6 +1,6 @@
 package com.trilobita.engine.server.masterserver.execution.synchronize;
 
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.common.Snapshot;
 import com.trilobita.core.graph.Graph;
 import com.trilobita.core.messaging.MessageConsumer;

diff --git a/...ne/src/main/java/com/trilobita/engine/server/masterserver/heartbeat/HeartbeatManager.java b/...ne/src/main/java/com/trilobita/engine/server/masterserver/heartbeat/HeartbeatManager.java
@@ -1,6 +1,6 @@
 package com.trilobita.engine.server.masterserver.heartbeat;
 
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.messaging.MessageConsumer;
 import com.trilobita.engine.server.masterserver.MasterServer;
 import com.trilobita.engine.server.masterserver.heartbeat.checker.HeartbeatChecker;

diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/Aggregator.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/Aggregator.java
@@ -1,6 +1,6 @@
 package com.trilobita.engine.server.util.functionable;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import com.trilobita.core.graph.VertexGroup;
 import com.trilobita.engine.server.AbstractServer;
 

diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/Combiner.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/Combiner.java
@@ -7,8 +7,8 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import lombok.extern.slf4j.Slf4j;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
 import com.trilobita.engine.server.AbstractServer;
 
 /*

diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/Functionable.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/Functionable.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.messaging.MessageConsumer;
 import com.trilobita.core.messaging.MessageProducer;
 import com.trilobita.core.messaging.MessageConsumer.MessageHandler;

diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/FunctionalMail.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/FunctionalMail.java
@@ -1,8 +1,8 @@
 package com.trilobita.engine.server.util.functionable;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
-import com.trilobita.commons.Message;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Message;
 
 public class FunctionalMail extends Mail {
     public FunctionalMail(String instanceName, Computable<?> value) {

diff --git a/...rilobita/engine/server/util/functionable/functionableRunner/MasterFunctionableRunner.java b/...rilobita/engine/server/util/functionable/functionableRunner/MasterFunctionableRunner.java
@@ -7,10 +7,10 @@
 import java.util.ArrayList;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
-import com.trilobita.commons.Message;
-import com.trilobita.commons.Mail.MailType;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Message;
+import com.trilobita.core.common.Mail.MailType;
 import com.trilobita.core.messaging.MessageProducer;
 import com.trilobita.engine.server.util.functionable.Functionable;