From 9dc1947234492fa81335c7b5c6a255392baf2cdb Mon Sep 17 00:00:00 2001
From: davassi <gianluigi.davassi@gmail.com>
Date: Wed, 7 Dec 2016 17:34:09 +0100
Subject: [PATCH] some refactoring

---
 src/main/java/jota/IotaAPIProxy.java         | 25 +++++++-------------
 src/main/java/jota/{utils => pow}/Curl.java  |  2 +-
 src/main/java/jota/utils/Checksum.java       |  2 ++
 src/main/java/jota/utils/InputValidator.java |  2 +-
 src/main/java/jota/utils/Signing.java        |  2 ++
 5 files changed, 14 insertions(+), 19 deletions(-)
 rename src/main/java/jota/{utils => pow}/Curl.java (98%)

diff --git a/src/main/java/jota/IotaAPIProxy.java b/src/main/java/jota/IotaAPIProxy.java
index 617de2e..5ce6806 100644
--- a/src/main/java/jota/IotaAPIProxy.java
+++ b/src/main/java/jota/IotaAPIProxy.java
@@ -208,48 +208,39 @@ public class IotaAPIProxy {
      * @param returnAll If true, it returns all addresses which were deterministically generated (until findTransactions returns null)
      * @return an array of strings with the specifed number of addresses
      */
-
     public GetNewAddressResponse getNewAddress(final String seed, final int index, final boolean checksum, final int total, final boolean returnAll) {
 
         final List<String> allAddresses = new ArrayList<>();
-        // Case 1: total
-        //
+        
         // If total number of addresses to generate is supplied, simply generate
         // and return the list of all addresses
-        
         if (total != 0) {
-            // Increase index with each iteration
             for (int i = index; i < index + total; i++) {
                 allAddresses.add(IotaAPIUtils.newAddress(seed, i, checksum));
             }
             return GetNewAddressResponse.create(allAddresses);
         }
-        
-        //  Case 2: no total provided
-        //
-        //  Continue calling findTransactions to see if address was already created
-        //  if null, return list of addresses
-        
+        // No total provided: Continue calling findTransactions to see if address was 
+        // already created if null, return list of addresses
         for (int i = index; ; i++) {
-            String newAddress = IotaAPIUtils.newAddress(seed, i, checksum);
-
+            
+        	final String newAddress = IotaAPIUtils.newAddress(seed, i, checksum);
             final FindTransactionResponse response = findTransactionsByAddresses(new String[]{newAddress});
             
             allAddresses.add(newAddress);
-            
             if (response.getHashes().length == 0) {
                 break;
             }
         }
 
-        // If returnAll, return list of allAddresses
-        // else return only the last address that was generated
+        // If !returnAll return only the last address that was generated
         if (!returnAll) {
         	allAddresses.subList(0, allAddresses.size()-1).clear();
         }
-
         return GetNewAddressResponse.create(allAddresses);        
     }
+    
+    
 
     public static class Builder {
 
diff --git a/src/main/java/jota/utils/Curl.java b/src/main/java/jota/pow/Curl.java
similarity index 98%
rename from src/main/java/jota/utils/Curl.java
rename to src/main/java/jota/pow/Curl.java
index 2c296e8..d72ed45 100644
--- a/src/main/java/jota/utils/Curl.java
+++ b/src/main/java/jota/pow/Curl.java
@@ -1,4 +1,4 @@
-package jota.utils;
+package jota.pow;
 
 /**
  * (c) 2016 Come-from-Beyond
diff --git a/src/main/java/jota/utils/Checksum.java b/src/main/java/jota/utils/Checksum.java
index 10a49de..fe22f5a 100644
--- a/src/main/java/jota/utils/Checksum.java
+++ b/src/main/java/jota/utils/Checksum.java
@@ -2,6 +2,8 @@ package jota.utils;
 
 import org.apache.commons.lang3.StringUtils;
 
+import jota.pow.Curl;
+
 /**
  * Created by pinpong on 02.12.16.
  */
diff --git a/src/main/java/jota/utils/InputValidator.java b/src/main/java/jota/utils/InputValidator.java
index ed5f2ef..c1ddd2a 100644
--- a/src/main/java/jota/utils/InputValidator.java
+++ b/src/main/java/jota/utils/InputValidator.java
@@ -17,7 +17,7 @@ public class InputValidator {
         return true;
     }
 
-    public static boolean isTrytes(String trytes, int length) {
+    public static boolean isTrytes(final String trytes, final int length) {
         return trytes.matches("^[A-Z9]{" + (length == 0 ? "0," : length) + "}$");
     }
 }
diff --git a/src/main/java/jota/utils/Signing.java b/src/main/java/jota/utils/Signing.java
index 025529e..a5e2553 100644
--- a/src/main/java/jota/utils/Signing.java
+++ b/src/main/java/jota/utils/Signing.java
@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import jota.pow.Curl;
+
 public class Signing {
 
     static int[] key(int[] seed, int index, int length) {