Adding static build time reference to bank holidays in case CI system… (#48)

* Adding static build time reference to bank holidays in case CI systems can't reach out to the internet to get them. Fixing issue #33

* Calling out from travis to get the bank holidays json

* Fixing codacy issues

Co-authored-by: travis-ci <travis@travis-ci.org>

Author: stevewalton28

.gitignore

@@ -48,4 +48,5 @@ bin
 *.csv
 
 script/dist
-logs/*
+logs/*
+src/main/resources/bank-holidays.json

.travis.yml

@@ -17,10 +17,12 @@ before_install:
   --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
 - google-chrome-stable --remote-debugging-port=9222 http://localhost &
 - chmod ugo+x scripts/publish-javadocs-to-github-pages.sh
+- chmod ugo+x scripts/get-bank-holiday-data-source-and-store-in-resources.sh
 addons:
   firefox: latest
 install:
 - mvn clean install -Dmaven.javadoc.skip=true -B -V
+- bash scripts/get-bank-holiday-data-source-and-store-in-resources.sh
 after_success:
 - gpg2 --keyring=$TRAVIS_BUILD_DIR/pubring.gpg --no-default-keyring --import deployment/signingkey.asc
 - gpg2 --allow-secret-key-import --keyring=$TRAVIS_BUILD_DIR/secring.gpg --no-default-keyring

pom.xml

@@ -279,7 +279,7 @@
                 <version>2.5.3</version>
                 <configuration>
                     <localCheckout>true</localCheckout>
-                    <pushChanges>true</pushChanges>
+                    <pushChanges>false</pushChanges>
                     <mavenExecutorId>forked-path</mavenExecutorId>
                     <arguments>-Dgpg.passphrase=${env.GPG_PASSPHRASE} -Dmaven.test.skip=true</arguments>
                     <checkModificationExcludes>

scripts/get-bank-holiday-data-source-and-store-in-resources.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+curl https://www.gov.uk/bank-holidays.json --output src/main/resources/bank-holidays.json
+echo "STEVE STEVE STEVE"
+ls src/main/resources

src/main/java/uk/co/evoco/testdata/Dates.java

@@ -1,13 +1,14 @@
 package uk.co.evoco.testdata;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import net.andreinc.mockneat.abstraction.MockUnitBase;
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import uk.co.evoco.webdriver.utils.JsonUtils;
 
+import java.io.IOException;
+
 import static io.restassured.RestAssured.get;
 
 public class Dates extends MockUnitBase {
@@ -78,13 +79,12 @@ public static String futureDateAvoidingWeekends(String startDate, int numberOfBu
      * @param numberOfBusinessDaysToAdd Days to add, avoiding weekends and UK bank holidays
      * @param dateFormat date format (e.g. "dd/MM/yyyy","dd/MM/yyyy HH:mm")
      * @return String representing resulting date
-     * @throws JsonProcessingException if the JSON source for bank holidays cannot be read
+     * @throws IOException if the JSON source for bank holidays cannot be read
      */
     public static String futureDataAvoidingWeekendsAndBankHolidays(
             Locale locale, String startDate,
-            int numberOfBusinessDaysToAdd, String dateFormat) throws JsonProcessingException {
-        BankHolidays bankHolidays = JsonUtils.fromString(
-                get("https://www.gov.uk/bank-holidays.json").body().asString(), BankHolidays.class);
+            int numberOfBusinessDaysToAdd, String dateFormat) throws IOException {
+        BankHolidays bankHolidays = getBankHolidays();
         DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern(dateFormat);
         DateTime now = DateTime.parse(startDate, dateTimeFormatter).toDateTime();
         DateTime futureDateTime = DateTime.parse(
@@ -106,4 +106,14 @@ public static String futureDataAvoidingWeekendsAndBankHolidays(
         return futureDateTime.toString(dateTimeFormatter);
     }
 
+    private static BankHolidays getBankHolidays() throws IOException {
+        BankHolidays bankHolidays;
+        try {
+            bankHolidays = JsonUtils.fromString(
+                    get("https://www.gov.uk/bank-holidays.json").body().asString(), BankHolidays.class);
+        } catch(Exception e) {
+            bankHolidays = JsonUtils.fromFile(ClassLoader.getSystemResourceAsStream("bank-holidays.json"), BankHolidays.class);
+        }
+        return bankHolidays;
+    }
 }

src/test/java/uk/co/evoco/testdata/DatesTests.java

@@ -1,13 +1,14 @@
 package uk.co.evoco.testdata;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import org.junit.jupiter.api.Test;
 
+import java.io.IOException;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static uk.co.evoco.testdata.Dates.futureDateAvoidingWeekends;
 import static uk.co.evoco.testdata.Dates.futureDate;
 import static uk.co.evoco.testdata.Dates.pastDate;
-import static uk.co.evoco.testdata.Dates.futureDateAvoidingWeekends;
 import static uk.co.evoco.testdata.Dates.futureDataAvoidingWeekendsAndBankHolidays;
 
 public class DatesTests {
@@ -31,15 +32,15 @@ public void testCanDataInFutureAvoidingWeekend() {
     }
 
     @Test
-    public void testCanGetDateInFutureAvoidingWeekendsAndBankHolidays() throws JsonProcessingException {
+    public void testCanGetDateInFutureAvoidingWeekendsAndBankHolidays() throws IOException {
         assertThat(futureDataAvoidingWeekendsAndBankHolidays(
                 Locale.ENGLAND_AND_WALES, "28/08/2017", 2, "dd/MM/yyyy"),
                 is("31/08/2017"));
     }
 
     @Test
     public void testCanGetDateInFutureAvoidingWeekendsAndBankHolidaysWhenStartDateIsOnFriday()
-            throws JsonProcessingException {
+            throws IOException {
         assertThat(futureDataAvoidingWeekendsAndBankHolidays(
                 Locale.ENGLAND_AND_WALES, "25/08/2017", 2, "dd/MM/yyyy"),
                 is("30/08/2017"));