-
- Downloads
Merge branch 'f-select-subproperties' into 'dev'
f-select-subproperties -> dev # Summary See summary of https://gitlab.com/caosdb/caosdb-webui/-/merge_requests/72 Funny side note: this MR !47 and the issue it resolves #47 have the same number# Focus * The important changes are in `RetrieveFullEntity.java`, `EntityToElementStrategy.java` and `SetFieldStrategy.java`. * `RetrieveFullEntity.java` is responsible for the retrieval of entities and it needed additional functionality to retrieve referenced entities recursively. It does this but only if a list of `Query.Selects` is there and non-empty, because this is the case when the request is a SELECT query. * `EntityToElementStrategy.java` is responsible for the xml generation. It was kind of buggy and I did some refactoring there. * `SetFieldStrategy.java` is decides whether a property of an entity is to be included in the generated output (xml) or not. Additional functionality is added to cope with deeply nested references. * Note: I also deleted the AWI stuff, because I didn't want to refactor these classes. # Test Environment See https://gitlab.com/caosdb/caosdb-webui/-/merge_requests/72 # Check List for the Author - [x] All automated tests pass - [x] Reference related Issues - [x] Up-to-date CHANGELOG.md - [x] Annotations in code (Gitlab comments) - Intent of new code - Problems with old code - Why this implementation? # Check List for the Reviewer - [x] I understand the intent of this MR - [x] All automated tests pass - [x] Up-to-date CHANGELOG.md - [ ] The test environment setup works and the intended behavior is reproducible in the test environment - [x] In-code documentation and comments are up-to-date. - [ ] Check: Are there spezifications? Are they satisfied? For further good practices have a look at [our review guidelines](https://gitlab.com/caosdb/caosdb/-/blob/dev/REVIEW_GUIDELINES.md). See merge request caosdb/caosdb-server!47
No related branches found
No related tags found
Showing
- CHANGELOG.md 3 additions, 0 deletionsCHANGELOG.md
- caosdb-webui 1 addition, 1 deletioncaosdb-webui
- src/main/java/caosdb/server/database/backend/transaction/RetrieveFullEntity.java 114 additions, 8 deletions...rver/database/backend/transaction/RetrieveFullEntity.java
- src/main/java/caosdb/server/entity/Entity.java 7 additions, 1 deletionsrc/main/java/caosdb/server/entity/Entity.java
- src/main/java/caosdb/server/entity/EntityInterface.java 4 additions, 0 deletionssrc/main/java/caosdb/server/entity/EntityInterface.java
- src/main/java/caosdb/server/entity/container/Container.java 15 additions, 1 deletionsrc/main/java/caosdb/server/entity/container/Container.java
- src/main/java/caosdb/server/entity/container/PropertyContainer.java 26 additions, 5 deletions...ava/caosdb/server/entity/container/PropertyContainer.java
- src/main/java/caosdb/server/entity/container/TransactionContainer.java 0 additions, 9 deletions.../caosdb/server/entity/container/TransactionContainer.java
- src/main/java/caosdb/server/entity/wrapper/EntityWrapper.java 8 additions, 0 deletions...main/java/caosdb/server/entity/wrapper/EntityWrapper.java
- src/main/java/caosdb/server/entity/xml/DomainToElementStrategy.java 15 additions, 2 deletions...ava/caosdb/server/entity/xml/DomainToElementStrategy.java
- src/main/java/caosdb/server/entity/xml/EntityToElementStrategy.java 100 additions, 44 deletions...ava/caosdb/server/entity/xml/EntityToElementStrategy.java
- src/main/java/caosdb/server/entity/xml/ParentToElementStrategy.java 16 additions, 5 deletions...ava/caosdb/server/entity/xml/ParentToElementStrategy.java
- src/main/java/caosdb/server/entity/xml/SetFieldStrategy.java 49 additions, 5 deletionssrc/main/java/caosdb/server/entity/xml/SetFieldStrategy.java
- src/main/java/caosdb/server/jobs/extension/JobException.java 0 additions, 42 deletionssrc/main/java/caosdb/server/jobs/extension/JobException.java
- src/main/java/caosdb/server/jobs/extension/SQLiteTransaction.java 0 additions, 172 deletions.../java/caosdb/server/jobs/extension/SQLiteTransaction.java
- src/main/java/caosdb/server/query/Query.java 3 additions, 1 deletionsrc/main/java/caosdb/server/query/Query.java
- src/test/java/caosdb/server/database/backend/transaction/RetrieveFullEntityTest.java 79 additions, 0 deletions.../database/backend/transaction/RetrieveFullEntityTest.java
- src/test/java/caosdb/server/entity/SelectionTest.java 59 additions, 10 deletionssrc/test/java/caosdb/server/entity/SelectionTest.java
- src/test/java/caosdb/server/entity/container/PropertyContainerTest.java 80 additions, 0 deletions...caosdb/server/entity/container/PropertyContainerTest.java
- src/test/java/caosdb/server/entity/xml/PropertyToElementStrategyTest.java 105 additions, 0 deletions...osdb/server/entity/xml/PropertyToElementStrategyTest.java
Loading
Please register or sign in to comment