Merge pull request #239 from xlate/schema_include_classpath

Allow loading included schemas on the class-path

src/main/java/io/xlate/edi/internal/schema/ClasspathURLStreamHandler.java

@@ -0,0 +1,28 @@
+package io.xlate.edi.internal.schema;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+
+class ClasspathURLStreamHandler extends URLStreamHandler {
+    /** The classloader to find resources from. */
+    private final ClassLoader classLoader;
+
+    public ClasspathURLStreamHandler(ClassLoader classLoader) {
+        this.classLoader = classLoader;
+    }
+
+    @Override
+    protected URLConnection openConnection(URL u) throws IOException {
+        final String resourcePath = u.getPath();
+        final URL resourceUrl = classLoader.getResource(resourcePath);
+
+        if (resourceUrl == null) {
+            throw new FileNotFoundException("Class-path resource not found: " + resourcePath);
+        }
+
+        return resourceUrl.openConnection();
+    }
+}

src/main/java/io/xlate/edi/internal/schema/SchemaReaderV4.java

@@ -48,7 +48,18 @@ protected void readInclude(XMLStreamReader reader, Map<String, EDIType> types) t
                 }
             }
 
-            URL schemaLocation = context != null ? new URL(context, location) : new URL(location);
+            URL schemaLocation;
+
+            if (location.startsWith("classpath:")) {
+                ClassLoader loader = Thread.currentThread().getContextClassLoader();
+                if (location.startsWith("classpath:/")) {
+                    location = location.substring(0, "classpath:".length()) + location.substring("classpath:/".length());
+                }
+                schemaLocation = new URL(null, location, new ClasspathURLStreamHandler(loader));
+            } else {
+                schemaLocation = new URL(context, location);
+            }
+
             types.putAll(StaEDISchemaFactory.readSchemaTypes(schemaLocation, super.properties));
             reader.nextTag(); // End of include
         } catch (Exception e) {

src/test/java/io/xlate/edi/internal/schema/ClasspathURLStreamHandlerTest.java

@@ -0,0 +1,40 @@
+package io.xlate.edi.internal.schema;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class ClasspathURLStreamHandlerTest {
+
+    ClasspathURLStreamHandler cut;
+
+    @BeforeEach
+    void setup() {
+        cut = new ClasspathURLStreamHandler(getClass().getClassLoader());
+    }
+
+    @Test
+    void testResourceUrlResolvesNull() throws MalformedURLException {
+        URL target = new URL(null, "classpath:does/not/exist.txt", cut);
+        @SuppressWarnings("unused")
+        FileNotFoundException ex = assertThrows(FileNotFoundException.class, () -> {
+            target.openConnection();
+        });
+    }
+
+    @Test
+    void testResourceUrlFound() throws IOException {
+        URL target = new URL(null, "classpath:logging.properties", cut);
+        URLConnection connection = target.openConnection();
+        assertNotNull(connection);
+    }
+
+}

src/test/resources/x12/005010X222/837_REF_impls.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <schema xmlns="http://xlate.io/EDISchema/v4">
 
-  <include schemaLocation="file:./target/test-classes/x12/005010/837.xml"/>
+  <include schemaLocation="classpath:/x12/005010/837.xml"/>
 
   <implementation>
     <sequence>

src/test/resources/x12/005010X222/837_loop1000_only.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <schema xmlns="http://xlate.io/EDISchema/v4">
 
-  <include schemaLocation="file:./target/test-classes/x12/005010/837.xml"/>
+  <include schemaLocation="classpath:x12/005010/837.xml"/>
 
   <implementation>
     <sequence>