Просмотр исходного кода

allergies: update reference and starter implementations

Sam Warner 8 лет назад
Родитель
Сommit
83db8c5ce1

+ 2
- 2
exercises/allergies/.meta/src/reference/java/Allergen.java Просмотреть файл

1
-public enum Allergen {
1
+enum Allergen {
2
     EGGS(1),
2
     EGGS(1),
3
     PEANUTS(2),
3
     PEANUTS(2),
4
     SHELLFISH(4),
4
     SHELLFISH(4),
14
         this.score = score;
14
         this.score = score;
15
     }
15
     }
16
 
16
 
17
-    public int getScore() {
17
+    int getScore() {
18
         return score;
18
         return score;
19
     }
19
     }
20
 }
20
 }

+ 4
- 4
exercises/allergies/.meta/src/reference/java/Allergies.java Просмотреть файл

2
 import java.util.List;
2
 import java.util.List;
3
 import java.util.stream.Collectors;
3
 import java.util.stream.Collectors;
4
 
4
 
5
-public class Allergies {
5
+class Allergies {
6
 
6
 
7
     private int score;
7
     private int score;
8
 
8
 
9
-    public Allergies(int score) {
9
+    Allergies(int score) {
10
         this.score = score;
10
         this.score = score;
11
     }
11
     }
12
 
12
 
13
-    public List<Allergen> getList() {
13
+    List<Allergen> getList() {
14
         return EnumSet.allOf(Allergen.class).stream()
14
         return EnumSet.allOf(Allergen.class).stream()
15
                 .filter(this::isAllergicTo)
15
                 .filter(this::isAllergicTo)
16
                 .collect(Collectors.toList());
16
                 .collect(Collectors.toList());
17
     }
17
     }
18
 
18
 
19
-    public boolean isAllergicTo(Allergen allergen) {
19
+    boolean isAllergicTo(Allergen allergen) {
20
         return (score & allergen.getScore()) == allergen.getScore();
20
         return (score & allergen.getScore()) == allergen.getScore();
21
     }
21
     }
22
 }
22
 }

+ 2
- 2
exercises/allergies/src/main/java/Allergen.java Просмотреть файл

1
-public enum Allergen {
1
+enum Allergen {
2
     EGGS(1),
2
     EGGS(1),
3
     PEANUTS(2),
3
     PEANUTS(2),
4
     SHELLFISH(4),
4
     SHELLFISH(4),
14
         this.score = score;
14
         this.score = score;
15
     }
15
     }
16
 
16
 
17
-    public int getScore() {
17
+    int getScore() {
18
         return score;
18
         return score;
19
     }
19
     }
20
 }
20
 }