api clean up, added lombok getter and setter, get transactions by public key

ZipCoinRedJavaServer/.idea/workspace.xml

@@ -12,10 +12,22 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="33">
+              <caret line="23" column="19" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
+            <state relative-caret-position="211">
               <caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
             </state>
           </provider>
@@ -25,37 +37,37 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionApis.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="60">
-              <caret line="4" column="98" lean-forward="true" selection-start-line="4" selection-start-column="98" selection-end-line="4" selection-end-column="98" />
+              <caret line="4" column="102" lean-forward="true" selection-start-line="4" selection-start-column="102" selection-end-line="4" selection-end-column="102" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WalletRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/WalletRepository.java">
+      <file leaf-file-name="TransactionService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/service/TransactionService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="10" column="71" selection-start-line="10" selection-start-column="71" selection-end-line="10" selection-end-column="71" />
+            <state relative-caret-position="-39">
+              <caret line="11" selection-start-line="11" selection-end-line="11" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
+      <file leaf-file-name="WalletRepository.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/WalletRepository.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="246">
-              <caret line="29" column="22" lean-forward="true" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="105">
+              <caret line="13" selection-start-line="13" selection-start-column="2" selection-end-line="14" selection-end-column="46" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WalletService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/service/WalletService.java">
+      <file leaf-file-name="WalletController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-12">
-              <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
+            <state relative-caret-position="130">
+              <caret line="39" selection-start-line="39" selection-start-column="2" selection-end-line="42" selection-end-column="7" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -63,41 +75,38 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BlockRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
+      <file leaf-file-name="BlockApis.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockApis.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="60">
-              <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
+              <caret line="4" column="83" selection-start-line="4" selection-start-column="83" selection-end-line="4" selection-end-column="83" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TransactionService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/service/TransactionService.java">
+      <file leaf-file-name="WalletApis.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletApis.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="45">
+              <caret line="3" column="65" selection-start-line="3" selection-start-column="49" selection-end-line="3" selection-end-column="65" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
+      <file leaf-file-name="TransactionRepository.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/TransactionRepository.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="18" selection-start-line="18" selection-end-line="18" />
+            <state relative-caret-position="120">
+              <caret line="18" column="96" selection-start-line="18" selection-start-column="96" selection-end-line="18" selection-end-column="96" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WalletController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java">
+      <file leaf-file-name="WalletService.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/service/WalletService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-116">
-              <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
+            <state relative-caret-position="465">
+              <caret line="31" selection-start-line="31" selection-start-column="2" selection-end-line="33" selection-end-column="7" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -105,15 +114,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TransactionRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/TransactionRepository.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="18" column="96" selection-start-line="18" selection-start-column="96" selection-end-line="18" selection-end-column="96" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -127,18 +127,25 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/ZipCoinApp.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionApis.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/repository/TransactionRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/service/TransactionService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/service/WalletService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletApis.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionApis.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockApis.java" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/model/Wallet.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/model/Chain.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/service/BlockService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/repository/WalletRepository.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/repository/TransactionRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/service/WalletService.java" />
       </list>
     </option>
   </component>
@@ -372,12 +379,12 @@
       <option name="presentableId" value="Default" />
       <updated>1533221514750</updated>
       <workItem from="1533221516219" duration="17000" />
-      <workItem from="1533244438155" duration="6556000" />
+      <workItem from="1533244438155" duration="11004000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9670000" />
+    <option name="totallyTimeSpent" value="14118000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -390,6 +397,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="5" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
@@ -403,16 +411,16 @@
       <window_info id="UI Designer" order="5" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32954547" />
-      <window_info anchor="bottom" id="Messages" order="9" visible="true" weight="0.32827586" />
+      <window_info anchor="bottom" id="Messages" order="9" weight="0.32827586" />
       <window_info anchor="right" id="Palette&#9;" order="5" />
       <window_info id="Image Layers" order="5" />
       <window_info anchor="bottom" id="Java Enterprise" order="7" weight="0.32954547" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.28" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.5834483" />
       <window_info anchor="bottom" id="Spring" order="7" weight="0.32954547" />
       <window_info anchor="bottom" id="Terminal" order="10" weight="0.0" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
       <window_info anchor="right" id="Bean Validation" order="3" />
       <window_info id="Web" order="5" side_tool="true" />
       <window_info anchor="bottom" id="Find" order="1" />
