Commit 649d4808 authored Feb 2, 2022 by Cornelia Michlits

Merge branch 'dev' into 104-ontology

Former-commit-id: e103d23e

parents fc0cda54 68f0e1fe

Branches

Tags

1 merge request!42Fixed the query service tests

Show whitespace changes

Inline Side-by-side

Showing

docker-compose.yml 35 additions, 20 deletions

docker-compose.yml
fda-gateway-service/gateway/src/main/java/at/tuwien/gatewayservice/config/GatewayConfig.java 1 addition, 1 deletion

...n/java/at/tuwien/gatewayservice/config/GatewayConfig.java
fda-identifier-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java 92 additions, 26 deletions

...src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
fda-identifier-service/rest-service/src/main/java/at/tuwien/endpoints/PersistenceEndpoint.java 42 additions, 0 deletions

...rc/main/java/at/tuwien/endpoints/PersistenceEndpoint.java
fda-identifier-service/rest-service/src/main/resources/application-docker.yml 2 additions, 2 deletions

...ce/rest-service/src/main/resources/application-docker.yml
fda-identifier-service/rest-service/src/main/resources/application.yml 2 additions, 2 deletions

...r-service/rest-service/src/main/resources/application.yml
fda-identifier-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java 126 additions, 90 deletions

...ce/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
fda-identifier-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java 17 additions, 16 deletions

...a/at/tuwien/service/IdentifierServiceIntegrationTest.java
fda-identifier-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceUnitTest.java 7 additions, 7 deletions

...est/java/at/tuwien/service/IdentifierServiceUnitTest.java
fda-identifier-service/services/src/main/java/at/tuwien/gateway/impl/QueryServiceGatewayImpl.java 4 additions, 2 deletions

.../java/at/tuwien/gateway/impl/QueryServiceGatewayImpl.java
fda-identifier-service/services/src/main/java/at/tuwien/mapper/IdentifierMapper.java 5 additions, 1 deletion

...ices/src/main/java/at/tuwien/mapper/IdentifierMapper.java
fda-identifier-service/services/src/main/java/at/tuwien/service/IdentifierService.java 28 additions, 7 deletions

...es/src/main/java/at/tuwien/service/IdentifierService.java
fda-identifier-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java 19 additions, 6 deletions

...in/java/at/tuwien/service/impl/IdentifierServiceImpl.java
fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/ExecuteStatementDto.java 13 additions, 1 deletion

...ava/at/tuwien/api/database/query/ExecuteStatementDto.java
fda-metadata-db/api/src/main/java/at/tuwien/api/database/query/QueryDto.java 9 additions, 4 deletions

.../src/main/java/at/tuwien/api/database/query/QueryDto.java
fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/TableCreateDto.java 2 additions, 2 deletions

...ain/java/at/tuwien/api/database/table/TableCreateDto.java
fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java 31 additions, 0 deletions

.../at/tuwien/api/database/table/columns/ColumnBriefDto.java
fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/CreatorDto.java 0 additions, 5 deletions

...pi/src/main/java/at/tuwien/api/identifier/CreatorDto.java
fda-metadata-db/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java 5 additions, 4 deletions

...src/main/java/at/tuwien/api/identifier/IdentifierDto.java
fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java 5 additions, 2 deletions

...c/main/java/at/tuwien/entities/identifier/Identifier.java

with 445 additions and 198 deletions

Please to comment