gh-2559 added hasTrait, its handler and corresponding tests #2561
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## develop #2561 +/- ##
=============================================
- Coverage 66.69% 66.25% -0.44%
+ Complexity 2522 2520 -2
=============================================
Files 995 864 -131
Lines 32457 27296 -5161
Branches 3936 3285 -651
=============================================
- Hits 21647 18085 -3562
+ Misses 9114 7744 -1370
+ Partials 1696 1467 -229
Continue to review full report at Codecov.
|
t92549
requested changes
Jan 11, 2022
core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/HasTraitHandlerTest.java
Outdated
Show resolved
Hide resolved
t11947
reviewed
Jan 12, 2022
core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/HasTrait.java
Outdated
Show resolved
Hide resolved
core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/HasTraitHandlerTest.java
Outdated
Show resolved
Hide resolved
t11947
approved these changes
Jan 13, 2022
t92549
requested changes
Jan 13, 2022
core/store/src/test/java/uk/gov/gchq/gaffer/store/operation/handler/HasTraitHandlerTest.java
Outdated
Show resolved
Hide resolved
t92549
approved these changes
Jan 14, 2022
t92549
added a commit
that referenced
this pull request
Jan 17, 2022
…2569) * gh-2559 added hasTrait, its handler and corresponding tests * gh-2559 amended comment in HasTrait, added additional tests for the handler * gh-2559 null check & tidy test Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> Co-authored-by: p3430233 <61738524+p3430233@users.noreply.github.com>
t92549
added a commit
that referenced
this pull request
Feb 4, 2022
* Update docs links in README * Revert "Update docs links in README" This reverts commit 2d87bf3. * gh-2559 added hasTrait, its handler and corresponding tests (#2561) * gh-2559 added hasTrait, its handler and corresponding tests * gh-2559 amended comment in HasTrait, added additional tests for the handler * gh-2559 null check & tidy test Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * Update links to Gaffer docs in all files (#2566) Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * gh-2560 GetTraitsHandler is initalised with traits dependednt on store type * gh-2560 reviewed comments * gh-2560 unused imports * gh-2560 review comments * checkstyle * gh-2560 fixed federated test * gh-2560 fixed GraphTest * gh-2560 fixed TestStore * gh-2560-getTraitsOperation (#2582) Removing redundant adding of GetTraitHandler from addAdditionalOperationHandlers() because it has its own method getGetTraitsHandler(). * gh-2560: Added fix to SingleUseMapStoreWithoutVisibilitySupport * gh-2560: Fixed Set copy issue in GetTraitsHandler constructor * gh-2560: Added extra protections to GetTraitsHandler Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> Co-authored-by: GCHQDev404 <45399082+GCHQDev404@users.noreply.github.com>
t92549
added a commit
that referenced
this pull request
Feb 23, 2022
* gh-2552: Removed deprecated code except getTraits and hasTrait * gh-2552: Fix javadoc issue * gh-2571: Fixed matchedVertex behaviour and added new ITs (#2572) * gh-2571: Fixed matchedVertex behaviour and added new ITs * gh-2571: Fixed checkstyle * gh-2571: Updated test name * gh-2573: Replace hasTrait usages with Operation (#2574) * gh-2573: Replace hasTrait usages with Operation * gh-2573: Fix tests by making exception more explicit * gh-2573: Fixed exception issues * gh-2573: Simplified but still failing test * gh-2573: Changed to user * gh-2573: Changed FederatedGetTraitsHandler to return DYNAMIC_SCHEMA * gh-2573: Use old function for FederatedOperationChainValidator * gh-2573: Fixed FederatedStoreUtil * gh-2573: Added Deprecation notice * gh-2573: Cherry pick federated store tests fix from 2553 * Revert "gh-2573: Cherry pick federated store tests fix from 2553" This reverts commit c367555. * gh-2573: Manual fix of FederatedStoreGetTraitsTest cache * gh-2573: Changed HasTraitHandler to not send Federated loop option * Gh-2560 get traits operation configurable (#2579) * Update docs links in README * Revert "Update docs links in README" This reverts commit 2d87bf3. * gh-2559 added hasTrait, its handler and corresponding tests (#2561) * gh-2559 added hasTrait, its handler and corresponding tests * gh-2559 amended comment in HasTrait, added additional tests for the handler * gh-2559 null check & tidy test Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * Update links to Gaffer docs in all files (#2566) Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * gh-2560 GetTraitsHandler is initalised with traits dependednt on store type * gh-2560 reviewed comments * gh-2560 unused imports * gh-2560 review comments * checkstyle * gh-2560 fixed federated test * gh-2560 fixed GraphTest * gh-2560 fixed TestStore * gh-2560-getTraitsOperation (#2582) Removing redundant adding of GetTraitHandler from addAdditionalOperationHandlers() because it has its own method getGetTraitsHandler(). * gh-2560: Added fix to SingleUseMapStoreWithoutVisibilitySupport * gh-2560: Fixed Set copy issue in GetTraitsHandler constructor * gh-2560: Added extra protections to GetTraitsHandler Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> Co-authored-by: GCHQDev404 <45399082+GCHQDev404@users.noreply.github.com> * gh-2552: Removed some remaining parquet properties files * gh-2552: Review comments traits test * gh-2552-remove-deprecated MultiSerialiser (#2587) * gh-2552-remove-deprecated MultiSerialiser update the MultiSerialiser wanting to emphasise the effectiveness of it during the deprecation of serialisers. 8 is the last and best. 24 is not latest regardless of natural-order. 7 is dead. * gh-2552: MultiSerialiser spelling corrections * Update core/serialisation/src/main/java/uk/gov/gchq/gaffer/serialisation/implementation/MultiSerialiser.java Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> Co-authored-by: p3430233 <61738524+p3430233@users.noreply.github.com> Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Co-authored-by: GCHQDev404 <45399082+GCHQDev404@users.noreply.github.com>
t92549
added a commit
that referenced
this pull request
Apr 14, 2022
…le, iterator and wrapper classes (#2583) * Transferred ChainedIterable from Koryphe, added existing constructor and added a test for new constructor * Removed the Closeable and WrappedCloseable classes and refactored the iterables/iterators to use java.io.Closeable and java.lang.Iterable instead. Also amended the tests * Renamed the CloseableIterableDeserializer to the IterableDeserializer and removed the WrappedCloseableIterable. Tests function * Renamed CloseableIterable to Iterable and removed the WrappedCloseableIterable and the CloseableIterable types. Tests function * gh-2552: Removed deprecated code except getTraits and hasTrait * gh-2552: Fix javadoc issue * Renamed CloseableIterable to Iterable and removed the WrappedCloseableIterable and the CloseableIterable types. The GraphSerialisableTest test does not function * Renamed CloseableIterable to Iterable and removed the WrappedCloseableIterable and the CloseableIterable types. Tests function * Changed to try-with-resources as both io classes are auto-closeable * The TestStore.mockStore was being set in GraphTest but reset afterwards which was causing GraphSerialisableTest to fail. Reset TestStore.mockStore for both. All Graph test now pass * Renamed CloseableIterable to Iterable * gh-2571: Fixed matchedVertex behaviour and added new ITs (#2572) * gh-2571: Fixed matchedVertex behaviour and added new ITs * gh-2571: Fixed checkstyle * gh-2571: Updated test name * Changed CloseableIterable to Iterable and removed the extends Wrapper, instead implemented Iterable. Fixed tests * Converted CloseableIterable to Iterable. Fixed AbstractElementFilter bug caused by the introduction of the Koryphe version of ChainedIterable. Fixed tests * Changed EmptyClosableIterable to EmptyIterable * Changed the OperationDetailTest name-of-class from CloseableIterable to Iterable * Changed the the instances and JSON values from CloseableIterable to Iterable. Test pass * Changed the the instances of CloseableIterable to Iterable. Suppresed test class casts. Test pass * Changed from CloseableIterable to Iterable. Deleted WrappedCloseableIterable. FederatedStoreGetTraitsTest fails * FederatedStoreGetTraitsTest did not delete the cache service before carrying out each test causing it to fail when run as part of the maven tests. In isolation it passed. Found that the FederatedGraphStorageTraitsTest was also not clearing the cache. Added the before and after cache clearance and bumped the JUnit version of FederatedStoreGetTraitsTest from 4 to 5. Tests now pass * Changed from CloseableIterable to Iterable and added finally to the try blocks with a close-if-auto-closeable check * gh-2573: Replace hasTrait usages with Operation (#2574) * gh-2573: Replace hasTrait usages with Operation * gh-2573: Fix tests by making exception more explicit * gh-2573: Fixed exception issues * gh-2573: Simplified but still failing test * gh-2573: Changed to user * gh-2573: Changed FederatedGetTraitsHandler to return DYNAMIC_SCHEMA * gh-2573: Use old function for FederatedOperationChainValidator * gh-2573: Fixed FederatedStoreUtil * gh-2573: Added Deprecation notice * gh-2573: Cherry pick federated store tests fix from 2553 * Revert "gh-2573: Cherry pick federated store tests fix from 2553" This reverts commit c367555. * gh-2573: Manual fix of FederatedStoreGetTraitsTest cache * gh-2573: Changed HasTraitHandler to not send Federated loop option * Gh-2560 get traits operation configurable (#2579) * Update docs links in README * Revert "Update docs links in README" This reverts commit 2d87bf3. * gh-2559 added hasTrait, its handler and corresponding tests (#2561) * gh-2559 added hasTrait, its handler and corresponding tests * gh-2559 amended comment in HasTrait, added additional tests for the handler * gh-2559 null check & tidy test Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * Update links to Gaffer docs in all files (#2566) Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * gh-2560 GetTraitsHandler is initalised with traits dependednt on store type * gh-2560 reviewed comments * gh-2560 unused imports * gh-2560 review comments * checkstyle * gh-2560 fixed federated test * gh-2560 fixed GraphTest * gh-2560 fixed TestStore * gh-2560-getTraitsOperation (#2582) Removing redundant adding of GetTraitHandler from addAdditionalOperationHandlers() because it has its own method getGetTraitsHandler(). * gh-2560: Added fix to SingleUseMapStoreWithoutVisibilitySupport * gh-2560: Fixed Set copy issue in GetTraitsHandler constructor * gh-2560: Added extra protections to GetTraitsHandler Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> Co-authored-by: GCHQDev404 <45399082+GCHQDev404@users.noreply.github.com> * gh-2552: Removed some remaining parquet properties files * Added missed iterable try-with-resources block, reformated and tested * Reformated code. Updated test code. All tests pass * Reformated code. Updated test code. All tests pass * Reformatted code. Updated test code. All tests pass * Reformatted code. All tests pass * Fixed NamedViewCacheTest bugs and reformatted code. All tests pass * Reformatted code. All tests pass * Reformatted code. All tests pass * Reformatted code. All tests pass * Reformatted code again. All tests pass * Reformatted code. Changed the Operation ArrayUtils import to lang3 as accumulo did not have the other apache version. All tests pass * Reformatted code again. All tests pass * Reformatted code again. All tests pass * Reformatted code. All tests pass * Created Objects.isNull static import * Created Objects.isNull and Objects.nonNull static imports * Update the copyright to the correct dates * Removed unnecessary cast * Corrected an/a grammar error * Removed the incorrect spacing in the imports * Created Objects.isNull and Objects.nonNull static imports for JSONSerialiser * Removed deleted FederatedGraphStorageTraitsTest * Re-added incorrectly deleted empty line * Removed the unnecessary try-finally blocks from the LimitedIterableTest * Removed the unnecessary try-finally blocks * Removed the unused imports * Removed the unnecessary try-finally blocks Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> Co-authored-by: p3430233 <61738524+p3430233@users.noreply.github.com> Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Co-authored-by: GCHQDev404 <45399082+GCHQDev404@users.noreply.github.com>
t92549
added a commit
that referenced
this pull request
May 12, 2023
* Update docs links in README * Revert "Update docs links in README" This reverts commit 2d87bf3. * gh-2559 added hasTrait, its handler and corresponding tests (#2561) * gh-2559 added hasTrait, its handler and corresponding tests * gh-2559 amended comment in HasTrait, added additional tests for the handler * gh-2559 null check & tidy test Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * Update links to Gaffer docs in all files (#2566) Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * gh-2604: Deprecates Parquet (#2606) * gh-2556: Add HBaseStore deprecated tag, javadocs and note to README (#2605) * gh-2556: Add HBaseStore deprecated tag, javadocs and note to README * gh-2556: Amend version number * Upgrade Hazelcast version to 5.1.1 (#2612) Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * Gh-2602: Replace Log4j with Reload4j (#2609) * Replace Log4j with Reload4j Also add enforcer plugin to prevent future problems * FederatedStoreGetTraitsTest did not delete the cache service before carrying out each test causing it to fail when run as part of the maven tests. In isolation it passed. Found that the FederatedGraphStorageTraitsTest was also not clearing the cache. Added the before and after cache clearance and bumped the JUnit version of FederatedStoreGetTraitsTest from 4 to 5. Tests now pass (#2617) Co-authored-by: r32575 <63105662+r32575@users.noreply.github.com> * Gh 2562 GetElementsWithinSet not allowing for the exclusion of properties - Gaffer v1 (#2597) * Fixed bug gh-2562. View properties are now being filtered. Added tests * After a review moved the return statements inside the doPostFilter if-check and changed a conditional fail to an assertThat test * Removed the try-finally blocks as the classes implement CloseableIterable * Added failure message to test * Adjusted javadoc formatting * Removed rogue letter Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * prepare release gaffer2-1.22.0 * prepare for next development iteration * gh-2618: Cleanup inconsistent use of logging strings (#2651) * Found 1 extra inconsistency than the mentioned one * found and fixed other inconsitencies * further fixes * further fixes 2 * fixed 3 out of 4 checkstyle errors - 1 more to fix * all checkstyle errors fixed * removed use of String.format * removed another instance of using String.format * more changes * additional change * reverted changes * replaced to SLF4J (#2663) * gh-2669: Added new aggregation function endpoints (#2670) * gh-2673: Fix links to koryphe core (#2674) * Gh 2705 operation details spring (#2706) * gh-2705: Cherry pick new spring endpoint * gh-2696: Added tests for new all operation details endpoint (#2700) * gh-2696: Added tests for new all operation details endpoint * gh-2696: Spotless apply * gh-2705: Copyright fix * Gh-2745: Fix crown copyright link Fixed Crown Copyright Link on Line 44 * Gh-2776: Create issue templates (#2777) * Create issue templates * Simplify bug report * build(deps): bump hazelcast (#2848) Bumps [hazelcast](https://github.com/hazelcast/hazelcast) from 5.1.1 to 5.1.3. - [Release notes](https://github.com/hazelcast/hazelcast/releases) - [Commits](hazelcast/hazelcast@v5.1.1...v5.1.3) --- updated-dependencies: - dependency-name: com.hazelcast:hazelcast dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * GH-2845: updt class var parameter to use Map interface (#2846) Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com> * Gh-2914: Remove redundant constants class (#2927) * #2914 Issue: Remove redundant constants class * Simplify charset * Fix import * Remove erroneous use of charset with JSONSerialiser.serialise * Use StandardCharsets inbuilt function --------- Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> * prepare release gaffer2-1.23.0 * prepare for next development iteration * Fix field names in ToCsv * Refactor to string enums --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: GCHQDeveloper314 <94527357+GCHQDeveloper314@users.noreply.github.com> Co-authored-by: p3430233 <61738524+p3430233@users.noreply.github.com> Co-authored-by: r32575 <63105662+r32575@users.noreply.github.com> Co-authored-by: Gaffer <github-actions@github.com> Co-authored-by: Robert <33911814+RobertG111@users.noreply.github.com> Co-authored-by: Anirban Patra <96457415+AnirbanPatragithub@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kvaithin <68995267+kvaithin@users.noreply.github.com> Co-authored-by: Brijesh Yadav <brijeshyadavjthj@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Issue