Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
1f157d3
Feature: Added update schema only on changes
SeanBerrieHRI Oct 20, 2025
fcc3116
Fix: fixed filterSchemasToUpdate_TaskIsInsert_TastIsFiltered test
SeanBerrieHRI Oct 20, 2025
cd4a9ad
Feat: Added improved error handling for reading and mapping of Proper…
SeanBerrieHRI Oct 22, 2025
a7dbf61
feat: compare schema before update and improve testability of code
PatrickDekkerHealthRI Oct 22, 2025
6e6f0a5
Feat: Added improved error handling for reading and formatting proper…
SeanBerrieHRI Oct 22, 2025
b35efcf
Merge remote-tracking branch 'origin/feature-compare-schema-before-up…
SeanBerrieHRI Oct 22, 2025
7281e57
Merged: merged with feature-compare-schema-before-update
SeanBerrieHRI Oct 22, 2025
a53fd28
Merged: merged with feature-compare-schema-before-update
SeanBerrieHRI Oct 23, 2025
c15aa91
Refactor: Code simplified and improved readability and maintainability.
SeanBerrieHRI Oct 24, 2025
5954441
refactor: general improvements
SeanBerrieHRI Oct 28, 2025
a0f0e6f
feature: added spring-boot-starter for enabling dependency injection
SeanBerrieHRI Oct 28, 2025
e7f2cf0
Refactor: added interface for FdpClient and seperated business logic …
SeanBerrieHRI Oct 29, 2025
6465486
Refactor: Moved request body generator from DTO to Client and added a…
SeanBerrieHRI Oct 29, 2025
f58846f
fix: replaced client dependencies with service and added ignore unuse…
SeanBerrieHRI Oct 30, 2025
0aabf53
refactor: Removed ResourceMap, ShapeMap and ObjectMap because of unne…
SeanBerrieHRI Oct 30, 2025
a53c102
refactor: added Resource and Shape Task domain and service
SeanBerrieHRI Nov 3, 2025
8df1832
refactor: Split resourceUpdateInsertTask into service and domain layer
SeanBerrieHRI Nov 3, 2025
b6ea53a
refactor: refactored SchemaTool logic to SchemaToolService
SeanBerrieHRI Nov 3, 2025
852aeb8
refactor: Added interfaces
SeanBerrieHRI Nov 4, 2025
f47ca52
refactor: added handler for createTask null on map search handling
SeanBerrieHRI Nov 4, 2025
95f0477
refactor: moved Version.java and removed unused imports and whitespaces
SeanBerrieHRI Nov 4, 2025
4b3d069
refactor: moved FdpService and added service annotations to each service
SeanBerrieHRI Nov 4, 2025
4e4564e
feature: initial commit for create task unit test
SeanBerrieHRI Nov 4, 2025
06624c3
tests: added dummy data from fdp schemas and resources and all edge c…
SeanBerrieHRI Nov 5, 2025
5eee6d8
tests: added all test scenarios for ResourceTaskService
SeanBerrieHRI Nov 10, 2025
d9eebf6
tests: Added all tests for ShapeTaskService
SeanBerrieHRI Nov 10, 2025
45e4540
fix: null on properties.schemasToPushblish because of @JsonIgnore
SeanBerrieHRI Nov 10, 2025
4ea0132
refactor: improved reusability for ResourceTaskServiceTest.java
SeanBerrieHRI Nov 10, 2025
e28bd49
fix: fixed ResourceTaskService giving incorrect resource task exists
SeanBerrieHRI Nov 10, 2025
209c7af
fix: fixed properties file for tests and added more asserts for task.…
SeanBerrieHRI Nov 10, 2025
9afba25
refactor: Split getSchemaUUID and getResourceInfo functions from crea…
SeanBerrieHRI Nov 11, 2025
e028a02
Fix: fixed getParentResourceInfo giving the correct childUuid
SeanBerrieHRI Nov 11, 2025
026e55b
refactor: moved records used by ResourceTaskService to the top of the…
SeanBerrieHRI Nov 11, 2025
ed18c03
feature: Added tests for getParentResourceInfo
SeanBerrieHRI Nov 12, 2025
04a7451
fix: added multiple properties data getters for better testing across…
SeanBerrieHRI Nov 12, 2025
fdd7b2f
feature: added test AllPropertyResourcesFoundInFdpResourceInfoMap_Whe…
SeanBerrieHRI Nov 12, 2025
251c78c
fix: fixed all tests
SeanBerrieHRI Nov 12, 2025
deef7f7
fix: moved properties back to constructor
SeanBerrieHRI Nov 12, 2025
75d33e9
feature: added update settings
SeanBerrieHRI Nov 26, 2025
9465cc6
refactor: Improvements on merging sources fromn existing FDP settings…
SeanBerrieHRI Nov 26, 2025
242f35a
feat: Added test cases
SeanBerrieHRI Nov 26, 2025
f568023
fix: resource merge
SeanBerrieHRI Dec 2, 2025
20e2e7b
fix: Test removed for duplicate resources in FdpSettings
SeanBerrieHRI Dec 2, 2025
86bfd1e
refactor: improved exception handling logging and InterruptedExceptio…
SeanBerrieHRI Jan 6, 2026
3646005
Refactor: change client request headers to use constants
SeanBerrieHRI Jan 7, 2026
a024a6c
refactor: improved error logging and handling and changed HttpHeader …
SeanBerrieHRI Jan 8, 2026
3716441
Merge branch 'feature/clean-up-tasks' into feature/update-settings-au…
SeanBerrieHRI Jan 16, 2026
c949fae
refactor: merge with feature/clean-up-tasks
SeanBerrieHRI Jan 16, 2026
7f3d436
refactor: improve exception handling for updating and getting settings
SeanBerrieHRI Jan 16, 2026
035f335
refactor: add "Dto" to class and filename of dto objects and removed …
SeanBerrieHRI Jan 19, 2026
0577dfd
refactor: add "Dto" to class and filename of dto objects.
SeanBerrieHRI Jan 19, 2026
7dcdbf2
fix: duplicate autocomplete form sources being saved fixed. Settings …
SeanBerrieHRI Jan 19, 2026
ddfc7c8
refactor: remove preset form sources from FdpSettings.json
SeanBerrieHRI Jan 22, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions FdpSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"forms": {
"autocomplete": {
"searchNamespace": true,
"sources": [
Comment thread
SeanBerrieHRI marked this conversation as resolved.
]
}
}
}
2 changes: 1 addition & 1 deletion Properties.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ outputRoot: "C:\\Users\\PatrickDekker(Health\\IdeaProjects\\health-ri-metadata\\
Core\\"
piecesDir: "PiecesShape"
fairDataPointDir: "FairDataPointShape"
validationDir: "ValidationShape"
validationDir: "ValidationShape"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Run the tool with the required configuration file:
-i path to Properties.yaml, you can use relative location (default is ./Properties.yaml) works if the property file is
located at the some location as the jar file.

-u fdp admin user (default: albert.einstein@example.com)
-u fdpClient admin user (default: albert.einstein@example.com)

-p password (default: password)

Expand Down
23 changes: 20 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.5.18</version>
<version>1.5.19</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down Expand Up @@ -117,8 +117,6 @@
<groupId>fr.sparna.rdf.xls2rdf</groupId>
<artifactId>xls2rdf-pom</artifactId>
<version>3.2.1</version>
<!-- <scope>system</scope>-->
<!-- <systemPath>xls2rdf-lib-3.2.1.jar</systemPath>-->
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
Expand All @@ -135,6 +133,25 @@
<artifactId>poi-ooxml-schemas</artifactId>
<version>4.1.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.20.0</version>
<scope>test</scope>
</dependency>
<!-- Spring Boot starter (includes @Service, @Autowired, etc.) -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>3.5.0</version>
</dependency>

<dependency>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
<version>3.2.6</version>
</dependency>

</dependencies>
<build>
Expand Down
188 changes: 0 additions & 188 deletions src/main/java/nl/healthri/fdp/uploadschema/FDP.java

This file was deleted.

Loading