modernize code using java 17 syntax #10889

MoadElfatihi · 2025-09-06T21:37:45Z

Hello,

This PR is about some changes to use jdk 17 syntaxe (no behavioral change).

Just a contribution to give a hand with ongoing codebase cleanup work 👍

Thanks

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

hibernate-github-bot · 2025-09-06T21:37:51Z

Thanks for your pull request!

This pull request does not follow the contribution rules. Could you have a look?

❌ All commit messages should start with a JIRA issue key matching pattern HHH-\d+
↳ Offending commits: [fc485f3]

› This message was automatically generated.

gavinking · 2025-09-11T04:14:16Z

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java

+			//note: datediff() is backwards on CUBRID
 			case DAY:
-				//note: datediff() is backwards on CUBRID


why this change??

ah no ! will revert it

gavinking · 2025-09-11T04:15:47Z

...rnate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java

-		else {
-			return super.castPattern( from, to );
-		}
+		return super.castPattern( from, to );


I'm not a fan of this style.

gavinking · 2025-09-11T04:17:53Z

...ects/src/main/java/org/hibernate/community/dialect/GaussDBCastingIntervalSecondJdbcType.java

-		else {
-			return this;
-		}
+		return this;


See above. Not personally a fan.

gavinking · 2025-09-11T04:22:05Z

...-dialects/src/main/java/org/hibernate/community/dialect/pagination/AltibaseLimitHandler.java

-		else {
-			return " limit " + firstParameter;
-		}
+		return " limit " + firstParameter;


Ditto. If anything I would change stuff like this to use the ... ? ... : .... operator.

gavinking · 2025-09-11T04:22:41Z

...ialects/src/main/java/org/hibernate/community/dialect/pagination/LegacyHSQLLimitHandler.java

-		else {
-			return " top " + firstParameter;
-		}
+		return " top " + firstParameter;


Another case for ?:, IMO.

gavinking · 2025-09-11T04:22:56Z

...nity-dialects/src/main/java/org/hibernate/community/dialect/pagination/RowsLimitHandler.java

-		else {
-			return " rows " + firstParameter;
-		}
+		return " rows " + firstParameter;


gavinking · 2025-09-11T04:23:44Z

...ects/src/main/java/org/hibernate/community/dialect/pagination/SQLServer2005LimitHandler.java

-		final int selectOffset = Keyword.SELECT.rootOffset( sql );
-		final int afterSelectOffset = Keyword.SELECT.endOffset( sql, selectOffset );
-		final int fromOffset = Keyword.FROM.rootOffset( sql ); //TODO: what if there is no 'from' clause?!
+		final var selectOffset = Keyword.SELECT.rootOffset( sql );
+		final var afterSelectOffset = Keyword.SELECT.endOffset( sql, selectOffset );
+		final var fromOffset = Keyword.FROM.rootOffset( sql ); //TODO: what if there is no 'from' clause?!

-		boolean hasCommonTables = Keyword.WITH.occursAt( sql, 0 );
-		boolean hasOrderBy = Keyword.ORDER_BY.rootOffset( sql ) > 0;
-		boolean hasFirstRow = hasFirstRow( limit );
+		var hasCommonTables = Keyword.WITH.occursAt( sql, 0 );
+		var hasOrderBy = Keyword.ORDER_BY.rootOffset( sql ) > 0;
+		var hasFirstRow = hasFirstRow( limit );


I don't think there's any benefit to changing int or boolean to var. Let's not use var for primitive types.

gavinking · 2025-09-11T04:24:00Z

