pre-merge

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

@@ -11,6 +11,14 @@ import java.util.List;
 public class Bank  {
     List<BankAccount> bankaccounts = new ArrayList<>();
 
+    public Bank() {
+    }
+
+    public Bank(List<BankAccount> bankaccounts) {
+
+        this.bankaccounts = bankaccounts;
+    }
+
     public BankAccount removeBankAccountByIndex(Integer indexNumber) {
 
 

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

@@ -16,9 +16,11 @@ public class Food {
 
     public <SpiceType extends Class<? extends Spice>> Map<SpiceType, Integer> getSpiceCount() {
 
+
         return null;
     }
 
     public void applySpice(Spice spice) {
+        listing.add(spice);
     }
 }

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

@@ -1,34 +1,97 @@
 package rocks.zipcode.quiz5.fundamentals;
 
+import java.util.Arrays;
+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;
+
+
+      String middle = getMiddleCharacter(str).toString();
+      String upper = middle.toUpperCase();
+
+        if(str.length() == 1){
+            return str.toUpperCase();
+        }else
+
+          return str.substring(0,middle.length()) + upper + str.substring(middle.length()+1);
+
     }
 
     public static String lowerCaseMiddleCharacter(String str) {
-        return null;
+
+        String middle = getMiddleCharacter(str).toString();
+        String lower = middle.toLowerCase();
+        if(str.length() == 1){
+
+            return str.toLowerCase();
+        }else if(middle.matches(" ")){
+            return str;
+        }
+        else{
+            return str.substring(0,middle.length()) + lower + str.substring(middle.length()+1);
+        }
+
     }
 
     public static Boolean isIsogram(String str) {
-        return null;
+
+        String [] a = str.split("");
+
+        Set<String> set = new HashSet<String>(Arrays.asList(a));
+
+        if(set.size() == str.length()){
+            return true;
+        }
+
+        return false;
+
+
     }
 
     public static Boolean hasDuplicateConsecutiveCharacters(String str) {
-        return null;
+
+        return isIsogram(str);
     }
 
     public static String removeConsecutiveDuplicateCharacters(String str) {
-        return null;
+        StringBuilder sb = new StringBuilder();
+        char [] ch = str.toCharArray();
+        int len =0;
+
+        for (int i = 0; i < ch.length; i++) {
+
+            if(  len == 0 || ch[i] != ch[len-1]){
+                ch[len++] = ch[i];
+            }else{
+                len --;
+            }
+        }
+        return new String (ch,0,len);
+
+
     }
 
     public static String invertCasing(String str) {
-        return null;
+
+        char [] ch = str.toCharArray();
+
+        for(int i =0; i<ch.length; i++){
+            char c = ch[i];
+            if(Character.isUpperCase(c)){
+                ch[i] = Character.toLowerCase(c);
+            }else if(Character.isLowerCase(c)){
+                ch[i] = Character.toUpperCase(c);
+            }
+        }
+        return new String(ch);
     }
 }

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

@@ -3,11 +3,15 @@ package rocks.zipcode.quiz5.objectorientation.account;
 /**
  * @author leon on 30/12/2018.
  */
-public class Account extends BankAccount {
+public class Account {
+
+    private Long id;
+
     public Long getId() {
-        return null;
+        return id;
     }
 
     public void setId(Long id) {
+        this.id = id;
     }
 }

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

@@ -1,9 +1,39 @@
 package rocks.zipcode.quiz5.objectorientation.account;
 
+
+
 /**
  * @author leon on 27/12/2018.
  */
-public class BankAccount {
+public class BankAccount extends Account implements Transactable {
+
+    private Double val;
+
+    public BankAccount() {
+    }
+
+    public BankAccount(Double val) {
+        this.val = val;
+    }
+
     public void setBalance(Double val) {
+
+        this.val = val;
+
+    }
+
+    @Override
+    public void deposit(Double amountToIncreaseBy) {
+        this.val += amountToIncreaseBy;
+    }
+
+    @Override
+    public void withdrawal(Double amountToDecreaseBy) {
+        this.val -= amountToDecreaseBy;
+    }
+
+    @Override
+    public Double getBalance() {
+        return this.val;
     }
 }

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

@@ -1,20 +1,59 @@
 package rocks.zipcode.quiz5.objectorientation.account;
 
+
+
 /**
  * @author leon on 30/12/2018.
  */
-public class Employee {
+public class Employee implements Worker {
+
+    private BankAccount bankAccount;
+    private Double moneyMade;
+    private Double hoursworked;
+    private Double hourlywage;
+
     public Employee() {
     }
 
     public Employee(BankAccount bankAccount) {
+
     }
 
+
     public BankAccount getBankAccount() {
-        return null;
+        return bankAccount;
     }
 
     public void setBankAccount(BankAccount bankAccount) {
 
+        this.bankAccount = bankAccount;
+    }
+
+    @Override
+    public void increaseHoursWorked(Double numberOfHours) {
+       this.moneyMade = this.hoursworked + numberOfHours;
+    }
+    public void setHoursWorked(Double hours){
+        this.hoursworked = hours;
+    }
+
+    @Override
+    public Double getHoursWorked() {
+        return this.hoursworked;
+    }
+
+    public void setHourlyWage(Double hourlywage){
+        this.hourlywage = hourlywage;
+    }
+
+
+    @Override
+    public Double getHourlyWage() {
+        return this.hourlywage;
+    }
+
+    @Override
+    public Double getMoneyEarned() {
+        return this.moneyMade = hourlywage * hoursworked;
     }
 }

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

@@ -4,6 +4,7 @@ package rocks.zipcode.quiz5.objectorientation.account;
  * @author leon on 30/12/2018.
  */
 public interface Transactable {
+
     void deposit(Double amountToIncreaseBy);
     void withdrawal(Double amountToDecreaseBy);
     Double getBalance();

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

@@ -4,6 +4,7 @@ package rocks.zipcode.quiz5.objectorientation.account;
  * @author leon on 30/12/2018.
  */
 public interface Worker {
+
     void increaseHoursWorked(Double numberOfHours);
     Double getHoursWorked();
     Double getHourlyWage();