Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release into master branch #3331

Merged
merged 60 commits into from
Nov 1, 2024
Merged

Merge release into master branch #3331

merged 60 commits into from
Nov 1, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Nov 1, 2024

Created by GH Action

github-actions bot and others added 30 commits August 13, 2024 16:34
* add attempt at improving readability of size method.

* add attempt at improving readability of size method and removed comments

* add tests to improve coverage of the size method

* add new test to improve coverage of the add method

* add comments to improve readability of add method.

* remove smell

* modify to suit standardisation of test assertions

* rename test using camel case

* update copyright headers

* Fix further code smells

* applied pr suggestions
* MapStore fixes and make DeleteAllData a core operation

* add test, fix typo and more improvements

* test fixes

* headers

* mvn spotless

* remove try/catch

---------

Co-authored-by: wb36499 <[email protected]>
* Adds createdAt to GraphConfig

* Asserts setCreatedAt not null

* Adds tests

* Moves creationTimestamp to Store & sets & retrieves accumulo table timestamp property, add operations handler

* Adds custom property to table, fixes comparison operator and adds tests

* Refactors accumuloProperties test - setting properties

* Adds creationTimestamp endpoint to config controller

* Aligns naming convention & start on federation

* Simplifies to return all sub graph created time

* Tiding up formatting and removing unneeded code

* More tidying

* Adds & updates tests

* Updates copyright and tests

* Reorder actual & expected

* Removes unncessary reformatting

* Fixes style errors

* Fixes assertion order

* More fixes

* Test fix

* Javadoc headers

* More test fixes

* Supported operations test fix

* Revert fix

* Updates javadoc header & test

* Resolves code smells

* Increase code coverage WIP

* Adds tests for code cov

* Copyright headers

* Adds annotations

* Code smells & style

* More tests

* Smells

* Addresses comments - test refactor & change to createdTime setting

* Chain assertions for test

* Removes commented code

---------

Co-authored-by: tb06904 <[email protected]>
* Initial files

* implement basic federated operation execution

* element aggregation based on schema

* simple test case

* tweaks and basic unit tests

* docs and unimplemented method

* add to ci

* typo

* address comments

* Add to legacy CI
* basic add graph handler

* support for federated specific ops

* update testing for operation

* test tweaks

* spotless

* address comments
* basic remove graph operation

* get all graph Ids operation

* basic unit tests

* make instances unique

* add missing dependency for legacy tests

* Update store-implementation/simple-federated-store/src/main/java/uk/gov/gchq/gaffer/federated/simple/FederatedStore.java

Co-authored-by: cn337131 <[email protected]>

---------

Co-authored-by: cn337131 <[email protected]>
* Gh-3281 add examples for /operations/execute

* swap imports

---------

Co-authored-by: wb36499 <[email protected]>
* Gh-3277 Add custom GafferPop Vertex Step

Add a fold step before each vertex step to collect all vertex ids
so the input to the new VertexStep is a list rather than single ids.
This means we can do a single Gaffer query for all ids.

Note: input seeds are essentially deduped so expected output may change

* Add ListVertexStep

change tab width

* add unit tests

* smells

* code cov

* code cov

* code cov

* iterable

* rename vertex step

* try again

---------

Co-authored-by: wb36499 <[email protected]>
* move to using the default cache

* test updates

* make cache unique to graph ID

---------

Co-authored-by: wb36499 <[email protected]>
* add ability to seed with vertex only and tests

* checkstyle

* fix

* address comments

* doc fixes

* rename

* remove space

* address comments

---------

Co-authored-by: tb06904 <[email protected]>
Co-authored-by: wb36499 <[email protected]>
* new store properties file

* allow configuring default graph ids

* allow configuring the merge operators

* test cases

* slight rename

* comment
j69772 and others added 23 commits September 19, 2024 09:31
…3301)

* add ChangeGraphId operation to poc simple  fed

* fix javadoc

* address comments

* support changing map id

* checkstyle

* remove exception

* fix

* javadoc
* fix error reporting

* add view for otel

* testing

* null check

---------

Co-authored-by: wb36499 <[email protected]>
Bumps commons-io:commons-io from 2.11.0 to 2.14.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
* slight rename of props

* allow passing a combined ops to the accumulator

* map merge method

* ability to exclude graphs from execution

---------

Co-authored-by: j69772 <[email protected]>
* add new fed store to gafferpop testing

*update to the GetAllLimit - changed to GetElementsLimit so that it applies across federated graphs

* rename

* checkstyle and fix

* address comments

* remove spans as breaking otel with seed size

* copyright

* test fix

* fix logs

---------

