Lambdas working and ready to push

src/main/java/com/zipcoder/Comparators/Id.java

@@ -1,34 +0,0 @@
-package com.zipcoder.Comparators;
-
-import com.zipcoder.payment.Payment;
-
-import java.util.Comparator;
-
-public class Id implements Comparator<Payment> {
-
-    public static void main(String[] args){
-
-
-        Comparator<String> stringComparatorLamda =
-                (String s1, String s2) -> {return s1.compareTo(s2);};
-
-        int lambdaComparison = stringComparatorLamda.compare("Hello", "World");
-
-        System.out.println(lambdaComparison);
-
-    }
-
-    public int compare(Payment o1, Payment o2) {
-        String id1 = Long.toString(o1.getId());
-        String id2 = Long.toString(o2.getId());
-
-        if(id1.compareTo(id2) > 0){
-            return 1;
-        } else if(o1.getId() < 0){
-            return -1;
-        } else {
-            return 0;
-        }
-    }
-
-}

src/main/java/com/zipcoder/Comparators/PaymentComparators.java

@@ -1,7 +0,0 @@
-package com.zipcoder.Comparators;
-
-public class PaymentComparators {
-
-
-
-}

src/main/java/com/zipcoder/Comparators/ShortDescription.java

@@ -1,22 +0,0 @@
-package com.zipcoder.Comparators;
-
-import com.zipcoder.payment.Payment;
-
-import java.util.Comparator;
-
-public class ShortDescription implements Comparator<Payment> {
-
-    public int compare(Payment o1, Payment o2) {
-        String str1 = o1.getShortDescription();
-        String str2 = o2.getShortDescription();
-
-        if(str1.compareTo(str2) > 0){
-            return 1;
-        } else if(str1.compareTo(str2) < 0){
-            return -1;
-        } else {
-            return 0;
-        }
-    }
-
-}

src/main/java/com/zipcoder/Comparators/Payer.java → src/main/java/com/zipcoder/payment/Payer.java

@@ -1,4 +1,4 @@
-package com.zipcoder.Comparators;
+package com.zipcoder.payment;
 
 import com.zipcoder.payment.Payment;
 

src/main/java/com/zipcoder/Comparators/PaymentOrder.java → src/main/java/com/zipcoder/payment/PaymentOrder.java

@@ -1,4 +1,4 @@
-package com.zipcoder.Comparators;
+package com.zipcoder.payment;
 
 public enum PaymentOrder {
     ID, PAYERNAME, SHORTDESCRIPTION

src/main/java/com/zipcoder/payment/PaymentPresenter.java

@@ -1,10 +1,5 @@
 package com.zipcoder.payment;
 
-import com.zipcoder.payment.Payment;
-import com.zipcoder.Comparators.Id;
-import com.zipcoder.Comparators.Payer;
-import com.zipcoder.Comparators.PaymentOrder;
-import com.zipcoder.Comparators.ShortDescription;
 
 import java.util.Comparator;
 
@@ -47,7 +42,7 @@ public class PaymentPresenter {
             case ID:
                 Comparator<Payment> idComparatorLamda =
                         (Payment s1, Payment s2) -> {return new Long(s1.getId()).compareTo(s2.getId());};
-                this.bubbleSort(payments, new Id());
+                this.bubbleSort(payments, idComparatorLamda);
                 break;
             default:
                 break;

src/test/java/com/zipcoder/payment/PaymentOrderByPayerTest.java

@@ -1,7 +1,5 @@
 package com.zipcoder.payment;
 
-import com.zipcoder.Comparators.Payer;
-
 import static org.junit.Assert.*;
 
 import org.junit.Test;
@@ -11,29 +9,6 @@ import java.util.Comparator;
 public class PaymentOrderByPayerTest {
 
     @Test
-    public void lambda() {
-        //When
-        Comparator ps = new Payer();
-        Payment cc = new CreditCard(12, 4111131,"Jimmy Maidanos", 4, 11);
-        Payment pp = new Paypal(23, "Nicholas Maidanos", "nmaidanos@gmail.com");
-
-        Comparator<Payment> stringComparatorLamda =
-                (Payment s1, Payment s2) -> {return s1.getShortDescription().compareTo(s2.getShortDescription());};
-
-        int lambdaComparison = stringComparatorLamda.compare(pp, cc);
-
-        System.out.println(lambdaComparison);
-
-//        //Expect
-//        int expect = -1;
-//
-//        //Actual
-//        int actual = ps.compare(cc, pp);
-//
-//        assertEquals(expect, actual);
-    }
-
-    @Test
     public void compairTest1() {
         //When
         Comparator ps = new Payer();

src/test/java/com/zipcoder/payment/PaymentPresenterTest.java

@@ -1,6 +1,5 @@
 package com.zipcoder.payment;
 
-import com.zipcoder.Comparators.PaymentOrder;
 import static org.junit.Assert.*;
 import org.junit.Test;