updated

src/main/java/rocks/zipcode/quiz5/arrays/ArrayUtils.java

@@ -1,5 +1,7 @@
 package rocks.zipcode.quiz5.arrays;
 
+import com.sun.deploy.util.ArrayUtil;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,11 +42,11 @@ public class ArrayUtils {
         List<String> list = new ArrayList();
 
         for (String value: values) {
-
-            if(value != getLastElement(values)) {
-                list.add(value);
-            }
+            list.add(value);
         }
-        return list.toArray(new String[0]);
+        list.remove(values.length-1);
+
+
+        return list.toArray(new String[list.size()]);
     }
 }

src/main/java/rocks/zipcode/quiz5/collections/Bank.java

@@ -7,19 +7,16 @@ import java.util.ArrayList;
 /**
  * @author leon on 27/12/2018.
  */
-public class Bank extends ArrayList{
+public class Bank {
 
     ArrayList<BankAccount> bank = new ArrayList<>();
-    BankAccount bankAccount = new BankAccount();
 
 
     public BankAccount removeBankAccountByIndex(Integer indexNumber) {
 
-        for(int i = 0; i < bank.size();i++){
-            if(i == indexNumber){
-                bank.remove(indexNumber);
-            }
-        }
+        BankAccount bankAccount = bank.get(indexNumber);
+
+        bank.remove(bankAccount);
 
         return bankAccount;
     }

src/main/java/rocks/zipcode/quiz5/collections/WordCounter.java

@@ -1,12 +1,26 @@
 package rocks.zipcode.quiz5.collections;
 
-import java.util.Map;
+import java.util.*;
 
 public class WordCounter {
     public WordCounter(String... strings) {
+
+        List<String> list = Arrays.asList(strings);
+
+//        for(String string; strings){
+//            int freq = Collections.frequency(list,string)
+//        }
+
     }
 
     public Map<String, Integer> getWordCountMap() {
+
+        Map<String, Integer> wordCountMap = new HashMap<>();
+
+
+
+
+
         return null;
     }
 }

src/main/java/rocks/zipcode/quiz5/fundamentals/StringUtils.java

@@ -59,35 +59,55 @@ public class StringUtils {
     public static Boolean hasDuplicateConsecutiveCharacters(String str) {
         char arr[] = str.toCharArray();
 
-        for(int i = 0; i < arr.length; i++){
-            for(int j = 0; j <arr.length; j++){
-                if(arr[i] == arr[j]){
-                    return false;
-                }
+        for(int i = 0; i < arr.length-1; i++){
+            if(arr[i] == arr[i+1]){
+                return true;
             }
         }
-        return true;
+        return false;
     }
 
     public static String removeConsecutiveDuplicateCharacters(String str) {
 
-        StringBuilder builder = new StringBuilder();
-
-        char previous = 'k';
-        int counter = 0;
+        String[] arr = str.split("");
 
-        char arr[] = str.toCharArray();
+        String letter = arr[0];
 
-        for(int i = 0; i < arr.length; i++){
-                if(previous != arr[i]){
-                    arr[counter++] = arr[i];
-                    previous = arr[i];
-                }
+        for(int i =1; i < arr.length; i++){
+            String next = arr[i];
+            if(letter.equals(next)){
+                arr[i] = "";
+                arr[i-1] = "";
             }
-        return new String(arr).substring(0,counter);
+            else{
+                letter = arr[i];
+            }
+        }
+
+        StringBuilder builder = new StringBuilder();
+        for(int i = 0; i <arr.length; i++){
+            builder.append(arr[i]);
+        }
+
+        return builder.toString();
+
     }
 
     public static String invertCasing(String str) {
-        return null;
+
+        char[] chars = str.toCharArray();
+        for (int i = 0; i < chars.length; i++)
+        {
+            char c = chars[i];
+            if (Character.isUpperCase(c))
+            {
+                chars[i] = Character.toLowerCase(c);
+            }
+            else if (Character.isLowerCase(c))
+            {
+                chars[i] = Character.toUpperCase(c);
+            }
+        }
+        return new String(chars);
     }
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/Curry.java

@@ -1,4 +1,6 @@
 package rocks.zipcode.quiz5.objectorientation;
 
-public class Curry {
+public class Curry implements Spice{
+    public Curry() {
+    }
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/Ginger.java

@@ -3,5 +3,5 @@ package rocks.zipcode.quiz5.objectorientation;
 /**
  * @author leon on 27/12/2018.
  */
-public class Ginger {
+public class Ginger implements Spice{
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/Pepper.java

@@ -3,5 +3,5 @@ package rocks.zipcode.quiz5.objectorientation;
 /**
  * @author leon on 27/12/2018.
  */
-public class Pepper {
+public class Pepper implements Spice{
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/account/Account.java

@@ -3,7 +3,7 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 30/12/2018.
  */
-public class Account extends BankAccount {
+public class Account {
 
     Long id;
 
@@ -14,4 +14,22 @@ public class Account extends BankAccount {
     public void setId(Long id) {
         this.id = id;
     }
+
+    Double balance;
+
+
+//    @Override
+//    public void deposit(Double amountToIncreaseBy) {
+//        balance += amountToIncreaseBy;
+//    }
+//
+//    @Override
+//    public void withdrawal(Double amountToDecreaseBy) {
+//        balance -= amountToDecreaseBy;
+//    }
+//
+//    @Override
+//    public Double getBalance() {
+//        return balance;
+//    }
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/account/BankAccount.java

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 /**
  * @author leon on 27/12/2018.
  */
-public class BankAccount extends ArrayList implements Transactable{
+public class BankAccount extends Account implements Transactable{
 
     Double val;
 

src/main/java/rocks/zipcode/quiz5/objectorientation/account/Employee.java

@@ -3,14 +3,23 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 30/12/2018.
  */
-public class Employee {
+public class Employee implements Worker, Transactable {
 
     BankAccount bankAccount;
 
+    Double hoursWorked;
+
+    Double hourlyWage;
+
+    Double moneyEarned;
+
+    Double balance;
+
     public Employee() {
     }
 
     public Employee(BankAccount bankAccount) {
+        setBankAccount(bankAccount);
     }
 
     public BankAccount getBankAccount() {
@@ -21,4 +30,42 @@ public class Employee {
         this.bankAccount = bankAccount;
 
     }
+
+    @Override
+    public void increaseHoursWorked(Double numberOfHours) {
+        hoursWorked += numberOfHours;
+    }
+
+    @Override
+    public Double getHoursWorked() {
+        return hoursWorked;
+    }
+
+    @Override
+    public Double getHourlyWage() {
+        return hourlyWage;
+    }
+
+    @Override
+    public Double getMoneyEarned() {
+
+        moneyEarned = getHoursWorked() * getHourlyWage();
+
+        return moneyEarned;
+    }
+
+    @Override
+    public void deposit(Double amountToIncreaseBy) {
+        balance += amountToIncreaseBy;
+    }
+
+    @Override
+    public void withdrawal(Double amountToDecreaseBy) {
+        balance -= amountToDecreaseBy;
+    }
+
+    @Override
+    public Double getBalance() {
+        return balance;
+    }
 }