@@ -433,15 +441,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="20" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
     <entry file="file://$PROJECT_DIR$/ZipCoin-RED.iml" />
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/block/test/BlockControllerTest.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -512,161 +511,188 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="358">
+          <caret line="57" column="20" selection-start-line="57" selection-start-column="20" selection-end-line="57" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/ZipCoinApp.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1230">
-          <caret line="82" column="4" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="4" />
+        <state relative-caret-position="255">
+          <caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Chain.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" selection-start-line="10" selection-end-line="10" />
+        <state relative-caret-position="245">
+          <caret line="52" column="21" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/HomeController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Wallet.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
+        <state relative-caret-position="345">
+          <caret line="32" column="5" selection-start-line="32" selection-start-column="5" selection-end-line="32" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="358">
-          <caret line="57" column="20" selection-start-line="57" selection-start-column="20" selection-end-line="57" selection-end-column="20" />
+        <state relative-caret-position="405">
+          <caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Chain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+        <state relative-caret-position="240">
+          <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/ZipCoinApp.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="300">
+          <caret line="25" column="36" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
-          <caret line="13" column="40" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
+          <caret line="18" selection-start-line="18" selection-end-line="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        <state relative-caret-position="180">
+          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/HomeController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="18" selection-start-line="18" selection-end-line="18" />
+        <state relative-caret-position="120">
+          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletApis.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="23" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" />
+        <state relative-caret-position="885">
+          <caret line="59" column="5" selection-start-line="59" selection-start-column="5" selection-end-line="59" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionApis.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/service/BlockService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="98" lean-forward="true" selection-start-line="4" selection-start-column="98" selection-end-line="4" selection-end-column="98" />
+        <state relative-caret-position="356">
+          <caret line="35" column="16" lean-forward="true" selection-start-line="35" selection-start-column="16" selection-end-line="35" selection-end-column="16" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="18" selection-start-line="18" selection-end-line="18" />
+        <state relative-caret-position="60">
+          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockApis.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
+        <state relative-caret-position="60">
+          <caret line="4" column="83" selection-start-line="4" selection-start-column="83" selection-end-line="4" selection-end-column="83" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/service/WalletService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
+        <state relative-caret-position="33">
+          <caret line="23" column="19" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/service/TransactionService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/TransactionRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="120">
+          <caret line="18" column="96" selection-start-line="18" selection-start-column="96" selection-end-line="18" selection-end-column="96" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/service/TransactionService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-116">
-          <caret line="7" column="28" selection-start-line="7" selection-start-column="28" selection-end-line="7" selection-end-column="28" />
+        <state relative-caret-position="-39">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/TransactionRepository.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="18" column="96" selection-start-line="18" selection-start-column="96" selection-end-line="18" selection-end-column="96" />
+        <state relative-caret-position="211">
+          <caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/WalletRepository.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionApis.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
-          <caret line="10" column="71" selection-start-line="10" selection-start-column="71" selection-end-line="10" selection-end-column="71" />
+          <caret line="4" column="102" lean-forward="true" selection-start-line="4" selection-start-column="102" selection-end-line="4" selection-end-column="102" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletApis.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
+        <state relative-caret-position="45">
+          <caret line="3" column="65" selection-start-line="3" selection-start-column="49" selection-end-line="3" selection-end-column="65" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="130">
+          <caret line="39" selection-start-line="39" selection-start-column="2" selection-end-line="42" selection-end-column="7" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/WalletRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="13" selection-start-line="13" selection-start-column="2" selection-end-line="14" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/service/WalletService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
-          <caret line="29" column="22" lean-forward="true" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
+        <state relative-caret-position="465">
+          <caret line="31" selection-start-line="31" selection-start-column="2" selection-end-line="33" selection-end-column="7" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

ZipCoinRedJavaServer/pom.xml

@@ -46,7 +46,11 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/BlockApis.java

@@ -0,0 +1,6 @@
+package com.zipcoin.config;
+
+public class BlockApis {
+    public static final String BASE_BLOCK_URL = "api/v1/blocks";
+    public static final String GET_MINED_BLOCK_BY_ID = BASE_BLOCK_URL + "/{id}/mine";
+}

ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/TransactionApis.java

@@ -2,5 +2,5 @@ package com.zipcoin.config;
 
 public class TransactionApis {
     public static final String BASE_TRANSACTION_URL = "api/v1/transactions";
-    public static final String GET_TRANSACTIONS_BY_PUBLIC_KEY = "api/v1/transactions/{publicKey}";
+    public static final String GET_TRANSACTIONS_BY_PUBLIC_KEY = BASE_TRANSACTION_URL + "/{publicKey}";
 }

ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletApis.java

