Merge pull request #11 from 2060-io/dev

2.0.7
2060-io · Apr 29, 2024 · ce1205d · ce1205d
2 parents d1265b7 + 42a6b5b
commit ce1205d
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>io.2060</groupId>
    <artifactId>service-agent-java-client</artifactId>
-   <version>2.0.6</version>
+   <version>2.0.7</version>
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <maven.compiler.source>17</maven.compiler.source>

diff --git a/src/main/java/io/twentysixty/sa/client/jms/AbstractProducer.java b/src/main/java/io/twentysixty/sa/client/jms/AbstractProducer.java
@@ -1,5 +1,6 @@
 package io.twentysixty.sa.client.jms;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -20,7 +21,7 @@
 import io.twentysixty.sa.client.util.JsonUtil;
 
 
-public abstract class AbstractProducer implements ProducerInterface {
+public abstract class AbstractProducer<M extends Serializable> implements ProducerInterface<M> {
 
 	private Integer producerId = 0;
 	private Integer producerCount = 8;
@@ -108,7 +109,7 @@ public void setProducerCount(Integer producerCount) {
 		this.producerCount = producerCount;
 	}
 
-	public void spool(BaseMessage sms, int attempt) throws Exception {
+	public void spool(M sms, int attempt) throws Exception {
 
     	JMSProducer producer = null;
     	JMSContext context = null;
@@ -194,7 +195,7 @@ public void setDebug(Boolean debug) {
 	}
 
 	@Override
-	public void sendMessage(BaseMessage message) throws Exception {
+	public void sendMessage(M message) throws Exception {
 		// TODO Auto-generated method stub
 
 	}

diff --git a/src/main/java/io/twentysixty/sa/client/jms/ProducerInterface.java b/src/main/java/io/twentysixty/sa/client/jms/ProducerInterface.java
@@ -1,16 +1,16 @@
 package io.twentysixty.sa.client.jms;
 
-import io.twentysixty.sa.client.model.message.BaseMessage;
+import java.io.Serializable;
 
-public interface ProducerInterface {
+public interface ProducerInterface<M extends Serializable> {
 
 
 	public void setExDelay(Long exDelay);
 	public void setQueueName(String queueName);
 	public void setThreads(Integer threads);
 	public void setDebug(Boolean debug);
 
-	public void sendMessage(BaseMessage message) throws Exception;
+	public void sendMessage(M message) throws Exception;
 
 
 

diff --git a/src/main/java/io/twentysixty/sa/client/model/event/DidExchangeState.java b/src/main/java/io/twentysixty/sa/client/model/event/DidExchangeState.java
@@ -31,6 +31,7 @@ export enum DidExchangeState {
 	RESPONSE_RECEIVED("response-received"),
 	ABANDONED("abandoned"),
 	COMPLETED("completed"),
+	TERMINATED("terminated"),
 
 	;
 
@@ -57,6 +58,7 @@ public static DidExchangeState getEnum(String index){
 		else if (index.equals("response-received")) return RESPONSE_RECEIVED;
 		else if (index.equals("abandoned")) return ABANDONED;
 		else if (index.equals("completed")) return COMPLETED;
+		else if (index.equals("terminated")) return TERMINATED;
 		else return null;
 
 	}

diff --git a/src/main/java/io/twentysixty/sa/client/model/event/Event.java b/src/main/java/io/twentysixty/sa/client/model/event/Event.java
@@ -26,8 +26,10 @@
 
 })
 
-public class Event  implements Serializable {
+public class Event implements Serializable {
 
+	private static final long serialVersionUID = -3403163200817960597L;
+
 	private String type;
 
 	@JsonSerialize(using = InstantSerializer.class)

diff --git a/src/main/java/io/twentysixty/sa/client/model/event/MessageReceived.java b/src/main/java/io/twentysixty/sa/client/model/event/MessageReceived.java
@@ -13,6 +13,7 @@
 public class MessageReceived extends Event  implements Serializable {
 
 
+	private static final long serialVersionUID = 8579005132408573827L;
 	private BaseMessage message;
 
 	public BaseMessage getMessage() {

diff --git a/src/main/java/io/twentysixty/sa/client/model/message/TerminateConnectionMessage.java b/src/main/java/io/twentysixty/sa/client/model/message/TerminateConnectionMessage.java
@@ -8,6 +8,7 @@
 
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
+@Deprecated
 public class TerminateConnectionMessage extends BaseMessage  implements Serializable {
 
 	private static final long serialVersionUID = -2840211856886973672L;

diff --git a/src/main/java/io/twentysixty/sa/client/res/c/CredentialTypeInterface.java b/src/main/java/io/twentysixty/sa/client/res/c/CredentialTypeInterface.java
@@ -9,7 +9,6 @@
 
 import io.twentysixty.sa.client.model.credential.CredentialType;
 
-@Path("/v1")
 public interface CredentialTypeInterface {
 
 	@POST

diff --git a/src/main/java/io/twentysixty/sa/client/res/c/MessageInterface.java b/src/main/java/io/twentysixty/sa/client/res/c/MessageInterface.java
@@ -7,7 +7,6 @@
 import io.twentysixty.sa.client.model.message.BaseMessage;
 import io.twentysixty.sa.client.model.message.IdMessage;
 
-@Path("/v1")
 public interface MessageInterface { //cambiar void 
 
 	@POST

diff --git a/src/main/java/io/twentysixty/sa/client/res/c/v1/CredentialTypeInterface.java b/src/main/java/io/twentysixty/sa/client/res/c/v1/CredentialTypeInterface.java
@@ -0,0 +1,28 @@
+package io.twentysixty.sa.client.res.c.v1;
+
+import java.util.List;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+
+import io.twentysixty.sa.client.model.credential.CredentialType;
+
+@Path("")
+public interface CredentialTypeInterface {
+
+	@POST
+	@Path("/v1/credential-types")
+	@Produces("application/json")
+	public void createCredentialType(CredentialType credentialType);
+
+
+	@GET
+	@Path("/v1/credential-types")
+	@Produces("application/json")
+	public List<CredentialType> getAllCredentialTypes();
+
+
+
+}
diff --git a/src/main/java/io/twentysixty/sa/client/res/c/v1/MessageInterface.java b/src/main/java/io/twentysixty/sa/client/res/c/v1/MessageInterface.java
@@ -0,0 +1,17 @@
+package io.twentysixty.sa.client.res.c.v1;
+
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+
+import io.twentysixty.sa.client.model.message.BaseMessage;
+import io.twentysixty.sa.client.model.message.IdMessage;
+
+@Path("")
+public interface MessageInterface { //cambiar void 
+
+	@POST
+	@Path("/v1/message")
+	@Produces("application/json")
+	public IdMessage sendMessage(BaseMessage message);
+}
diff --git a/src/main/java/io/twentysixty/sa/client/res/s/ConnectionEventInterface.java b/src/main/java/io/twentysixty/sa/client/res/s/ConnectionEventInterface.java
@@ -8,7 +8,6 @@
 
 import io.twentysixty.sa.client.model.event.ConnectionStateUpdated;
 
-@Path("/v1")
 public interface ConnectionEventInterface {
 
 	@POST

diff --git a/src/main/java/io/twentysixty/sa/client/res/s/MessageEventInterface.java b/src/main/java/io/twentysixty/sa/client/res/s/MessageEventInterface.java
@@ -9,7 +9,6 @@
 import io.twentysixty.sa.client.model.event.MessageReceived;
 import io.twentysixty.sa.client.model.event.MessageStateUpdated;
 
-@Path("/v1")
 public interface MessageEventInterface {
 
 	@POST

diff --git a/src/main/java/io/twentysixty/sa/client/util/testing/Tryme.java b/src/main/java/io/twentysixty/sa/client/util/testing/Tryme.java
@@ -5,6 +5,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 
+import io.twentysixty.sa.client.model.message.BaseMessage;
 import io.twentysixty.sa.client.model.message.TextMessage;
 import io.twentysixty.sa.client.util.JsonUtil;
 
@@ -17,7 +18,7 @@ public static void main(String[] args) throws JsonProcessingException {
 		textMessage.setId(UUID.randomUUID());
 		textMessage.setThreadId(UUID.randomUUID());
 		textMessage.setTimestamp(Instant.now());
-		System.out.println(JsonUtil.serialize(textMessage, false));
+		System.out.println(JsonUtil.serialize((BaseMessage)textMessage, true));
 
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
     import io.twentysixty.sa.client.model.credential.CredentialType;
-    @Path("/v1")
     public interface CredentialTypeInterface {
     	@POST
@@ Expand Down @@