issue #289

wowasa · wowasa · commit ed14d8e6cf6c · 2025-09-14T18:04:48.000+02:00
diff --git a/curation-api/src/test/java/eu/clarin/cmdi/curation/api/BaseTest.java b/curation-api/src/test/java/eu/clarin/cmdi/curation/api/BaseTest.java
@@ -6,10 +6,12 @@
 import org.mockserver.logging.MockServerLogger;
 import org.mockserver.socket.tls.KeyStoreFactory;
 import org.mockserver.springtest.MockServerTest;
+import org.springframework.core.io.ClassPathResource;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
@@ -28,7 +30,7 @@ public static void init() throws IOException {
         HttpsURLConnection.setDefaultSSLSocketFactory(new KeyStoreFactory(new MockServerLogger()).sslContext().getSocketFactory());
     }
     @BeforeEach
-    public void createExpectations() throws URISyntaxException, IOException {
+    public void createExpectations() throws IOException {
         this.mockServerClient
                 .when(
                         request()
@@ -56,7 +58,7 @@ public void createExpectations() throws URISyntaxException, IOException {
                 )
                 .respond(
                         response()
-                                .withBody(Files.readString(Paths.get(getClass().getResource("/profile/teiHeader.xsd").toURI())))
+                                .withBody(new String(new ClassPathResource("profile/teiHeader.xsd").getInputStream().readAllBytes(), StandardCharsets.UTF_8))
                 );
         this.mockServerClient
                 .when(
diff --git a/curation-cr/src/main/java/eu/clarin/cmdi/curation/cr/profile_parser/CMDI1_2_ProfileParser.java b/curation-cr/src/main/java/eu/clarin/cmdi/curation/cr/profile_parser/CMDI1_2_ProfileParser.java
@@ -8,10 +8,12 @@
 import eu.clarin.cmdi.curation.cr.profile_parser.CMDINode.Component;
 import eu.clarin.cmdi.curation.cr.profile_parser.CRElement.NodeType;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Collection;
@@ -38,7 +40,7 @@ public CMDI1_2_ProfileParser(CCRService ccrService, CRConfig crConfig, ProfileCa
 
         super(ccrService, crConfig);
 
-        String schemaString = Files.readString(Paths.get(getClass().getResource("/cmd-envelop.xsd").toURI()));
+        String schemaString = new String(new ClassPathResource("cmd-envelop.xsd").getInputStream().readAllBytes(), StandardCharsets.UTF_8);
 
         VTDGen vg = new VTDGen();
 
diff --git a/curation-cr/src/test/java/eu/clarin/cmdi/curation/cr/CRServiceTests.java b/curation-cr/src/test/java/eu/clarin/cmdi/curation/cr/CRServiceTests.java
@@ -123,7 +123,7 @@ void connectionTimeout() throws NoCRCacheEntryException, CCRServiceNotAvailableE
     }
 
     @Test
-    void nonParseableResult() throws CCRServiceNotAvailableException, PPHCacheException, NoCRCacheEntryException {
+    void nonParseableResult() throws CCRServiceNotAvailableException, PPHCacheException {
 
         this.mockServerClient
                 .when(
@@ -151,7 +151,7 @@ void nonParseableResult() throws CCRServiceNotAvailableException, PPHCacheExcept
     }
 
     @Test
-    void isPublic() throws URISyntaxException, IOException {
+    void isPublic() {
 
         this.mockServerClient
                 .when(
diff --git a/curation-web/src/test/java/eu/clarin/cmdi/curation/web/controller/BaseCtlTest.java b/curation-web/src/test/java/eu/clarin/cmdi/curation/web/controller/BaseCtlTest.java
@@ -7,11 +7,13 @@
 import org.mockserver.logging.MockServerLogger;
 import org.mockserver.socket.tls.KeyStoreFactory;
 import org.mockserver.springtest.MockServerTest;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.web.servlet.MockMvc;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
@@ -42,7 +44,7 @@ public static void init() throws IOException {
         HttpsURLConnection.setDefaultSSLSocketFactory(new KeyStoreFactory(new MockServerLogger()).sslContext().getSocketFactory());
     }
     @BeforeEach
-    public void createExpectations() throws URISyntaxException, IOException {
+    public void createExpectations() throws IOException {
         this.mockServerClient
                 .when(
                         request()
@@ -70,7 +72,7 @@ public void createExpectations() throws URISyntaxException, IOException {
                 )
                 .respond(
                         response()
-                                .withBody(Files.readString(Paths.get(getClass().getResource("/testfiles/teiHeader.xsd").toURI())))
+                                .withBody(new String(new ClassPathResource("testfiles/teiHeader.xsd").getInputStream().readAllBytes(), StandardCharsets.UTF_8))
                 );
         this.mockServerClient
                 .when(
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.4</version>
+        <version>3.5.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>eu.clarin.cmdi</groupId>
@@ -22,7 +22,7 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <linkchecker-persistence.version>2.0.1</linkchecker-persistence.version>
-        <revision>7.4.0</revision>
+        <revision>7.5.0-SNAPSHOT</revision>
         <vlo.version>4.12.1</vlo.version>
         <vtd.version>2.11</vtd.version>
         <saxon.version>12.3</saxon.version>
@@ -82,29 +82,6 @@
                     <argLine>-XX:+EnableDynamicAgentLoading</argLine>
                 </configuration>
             </plugin>
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-caches</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${java.io.tmpdir}/ehtestcache</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>ehtestcache</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
         </plugins>
     </build>
     <repositories>

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ void connectionTimeout() throws NoCRCacheEntryException, CCRServiceNotAvailableE`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Test`
`126`		`- void nonParseableResult() throws CCRServiceNotAvailableException, PPHCacheException, NoCRCacheEntryException {`
	`126`	`+ void nonParseableResult() throws CCRServiceNotAvailableException, PPHCacheException {`
`127`	`127`
`128`	`128`	`this.mockServerClient`
`129`	`129`	`.when(`
`@@ -151,7 +151,7 @@ void nonParseableResult() throws CCRServiceNotAvailableException, PPHCacheExcept`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`@Test`
`154`		`- void isPublic() throws URISyntaxException, IOException {`
	`154`	`+ void isPublic() {`
`155`	`155`
`156`	`156`	`this.mockServerClient`
`157`	`157`	`.when(`