Added updates and refactored code

Java/Car.java

@@ -1,7 +1,9 @@
+package com.toll.calculator;
+import static com.toll.calculator.Constants.CAR;
 
 public class Car implements Vehicle {
   @Override
   public String getType() {
-    return "Car";
+    return CAR;
   }
 }

Java/Constants.java

@@ -0,0 +1,11 @@
+package com.toll.calculator;
+
+public class Constants {
+
+	public static final String CAR = "Car";
+	public static final String BIKE = "Motorbike";
+	public static final String JULY = "July";
+	public static final int MAXIMUM = 60;
+	public static final int MINIMUM = 8;
+
+}

Java/HolidayList.java

@@ -0,0 +1,27 @@
+package com.toll.calculator;
+
+public enum HolidayList {
+    JANUARY("1"),
+    MARCH("28,29"),
+    APRIL("1,30"),
+    MAY("1,8,9"),
+    JUNE("5,6,21"),
+    NOVEMBER("1"),
+    DECEMBER("24,25,26,31");
+
+    private final String month;
+
+    HolidayList(String month) {
+      this.month = month;
+    }
+
+    public static String getDays(String month) {
+        for (HolidayList holidayList : HolidayList.values()) {
+            if (holidayList.name().equalsIgnoreCase(month)) {
+                return holidayList.month;
+            }
+        }
+        return null;
+    }
+
+}

Java/Motorbike.java

@@ -1,7 +1,9 @@
+package com.toll.calculator;
+import static com.toll.calculator.Constants.BIKE;
 
 public class Motorbike implements Vehicle {
   @Override
   public String getType() {
-    return "Motorbike";
+    return BIKE;
   }
 }

Java/TollCalculator.java

@@ -1,7 +1,10 @@
+package com.toll.calculator;
 
 import java.util.*;
 import java.util.concurrent.*;
 
