Aman changes

src/oops/SOLID/lsp/stack/before/StackWrong.java

@@ -14,19 +14,25 @@
  * so objects of ArrayList are not fully replaceable by the objects of stack.   
  * 
  */
-public class StackWrong extends ArrayList<Integer>{
+public class StackWrong{
 	private int topPointer = 0;
-
+
+	ArrayList<Integer> arrayList;
+
 	public void push(Integer a) {
-		add(topPointer, a);
+		arrayList.add(topPointer, a);
 		topPointer++;
 	}	
 	public void pop() {
-		remove(topPointer-1);
+		arrayList.remove(topPointer-1);
 		topPointer--;
 	}
 	public Integer top() {
-		return get(topPointer-1);
+		return arrayList.get(topPointer-1);
+	}
+
+	public StackWrong(){
+		arrayList = new ArrayList<Integer>();
 	}
 
 	public static void main(String[] args) {

src/oops/SOLID/openClosePrinciple/before/client/CalculateTaxesClient.java

@@ -26,10 +26,10 @@ public static void main(String[] args) {
         for (Employee employee: employees){
 
             // compute individual tax
-            double tax = TaxCalculator.calculate(employee);
+            double tax = employee.getTaxableAmount();
             String formattedTax = currencyFormatter.format(tax);
             // add to company total taxes
-            totalTaxes += TaxCalculator.calculate(employee);
+            totalTaxes += tax;
         }
     }
 }

src/oops/SOLID/openClosePrinciple/before/employees/Employee.java

@@ -3,7 +3,7 @@
 /*
 Models an employee form a business perspective
  */
-public abstract class Employee {
+public abstract class Employee extends ITaxable{
     private String firstName;
     private String lastName;
     private int monthlyIncome;
@@ -57,5 +57,7 @@ public void setNbHoursPerWeek(int nbHoursPerWeek) {
     public String getFullName(){
         return this.firstName + " " + this.lastName;
     }
+
+    public abstract double getTaxableAmount();
 }
 

src/oops/SOLID/openClosePrinciple/before/employees/FullTimeEmployee.java

@@ -1,8 +1,14 @@
 package oops.SOLID.openClosePrinciple.before.employees;
+import oops.SOLID.openClosePrinciple.before.taxes;
 
 public class FullTimeEmployee extends Employee {
     public FullTimeEmployee(String fullName, int monthlyIncome) {
         super(fullName, monthlyIncome);
         this.setNbHoursPerWeek(40);
     }
+
+    @Override
+    public double getTaxableAmount(){
+        FullTimeEmployeeTaxCalculator.calculate(this);
+    }
 }

src/oops/SOLID/openClosePrinciple/before/employees/ITaxable.java

@@ -0,0 +1,5 @@
+package oops.SOLID.openClosePrinciple.before.employees;
+
+public interface ITaxable{
+    public double getTaxableAmount();
+}

src/oops/SOLID/openClosePrinciple/before/employees/Intern.java

@@ -5,4 +5,9 @@ public Intern(String fullName, int monthlyIncome, int nbHours) {
         super(fullName, monthlyIncome);
         setNbHoursPerWeek(nbHours);
     }
+
+    @Override
+    public double getTaxableAmount(){
+        InternTaxCalculator.calculate(this);
+    }
 }

src/oops/SOLID/openClosePrinciple/before/employees/PartTimeEmployee.java

@@ -5,4 +5,9 @@ public PartTimeEmployee(String fullName, int monthlyIncome) {
         super(fullName, monthlyIncome);
         this.setNbHoursPerWeek(20);
     }
+
+    @Override
+    public double getTaxableAmount(){
+        PartTimeEmployeeTaxCalculator.calculate(this);
+    }
 }

src/oops/SOLID/openClosePrinciple/before/taxes/FullTimeEmployeeTaxCalculator.java

@@ -0,0 +1,18 @@
+package oops.SOLID.openClosePrinciple.before.taxes;
+
+import oops.SOLID.openClosePrinciple.before.employees.Employee;
+
+public class FullTimeEmployeeTaxCalculator extends TaxCalculator {
+    private final static int INCOME_TAX_PERCENTAGE = 30;
+    private final static int PROFESSIONAL_TAX_PERCENTAGE = 2;
+    private final static int EDUCATIONAL_CESS = 1;
+
+
+    public static double calculate(Employee employee) {
+        return
+                (employee.getMonthlyIncome() * PROFESSIONAL_TAX_PERCENTAGE) / 100 +
+                        (employee.getMonthlyIncome() * INCOME_TAX_PERCENTAGE) / 100 +
+                        (employee.getMonthlyIncome() * EDUCATIONAL_CESS);
+
+    }
+}

src/oops/SOLID/openClosePrinciple/before/taxes/InternTaxCalculator.java

@@ -0,0 +1,19 @@
+package oops.SOLID.openClosePrinciple.before.taxes;
+
+import oops.SOLID.openClosePrinciple.before.employees.Employee;
+
+public class InternTaxCalculator extends TaxCalculator {
+    private final static int INCOME_TAX_PERCENTAGE = 15;
+    private final static int TAX_FREE_LIMIT = 300000;
+
+
+    public static double calculate(Employee employee) {
+        if(employee.getMonthlyIncome() * 12 <= TAX_FREE_LIMIT){
+            return 0;
+        }
+
+        return
+                (employee.getMonthlyIncome() * PROFESSIONAL_TAX_PERCENTAGE) / 100;
+
+    }
+}

src/oops/SOLID/openClosePrinciple/before/taxes/PartTimeEmployeeTaxCalculator.java

@@ -0,0 +1,18 @@
+package oops.SOLID.openClosePrinciple.before.taxes;
+
+import oops.SOLID.openClosePrinciple.before.employees.Employee;
+
+public class PartTimeEmployeeTaxCalculator extends TaxCalculator {
+    private final static int INCOME_TAX_PERCENTAGE = 20;
+    private final static int PROFESSIONAL_TAX_PERCENTAGE = 3;
+    private final static int EDUCATIONAL_CESS = 1;
+
+
+    public static double calculate(Employee employee) {
+        return
+                (employee.getMonthlyIncome() * PROFESSIONAL_TAX_PERCENTAGE) / 100 +
+                        (employee.getMonthlyIncome() * INCOME_TAX_PERCENTAGE) / 100 +
+                        (employee.getMonthlyIncome() * EDUCATIONAL_CESS);
+
+    }
+}

src/oops/SOLID/singleResponsibilityPrinciple/before/Employee.java

@@ -8,7 +8,7 @@
 /*
 Models an employee form a business perspective
  */
-public abstract class Employee {
+public abstract class Employee implements ISavable {
     private String firstName;
     private String lastName;
     private int monthlyIncome;
@@ -63,32 +63,27 @@ public String getFullName(){
         return this.firstName + " " + this.lastName;
     }
 
-    public  void save(){
-        try {
-        	Employee employee =this;
-            StringBuilder sb = new StringBuilder();
-            sb.append("### EMPLOYEE RECORD ####");
-            sb.append(System.lineSeparator());
-            sb.append("NAME: ");
-            sb.append(employee.firstName + " " + employee.lastName);
-            sb.append(System.lineSeparator());
-            sb.append("POSITION: ");
-            sb.append(employee.getClass().getTypeName());
-            sb.append(System.lineSeparator());
-            sb.append("EMAIL: ");
-            sb.append(employee.getEmail());
-            sb.append(System.lineSeparator());
-            sb.append("MONTHLY WAGE: ");
-            sb.append(employee.monthlyIncome);
-            sb.append(System.lineSeparator());
-
-            Path path = Paths.get(employee.getFullName()
-                    .replace(" ","_") + ".rec");
-            Files.write(path, sb.toString().getBytes());
+    public string getSavableData(){
+        return Employee employee =this;
+        StringBuilder sb = new StringBuilder();
+        sb.append("### EMPLOYEE RECORD ####");
+        sb.append(System.lineSeparator());
+        sb.append("NAME: ");
+        sb.append(employee.firstName + " " + employee.lastName);
+        sb.append(System.lineSeparator());
+        sb.append("POSITION: ");
+        sb.append(employee.getClass().getTypeName());
+        sb.append(System.lineSeparator());
+        sb.append("EMAIL: ");
+        sb.append(employee.getEmail());
+        sb.append(System.lineSeparator());
+        sb.append("MONTHLY WAGE: ");
+        sb.append(employee.monthlyIncome);
+        sb.append(System.lineSeparator());
+    }
 
-            System.out.println("Saved employee " + employee.toString());
-        } catch (IOException e){
-            System.out.println("ERROR: Could not save employee. " + e);
-        }
+    public string getFileName(){
+        return employee.getFullName()
+                .replace(" ","_") + ".rec";
     }
 }

src/oops/SOLID/singleResponsibilityPrinciple/before/Savable.java

@@ -0,0 +1,6 @@
+package oops.SOLID.singleResponsibilityPrinciple.before;
+
+public interface ISavable{
+    string getSavableData();
+    string getFileName();
+}

src/oops/SOLID/singleResponsibilityPrinciple/before/SaveEmployeesMain.java

@@ -8,9 +8,20 @@ public static void main(String[] args) {
         EmployeeRepository repository = new EmployeeRepository();
         List<Employee> employees = repository.findAll();
 
+        public  void save(ISavable savable){
+            try {
+                Path path = Paths.get(savable.getFileName());
+                Files.write(path, savable.getSavableData().getBytes());
+
+                System.out.println("Saved employee " + employee.toString());
+            } catch (IOException e){
+                System.out.println("ERROR: Could not save employee. " + e);
+            }
+        }
+
         // Save all
         for (Employee e : employees){
-            e.save();
+            save(e);
         }
     }
 }