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

Changes for Upgrade to Java 11 #194 #196

Merged
merged 6 commits into from
Aug 27, 2020

Conversation

phosphorbronze50
Copy link

@phosphorbronze50 phosphorbronze50 commented Aug 24, 2020

Please review the changes to Koryphe to bring the code up to Java 11 level.

Java version has been set to 11.
All plugins and dependencies have been moved up to the most recent stable release versions (ignoring release candidates and very recent versions with low usage figures).

Checkstyle has been brought up to the most recent version. This has necessitated some changes to the checkstyle.xml configuration file to eliminate deprecated options.
Where checkstyle modules have been tightened up some main code code changes have been made to allow the checkstyle checks to pass - these are mainly RedundantModifier module checks for the 'final' modifier.

There has been no attempt to (Java 9) modularise Koryphe at this time.

@codecov-commenter
Copy link

Codecov Report

Merging #196 into develop will increase coverage by 0.31%.
The diff coverage is 98.03%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop     #196      +/-   ##
=============================================
+ Coverage      73.65%   73.96%   +0.31%     
+ Complexity      1285     1282       -3     
=============================================
  Files            184      184              
  Lines           3670     3653      -17     
  Branches         383      382       -1     
=============================================
- Hits            2703     2702       -1     
+ Misses           784      769      -15     
+ Partials         183      182       -1     
Impacted Files Coverage Δ Complexity Δ
.../koryphe/binaryoperator/KorypheBinaryOperator.java 100.00% <ø> (ø) 11.00 <0.00> (ø)
.../impl/binaryoperator/NumericAggregateFunction.java 83.33% <ø> (ø) 6.00 <0.00> (ø)
.../java/uk/gov/gchq/koryphe/signature/Signature.java 82.97% <ø> (+0.18%) 39.00 <0.00> (ø)
.../gchq/koryphe/tuple/function/KorypheFunction2.java 100.00% <ø> (ø) 2.00 <0.00> (ø)
.../gchq/koryphe/tuple/function/KorypheFunction3.java 50.00% <ø> (ø) 1.00 <0.00> (ø)
.../gchq/koryphe/tuple/function/KorypheFunction4.java 0.00% <ø> (ø) 0.00 <0.00> (ø)
.../gchq/koryphe/tuple/function/KorypheFunction5.java 0.00% <ø> (ø) 0.00 <0.00> (ø)
.../gchq/koryphe/tuple/function/KorypheFunctionN.java 33.33% <ø> (ø) 2.00 <0.00> (ø)
...chq/koryphe/tuple/predicate/KoryphePredicate2.java 100.00% <ø> (ø) 2.00 <0.00> (ø)
...chq/koryphe/tuple/predicate/KoryphePredicate3.java 0.00% <ø> (ø) 0.00 <0.00> (ø)
... and 42 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c6c1985...3ee2d5e. Read the comment docs.

Copy link
Contributor

@t11947 t11947 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I notice the final annotations have been removed from a lot of method parameters. Is this related to a change with Java 11?

@phosphorbronze50
Copy link
Author

Checkstyle has been brought up to the most recent version.
Where checkstyle modules have been tightened up some main code code changes have been made to allow the checkstyle checks to pass - these are mainly RedundantModifier module checks for the 'final' modifier.

@t11947 t11947 changed the base branch from develop to Java-11-upgrade August 27, 2020 13:44
@t11947
Copy link
Contributor

t11947 commented Aug 27, 2020

Given that this will require users to upgrade to a more recent runtime and thus effectively a breaking change, we'll merge this into a non-develop branch for the time being. This will allow for any non-breaking changes to still be made to develop and released without being blocked behind this change. Any subsequent changes to Java 11 compatible code can be cloned from/merged into that branch for the time being. I've rebased this to the new branch.

@t11947 t11947 merged commit 696cb86 into gchq:Java-11-upgrade Aug 27, 2020
@n3101 n3101 mentioned this pull request May 12, 2021
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.

3 participants