소스 검색

Lambdas working and ready to push

Nicholas Maidanos 8 년 전
부모
커밋
a589d5a587

+ 0
- 34
src/main/java/com/zipcoder/Comparators/Id.java 파일 보기

1
-package com.zipcoder.Comparators;
2
-
3
-import com.zipcoder.payment.Payment;
4
-
5
-import java.util.Comparator;
6
-
7
-public class Id implements Comparator<Payment> {
8
-
9
-    public static void main(String[] args){
10
-
11
-
12
-        Comparator<String> stringComparatorLamda =
13
-                (String s1, String s2) -> {return s1.compareTo(s2);};
14
-
15
-        int lambdaComparison = stringComparatorLamda.compare("Hello", "World");
16
-
17
-        System.out.println(lambdaComparison);
18
-
19
-    }
20
-
21
-    public int compare(Payment o1, Payment o2) {
22
-        String id1 = Long.toString(o1.getId());
23
-        String id2 = Long.toString(o2.getId());
24
-
25
-        if(id1.compareTo(id2) > 0){
26
-            return 1;
27
-        } else if(o1.getId() < 0){
28
-            return -1;
29
-        } else {
30
-            return 0;
31
-        }
32
-    }
33
-
34
-}

+ 0
- 7
src/main/java/com/zipcoder/Comparators/PaymentComparators.java 파일 보기

1
-package com.zipcoder.Comparators;
2
-
3
-public class PaymentComparators {
4
-
5
-
6
-
7
-}

+ 0
- 22
src/main/java/com/zipcoder/Comparators/ShortDescription.java 파일 보기

1
-package com.zipcoder.Comparators;
2
-
3
-import com.zipcoder.payment.Payment;
4
-
5
-import java.util.Comparator;
6
-
7
-public class ShortDescription implements Comparator<Payment> {
8
-
9
-    public int compare(Payment o1, Payment o2) {
10
-        String str1 = o1.getShortDescription();
11
-        String str2 = o2.getShortDescription();
12
-
13
-        if(str1.compareTo(str2) > 0){
14
-            return 1;
15
-        } else if(str1.compareTo(str2) < 0){
16
-            return -1;
17
-        } else {
18
-            return 0;
19
-        }
20
-    }
21
-
22
-}

src/main/java/com/zipcoder/Comparators/Payer.java → src/main/java/com/zipcoder/payment/Payer.java 파일 보기

1
-package com.zipcoder.Comparators;
1
+package com.zipcoder.payment;
2
 
2
 
3
 import com.zipcoder.payment.Payment;
3
 import com.zipcoder.payment.Payment;
4
 
4
 

src/main/java/com/zipcoder/Comparators/PaymentOrder.java → src/main/java/com/zipcoder/payment/PaymentOrder.java 파일 보기

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

+ 1
- 6
src/main/java/com/zipcoder/payment/PaymentPresenter.java 파일 보기

1
 package com.zipcoder.payment;
1
 package com.zipcoder.payment;
2
 
2
 
3
-import com.zipcoder.payment.Payment;
4
-import com.zipcoder.Comparators.Id;
5
-import com.zipcoder.Comparators.Payer;
6
-import com.zipcoder.Comparators.PaymentOrder;
7
-import com.zipcoder.Comparators.ShortDescription;
8
 
3
 
9
 import java.util.Comparator;
4
 import java.util.Comparator;
10
 
5
 
47
             case ID:
42
             case ID:
48
                 Comparator<Payment> idComparatorLamda =
43
                 Comparator<Payment> idComparatorLamda =
49
                         (Payment s1, Payment s2) -> {return new Long(s1.getId()).compareTo(s2.getId());};
44
                         (Payment s1, Payment s2) -> {return new Long(s1.getId()).compareTo(s2.getId());};
50
-                this.bubbleSort(payments, new Id());
45
+                this.bubbleSort(payments, idComparatorLamda);
51
                 break;
46
                 break;
52
             default:
47
             default:
53
                 break;
48
                 break;

+ 0
- 25
src/test/java/com/zipcoder/payment/PaymentOrderByPayerTest.java 파일 보기

1
 package com.zipcoder.payment;
1
 package com.zipcoder.payment;
2
 
2
 
3
-import com.zipcoder.Comparators.Payer;
4
-
5
 import static org.junit.Assert.*;
3
 import static org.junit.Assert.*;
6
 
4
 
7
 import org.junit.Test;
5
 import org.junit.Test;
11
 public class PaymentOrderByPayerTest {
9
 public class PaymentOrderByPayerTest {
12
 
10
 
13
     @Test
11
     @Test
14
-    public void lambda() {
15
-        //When
16
-        Comparator ps = new Payer();
17
-        Payment cc = new CreditCard(12, 4111131,"Jimmy Maidanos", 4, 11);
18
-        Payment pp = new Paypal(23, "Nicholas Maidanos", "nmaidanos@gmail.com");
19
-
20
-        Comparator<Payment> stringComparatorLamda =
21
-                (Payment s1, Payment s2) -> {return s1.getShortDescription().compareTo(s2.getShortDescription());};
22
-
23
-        int lambdaComparison = stringComparatorLamda.compare(pp, cc);
24
-
25
-        System.out.println(lambdaComparison);
26
-
27
-//        //Expect
28
-//        int expect = -1;
29
-//
30
-//        //Actual
31
-//        int actual = ps.compare(cc, pp);
32
-//
33
-//        assertEquals(expect, actual);
34
-    }
35
-
36
-    @Test
37
     public void compairTest1() {
12
     public void compairTest1() {
38
         //When
13
         //When
39
         Comparator ps = new Payer();
14
         Comparator ps = new Payer();

+ 0
- 1
src/test/java/com/zipcoder/payment/PaymentPresenterTest.java 파일 보기

1
 package com.zipcoder.payment;
1
 package com.zipcoder.payment;
2
 
2
 
3
-import com.zipcoder.Comparators.PaymentOrder;
4
 import static org.junit.Assert.*;
3
 import static org.junit.Assert.*;
5
 import org.junit.Test;
4
 import org.junit.Test;
6
 
5