Merge pull request #10 from tomaytotomato/9-canonical-loading

Canonical loading of location4j.bin file from classpath

.github/workflows/build.yml

@@ -3,12 +3,12 @@ name: Build
 on:
   push:
     paths:
-      - 'src/**'
+      - 'library/src/**'
       - 'pom.xml'
       - '.github/**'
   pull_request:
     paths:
-      - 'src/**'
+      - 'library/src/**'
       - 'pom.xml'
       - '.github/**'
 

library/src/main/java/com/tomaytotomato/loader/DefaultCountriesDataLoaderImpl.java

@@ -9,17 +9,21 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+/**
+ * The default loader for retrieving Countries from the DEFAULT_FILE located in the location4j.jar
+ *
+ */
 public class DefaultCountriesDataLoaderImpl implements CountriesDataLoader {
 
-  private static final String DEFAULT_FILE = "location4j.bin";
+  private static final String DEFAULT_FILE = "/location4j.bin";
   private final List<Country> countries = new ArrayList<>();
 
   /**
    * Loads a list of {@link Country} from the location4j.bin file.
    */
   public DefaultCountriesDataLoaderImpl() {
     var logger = Logger.getLogger(this.getClass().getName());
-    try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(DEFAULT_FILE)) {
+    try (InputStream inputStream = getClass().getResourceAsStream(DEFAULT_FILE)) {
       logger.info("Attempting to load countries from " + DEFAULT_FILE);
       if (inputStream == null) {
         throw new IllegalArgumentException("File not found: " + DEFAULT_FILE);
@@ -34,7 +38,6 @@ public DefaultCountriesDataLoaderImpl() {
   private void loadLocationsFromBinary(InputStream inputStream, Logger logger)
       throws IOException, ClassNotFoundException {
     try (var objectInputStream = new ObjectInputStream(inputStream)) {
-      // Read the list of countries from the binary file
       List<Country> loadedCountries = (List<Country>) objectInputStream.readObject();
       this.countries.addAll(loadedCountries);
       logger.info("Successfully loaded countries binary file");