From 7169cb420ea5532c9fa536b100c3da43a251adb6 Mon Sep 17 00:00:00 2001 From: AllanCapistrano Date: Thu, 20 Oct 2022 14:50:37 -0300 Subject: [PATCH 1/9] Feat: using a test tag for LB_STATUS transactions --- .../java/dlt/client/tangle/model/LedgerWriter.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/dlt/client/tangle/model/LedgerWriter.java b/src/main/java/dlt/client/tangle/model/LedgerWriter.java index 12c4721..62bcd37 100644 --- a/src/main/java/dlt/client/tangle/model/LedgerWriter.java +++ b/src/main/java/dlt/client/tangle/model/LedgerWriter.java @@ -88,7 +88,18 @@ public void run() { Transaction transaction = this.DLTOutboundBuffer.take(); transaction.setPublishedAt(System.currentTimeMillis()); String transactionJson = gson.toJson(transaction); - this.writeToTangle(transaction.getGroup(), transactionJson); + + String tag; + + if (transaction.getType().equals(TransactionType.LB_STATUS)) { + String[] temp = transaction.getSource().split("/"); + + tag = temp[2]; + } else { + tag = transaction.getGroup(); + } + + this.writeToTangle(tag, transactionJson); } catch (InterruptedException ex) { this.DLTOutboundMonitor.interrupt(); } From 962b9ee03afd79afe0d8ed143ec86210fe39b6d5 Mon Sep 17 00:00:00 2001 From: AllanCapistrano Date: Sun, 12 Feb 2023 17:03:15 -0300 Subject: [PATCH 2/9] Refactor: change sysout for log.info --- src/main/java/dlt/client/tangle/model/LedgerWriter.java | 9 ++++++--- src/main/java/dlt/client/tangle/model/ZMQServer.java | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/dlt/client/tangle/model/LedgerWriter.java b/src/main/java/dlt/client/tangle/model/LedgerWriter.java index 62bcd37..272aafd 100644 --- a/src/main/java/dlt/client/tangle/model/LedgerWriter.java +++ b/src/main/java/dlt/client/tangle/model/LedgerWriter.java @@ -23,6 +23,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 +41,7 @@ public class LedgerWriter implements ILedgerWriter, Runnable { private final int minimumWeightMagnitude; private final int securityLevel; private String url; + private Logger log; public LedgerWriter( String protocol, @@ -59,6 +61,7 @@ public LedgerWriter( this.minimumWeightMagnitude = mwm; this.securityLevel = securityLevel; this.url = url; + this.log = Logger.getLogger(LedgerWriter.class.getName()); this.DLTOutboundBuffer = new ArrayBlockingQueue(bufferSize); } @@ -122,8 +125,8 @@ public Transaction getTransactionByHash(String hashTransaction) { } private Transaction getTypeTransaction(String transactionJSON) { - System.out.println("JSON Message"); - System.out.println(transactionJSON); + this.log.info("JSON Message"); + this.log.info(transactionJSON); JsonParser jsonparser = new JsonParser(); JsonReader reader = new JsonReader(new StringReader(transactionJSON)); @@ -180,7 +183,7 @@ private void writeToTangle(String tagGroup, String message) { null ); } catch (ArgumentException e) { - System.out.println("Error in arguments!"); + this.log.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..4182c32 100644 --- a/src/main/java/dlt/client/tangle/model/ZMQServer.java +++ b/src/main/java/dlt/client/tangle/model/ZMQServer.java @@ -6,6 +6,7 @@ import java.util.logging.Logger; import org.zeromq.SocketType; import org.zeromq.ZMQ; +import java.util.logging.Logger; /** * @@ -19,6 +20,7 @@ public class ZMQServer implements Runnable { private ZMQ.Socket serverListener; private String socketURL; private String address; + private Logger log; public ZMQServer( int bufferSize, @@ -32,11 +34,12 @@ public ZMQServer( this.socketURL = String.format("%s://%s:%s", socketProtocol, socketURL, socketPort); this.address = address; + this.log = Logger.getLogger(ZMQServer.class.getName()); } public void start() { if (this.serverThread == null) { - System.out.println("Socket URL: " + this.socketURL); + this.log.info("Socket URL: " + this.socketURL); this.serverListener.connect(this.socketURL); this.serverThread = new Thread(this); @@ -51,7 +54,7 @@ public void stop() { } public void subscribe(String topic) { - System.out.println("Subscribe: " + topic); + this.log.info("Subscribe: " + topic); this.serverListener.subscribe(topic); } @@ -65,7 +68,7 @@ public String take() throws InterruptedException { @Override public void run() { - System.out.println("Address: " + address); + this.log.info("Address: " + address); while (!this.serverThread.isInterrupted()) { byte[] reply = serverListener.recv(0); String[] data = (new String(reply).split(" ")); From a8309bcd5a15cbaf6ecb8b68531e0864915259e3 Mon Sep 17 00:00:00 2001 From: AllanCapistrano Date: Sat, 18 Feb 2023 18:37:30 -0300 Subject: [PATCH 3/9] Feat: add toString method --- .../client/tangle/model/transactions/Transaction.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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(); + } } From 406ecb75e9e6ce95b389d3b8a53350c723ff0a02 Mon Sep 17 00:00:00 2001 From: AllanCapistrano Date: Sat, 18 Feb 2023 18:37:55 -0300 Subject: [PATCH 4/9] Refactor: rename getAvailable method --- src/main/java/dlt/client/tangle/model/transactions/Status.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From fb632c4ed11428edc53d207aac634cc23a60a1f8 Mon Sep 17 00:00:00 2001 From: AllanCapistrano Date: Sat, 18 Feb 2023 18:38:31 -0300 Subject: [PATCH 5/9] Style: formatting code --- src/main/java/dlt/client/tangle/model/LedgerReader.java | 1 - 1 file changed, 1 deletion(-) 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)); } } From b7c94a43873aaf533f58febdf38f0d7ce6bbd1e6 Mon Sep 17 00:00:00 2001 From: AllanCapistrano Date: Sat, 18 Feb 2023 18:39:18 -0300 Subject: [PATCH 6/9] Refactor: add LBDevice case to getTypeTransaction method --- src/main/java/dlt/client/tangle/model/LedgerWriter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/dlt/client/tangle/model/LedgerWriter.java b/src/main/java/dlt/client/tangle/model/LedgerWriter.java index 272aafd..65b86ba 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; @@ -151,9 +152,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) { From e28afc05e9a717c90142a4287313d95bac08ea90 Mon Sep 17 00:00:00 2001 From: AllanCapistrano Date: Sat, 18 Feb 2023 18:42:09 -0300 Subject: [PATCH 7/9] Fix: remove unnecessary tag code --- .../java/dlt/client/tangle/model/LedgerWriter.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/java/dlt/client/tangle/model/LedgerWriter.java b/src/main/java/dlt/client/tangle/model/LedgerWriter.java index 65b86ba..dff8c1d 100644 --- a/src/main/java/dlt/client/tangle/model/LedgerWriter.java +++ b/src/main/java/dlt/client/tangle/model/LedgerWriter.java @@ -92,18 +92,7 @@ public void run() { Transaction transaction = this.DLTOutboundBuffer.take(); transaction.setPublishedAt(System.currentTimeMillis()); String transactionJson = gson.toJson(transaction); - - String tag; - - if (transaction.getType().equals(TransactionType.LB_STATUS)) { - String[] temp = transaction.getSource().split("/"); - - tag = temp[2]; - } else { - tag = transaction.getGroup(); - } - - this.writeToTangle(tag, transactionJson); + this.writeToTangle(transaction.getGroup(), transactionJson); } catch (InterruptedException ex) { this.DLTOutboundMonitor.interrupt(); } From 3eaeeb9e8eea654defb5cd5f032b54e0eacb0ca1 Mon Sep 17 00:00:00 2001 From: AllanCapistrano Date: Mon, 20 Feb 2023 09:10:41 -0300 Subject: [PATCH 8/9] Refactor: change log object --- .../java/dlt/client/tangle/model/LedgerWriter.java | 9 ++++----- .../java/dlt/client/tangle/model/ZMQServer.java | 13 ++++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/dlt/client/tangle/model/LedgerWriter.java b/src/main/java/dlt/client/tangle/model/LedgerWriter.java index dff8c1d..1e4dde9 100644 --- a/src/main/java/dlt/client/tangle/model/LedgerWriter.java +++ b/src/main/java/dlt/client/tangle/model/LedgerWriter.java @@ -42,7 +42,7 @@ public class LedgerWriter implements ILedgerWriter, Runnable { private final int minimumWeightMagnitude; private final int securityLevel; private String url; - private Logger log; + private static final Logger logger = Logger.getLogger(LedgerWriter.class.getName()); public LedgerWriter( String protocol, @@ -62,7 +62,6 @@ public LedgerWriter( this.minimumWeightMagnitude = mwm; this.securityLevel = securityLevel; this.url = url; - this.log = Logger.getLogger(LedgerWriter.class.getName()); this.DLTOutboundBuffer = new ArrayBlockingQueue(bufferSize); } @@ -115,8 +114,8 @@ public Transaction getTransactionByHash(String hashTransaction) { } private Transaction getTypeTransaction(String transactionJSON) { - this.log.info("JSON Message"); - this.log.info(transactionJSON); + logger.info("JSON Message"); + logger.info(transactionJSON); JsonParser jsonparser = new JsonParser(); JsonReader reader = new JsonReader(new StringReader(transactionJSON)); @@ -174,7 +173,7 @@ private void writeToTangle(String tagGroup, String message) { null ); } catch (ArgumentException e) { - this.log.info("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 4182c32..c7c84e7 100644 --- a/src/main/java/dlt/client/tangle/model/ZMQServer.java +++ b/src/main/java/dlt/client/tangle/model/ZMQServer.java @@ -6,7 +6,6 @@ import java.util.logging.Logger; import org.zeromq.SocketType; import org.zeromq.ZMQ; -import java.util.logging.Logger; /** * @@ -20,7 +19,7 @@ public class ZMQServer implements Runnable { private ZMQ.Socket serverListener; private String socketURL; private String address; - private Logger log; + private static final Logger logger = Logger.getLogger(ZMQServer.class.getName()); public ZMQServer( int bufferSize, @@ -34,12 +33,11 @@ public ZMQServer( this.socketURL = String.format("%s://%s:%s", socketProtocol, socketURL, socketPort); this.address = address; - this.log = Logger.getLogger(ZMQServer.class.getName()); } public void start() { if (this.serverThread == null) { - this.log.info("Socket URL: " + this.socketURL); + logger.info("Socket URL: " + this.socketURL); this.serverListener.connect(this.socketURL); this.serverThread = new Thread(this); @@ -54,7 +52,7 @@ public void stop() { } public void subscribe(String topic) { - this.log.info("Subscribe: " + topic); + logger.info("Subscribe: " + topic); this.serverListener.subscribe(topic); } @@ -68,7 +66,8 @@ public String take() throws InterruptedException { @Override public void run() { - this.log.info("Address: " + address); + logger.info("Address: " + address); + while (!this.serverThread.isInterrupted()) { byte[] reply = serverListener.recv(0); String[] data = (new String(reply).split(" ")); @@ -85,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); } } } From e4872999c8d540fdbefdfca2d7b029b5d5bf6601 Mon Sep 17 00:00:00 2001 From: Uellington Damasceno Date: Fri, 24 Feb 2023 00:58:03 -0300 Subject: [PATCH 9/9] If applied, this commit will update the pom so that it's possible to publish to the maven repository. --- pom.xml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed8c871..5fbffb2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,49 @@ 4.0.0 - br.uefs.larsid.dlt.iot.soft + io.github.larsid SOFT-IoT-DLT-Client-Tangle 1.0-SNAPSHOT bundle SOFT-IoT-DLT-Client-Tangle SOFT-IOT-DLT-Client-Tangle OSGi blueprint bundle project. + https://github.com/larsid/soft-iot-dlt-client-tangle + + + MIT License + http://www.opensource.org/licenses/mit-license.php + + + + + + Uellington Damasceno + udamasceno@ecomp.uefs.br + LARSID + https://github.com/larsid/ + + + + + scm:git:git://github.com/larsid/soft-iot-dlt-client-tangle.git + scm:git:ssh://github.com:larsid/soft-iot-dlt-client-tangle.git + http://github.com/larsid/soft-iot-dlt-client-tangle/tree/master + + + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + jitpack.io @@ -67,6 +102,34 @@ 256M + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + ${gpg.keyname} + + + +