Skip to content

Commit 21b3f70

Browse files
VladoKurucbeikov
authored andcommitted
HHH-19283: Build with JDK 21 fix and logger cleanup
1 parent 16e20e4 commit 21b3f70

File tree

2 files changed

+24
-14
lines changed

2 files changed

+24
-14
lines changed

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementHelper.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@ public static void enhance(
5252
}
5353
final Enhancer enhancer = generateEnhancer( classLoader, enhancementDsl );
5454

55-
discoverTypes( classesDir, classesDir, enhancer, logger, ormDsl.getFileOperations() );
56-
doEnhancement( classesDir, classesDir, enhancer, logger, ormDsl.getFileOperations(), classesToEnhance );
55+
discoverTypes( classesDir, classesDir, enhancer, ormDsl.getFileOperations() );
56+
doEnhancement( classesDir, classesDir, enhancer, ormDsl.getFileOperations(), classesToEnhance );
5757
}
5858

59-
private static void discoverTypes(File classesDir, File dir, Enhancer enhancer, Logger logger, FileOperations fileOperations) {
59+
private static void discoverTypes(File classesDir, File dir, Enhancer enhancer, FileOperations fileOperations) {
6060
for ( File subLocation : dir.listFiles() ) {
6161
if ( subLocation.isDirectory() ) {
62-
discoverTypes( classesDir, subLocation, enhancer, logger, fileOperations );
62+
discoverTypes( classesDir, subLocation, enhancer, fileOperations );
6363
}
6464
else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
6565
final String className = determineClassName( classesDir, subLocation );
6666
final long lastModified = subLocation.lastModified();
6767

68-
discoverTypes( subLocation, className, enhancer, logger );
68+
discoverTypes( subLocation, className, enhancer);
6969

7070
final boolean timestampReset = subLocation.setLastModified( lastModified );
7171
if ( !timestampReset ) {
@@ -76,10 +76,10 @@ else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
7676
}
7777
}
7878

79-
private static void doEnhancement(File classesDir, File dir, Enhancer enhancer, Logger logger, FileOperations fileOperations, List<String> classesToEnhance) {
79+
private static void doEnhancement(File classesDir, File dir, Enhancer enhancer, FileOperations fileOperations, List<String> classesToEnhance) {
8080
for ( File subLocation : dir.listFiles() ) {
8181
if ( subLocation.isDirectory() ) {
82-
doEnhancement( classesDir, subLocation, enhancer, logger, fileOperations, classesToEnhance );
82+
doEnhancement( classesDir, subLocation, enhancer, fileOperations, classesToEnhance );
8383
}
8484
else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
8585
final String className = determineClassName( classesDir, subLocation );
@@ -89,7 +89,7 @@ else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
8989
continue;
9090
}
9191

92-
enhance( subLocation, className, enhancer, logger );
92+
enhance( subLocation, className, enhancer );
9393

9494
final boolean timestampReset = subLocation.setLastModified( lastModified );
9595
if ( !timestampReset ) {
@@ -103,8 +103,7 @@ else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
103103
private static void discoverTypes(
104104
File javaClassFile,
105105
String className,
106-
Enhancer enhancer,
107-
Logger logger) {
106+
Enhancer enhancer) {
108107
try {
109108
enhancer.discoverTypes( className, Files.readAllBytes( javaClassFile.toPath() ) );
110109
logger.info( "Successfully discovered types for class : " + className );
@@ -117,11 +116,10 @@ private static void discoverTypes(
117116
private static void enhance(
118117
File javaClassFile,
119118
String className,
120-
Enhancer enhancer,
121-
Logger logger) {
119+
Enhancer enhancer) {
122120
final byte[] enhancedBytecode = doEnhancement( javaClassFile, className, enhancer );
123121
if ( enhancedBytecode != null ) {
124-
writeOutEnhancedClass( enhancedBytecode, javaClassFile, logger );
122+
writeOutEnhancedClass( enhancedBytecode, javaClassFile );
125123
logger.info( "Successfully enhanced class : " + className );
126124
}
127125
else {
@@ -176,7 +174,7 @@ public boolean doExtendedEnhancement(UnloadedClass classDescriptor) {
176174
return buildDefaultBytecodeProvider().getEnhancer( enhancementContext );
177175
}
178176

179-
private static void writeOutEnhancedClass(byte[] enhancedBytecode, File file, Logger logger) {
177+
private static void writeOutEnhancedClass(byte[] enhancedBytecode, File file) {
180178
try {
181179
if ( file.delete() ) {
182180
if ( !file.createNewFile() ) {

tooling/hibernate-gradle-plugin/src/test/resources/projects/simple-kotlin/build.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@ dependencies {
2424
implementation 'org.hibernate.orm:hibernate-core:6.1.0.Final'
2525
}
2626

27+
java {
28+
sourceCompatibility = JavaVersion.VERSION_17
29+
targetCompatibility = JavaVersion.VERSION_17
30+
}
31+
32+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
33+
kotlinOptions {
34+
jvmTarget = "17"
35+
freeCompilerArgs += ["-Xjdk-release=17"]
36+
}
37+
}
38+
2739
hibernate {
2840
useSameVersion = false
2941
enhancement {

0 commit comments

Comments
 (0)