Gh 2940: Merge develop into v2-alpha #2945

t92549 · 2023-05-11T16:43:19Z

Related Issue

Resolve Merge develop into v2-alpha #2940

This reverts commit 2d87bf3.

* 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: t92549 <80890692+t92549@users.noreply.github.com>

…2605) * gh-2556: Add HBaseStore deprecated tag, javadocs and note to README * gh-2556: Amend version number

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* Replace Log4j with Reload4j Also add enforcer plugin to prevent future problems

…arrying 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>

…ties - 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>

* 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

* 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

Fixed Crown Copyright Link on Line 44

* Create issue templates * Simplify bug report

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>

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

* #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>

CLAassistant · 2023-05-11T16:43:28Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
8 out of 9 committers have signed the CLA.

✅ GCHQDeveloper314
✅ t92549
✅ p3430233
✅ r32575
✅ AnirbanPatragithub
✅ kvaithin
✅ ibrijesh
✅ RobertG111
❌ Gaffer

Gaffer seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

codecov-commenter · 2023-05-11T16:54:24Z

Codecov Report

❗ No coverage uploaded for pull request base (v2-alpha@cfa9b90). Click here to learn what that means.
The diff coverage is n/a.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@             Coverage Diff             @@
##             v2-alpha    #2945   +/-   ##
===========================================
  Coverage            ?   56.12%           
  Complexity          ?     2476           
===========================================
  Files               ?      916           
  Lines               ?    32288           
  Branches            ?     3292           
===========================================
  Hits                ?    18123           
  Misses              ?    12776           
  Partials            ?     1389

GCHQDeveloper314 and others added 25 commits January 11, 2022 15:41

Update docs links in README

2d87bf3

Revert "Update docs links in README"

bcb7f9e

This reverts commit 2d87bf3.

Update links to Gaffer docs in all files (#2566)

f54e069

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

gh-2604: Deprecates Parquet (#2606)

3c1c9f3

gh-2556: Add HBaseStore deprecated tag, javadocs and note to README (#…

f8249c7

…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)

bef66a1

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

Gh-2602: Replace Log4j with Reload4j (#2609)

fb63fc2

* Replace Log4j with Reload4j Also add enforcer plugin to prevent future problems

prepare release gaffer2-1.22.0

c33d0d8

prepare for next development iteration

6a0c863

replaced to SLF4J (#2663)

bcd721e

gh-2669: Added new aggregation function endpoints (#2670)

8556c44

gh-2673: Fix links to koryphe core (#2674)

1f8b743

Gh 2705 operation details spring (#2706)

580cf2b

* 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

72240c4

Fixed Crown Copyright Link on Line 44

Gh-2776: Create issue templates (#2777)

9421d9d

* Create issue templates * Simplify bug report

GH-2845: updt class var parameter to use Map interface (#2846)

ca465ec

Co-authored-by: t92549 <80890692+t92549@users.noreply.github.com>

prepare release gaffer2-1.23.0

c1ecf5d

prepare for next development iteration

cf827c4

Merge branch 'develop' into gh-2940-merge-develop

e215066

t92549 requested a review from GCHQDeveloper314 May 11, 2023 16:43

t92549 linked an issue May 11, 2023 that may be closed by this pull request

Merge develop into v2-alpha #2940

Closed

Fix field names in ToCsv

04e44aa

t92549 marked this pull request as ready for review May 11, 2023 17:13

Refactor to string enums

cd035e7

GCHQDeveloper314 approved these changes May 12, 2023

View reviewed changes

t92549 merged commit 1bbd1dd into v2-alpha May 12, 2023
20 checks passed

t92549 deleted the gh-2940-merge-develop branch May 12, 2023 08:50

t92549 mentioned this pull request May 12, 2023

Merge develop into v2-alpha #2940

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gh 2940: Merge develop into v2-alpha #2945

Gh 2940: Merge develop into v2-alpha #2945

t92549 commented May 11, 2023 •

edited by github-actions bot

Loading

CLAassistant commented May 11, 2023 •

edited

Loading

codecov-commenter commented May 11, 2023 •

edited

Loading

Gh 2940: Merge develop into v2-alpha #2945

Gh 2940: Merge develop into v2-alpha #2945

Conversation

t92549 commented May 11, 2023 • edited by github-actions bot Loading

Related Issue

CLAassistant commented May 11, 2023 • edited Loading

codecov-commenter commented May 11, 2023 • edited Loading

Codecov Report

t92549 commented May 11, 2023 •

edited by github-actions bot

Loading

CLAassistant commented May 11, 2023 •

edited

Loading

codecov-commenter commented May 11, 2023 •

edited

Loading