further fix for Timbuctoo

arcuri82 · arcuri82 · commit 1e1ff93eefcd · 2022-01-30T11:42:03.000+01:00
diff --git a/jdk_11_maven/em/embedded/graphql/timbuctoo/src/main/java/em/embedded/nl/knaw/huygens/EmbeddedEvoMasterController.java b/jdk_11_maven/em/embedded/graphql/timbuctoo/src/main/java/em/embedded/nl/knaw/huygens/EmbeddedEvoMasterController.java
@@ -143,10 +143,10 @@ public void resetStateOfSUT() {
             //FIXME: this fails due to locks on Neo4j. need way to reset it
             //deleteDir(new File(tmpFolder));
             if(!Files.exists(Path.of(tmpFolder))) {
-                Files.createDirectory(Path.of(tmpFolder));
+                Files.createDirectories(Path.of(tmpFolder));
             }
-            Files.copy(Path.of(getClass().getClassLoader().getResource("users.json").toURI()), Path.of(tmpFolder,"users.json"), StandardCopyOption.REPLACE_EXISTING);
-            Files.copy(Path.of(getClass().getClassLoader().getResource("logins.json").toURI()), Path.of(tmpFolder,"logins.json"), StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(getClass().getClassLoader().getResourceAsStream("users.json"), Path.of(tmpFolder,"users.json"), StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(getClass().getClassLoader().getResourceAsStream("logins.json"), Path.of(tmpFolder,"logins.json"), StandardCopyOption.REPLACE_EXISTING);
         }catch (Exception e){
             throw new RuntimeException(e);
         }
diff --git a/jdk_11_maven/em/external/graphql/timbuctoo/src/main/java/em/external/nl/knaw/huygens/ExternalEvoMasterController.java b/jdk_11_maven/em/external/graphql/timbuctoo/src/main/java/em/external/nl/knaw/huygens/ExternalEvoMasterController.java
@@ -197,11 +197,11 @@ public void resetStateOfSUT() {
             //FIXME: this fails due to locks on Neo4j. need way to reset it
             //deleteDir(new File(tmpFolder));
             if(!Files.exists(Path.of(tmpFolder))) {
-                Files.createDirectory(Path.of(tmpFolder));
+                Files.createDirectories(Path.of(tmpFolder));
             }
 
-            Files.copy(Path.of(getClass().getClassLoader().getResource("users.json").toURI()), Path.of(tmpFolder,"users.json"), StandardCopyOption.REPLACE_EXISTING);
-            Files.copy(Path.of(getClass().getClassLoader().getResource("logins.json").toURI()), Path.of(tmpFolder,"logins.json"), StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(getClass().getClassLoader().getResourceAsStream("users.json"), Path.of(tmpFolder,"users.json"), StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(getClass().getClassLoader().getResourceAsStream("logins.json"), Path.of(tmpFolder,"logins.json"), StandardCopyOption.REPLACE_EXISTING);
         }catch (Exception e){
             throw new RuntimeException(e);
         }

Original file line number	Diff line number	Diff line change
`@@ -143,10 +143,10 @@ public void resetStateOfSUT() {`
`143`	`143`	`//FIXME: this fails due to locks on Neo4j. need way to reset it`
`144`	`144`	`//deleteDir(new File(tmpFolder));`
`145`	`145`	`if(!Files.exists(Path.of(tmpFolder))) {`
`146`		`- Files.createDirectory(Path.of(tmpFolder));`
	`146`	`+ Files.createDirectories(Path.of(tmpFolder));`
`147`	`147`	`}`
`148`		`- Files.copy(Path.of(getClass().getClassLoader().getResource("users.json").toURI()), Path.of(tmpFolder,"users.json"), StandardCopyOption.REPLACE_EXISTING);`
`149`		`- Files.copy(Path.of(getClass().getClassLoader().getResource("logins.json").toURI()), Path.of(tmpFolder,"logins.json"), StandardCopyOption.REPLACE_EXISTING);`
	`148`	`+ Files.copy(getClass().getClassLoader().getResourceAsStream("users.json"), Path.of(tmpFolder,"users.json"), StandardCopyOption.REPLACE_EXISTING);`
	`149`	`+ Files.copy(getClass().getClassLoader().getResourceAsStream("logins.json"), Path.of(tmpFolder,"logins.json"), StandardCopyOption.REPLACE_EXISTING);`
`150`	`150`	`}catch (Exception e){`
`151`	`151`	`throw new RuntimeException(e);`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,11 +197,11 @@ public void resetStateOfSUT() {`
`197`	`197`	`//FIXME: this fails due to locks on Neo4j. need way to reset it`
`198`	`198`	`//deleteDir(new File(tmpFolder));`
`199`	`199`	`if(!Files.exists(Path.of(tmpFolder))) {`
`200`		`- Files.createDirectory(Path.of(tmpFolder));`
	`200`	`+ Files.createDirectories(Path.of(tmpFolder));`
`201`	`201`	`}`
`202`	`202`
`203`		`- Files.copy(Path.of(getClass().getClassLoader().getResource("users.json").toURI()), Path.of(tmpFolder,"users.json"), StandardCopyOption.REPLACE_EXISTING);`
`204`		`- Files.copy(Path.of(getClass().getClassLoader().getResource("logins.json").toURI()), Path.of(tmpFolder,"logins.json"), StandardCopyOption.REPLACE_EXISTING);`
	`203`	`+ Files.copy(getClass().getClassLoader().getResourceAsStream("users.json"), Path.of(tmpFolder,"users.json"), StandardCopyOption.REPLACE_EXISTING);`
	`204`	`+ Files.copy(getClass().getClassLoader().getResourceAsStream("logins.json"), Path.of(tmpFolder,"logins.json"), StandardCopyOption.REPLACE_EXISTING);`
`205`	`205`	`}catch (Exception e){`
`206`	`206`	`throw new RuntimeException(e);`
`207`	`207`	`}`