Merge pull request #41 from oneteme/develop

V2
oneteme · Feb 29, 2024 · 1bcf5f1 · 1bcf5f1
2 parents 4e3cbf7 + cbad4ab
commit 1bcf5f1
Show file tree

Hide file tree

Showing 17 changed files with 509 additions and 499 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
 		<dependency>
 			<groupId>io.github.oneteme.traceapi</groupId>
 			<artifactId>traceapi-core</artifactId>
-			<version>0.0.15-SNAPSHOT</version>
+			<version>0.0.16-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.github.oneteme</groupId>

diff --git a/src/main/java/org/usf/trace/api/server/ApiController.java b/src/main/java/org/usf/trace/api/server/ApiController.java
diff --git a/src/main/java/org/usf/trace/api/server/Exchange.java b/src/main/java/org/usf/trace/api/server/Exchange.java
@@ -1,7 +1,8 @@
 package org.usf.trace.api.server;
 
-import org.usf.traceapi.core.IncomingRequest;
-import org.usf.traceapi.core.OutcomingRequest;
+import lombok.Setter;
+import org.usf.traceapi.core.ApiSession;
+import org.usf.traceapi.core.ApiRequest;
 
 import lombok.Getter;
 
@@ -11,12 +12,9 @@
  *
  */
 @Getter
-public final class Exchange extends OutcomingRequest {
+@Setter
+public final class Exchange extends ApiRequest {
 
-	private IncomingRequest remoteTrace;
-
-	public Exchange(String id) {
-		super(id);
-	}
+	private ApiSession remoteTrace;
 
 }
diff --git a/src/main/java/org/usf/trace/api/server/FilterCriteria.java b/src/main/java/org/usf/trace/api/server/FilterCriteria.java
@@ -21,9 +21,7 @@
 @AllArgsConstructor
 public class FilterCriteria {
 
-    private final String[] idIncoming; //
-
-    private final String[] idMain;
+    private final String[] idSession; //
     private final String[] name;
     private final String[] env;
     private final String[] port;
@@ -33,8 +31,7 @@ public class FilterCriteria {
     private final Instant  end;
 
 
-    public String toSql(Filters idIncomingColname,
-                        Filters idMainColname,
+    public String toSql(Filters idSession,
                         Filters nameColname,
                         Filters envColname,
                         Filters portColname,
@@ -45,8 +42,7 @@ public String toSql(Filters idIncomingColname,
                         Collection<Integer> argTypes) {
 
         var sql = " WHERE 1 = 1";
-        sql += toSql(idIncomingColname,args,argTypes,getIdIncoming());
-        sql += toSql(idMainColname,args,argTypes,getIdMain());
+        sql += toSql(idSession,args,argTypes,getIdSession());
         sql += toSql(nameColname,args,argTypes,getName());
         sql += toSql(envColname,args,argTypes,getEnv());
         sql += toSql(portColname,args,argTypes,getPort());
@@ -70,7 +66,7 @@ String toSql(Filters colname, Collection<Object> args, Collection<Integer> argTy
             if(values.length == 1){
                 return " AND "+ sql;
             }
-            return " AND (" + sql + " " + colname + "IN(" + Utils.nArg(values.length) + "))";//error
+            return " AND (" + sql + " " + colname + " IN(" + Utils.nArg(values.length) + "))";//error
         }
         args.addAll(Arrays.asList(values));
         argTypes.addAll(Collections.nCopies(values.length, colname.getType()));
@@ -101,8 +97,7 @@ String endToSql(Filters end , Collection<Object> args, Collection<Integer> argTy
     @Override
     public String toString() {
         return "FilterCriteria{" +
-                "id=" + Arrays.toString(idIncoming) +
-                ", host=" + Arrays.toString(name) +
+                "host=" + Arrays.toString(name) +
                 ", env=" + Arrays.toString(env) +
                 ", port=" + Arrays.toString(port) +
                 ", start='" + start + '\'' +

diff --git a/src/main/java/org/usf/trace/api/server/Filters.java b/src/main/java/org/usf/trace/api/server/Filters.java
@@ -5,8 +5,7 @@
 
 
 public enum Filters {
-    ID_IN_REQ(VARCHAR),
-    ID_MAIN_REQ(VARCHAR),
+    ID_SES(VARCHAR),
     VA_APP_NME(VARCHAR),
     VA_ENV(VARCHAR),
     CD_PRT(INTEGER),