...ects/src/main/java/org/hibernate/community/dialect/pagination/SQLServer2005LimitHandler.java

 			}
 			else {
-				final int firstPosition = jdbcParameterCount + 1 + ( topAdded ? 1 : 0 );
+				final var firstPosition = jdbcParameterCount + 1 + ( topAdded ? 1 : 0 );


gavinking

OK, thanks.

Many of these changes I like, but:

I'm not at all a fan of getting rid of else everywhere. To me this just disrupts the symmetry of the code. I mean false and true are symmetric, why should true be more nested? I do, on the other hand, like the ?: operator, which feels more "functional" to me.
I have not generally been replacing everything with var. I'm usually just doing it for longer type names and especially generic types. I definitely don't want to go through the whole code base and replace primitives, String, Integer, and Object with var everywhere. That just doesn't buy us anything, really. So for consistency, I would prefer that we avoid var in those "trivial" cases.
I have not been writing instanceof final because it has too much tendency to make long if conditions even longer. For consistency across the code base, let's stick with just instanceof.

MoadElfatihi · 2025-09-14T19:39:37Z

OK, thanks.

Many of these changes I like, but:

I'm not at all a fan of getting rid of else everywhere. To me this just disrupts the symmetry of the code. I mean false and true are symmetric, why should true be more nested? I do, on the other hand, like the ?: operator, which feels more "functional" to me.

I have not generally been replacing everything with var. I'm usually just doing it for longer type names and especially generic types. I definitely don't want to go through the whole code base and replace primitives, String, Integer, and Object with var everywhere. That just doesn't buy us anything, really. So for consistency, I would prefer that we avoid var in those "trivial" cases.

I have not been writing instanceof final because it has too much tendency to make long if conditions even longer. For consistency across the code base, let's stick with just instanceof.

Dear @gavinking ,

Thank you for the attention you gave to this PR and sorry for the extra mental load it might have caused.
I really appreciate your detailed feedback and I update the PR accordingly:

Restore the else blocks for clarity and symmetry.
Limit the use of var to cases where it improves readability ( I had noticed one of your commits titled "use more var", and I misunderstood it as a more general guideline. Thanks for clarifying the intended scope)
Avoid instanceof final and stick to plain instanceof for consistency.

Thanks @gavinking 🙏

gavinking reviewed Sep 11, 2025

View reviewed changes

gavinking requested changes Sep 11, 2025

View reviewed changes

MoadElfatihi force-pushed the minor-cleanup branch from 55140f5 to e968b15 Compare September 14, 2025 16:24

MoadElfatihi marked this pull request as draft September 14, 2025 16:50

MoadElfatihi force-pushed the minor-cleanup branch from 3b31d77 to 2b44e52 Compare September 14, 2025 18:50

MoadElfatihi marked this pull request as ready for review September 14, 2025 18:52

MoadElfatihi marked this pull request as draft September 14, 2025 19:04

modernize code using java 17 syntax

fc485f3

MoadElfatihi force-pushed the minor-cleanup branch from 2b44e52 to fc485f3 Compare September 14, 2025 19:23

MoadElfatihi marked this pull request as ready for review September 14, 2025 19:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

modernize code using java 17 syntax #10889

modernize code using java 17 syntax #10889

Uh oh!

MoadElfatihi commented Sep 6, 2025 •

edited

Loading

Uh oh!

hibernate-github-bot bot commented Sep 6, 2025 •

edited

Loading

Uh oh!

gavinking Sep 11, 2025

Uh oh!

MoadElfatihi Sep 14, 2025 •

edited

Loading

Uh oh!

gavinking Sep 11, 2025

Uh oh!

gavinking Sep 11, 2025

Uh oh!

gavinking Sep 11, 2025

Uh oh!

gavinking Sep 11, 2025

Uh oh!

gavinking Sep 11, 2025

Uh oh!

gavinking Sep 11, 2025

Uh oh!

gavinking Sep 11, 2025

Uh oh!

gavinking left a comment

Uh oh!

MoadElfatihi commented Sep 14, 2025

Uh oh!

Uh oh!

Uh oh!

modernize code using java 17 syntax #10889

Are you sure you want to change the base?

modernize code using java 17 syntax #10889

Uh oh!

Conversation

MoadElfatihi commented Sep 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Thanks

Uh oh!

hibernate-github-bot bot commented Sep 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MoadElfatihi Sep 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gavinking left a comment

Choose a reason for hiding this comment

Uh oh!

MoadElfatihi commented Sep 14, 2025

Uh oh!

Uh oh!

MoadElfatihi commented Sep 6, 2025 •

edited

Loading

hibernate-github-bot bot commented Sep 6, 2025 •

edited

Loading

MoadElfatihi Sep 14, 2025 •

edited

Loading