+import static com.toll.calculator.Constants.*;
+
 public class TollCalculator {
 
   /**
@@ -22,89 +25,67 @@ public int getTollFee(Vehicle vehicle, Date... dates) {
       long diffInMillies = date.getTime() - intervalStart.getTime();
       long minutes = timeUnit.convert(diffInMillies, TimeUnit.MILLISECONDS);
 
-      if (minutes <= 60) {
+      if (minutes <= MAXIMUM) {
         if (totalFee > 0) totalFee -= tempFee;
         if (nextFee >= tempFee) tempFee = nextFee;
         totalFee += tempFee;
       } else {
         totalFee += nextFee;
       }
     }
-    if (totalFee > 60) totalFee = 60;
+    if (totalFee > MAXIMUM) totalFee = MAXIMUM;
     return totalFee;
   }
 
   private boolean isTollFreeVehicle(Vehicle vehicle) {
-    if(vehicle == null) return false;
-    String vehicleType = vehicle.getType();
-    return vehicleType.equals(TollFreeVehicles.MOTORBIKE.getType()) ||
-           vehicleType.equals(TollFreeVehicles.TRACTOR.getType()) ||
-           vehicleType.equals(TollFreeVehicles.EMERGENCY.getType()) ||
-           vehicleType.equals(TollFreeVehicles.DIPLOMAT.getType()) ||
-           vehicleType.equals(TollFreeVehicles.FOREIGN.getType()) ||
-           vehicleType.equals(TollFreeVehicles.MILITARY.getType());
+    if(vehicle == null) 
+    	return false;
+    return TollFreeVehicles.contains(vehicle.getType());
   }
 
   public int getTollFee(final Date date, Vehicle vehicle) {
     if(isTollFreeDate(date) || isTollFreeVehicle(vehicle)) return 0;
-    Calendar calendar = GregorianCalendar.getInstance();
+    GregorianCalendar calendar = new GregorianCalendar();
     calendar.setTime(date);
+    return calculateToll(calendar);
+  }
+
+  private static int calculateToll(final Calendar calendar)
+  {
     int hour = calendar.get(Calendar.HOUR_OF_DAY);
     int minute = calendar.get(Calendar.MINUTE);
-
-    if (hour == 6 && minute >= 0 && minute <= 29) return 8;
-    else if (hour == 6 && minute >= 30 && minute <= 59) return 13;
-    else if (hour == 7 && minute >= 0 && minute <= 59) return 18;
-    else if (hour == 8 && minute >= 0 && minute <= 29) return 13;
-    else if (hour >= 8 && hour <= 14 && minute >= 30 && minute <= 59) return 8;
-    else if (hour == 15 && minute >= 0 && minute <= 29) return 13;
-    else if (hour == 15 && minute >= 0 || hour == 16 && minute <= 59) return 18;
-    else if (hour == 17 && minute >= 0 && minute <= 59) return 13;
-    else if (hour == 18 && minute >= 0 && minute <= 29) return 8;
-    else return 0;
+    if ((hour == 6 || hour == 18) && minute <= 29) return MINIMUM;
+    else if (hour == 6 || hour == 17 ) return 13;
+    else if (hour == 8 && minute <= 29) return 13;
+    else if (hour >= 8 && hour <= 14 && minute >= 30) return MINIMUM;
+    else if (hour == 15 && minute <= 29) return 13;
+    else if (hour == 7 || hour == 15 || hour == 16) return 18;
+    return 0;
   }
 
-  private Boolean isTollFreeDate(Date date) {
-    Calendar calendar = GregorianCalendar.getInstance();
+  private boolean isTollFreeDate(Date date) {
+    GregorianCalendar calendar = new GregorianCalendar();
     calendar.setTime(date);
-    int year = calendar.get(Calendar.YEAR);
-    int month = calendar.get(Calendar.MONTH);
-    int day = calendar.get(Calendar.DAY_OF_MONTH);
-
-    int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
-    if (dayOfWeek == Calendar.SATURDAY || dayOfWeek == Calendar.SUNDAY) return true;
-
-    if (year == 2013) {
-      if (month == Calendar.JANUARY && day == 1 ||
-          month == Calendar.MARCH && (day == 28 || day == 29) ||
-          month == Calendar.APRIL && (day == 1 || day == 30) ||
-          month == Calendar.MAY && (day == 1 || day == 8 || day == 9) ||
-          month == Calendar.JUNE && (day == 5 || day == 6 || day == 21) ||
-          month == Calendar.JULY ||
-          month == Calendar.NOVEMBER && day == 1 ||
-          month == Calendar.DECEMBER && (day == 24 || day == 25 || day == 26 || day == 31)) {
-        return true;
-      }
-    }
-    return false;
+    if(isWeekend(calendar)) return true;
+    return isHoliday(calendar);
+  }
+
+  private static boolean isWeekend(final Calendar cal)
+  {
+      int day = cal.get(Calendar.DAY_OF_WEEK);
+      return day == Calendar.SATURDAY || day == Calendar.SUNDAY;
   }
 
-  private enum TollFreeVehicles {
-    MOTORBIKE("Motorbike"),
-    TRACTOR("Tractor"),
-    EMERGENCY("Emergency"),
-    DIPLOMAT("Diplomat"),
-    FOREIGN("Foreign"),
-    MILITARY("Military");
-    private final String type;
-
-    TollFreeVehicles(String type) {
-      this.type = type;
-    }
-
-    public String getType() {
-      return type;
-    }
+  private static boolean isHoliday(final Calendar calendar)
+  {
+    String month = calendar.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.getDefault());
+    if (month.equalsIgnoreCase(JULY)) return true;
+    String holidays = HolidayList.getDays(month);
+    if (null == holidays) return false;
+    List<String> holidayList = new ArrayList<>(Arrays.asList(holidays.split(",")));
+    int day = calendar.get(Calendar.DAY_OF_MONTH);
+    return holidayList.contains(Integer.toString(day));
   }
+
 }
 

Java/TollCalculatorTest.java

@@ -0,0 +1,67 @@
+package com.toll.calculator;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class TollCalculatorTest {
+
+    public static void main(String...args) throws ParseException {
+        TollCalculator calculator = new TollCalculator();
+        DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+
+        Vehicle test = new Car();
+        String dateString1 = "2013-06-26 07:00:00";
+        String dateString2 = "2013-06-26 15:31:00";
+        String dateString3 = "2013-06-26 15:33:00";
+        String dateString4 = "2013-06-26 16:34:00";
+        Date dateObject1 = sdf.parse(dateString1);
+        Date dateObject2 = sdf.parse(dateString2);
+        Date dateObject3 = sdf.parse(dateString3);
+        Date dateObject4 = sdf.parse(dateString4);
+        int value = calculator.getTollFee(test,dateObject1,dateObject2,dateObject3,dateObject4);
+        System.out.println("Maximum Toll Test: " +value);
+
+        test = new Car();
+        dateString1 = "2013-06-26 06:00:00";
+        dateString2 = "2013-06-26 06:20:00";
+        dateObject1 = sdf.parse(dateString1);
+        dateObject2 = sdf.parse(dateString2);
+        value = calculator.getTollFee(test,dateObject1,dateObject2);
+        System.out.println("Minimum Toll Test: " +value);
+
+        test = new Motorbike();
+        dateString1 = "2013-06-26 07:00:00";
+        dateString2 = "2013-06-26 15:31:00";
+        dateObject1 = sdf.parse(dateString1);
+        dateObject2 = sdf.parse(dateString2);
+        value = calculator.getTollFee(test,dateObject1,dateObject2);
+        System.out.println("TollFree Test: " +value);
+
+        test = new Car();
+        dateString1 = "2013-06-21 07:00:00";
+        dateString2 = "2013-06-21 15:31:00";
+        dateObject1 = sdf.parse(dateString1);
+        dateObject2 = sdf.parse(dateString2);
+        value = calculator.getTollFee(test,dateObject1,dateObject2);
+        System.out.println("Holiday Toll Test: " +value);
+
+        test = new Car();
+        dateString1 = "2013-06-15 07:00:00";
+        dateString2 = "2013-06-15 15:31:00";
+        dateObject1 = sdf.parse(dateString1);
+        dateObject2 = sdf.parse(dateString2);
+        value = calculator.getTollFee(test,dateObject1,dateObject2);
+        System.out.println("Weekend Toll Test: " +value);
+
+        test = new Car();
+        dateString1 = "2013-06-26 16:00:00";
+        dateString2 = "2013-06-26 18:31:00";
+        dateObject1 = sdf.parse(dateString1);
+        dateObject2 = sdf.parse(dateString2);
+        value = calculator.getTollFee(test,dateObject1,dateObject2);
+        System.out.println("Casual Hours Test: " +value);
+
+    }
+}

Java/TollFreeVehicles.java

@@ -0,0 +1,22 @@
+package com.toll.calculator;
+
+import java.util.stream.Stream;
+
+public enum TollFreeVehicles {
+    MOTORBIKE("Motorbike"),
+    TRACTOR("Tractor"),
+    EMERGENCY("Emergency"),
+    DIPLOMAT("Diplomat"),
+    FOREIGN("Foreign"),
+    MILITARY("Military");
+    private final String type;
+
+    TollFreeVehicles(String type) {
+      this.type = type;
+    }
+
+    public static boolean contains(final String type) {
+    	return Stream.of(TollFreeVehicles.values()).anyMatch(vehicleType -> vehicleType.type.equalsIgnoreCase(type));
+    }
+
+}

Java/Vehicle.java

@@ -1,5 +1,7 @@
+package com.toll.calculator;
 
 public interface Vehicle {
 
-  public String getType();
+  String getType();
+
 }