fix wrong PackageName in SPI loader configuration

4 files changed, 65 insertions, 2 deletions

diff --git a/eaaf_modules/eaaf_module_moa-sig/pom.xml b/eaaf_modules/eaaf_module_moa-sig/pom.xml
index e147a38e..3ee44753 100644
--- a/eaaf_modules/eaaf_module_moa-sig/pom.xml
+++ b/eaaf_modules/eaaf_module_moa-sig/pom.xml
@@ -172,7 +172,12 @@
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-test</artifactId>
 		<scope>test</scope>
-	</dependency>	
+	</dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>	
 	  	  	
   </dependencies>
   
diff --git a/eaaf_modules/eaaf_module_moa-sig/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider b/eaaf_modules/eaaf_module_moa-sig/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
index 2f0ae67f..a0a1d413 100644
--- a/eaaf_modules/eaaf_module_moa-sig/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
+++ b/eaaf_modules/eaaf_module_moa-sig/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
@@ -1 +1 @@
-at.gv.egiz.eid.authhandler.modules.sigverify.moasig.impl.MoaSigSpringResourceProvider
\ No newline at end of file
+at.gv.egiz.eaaf.modules.sigverify.moasig.impl.MoaSigSpringResourceProvider
\ No newline at end of file
diff --git a/eaaf_modules/eaaf_module_moa-sig/src/test/java/at/gv/egiz/eaaf/modules/sigverify/moasig/test/MoaSigSpringResourceProviderTest.java b/eaaf_modules/eaaf_module_moa-sig/src/test/java/at/gv/egiz/eaaf/modules/sigverify/moasig/test/MoaSigSpringResourceProviderTest.java
new file mode 100644
index 00000000..341c5a8c
--- /dev/null
+++ b/eaaf_modules/eaaf_module_moa-sig/src/test/java/at/gv/egiz/eaaf/modules/sigverify/moasig/test/MoaSigSpringResourceProviderTest.java
@@ -0,0 +1,52 @@
+package at.gv.egiz.eaaf.modules.sigverify.moasig.test;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.springframework.core.io.Resource;
+
+import at.gv.egiz.eaaf.modules.sigverify.moasig.impl.MoaSigSpringResourceProvider;
+
+
+
+@RunWith(BlockJUnit4ClassRunner.class)
+public class MoaSigSpringResourceProviderTest {
+
+  static final String TEST_SPI_LOADER_PATH =
+      "/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider";
+  
+  @Test
+  public void testSpringConfig() {
+    final MoaSigSpringResourceProvider test = new MoaSigSpringResourceProvider();
+    for (final Resource el : test.getResourcesToLoad()) {
+      try {
+        IOUtils.toByteArray(el.getInputStream());
+
+      } catch (final IOException e) {
+        Assert.fail("Ressouce: " + el.getFilename() + " not found");
+      }
+
+    }
+  }
+
+  @Test
+  public void testSpiLoaderConfig() {
+    final InputStream el = this.getClass().getResourceAsStream(TEST_SPI_LOADER_PATH);
+    try {
+      final String spiFile = IOUtils.toString(el, "UTF-8");
+
+      Assert.assertEquals("Wrong classpath in SPI file", MoaSigSpringResourceProvider.class.getName(),
+          spiFile);
+
+
+    } catch (final IOException e) {
+      Assert.fail("Ressouce: " + TEST_SPI_LOADER_PATH + " not found");
+    }
+
+  }
+}
diff --git a/pom.xml b/pom.xml
index 771b12d5..ca90543d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
     <org.apache.commons-lang3.version>3.11</org.apache.commons-lang3.version>
     <org.apache.commons-text.version>1.9</org.apache.commons-text.version>
     <org.apache.commons-collections4>4.4</org.apache.commons-collections4>
+    <commons-io.version>2.7</commons-io.version>
     <commons-fileupload.version>1.4</commons-fileupload.version>
     <javax.servlet-api>3.0.1</javax.servlet-api>
     <org.apache.velocity.version>1.7</org.apache.velocity.version>
@@ -359,6 +360,11 @@
         <version>${org.apache.commons-collections4}</version>
       </dependency>
       <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons-io.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
         <version>${org.springframework.version}</version>