Co-authored-by: j69772 <[email protected]>
Co-authored-by: wb36499 <[email protected]>
* First commit. Fixing bug that would only allow String properties. This commit allows any type of object to be passed.

* Addressing CheckStyle issues.

* Correcting copyright in ElementVisibiliy.

---------

Co-authored-by: wb36499 <[email protected]>
* basic graph access system

* misc fixes and add basic testing for access

* integrate with getallgraphinfo

* basic unit tests for graph access

* configure default public

* expand access control testing

* integrate with change graph id

* tweak properties access

* add option to skip on failure

* tweak the graph info

* add helper for graphaccess

* update method call

* property name update

---------

Co-authored-by: j69772 <[email protected]>
* Change OTEL user attribute

standardise other attributes

* address comments
* bug fix, tests and schema fix

* checkstyle fixes

* typos

---------

Co-authored-by: wb36499 <[email protected]>
* add validator

* add test

* checkstyle

* copyright

* javadoc

* fix

* exception test

---------

Co-authored-by: tb06904 <[email protected]>
* better handle cache related operations

* basic testing to ensure named ops work

* sonar smells

* whitespace

* add option to let results stay separate #3118

* add option to specify to use default graph ids

* typo

* check style

---------

Co-authored-by: p29876 <[email protected]>
* Added temporary test to show inconsistency

* remove demo test showing inconsistency

* remove duplication

* Remove bug by creating new edge for matched Vertex  SOURCE

* add test to confirm changes

* remove ref to Edge id

* remove public modifier from test

* remove repeated copyright header

* remove unused import

* address comments

* disable failing integration tests - see #3314

I think the map store implementation for MatchedVertex is now correct
We need to investigate the behaviour for Accumulo

* disable test, copyright headers

* try again

* headers

---------

Co-authored-by: t92549 <[email protected]>
Co-authored-by: p29876 <[email protected]>
Co-authored-by: wb36499 <[email protected]>
* Add AbstractStoreITs to the simple fed store - including fixes

* Add GraphHooksIT error

* update store properties

* checkstyle and remove logger

* fix and rename graphs

* additional explanation of skipped tests

* add GraphAccess and update store props

* update skipped tests and fixes

* improve comment for test

---------

Co-authored-by: p29876 <[email protected]>
* allow execution to continue on sub graphs

* add recoverable states when merging schema

* quick fix to either handler

* add unit tests and changes from testing

* sonar smells

* add deprecation notices to existing federation

* copyright
Copy link

sonarqubecloud bot commented Nov 1, 2024

Copy link

codecov bot commented Nov 1, 2024

Codecov Report

Attention: Patch coverage is 87.42857% with 110 lines in your changes missing coverage. Please review.

Project coverage is 68.01%. Comparing base (1345483) to head (d265a92).
Report is 61 commits behind head on master.

Files with missing lines Patch % Lines
...v/gchq/gaffer/federated/simple/FederatedStore.java 87.37% 10 Missing and 3 partials ⚠️
...e/operation/handler/FederatedOperationHandler.java 77.77% 8 Missing and 2 partials ⚠️
...ffer/federated/simple/operation/ChangeGraphId.java 66.66% 7 Missing ⚠️
...gaffer/federated/simple/operation/RemoveGraph.java 68.18% 7 Missing ⚠️
...gchq/gaffer/rest/controller/GremlinController.java 91.78% 5 Missing and 1 partial ⚠️
...fer/federated/simple/operation/GetAllGraphIds.java 25.00% 6 Missing ⚠️
...er/federated/simple/operation/GetAllGraphInfo.java 25.00% 6 Missing ⚠️
...imple/operation/handler/SeparateOutputHandler.java 62.50% 5 Missing and 1 partial ⚠️
...derated/simple/merge/DefaultResultAccumulator.java 80.00% 2 Missing and 3 partials ⚠️
...fer/federated/simple/FederatedStoreProperties.java 42.85% 4 Missing ⚠️
... and 21 more
Additional details and impacted files
@@             Coverage Diff              @@
##             master    #3331      +/-   ##
============================================
+ Coverage     67.51%   68.01%   +0.49%     
- Complexity     2589     2596       +7     
============================================
  Files           926      955      +29     
  Lines         29778    30564     +786     
  Branches       3289     3376      +87     
============================================
+ Hits          20105    20787     +682     
- Misses         8223     8302      +79     
- Partials       1450     1475      +25     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@j69772 j69772 merged commit 31abc0e into master Nov 1, 2024
28 checks passed
@j69772 j69772 deleted the release/2.3.1 branch November 1, 2024 14:33
@tb06904 tb06904 restored the release/2.3.1 branch November 1, 2024 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants