From 2febd203af4ac534e6bfd2837cdc7fda51a09c82 Mon Sep 17 00:00:00 2001 From: Moe Aydin Date: Fri, 20 Mar 2020 15:05:56 -0400 Subject: [PATCH 1/6] completed fundamentals section --- .../quiz4/fundamentals/Calculator.java | 18 +++---- .../quiz4/fundamentals/StringUtils.java | 47 ++++++++++++++++--- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java index 02f2618..7170d53 100644 --- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java +++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java @@ -1,35 +1,35 @@ package rocks.zipcode.quiz4.fundamentals; +import java.util.Arrays; + /** * @author leon on 21/12/2018. */ public class Calculator { public static Double squareRoot(Double value) { - return null; + return Math.sqrt(value); } public static Double square(Double value) { - return null; + return value * value; } public static Double[] squareRoots(Double... value) { - return null; + return Arrays.asList(value).stream().map(v -> squareRoot(v)).toArray(Double[]::new); } public static Double[] squares(Double... values) { - return null; + return Arrays.asList(values).stream().map(v -> square(v)).toArray(Double[]::new); } - public static Double add(Double value1, Double value2) { - return null; - } + public static Double add(Double value1, Double value2) { return value1 + value2; } public static Double subtract(Double value1, Double value2) { - return null; + return value1 - value2; } public static Double divide(Double divisor, Double dividend) { - return null; + return divisor / dividend; } } diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java index 5ec61be..01be859 100644 --- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java +++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java @@ -1,34 +1,67 @@ package rocks.zipcode.quiz4.fundamentals; +import java.util.HashSet; +import java.util.Set; + /** * @author leon on 21/12/2018. */ public class StringUtils { public static Character getMiddleCharacter(String string) { - return null; + return string.charAt(string.length()/2); } public static String capitalizeMiddleCharacter(String str) { - return null; + int middle = str.length() / 2; + return str.substring(0,middle)+ Character.toUpperCase(getMiddleCharacter(str)) + str.substring(middle + 1); } public static String lowerCaseMiddleCharacter(String str) { - return null; + int middle = str.length() / 2; + return str.substring(0,middle)+ Character.toLowerCase(getMiddleCharacter(str)) + str.substring(middle + 1); } public static Boolean isIsogram(String str) { - return null; + Set result = new HashSet(); + for (int i = 0; i < str.length(); i++) { + result.add(str.charAt(i)); + } + return str.length() == result.size(); } public static Boolean hasDuplicateConsecutiveCharacters(String str) { - return null; + for (int i = 1; i < str.length() ; i++) { + if(str.charAt(i) == str.charAt(i-1)){ + return true; + } + } + return false; } public static String removeConsecutiveDuplicateCharacters(String str) { - return null; + String result = ""; + int index = 0; + for (int i = 1; i < str.length() ; i++) { + if(str.charAt(i) == str.charAt(i-1)){ + result += str.substring(index, i-1); + index = 1 + i; + } + } + result += str.substring(index); + return result; } public static String invertCasing(String str) { - return null; + String[] arr = str.split(""); + String result = ""; + for (String s : arr){ + if(Character.isUpperCase(s.charAt(0))){ + result += s.toLowerCase(); + } else{ + result += s.toUpperCase(); + } + } + return result; } + } \ No newline at end of file From de4050542cf9e7835b02b6e5ca98d89936422675 Mon Sep 17 00:00:00 2001 From: Moe Aydin Date: Fri, 20 Mar 2020 15:32:35 -0400 Subject: [PATCH 2/6] complete array utils --- .../zipcode/quiz4/arrays/ArrayUtils.java | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java index 6deaf61..836122f 100644 --- a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java +++ b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java @@ -5,18 +5,35 @@ */ public class ArrayUtils { public static String getMiddleElement(String[] values) { - return null; + return values[values.length / 2]; } public static String[] removeMiddleElement(String[] values) { - return null; + + String[] removeMiddle = new String[values.length - 1]; + int mid = values.length / 2; + for (int i = 0; i < values.length ; i++) { + if(i < mid){ + removeMiddle[i] = values[i]; + } + if(i > mid) { + removeMiddle[i-1] = values[i]; + } + } + + return removeMiddle; + } public static String getLastElement(String[] values) { - return null; + return values[values.length - 1]; } public static String[] removeLastElement(String[] values) { - return null; + + String[] removeLast = new String[values.length-1]; + System.arraycopy(values, 0, removeLast, 0, values.length - 1); + return removeLast; + } } \ No newline at end of file From 1545c341e6a206d869a9f5a2059a09b778971c9f Mon Sep 17 00:00:00 2001 From: Moe Aydin Date: Fri, 20 Mar 2020 18:25:23 -0400 Subject: [PATCH 3/6] complete last 2 sections, incorporated streams and lamdas --- .../zipcode/quiz4/arrays/ArrayUtils.java | 42 ++++++++++----- .../quiz4/collections/WordCounter.java | 22 +++++++- .../quiz4/collections/culonary/Curry.java | 11 +++- .../quiz4/collections/culonary/Food.java | 27 +++++++++- .../quiz4/collections/culonary/Ginger.java | 11 +++- .../quiz4/collections/culonary/Pepper.java | 12 ++++- .../quiz4/collections/culonary/Spice.java | 3 +- .../quiz4/fundamentals/StringUtils.java | 5 +- .../objectorientation/account/Account.java | 9 +++- .../quiz4/objectorientation/account/Bank.java | 17 ++++++- .../account/BankAccount.java | 35 ++++++++++++- .../objectorientation/account/Employee.java | 51 ++++++++++++++++++- 12 files changed, 216 insertions(+), 29 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java index 836122f..89cb70f 100644 --- a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java +++ b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java @@ -1,27 +1,33 @@ package rocks.zipcode.quiz4.arrays; +import java.util.stream.Stream; + /** * @author leon on 01/01/2019. */ public class ArrayUtils { + public static String getMiddleElement(String[] values) { return values[values.length / 2]; } public static String[] removeMiddleElement(String[] values) { - String[] removeMiddle = new String[values.length - 1]; - int mid = values.length / 2; - for (int i = 0; i < values.length ; i++) { - if(i < mid){ - removeMiddle[i] = values[i]; - } - if(i > mid) { - removeMiddle[i-1] = values[i]; - } - } - - return removeMiddle; +// String[] removeMiddle = new String[values.length - 1]; +// int mid = values.length / 2; +// for (int i = 0; i < values.length ; i++) { +// if(i < mid){ +// removeMiddle[i] = values[i]; +// } +// if(i > mid) { +// removeMiddle[i-1] = values[i]; +// } +// } +// +// return removeMiddle; + return Stream.of(values) + .filter(v -> !v.equals(getMiddleElement(values))) + .toArray(String[]::new); } @@ -30,10 +36,18 @@ public static String getLastElement(String[] values) { } public static String[] removeLastElement(String[] values) { - String[] removeLast = new String[values.length-1]; System.arraycopy(values, 0, removeLast, 0, values.length - 1); return removeLast; - } + + // arraycopy(Object source_arr, int sourcePos, +// Object dest_arr, int destPos, int len) +// Parameters : +// source_arr : array to be copied from +// sourcePos : starting position in source array from where to copy +// dest_arr : array to be copied in +// destPos : starting position in destination array, where to copy in +// len : total no. of components to be copied. + } \ No newline at end of file diff --git a/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java b/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java index 2bf5ec2..3068634 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java @@ -1,12 +1,32 @@ package rocks.zipcode.quiz4.collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.Map; public class WordCounter { + + String[] stringArray; + public WordCounter(String... strings) { + this.stringArray = strings; } public Map getWordCountMap() { - return null; + + Map map = new HashMap<>(); +// +// for(String s : stringArray){ +// if(map.keySet().contains(s)){ +// map.put(s, map.get(s)+1); +// } else { +// map.put(s,1); +// } +// } + for(String s : stringArray){ + map.compute(s, (k,v) -> (v == null) ? 1 : v+1); + } + return map; + } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java index 199cefc..14a8726 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java @@ -1,4 +1,13 @@ package rocks.zipcode.quiz4.collections.culonary; -public class Curry { +public class Curry implements Spice{ + @Override + public String getName() { + return "Curry"; + } + + @Override + public int compareTo(Object o) { + return 0; + } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java index e06abbc..324e7df 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java @@ -1,5 +1,7 @@ package rocks.zipcode.quiz4.collections.culonary; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -7,14 +9,35 @@ * @author leon on 27/12/2018. */ public class Food { + + private List spicesAdded; + public List getAllSpices() { - return null; + return spicesAdded; + } + + public Food() { + this.spicesAdded = new ArrayList<>(); } public > Map getSpiceCount() { - return null; + Map map = new HashMap<>(); +// for (Spice s: spicesAdded) { +// SpiceType spice = (SpiceType)s.getClass(); +// if(map.containsKey(spice)){ +// map.replace(spice, map.get(spice),map.get(spice) +1); +// }else { +// map.put(spice,1); +// } +// } +// return map; + for(Spice s: spicesAdded){ + map.compute((SpiceType)s.getClass(), (k,v) -> (v == null) ? 1: v+1); + } + return map; } public void applySpice(Spice spice) { + spicesAdded.add(spice); } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java index 3c4e177..c50dcbc 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java @@ -3,5 +3,14 @@ /** * @author leon on 27/12/2018. */ -public class Ginger { +public class Ginger implements Spice{ + @Override + public String getName() { + return "Ginger"; + } + + @Override + public int compareTo(Object o) { + return 0; + } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java index 4b771a8..7995e35 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java @@ -3,5 +3,15 @@ /** * @author leon on 27/12/2018. */ -public class Pepper { +public class Pepper implements Spice{ + @Override + public String getName() { + return "Pepper"; + } + + + @Override + public int compareTo(Object o) { + return 0; + } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java index 9ab865b..5b8b8d3 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java @@ -3,5 +3,6 @@ /** * @author leon on 27/12/2018. */ -public interface Spice { +public interface Spice extends Comparable{ + public String getName(); } diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java index 01be859..c9a3366 100644 --- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java +++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java @@ -2,6 +2,7 @@ import java.util.HashSet; import java.util.Set; +import java.util.stream.Stream; /** * @author leon on 21/12/2018. @@ -39,6 +40,7 @@ public static Boolean hasDuplicateConsecutiveCharacters(String str) { } public static String removeConsecutiveDuplicateCharacters(String str) { + String result = ""; int index = 0; for (int i = 1; i < str.length() ; i++) { @@ -49,6 +51,7 @@ public static String removeConsecutiveDuplicateCharacters(String str) { } result += str.substring(index); return result; + } public static String invertCasing(String str) { @@ -63,5 +66,5 @@ public static String invertCasing(String str) { } return result; } - + } \ No newline at end of file diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java index 40eb4a8..3e2789a 100644 --- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java +++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java @@ -3,11 +3,16 @@ /** * @author leon on 30/12/2018. */ -public class Account extends BankAccount { +public class Account { + + private long id; + public Long getId() { - return null; + return this.id; } public void setId(Long id) { + this.id = id; } + } diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java index 0dd4183..6c3d9cb 100644 --- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java +++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java @@ -1,17 +1,30 @@ package rocks.zipcode.quiz4.objectorientation.account; +import java.util.ArrayList; +import java.util.List; + /** * @author leon on 27/12/2018. */ public class Bank { + + private List accounts; + + public Bank(){ + this.accounts = new ArrayList<>(); + } + public BankAccount removeBankAccountByIndex(Integer indexNumber) { - return null; + BankAccount account = accounts.get(indexNumber); + accounts.remove((int)indexNumber); + return account; } public void addBankAccount(BankAccount bankAccount) { + accounts.add(bankAccount); } public Boolean containsBankAccount(BankAccount bankAccount) { - throw new UnsupportedOperationException("Method not yet implemented"); + return accounts.contains(bankAccount); } } diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java index 70ccb74..16fdf25 100644 --- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java +++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java @@ -3,7 +3,40 @@ /** * @author leon on 27/12/2018. */ -public class BankAccount { +public class BankAccount extends Account implements Transactable { + + private double balance; + + public BankAccount(){ + balance = 0.0; + } + public void setBalance(Double val) { + this.balance = val; + } + + @Override + public void deposit(Double amountToIncreaseBy) { + if(amountToIncreaseBy < 0) { + throw new IllegalArgumentException("Can't deposit negative money"); + } + balance += amountToIncreaseBy; } + + @Override + public void withdrawal(Double amountToDecreaseBy) { + if(amountToDecreaseBy < 0){ + throw new IllegalArgumentException("Can't withdraw a negative amount"); + }else if(amountToDecreaseBy > balance){ + throw new IllegalArgumentException("Balance is too low!"); + } else { + balance -= amountToDecreaseBy; + } + } + + @Override + public Double getBalance() { + return balance; + } + } diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java index 8407f1a..4c1c4ab 100644 --- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java +++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java @@ -3,18 +3,65 @@ /** * @author leon on 30/12/2018. */ -public class Employee { +public class Employee implements Worker, Transactable { + + private BankAccount bankAccount; + private Double hoursWorked; + private Double wage; + + public Employee() { + bankAccount = new BankAccount(); + hoursWorked = 0.0; + wage = 35.0; } public Employee(BankAccount bankAccount) { + this.bankAccount = bankAccount; + hoursWorked = 0.0; + wage = 35.0; } public BankAccount getBankAccount() { - return null; + return bankAccount; } public void setBankAccount(BankAccount bankAccount) { + this.bankAccount = bankAccount; + } + + @Override + public void deposit(Double amountToIncreaseBy) { + bankAccount.deposit(amountToIncreaseBy); + } + + @Override + public void withdrawal(Double amountToDecreaseBy) { + bankAccount.withdrawal(amountToDecreaseBy); + } + + @Override + public Double getBalance() { + return bankAccount.getBalance(); + } + + @Override + public void increaseHoursWorked(Double numberOfHours) { + hoursWorked += numberOfHours; + } + + @Override + public Double getHoursWorked() { + return this.hoursWorked; + } + + @Override + public Double getHourlyWage() { + return wage; + } + @Override + public Double getMoneyEarned() { + return this.wage * this.hoursWorked; } } From 6d4b8e0b5522918f36a2d17d9b0666c8c8ca1be2 Mon Sep 17 00:00:00 2001 From: Moe Aydin Date: Fri, 20 Mar 2020 18:44:49 -0400 Subject: [PATCH 4/6] removed usles comparable --- .../java/rocks/zipcode/quiz4/collections/culonary/Curry.java | 5 +---- .../java/rocks/zipcode/quiz4/collections/culonary/Food.java | 1 + .../rocks/zipcode/quiz4/collections/culonary/Ginger.java | 4 ---- .../rocks/zipcode/quiz4/collections/culonary/Pepper.java | 5 ----- .../java/rocks/zipcode/quiz4/collections/culonary/Spice.java | 2 +- 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java index 14a8726..c4abe9b 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java @@ -1,13 +1,10 @@ package rocks.zipcode.quiz4.collections.culonary; public class Curry implements Spice{ + @Override public String getName() { return "Curry"; } - @Override - public int compareTo(Object o) { - return 0; - } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java index 324e7df..fecb8a6 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java @@ -40,4 +40,5 @@ public > Map getSpi public void applySpice(Spice spice) { spicesAdded.add(spice); } + } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java index c50dcbc..17b0fb8 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java @@ -9,8 +9,4 @@ public String getName() { return "Ginger"; } - @Override - public int compareTo(Object o) { - return 0; - } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java index 7995e35..97cd24f 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java @@ -9,9 +9,4 @@ public String getName() { return "Pepper"; } - - @Override - public int compareTo(Object o) { - return 0; - } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java index 5b8b8d3..ed6e324 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java @@ -3,6 +3,6 @@ /** * @author leon on 27/12/2018. */ -public interface Spice extends Comparable{ +public interface Spice { public String getName(); } From efef936cb1ce62e7e098b50936252b0f8a54e4ca Mon Sep 17 00:00:00 2001 From: Moe Aydin Date: Fri, 20 Mar 2020 18:47:27 -0400 Subject: [PATCH 5/6] added test annotation for employeePolymorphism --- .../objectorientation/employee/EmployeePolymorphismTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/rocks/zipcode/quiz4/objectorientation/employee/EmployeePolymorphismTest.java b/src/test/java/rocks/zipcode/quiz4/objectorientation/employee/EmployeePolymorphismTest.java index ffc4422..fd37e08 100644 --- a/src/test/java/rocks/zipcode/quiz4/objectorientation/employee/EmployeePolymorphismTest.java +++ b/src/test/java/rocks/zipcode/quiz4/objectorientation/employee/EmployeePolymorphismTest.java @@ -22,7 +22,7 @@ public void test1() { public void test2() { Assert.assertTrue(employee instanceof Worker); } - + @Test public void test3() { Assert.assertFalse(employee instanceof Account); } From 8b9dc448bef2e72bc635af912bbb5e018beec7c3 Mon Sep 17 00:00:00 2001 From: Moe Aydin Date: Sun, 22 Mar 2020 14:31:48 -0400 Subject: [PATCH 6/6] listened to IntelliJ --- .../java/rocks/zipcode/quiz4/fundamentals/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java index 7170d53..154373c 100644 --- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java +++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java @@ -15,11 +15,11 @@ public static Double square(Double value) { } public static Double[] squareRoots(Double... value) { - return Arrays.asList(value).stream().map(v -> squareRoot(v)).toArray(Double[]::new); + return Arrays.stream(value).map(Calculator::squareRoot).toArray(Double[]::new); } public static Double[] squares(Double... values) { - return Arrays.asList(values).stream().map(v -> square(v)).toArray(Double[]::new); + return Arrays.stream(values).map(Calculator::square).toArray(Double[]::new); } public static Double add(Double value1, Double value2) { return value1 + value2; }