Skip to content

Commit

Permalink
Moved free-resources.json and enables input from data folder (#598)
Browse files Browse the repository at this point in the history
Change-Id: I6bd271e7bba3cddd2d87afcaf1c50e205f585943
  • Loading branch information
margaretha committed Mar 22, 2024
1 parent 5fecd61 commit 387e468
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# version 0.73.1-SNAPSHOT

- Fixed jakarta validation error.
- Added openapi doc (#744)
- Moved service.properties to src/main/resources/properties
- Moved free-resources.json to src/main/resources/json
- Enables inputting free-resources.json from data folder


# version 0.73
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ public class FreeResourceParser {

public void run () throws IOException, KustvaktException {
InputStream is = null;
File f = new File(FREE_RESOURCE_FILE);
File f = new File("data/"+FREE_RESOURCE_FILE);
if (f.exists()) {
is = new FileInputStream(f);
}
else {
is = FreeResourceParser.class.getClassLoader()
.getResourceAsStream(FREE_RESOURCE_FILE);
.getResourceAsStream("json/"+FREE_RESOURCE_FILE);
}

JsonNode node = mapper.readTree(is);
Expand Down
File renamed without changes.

0 comments on commit 387e468

Please sign in to comment.