From 0edeaa7790c9f96e8b6a575df540a844e1a7dccd Mon Sep 17 00:00:00 2001
From: Gary Rowe <g.rowe@froot.co.uk>
Date: Sun, 12 Jul 2015 20:41:01 +0100
Subject: [PATCH] Removed unnecessary logging of protocol data

---
 .../multibit/hd/brit/core/dto/MatcherResponse.java    |  8 --------
 .../org/multibit/hd/brit/core/dto/PayerRequest.java   |  9 ---------
 .../hd/brit/core/dto/WalletToEncounterDateLink.java   | 11 -----------
 .../hd/brit/rest/resources/PublicBritResource.java    |  4 ++--
 4 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/brit-core/src/main/java/org/multibit/hd/brit/core/dto/MatcherResponse.java b/brit-core/src/main/java/org/multibit/hd/brit/core/dto/MatcherResponse.java
index d54915a..310e610 100644
--- a/brit-core/src/main/java/org/multibit/hd/brit/core/dto/MatcherResponse.java
+++ b/brit-core/src/main/java/org/multibit/hd/brit/core/dto/MatcherResponse.java
@@ -81,7 +81,6 @@ public byte[] serialise() {
       }
     }
 
-    log.trace("Serialised matcherResponse = \n{}\n", builder.toString());
     return builder.toString().getBytes(Charsets.UTF_8);
 
   }
@@ -164,11 +163,4 @@ public int hashCode() {
     return result;
   }
 
-  @Override
-  public String toString() {
-    return "MatcherResponse{" +
-      "replayDateOptional=" + replayDateOptional +
-      ", addressList=" + bitcoinAddresses +
-      '}';
-  }
 }
diff --git a/brit-core/src/main/java/org/multibit/hd/brit/core/dto/PayerRequest.java b/brit-core/src/main/java/org/multibit/hd/brit/core/dto/PayerRequest.java
index c3c85b5..0fd8178 100644
--- a/brit-core/src/main/java/org/multibit/hd/brit/core/dto/PayerRequest.java
+++ b/brit-core/src/main/java/org/multibit/hd/brit/core/dto/PayerRequest.java
@@ -158,13 +158,4 @@ public int hashCode() {
     return result;
   }
 
-  @Override
-  public String toString() {
-    return "PayerRequest{" +
-      "version=" + version +
-      ", britWalletId=" + britWalletId +
-      ", sessionKey=" + Arrays.toString(sessionKey) +
-      ", firstTransactionDate=" + firstTransactionDate +
-      '}';
-  }
 }
diff --git a/brit-core/src/main/java/org/multibit/hd/brit/core/dto/WalletToEncounterDateLink.java b/brit-core/src/main/java/org/multibit/hd/brit/core/dto/WalletToEncounterDateLink.java
index c07b98c..4347ddf 100644
--- a/brit-core/src/main/java/org/multibit/hd/brit/core/dto/WalletToEncounterDateLink.java
+++ b/brit-core/src/main/java/org/multibit/hd/brit/core/dto/WalletToEncounterDateLink.java
@@ -73,7 +73,6 @@ public String serialise() {
       builder.append(PayerRequest.OPTIONAL_NOT_PRESENT_TEXT);
     }
 
-    log.debug("Serialised walletToEncounterDateLink = \n" + builder.toString());
     return builder.toString();
 
   }
@@ -85,8 +84,6 @@ public String serialise() {
    */
   public static WalletToEncounterDateLink parse(String serialisedWalletToEncounterDate) {
 
-    log.trace("Attempting to parse walletToEncounterDateLink:\n{}", serialisedWalletToEncounterDate);
-
     if (serialisedWalletToEncounterDate == null) {
       return null;
     }
@@ -145,12 +142,4 @@ public int hashCode() {
 
   }
 
-  @Override
-  public String toString() {
-    return "WalletToEncounterDateLink{" +
-      "britWalletId=" + britWalletId +
-      ", encounterDateOptional=" + encounterDateOptional +
-      ", firstTransactionDate=" + firstTransactionDate +
-      '}';
-  }
 }
diff --git a/brit-rest/src/main/java/org/multibit/hd/brit/rest/resources/PublicBritResource.java b/brit-rest/src/main/java/org/multibit/hd/brit/rest/resources/PublicBritResource.java
index 666c817..69b92e6 100644
--- a/brit-rest/src/main/java/org/multibit/hd/brit/rest/resources/PublicBritResource.java
+++ b/brit-rest/src/main/java/org/multibit/hd/brit/rest/resources/PublicBritResource.java
@@ -150,7 +150,7 @@ private EncryptedMatcherResponse newMatcherResponse(byte[] payload) throws NoSuc
     try {
       // The Matcher can decrypt the EncryptedPaymentRequest using its PGP secret key
       final PayerRequest payerRequest = matcher.decryptPayerRequest(encryptedPayerRequest);
-      log.debug("Decrypted Version {} Payer request. BRIT walletId: {}", payerRequest.getVersion(), payerRequest.getBritWalletId());
+      log.debug("Decrypted Version {} Payer request.", payerRequest.getVersion());
 
       // Get the Matcher to process the EncryptedPayerRequest
       final MatcherResponse matcherResponse = matcher.process(payerRequest);
@@ -161,7 +161,7 @@ private EncryptedMatcherResponse newMatcherResponse(byte[] payload) throws NoSuc
       // Encrypt the Matcher response with the AES session key
       encryptedMatcherResponse = matcher.encryptMatcherResponse(matcherResponse, payerRequest);
       Preconditions.checkNotNull(encryptedMatcherResponse, "'encryptedMatcherResponse' must be present");
-      log.debug("Encrypted Version {} matcher response, size: {} bytes", matcherResponse.getVersion(), encryptedMatcherResponse.getPayload().length);
+      log.debug("Encrypted Version {} Matcher response. Size: {} bytes", matcherResponse.getVersion(), encryptedMatcherResponse.getPayload().length);
 
       // Put it in the cache for later
       MatcherResponseCache.INSTANCE.put(sha1, encryptedMatcherResponse);