From ea8ea96fc5a635734941911a76407891652f01d5 Mon Sep 17 00:00:00 2001
From: Mo <born19th@gmail.com>
Date: Sun, 18 Sep 2016 18:20:44 +0300
Subject: [PATCH] decompress eddn message, improve debug info

---
 utils/src/main/java/ru/trader/emdn/Receiver.java       |  3 ++-
 utils/src/main/java/ru/trader/emdn/entities/Body.java  | 10 ++++++++++
 .../src/main/java/ru/trader/emdn/entities/Header.java  |  2 +-
 utils/src/main/java/ru/trader/emdn/entities/Item.java  |  2 +-
 .../src/main/java/ru/trader/emdn/entities/Message.java |  2 +-
 .../main/java/ru/trader/emdn/entities/StarSystem.java  |  2 +-
 .../src/main/java/ru/trader/emdn/entities/Station.java |  2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/utils/src/main/java/ru/trader/emdn/Receiver.java b/utils/src/main/java/ru/trader/emdn/Receiver.java
index feed401..fc7c521 100644
--- a/utils/src/main/java/ru/trader/emdn/Receiver.java
+++ b/utils/src/main/java/ru/trader/emdn/Receiver.java
@@ -73,8 +73,9 @@ public class Receiver implements Runnable {
                         byte[] receivedData = subscriber.recv(ZMQ.PAIR);
                         LOG.trace("Received data: {}", receivedData);
                         if (receivedData == null) continue;
-    //                    receivedData = decompress(receivedData);
+                        receivedData = decompress(receivedData);
                         String marketJson = new String(receivedData, "UTF-8");
+                        LOG.trace("Decompress message: {}", marketJson);
                         builder.append(marketJson);
                         if (!subscriber.hasReceiveMore()){
                             Message message = parser.parse(builder.toString());
diff --git a/utils/src/main/java/ru/trader/emdn/entities/Body.java b/utils/src/main/java/ru/trader/emdn/entities/Body.java
index 5a9572e..df36ebb 100644
--- a/utils/src/main/java/ru/trader/emdn/entities/Body.java
+++ b/utils/src/main/java/ru/trader/emdn/entities/Body.java
@@ -43,4 +43,14 @@ public class Body {
     public void addAll(Collection<Item> items){
         commodities.addAll(items);
     }
+
+    @Override
+    public String toString() {
+        return "Body{" +
+                "system=" + system +
+                ", station=" + station +
+                ", timestamp=" + timestamp +
+                ", commodities=" + commodities +
+                '}';
+    }
 }
diff --git a/utils/src/main/java/ru/trader/emdn/entities/Header.java b/utils/src/main/java/ru/trader/emdn/entities/Header.java
index c024361..ed8d411 100644
--- a/utils/src/main/java/ru/trader/emdn/entities/Header.java
+++ b/utils/src/main/java/ru/trader/emdn/entities/Header.java
@@ -41,6 +41,6 @@ public class Header {
                 ", softwareName='" + softwareName + '\'' +
                 ", softwareVersion='" + softwareVersion + '\'' +
                 ", gatewayTimestamp=" + gatewayTimestamp +
-                "} " + super.toString();
+                '}';
     }
 }
diff --git a/utils/src/main/java/ru/trader/emdn/entities/Item.java b/utils/src/main/java/ru/trader/emdn/entities/Item.java
index 9b4777e..273ce22 100644
--- a/utils/src/main/java/ru/trader/emdn/entities/Item.java
+++ b/utils/src/main/java/ru/trader/emdn/entities/Item.java
@@ -73,6 +73,6 @@ public class Item {
                 ", sellPrice=" + sellPrice +
                 ", demand=" + demand +
                 ", demandLevel=" + demandLevel +
-                "} " + super.toString();
+                "} ";
     }
 }
diff --git a/utils/src/main/java/ru/trader/emdn/entities/Message.java b/utils/src/main/java/ru/trader/emdn/entities/Message.java
index 1b26454..3011c0d 100644
--- a/utils/src/main/java/ru/trader/emdn/entities/Message.java
+++ b/utils/src/main/java/ru/trader/emdn/entities/Message.java
@@ -34,6 +34,6 @@ public class Message {
                 "schemaRef='" + schemaRef + '\'' +
                 ", header=" + header +
                 ", body=" + body +
-                "} " + super.toString();
+                "} ";
     }
 }
diff --git a/utils/src/main/java/ru/trader/emdn/entities/StarSystem.java b/utils/src/main/java/ru/trader/emdn/entities/StarSystem.java
index 3de7a12..01c2308 100644
--- a/utils/src/main/java/ru/trader/emdn/entities/StarSystem.java
+++ b/utils/src/main/java/ru/trader/emdn/entities/StarSystem.java
@@ -35,6 +35,6 @@ public class StarSystem {
                 "name='" + name + '\'' +
                 ", id=" + id +
                 ", address=" + address +
-                "} " + super.toString();
+                "} ";
     }
 }
diff --git a/utils/src/main/java/ru/trader/emdn/entities/Station.java b/utils/src/main/java/ru/trader/emdn/entities/Station.java
index e0666a8..e766f8c 100644
--- a/utils/src/main/java/ru/trader/emdn/entities/Station.java
+++ b/utils/src/main/java/ru/trader/emdn/entities/Station.java
@@ -25,6 +25,6 @@ public class Station {
         return "Station{" +
                 "name='" + name + '\'' +
                 ", id=" + id +
-                "} " + super.toString();
+                "} ";
     }
 }