@@ -1,4 +1,7 @@
 package com.zipcoin.config;
 
 public class WalletApis {
+    public static final String BASE_WALLET_URL = "api/v1/wallets";
+    public static final String GET_WALLET_BY_PUBLIC_KEY = BASE_WALLET_URL + "/{publicKey}";
+    public static final String GET_ALL_WALLET_PUBLIC_KEYS = BASE_WALLET_URL + "/publicKeys";
 }

ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java

@@ -19,15 +19,11 @@ public class WalletLoader implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments applicationArguments) throws Exception {
-        Wallet[] wallets = new Wallet[]
-                {
-                        new Wallet("ann","34",80),
-                        new Wallet("sen","3564",8)
-
-
-                };
-        for(Wallet wallet :wallets)
-        {
+        Wallet[] wallets = new Wallet[]{
+                new Wallet("ann","34",80),
+                new Wallet("sen","3564",8)
+        };
+        for(Wallet wallet :wallets) {
             this.walletRepository.save(wallet);
         }
     }

ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/BlockController.java

@@ -1,50 +1,38 @@
 package com.zipcoin.controller;
 
 import com.zipcoin.model.Block;
-import com.zipcoin.utilities.Miner;
-import org.springframework.beans.BeanUtils;
+import com.zipcoin.service.BlockService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.zipcoin.repository.BlockRepository;
 
-import java.util.List;
-import java.util.Optional;
+import java.util.Collection;
+
+import static com.zipcoin.config.BlockApis.BASE_BLOCK_URL;
+import static com.zipcoin.config.BlockApis.GET_MINED_BLOCK_BY_ID;
 
 @RestController
-@RequestMapping("api/v1/")
 @CrossOrigin(origins = {"http://localhost:8100"})
 public class BlockController {
 
-    @Autowired
-    private BlockRepository blockRepository;
+    private BlockService blockService;
 
-    @RequestMapping(value = "blocks", method = RequestMethod.POST)
-    public Block create(@RequestBody Block block){
-        return blockRepository.saveAndFlush(block);
-    }
-
-    @RequestMapping(value = "blocks/{id}", method = RequestMethod.GET)
-    public Optional<Block> get(@PathVariable Long id){
-        return blockRepository.findById(id);
+    @Autowired
+    public BlockController(BlockService blockService){
+        this.blockService = blockService;
     }
 
-    @RequestMapping(value = "blocks", method = RequestMethod.GET)
-    public List<Block> get(){
-        return blockRepository.findAll();
+    @PostMapping(path = BASE_BLOCK_URL)
+    public Block createBlock(@RequestBody Block block){
+        return blockService.createBlock(block);
     }
 
-    @RequestMapping(value = "blocks/{id}", method = RequestMethod.DELETE)
-    public Block delete(@PathVariable Long id){
-        Block blockToDelete = blockRepository.findOne(id);
-        blockRepository.delete(blockToDelete);
-        return blockToDelete;
+    @GetMapping(path = BASE_BLOCK_URL)
+    public Collection<Block> getAllBlocks(){
+        return blockService.getAllBlocks();
     }
 
-    @RequestMapping(value = "blocks/{id}/mine", method = RequestMethod.GET)
-    public Block mine(@PathVariable Long id){
-        Block blockToMine = blockRepository.findOne(id);
-        Miner miner = new Miner();
-        Block minedBlock = miner.mine(blockToMine);
-        return blockRepository.saveAndFlush(minedBlock);
+    @GetMapping(path = GET_MINED_BLOCK_BY_ID)
+    public Block getMinedBlockById(@PathVariable Long id){
+        return blockService.getMinedBlockById(id);
     }
 }

ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/WalletController.java

@@ -7,8 +7,11 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Collection;
 
+import static com.zipcoin.config.WalletApis.BASE_WALLET_URL;
+import static com.zipcoin.config.WalletApis.GET_ALL_WALLET_PUBLIC_KEYS;
+import static com.zipcoin.config.WalletApis.GET_WALLET_BY_PUBLIC_KEY;
+
 @RestController
-@RequestMapping("api/v1/")
 @CrossOrigin(origins = {"http://localhost:8100"})
 public class WalletController {
 
@@ -19,24 +22,24 @@ public class WalletController {
         this.walletService = walletService;
     }
 
-    @PostMapping(path = "wallets")
+    @PostMapping(path = BASE_WALLET_URL)
     public Wallet createWallet(@RequestBody Wallet wallet){
         return walletService.createWallet(wallet);
     }
 
-    @GetMapping(path = "wallets")
+    @GetMapping(path = BASE_WALLET_URL)
     public Collection<Wallet> getAllWallets() {
         return walletService.getAllWallets();
     }
 
-    @GetMapping(path = "wallets/{publicKey}")
+    @GetMapping(path = GET_WALLET_BY_PUBLIC_KEY)
     public Wallet getWalletByPublicKey(@PathVariable String publicKey){
         return walletService.getWalletByPublicKey(publicKey);
     }
 
-    @GetMapping(value = "wallets/publicKeys")
-    public Collection<String> getAllPublicKeys(){
-        return walletService.getAllPublicKeys();
-    }
+//    @GetMapping(path = GET_ALL_WALLET_PUBLIC_KEYS)
+//    public Collection<Object[]> getAllPublicKeys(){
+//        return walletService.getAllPublicKeys();
+//    }
 
 }

ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Block.java

@@ -1,10 +1,13 @@
 package com.zipcoin.model;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.codec.digest.DigestUtils;
 
 import javax.persistence.*;
 
 @Entity
+@Getter @Setter
 public class Block {
 
     @Id
@@ -40,46 +43,10 @@ public class Block {
         nonce=0;
     }
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setBlockNumber(Integer blockNumber) {
-        this.blockNumber = blockNumber;
-    }
-
-    public Integer getBlockNumber() {
-        return blockNumber;
-    }
-
-    public void setPreviousHash(String previousHash) {
-        this.previousHash = previousHash;
-    }
-
-    public String getPreviousHash() {
-        return previousHash;
-    }
-
-    public void setNonce(Integer nonce) {
-        this.nonce = nonce;
-    }
-
     public void iterateNonce() {
         this.nonce ++;
     }
 
-    public Integer getNonce() {
-        return nonce;
-    }
-
-    public void setCurrentHash(String currentHash) {
-        this.currentHash = currentHash;
-    }
-
     public String getCurrentHash() {
         updateCurrentHash();
         return currentHash;
@@ -92,14 +59,6 @@ public class Block {
         currentHash = DigestUtils.sha256Hex(text).toUpperCase();
     }
 
-    public String getTransactionList() {
-        return transactionList;
-    }
-
-    public void setTransactionList(String transactionList) {
-        this.transactionList = transactionList;
-    }
-
     public void addTransaction(String transaction){
         transactionList += transaction;
     }

ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Chain.java

@@ -1,7 +1,11 @@
 package com.zipcoin.model;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.ArrayList;
 
+@Getter @Setter
 public class Chain {
 
     Block block = new Block(0);

ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java

@@ -1,80 +1,40 @@
 package com.zipcoin.model;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.codec.digest.DigestUtils;
 
 import javax.persistence.*;
 
-
 @Entity
+@Getter @Setter
 public class Transaction {
+
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long transactionId;
-
     private String sender;
     private String recipient;
     private float amount;
-
     //@OneToMany
-  /*  private List<Integer> coins;*/
-
-
-
+    //private List<Integer> coins;
     //public Signature signature;
-    public Transaction()
-    {
+
+    public Transaction() {
 
     }
 
-    public Transaction(String from, String to, float amount/*List<Integer> coins*/) {
+    public Transaction(String from, String to, float amount/*,List<Integer> coins*/) {
         this.sender = from;
         this.recipient = to;
         this.amount = amount;
         //this.coins=coins;
-
-    }
-
-    public Long getTransactionId() {
-        return transactionId;
-    }
-
-    public void setTransactionId(Long transactionId) {
-        this.transactionId = transactionId;
-    }
-
-    public String getSender() {
-        return sender;
-    }
-
-    public void setSender(String sender) {
-        this.sender = sender;
-    }
-
-    public String getRecipient() {
-        return recipient;
-    }
-
-    public void setRecipient(String recipient) {
-        this.recipient = recipient;
     }
 
-    public float getAmount() { return amount; }
-
-    public void setAmount(float amount) { this.amount = amount; }
-
-    /*public List<Integer> getCoins() { return coins; }
-
-    public void setCoins(List<Integer> coins) { this.coins = coins; }*/
-
     private String calculateHash() {
-
-        return DigestUtils.sha256Hex(
-                sender +
-                        recipient +
-
-                        Float.toString(amount)
-        );
+        return DigestUtils.sha256Hex(sender + recipient + Float.toString(amount));
     }
+
 //    public void generateSignature(PrivateKey privateKey) throws NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException {
 //        String data = StringUtil.getStringFromKey(sender) + StringUtil.getStringFromKey(reciepient) + Float.toString(value)    ;
 //        signature = StringUtil.applyECDSASig(privateKey,data);

ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java

@@ -1,6 +1,8 @@
 package com.zipcoin.model;
 
 import com.zipcoin.utilities.StringUtil;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -10,62 +12,30 @@ import java.security.*;
 import java.util.Random;
 
 @Entity
+@Getter @Setter
 public class Wallet {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPublickey() {
-        return publickey;
-    }
-
-    public void setPublickey(String publickey) {
-        this.publickey = publickey;
-    }
-
     private String name;
-    private String publickey;
+    private String publicKey;
     private Double amount;
 
-    public Wallet()
-    {
+    public Wallet() {
         generateKeyPair();
-
     }
-    public Wallet(String name,String publickey,double amount)
-    {
+
+    public Wallet(String name, String publicKey, double amount) {
         this.name=name;
-        this.publickey=publickey;
+        this.publicKey=publicKey;
         this.amount=amount;
     }
 
-    public Double getAmount()
-    {
-        return amount;
-    }
-
-    public void setAmount(Double amount)
-    {
-        this.amount = amount;
-    }
-
-
-    public String getPublicKey()
-    {
-        return publickey;
-    }
-
-
     public void generateKeyPair() {
+        Random random =new SecureRandom();
+        Integer random10digit= random.nextInt(10);
+        publicKey=random10digit.toString();
 //        try {
 //
 //            KeyPairGenerator keyGen = KeyPairGenerator.getInstance( "DSA","SUN");
@@ -84,9 +54,6 @@ public class Wallet {
 //        } catch (Exception e) {
 //            throw new RuntimeException(e);
 //        }
-        Random random =new SecureRandom();
-        Integer random10digit= random.nextInt(10);
-        publickey=random10digit.toString();
     }
 
 }

ZipCoinRedJavaServer/src/main/java/com/zipcoin/repository/WalletRepository.java

@@ -10,5 +10,7 @@ import java.util.List;
 
 public interface WalletRepository extends JpaRepository<Wallet, Long> {
     Wallet findWalletByPublicKey(String publicKey);
-    Collection<String> findAllPublicKeys();
+
+//    @Query(value = "SELECT publicKey FROM Wallet", nativeQuery = true)
+//    Collection<Object[]> findAllPublicKey();
 }

ZipCoinRedJavaServer/src/main/java/com/zipcoin/service/BlockService.java

@@ -0,0 +1,41 @@
+package com.zipcoin.service;
+
+import com.zipcoin.model.Block;
+import com.zipcoin.repository.BlockRepository;
+import com.zipcoin.utilities.Miner;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Optional;
+
+@Service
+public class BlockService {
+
+    private BlockRepository blockRepository;
+
+    @Autowired
+    public BlockService(BlockRepository blockRepository){
+        this.blockRepository = blockRepository;
+    }
+
+    public Block createBlock(Block block) {
+        return blockRepository.saveAndFlush(block);
+    }
+
+    public Collection<Block> getAllBlocks() {
+        return blockRepository.findAll();
+    }
+
+    public Block getMinedBlockById(Long id) {
+        Optional<Block> blockToMine = blockRepository.findById(id);
+        if (blockToMine.isPresent()) {
+            Miner miner = new Miner();
+            Block minedBlock = miner.mine(blockToMine.get());
+            return blockRepository.saveAndFlush(minedBlock);
+        } else {
+            return null;
+        }
+    }
+
+}

ZipCoinRedJavaServer/src/main/java/com/zipcoin/service/TransactionService.java

@@ -1,7 +1,6 @@
 package com.zipcoin.service;
 
 import com.zipcoin.model.Transaction;
-import com.zipcoin.model.Wallet;
 import com.zipcoin.repository.TransactionRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ZipCoinRedJavaServer/src/main/java/com/zipcoin/service/WalletService.java

@@ -29,8 +29,8 @@ public class WalletService {
         return walletRepository.findWalletByPublicKey(publicKey);
     }
 
-    public Collection<String> getAllPublicKeys() {
-        return walletRepository.findAllPublicKeys();
-    }
+//    public Collection<Object[]> getAllPublicKeys() {
+//        return walletRepository.findAllPublicKey();
+//    }
 
 }