diff --git a/pom.xml b/pom.xml
index 5852ece..b998e33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
-
+
jitpack.io
@@ -125,6 +125,7 @@
true
+
org.apache.maven.plugins
maven-gpg-plugin
diff --git a/src/main/java/dlt/client/tangle/model/LedgerReader.java b/src/main/java/dlt/client/tangle/model/LedgerReader.java
index d657895..8f908e4 100644
--- a/src/main/java/dlt/client/tangle/model/LedgerReader.java
+++ b/src/main/java/dlt/client/tangle/model/LedgerReader.java
@@ -92,7 +92,6 @@ private void notifyAll(String topic, Object object) {
if (topic != null && !topic.isEmpty()) {
Set subscribers = this.topics.get(topic);
if (subscribers != null && !subscribers.isEmpty()) {
-
subscribers.forEach(sub -> sub.update(object));
}
}
diff --git a/src/main/java/dlt/client/tangle/model/LedgerWriter.java b/src/main/java/dlt/client/tangle/model/LedgerWriter.java
index 12c4721..1e4dde9 100644
--- a/src/main/java/dlt/client/tangle/model/LedgerWriter.java
+++ b/src/main/java/dlt/client/tangle/model/LedgerWriter.java
@@ -5,6 +5,7 @@
import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
import dlt.client.tangle.enums.TransactionType;
+import dlt.client.tangle.model.transactions.LBDevice;
import dlt.client.tangle.model.transactions.LBReply;
import dlt.client.tangle.model.transactions.Reply;
import dlt.client.tangle.model.transactions.Request;
@@ -23,6 +24,7 @@
import org.iota.jota.model.Transfer;
import org.iota.jota.utils.SeedRandomGenerator;
import org.iota.jota.utils.TrytesConverter;
+import java.util.logging.Logger;
/**
*
@@ -40,6 +42,7 @@ public class LedgerWriter implements ILedgerWriter, Runnable {
private final int minimumWeightMagnitude;
private final int securityLevel;
private String url;
+ private static final Logger logger = Logger.getLogger(LedgerWriter.class.getName());
public LedgerWriter(
String protocol,
@@ -111,8 +114,8 @@ public Transaction getTransactionByHash(String hashTransaction) {
}
private Transaction getTypeTransaction(String transactionJSON) {
- System.out.println("JSON Message");
- System.out.println(transactionJSON);
+ logger.info("JSON Message");
+ logger.info(transactionJSON);
JsonParser jsonparser = new JsonParser();
JsonReader reader = new JsonReader(new StringReader(transactionJSON));
@@ -137,9 +140,10 @@ private Transaction getTypeTransaction(String transactionJSON) {
return gson.fromJson(reader, Request.class);
} else if (type.equals(TransactionType.LB_STATUS.name())) {
return gson.fromJson(reader, Status.class);
+ } else {
+ return gson.fromJson(reader, LBDevice.class);
}
- return null;
}
private void writeToTangle(String tagGroup, String message) {
@@ -169,7 +173,7 @@ private void writeToTangle(String tagGroup, String message) {
null
);
} catch (ArgumentException e) {
- System.out.println("Error in arguments!");
+ logger.info("Error in arguments!");
e.printStackTrace();
}
}
diff --git a/src/main/java/dlt/client/tangle/model/ZMQServer.java b/src/main/java/dlt/client/tangle/model/ZMQServer.java
index bd84766..c7c84e7 100644
--- a/src/main/java/dlt/client/tangle/model/ZMQServer.java
+++ b/src/main/java/dlt/client/tangle/model/ZMQServer.java
@@ -19,6 +19,7 @@ public class ZMQServer implements Runnable {
private ZMQ.Socket serverListener;
private String socketURL;
private String address;
+ private static final Logger logger = Logger.getLogger(ZMQServer.class.getName());
public ZMQServer(
int bufferSize,
@@ -36,7 +37,7 @@ public ZMQServer(
public void start() {
if (this.serverThread == null) {
- System.out.println("Socket URL: " + this.socketURL);
+ logger.info("Socket URL: " + this.socketURL);
this.serverListener.connect(this.socketURL);
this.serverThread = new Thread(this);
@@ -51,7 +52,7 @@ public void stop() {
}
public void subscribe(String topic) {
- System.out.println("Subscribe: " + topic);
+ logger.info("Subscribe: " + topic);
this.serverListener.subscribe(topic);
}
@@ -65,7 +66,8 @@ public String take() throws InterruptedException {
@Override
public void run() {
- System.out.println("Address: " + address);
+ logger.info("Address: " + address);
+
while (!this.serverThread.isInterrupted()) {
byte[] reply = serverListener.recv(0);
String[] data = (new String(reply).split(" "));
@@ -82,7 +84,7 @@ private void putReceivedMessageBuffer(String receivedMessage) {
try {
this.DLTInboundBuffer.put(receivedMessage);
} catch (InterruptedException ex) {
- Logger.getLogger(ZMQServer.class.getName()).log(Level.SEVERE, null, ex);
+ logger.log(Level.SEVERE, null, ex);
}
}
}
diff --git a/src/main/java/dlt/client/tangle/model/transactions/Status.java b/src/main/java/dlt/client/tangle/model/transactions/Status.java
index 112c5cc..ae76d7d 100644
--- a/src/main/java/dlt/client/tangle/model/transactions/Status.java
+++ b/src/main/java/dlt/client/tangle/model/transactions/Status.java
@@ -27,7 +27,7 @@ public double getLastLoad() {
return lastLoad;
}
- public boolean getAvaible() {
+ public boolean getAvailable() {
return available;
}
diff --git a/src/main/java/dlt/client/tangle/model/transactions/Transaction.java b/src/main/java/dlt/client/tangle/model/transactions/Transaction.java
index 2e8f6f9..ee058b8 100644
--- a/src/main/java/dlt/client/tangle/model/transactions/Transaction.java
+++ b/src/main/java/dlt/client/tangle/model/transactions/Transaction.java
@@ -45,4 +45,15 @@ public final void setPublishedAt(long publishedAt) {
public final long getPublishedAt() {
return this.publishedAt;
}
+
+ @Override
+ public String toString() {
+ return new StringBuilder("Transaction: ")
+ .append(this.source)
+ .append(this.group)
+ .append(this.type)
+ .append(this.createdAt)
+ .append(this.publishedAt)
+ .toString();
+ }
}