@@ -52,20 +52,20 @@ public static void enhance(
52
52
}
53
53
final Enhancer enhancer = generateEnhancer ( classLoader , enhancementDsl );
54
54
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 );
57
57
}
58
58
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 ) {
60
60
for ( File subLocation : dir .listFiles () ) {
61
61
if ( subLocation .isDirectory () ) {
62
- discoverTypes ( classesDir , subLocation , enhancer , logger , fileOperations );
62
+ discoverTypes ( classesDir , subLocation , enhancer , fileOperations );
63
63
}
64
64
else if ( subLocation .isFile () && subLocation .getName ().endsWith ( ".class" ) ) {
65
65
final String className = determineClassName ( classesDir , subLocation );
66
66
final long lastModified = subLocation .lastModified ();
67
67
68
- discoverTypes ( subLocation , className , enhancer , logger );
68
+ discoverTypes ( subLocation , className , enhancer );
69
69
70
70
final boolean timestampReset = subLocation .setLastModified ( lastModified );
71
71
if ( !timestampReset ) {
@@ -76,10 +76,10 @@ else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
76
76
}
77
77
}
78
78
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 ) {
80
80
for ( File subLocation : dir .listFiles () ) {
81
81
if ( subLocation .isDirectory () ) {
82
- doEnhancement ( classesDir , subLocation , enhancer , logger , fileOperations , classesToEnhance );
82
+ doEnhancement ( classesDir , subLocation , enhancer , fileOperations , classesToEnhance );
83
83
}
84
84
else if ( subLocation .isFile () && subLocation .getName ().endsWith ( ".class" ) ) {
85
85
final String className = determineClassName ( classesDir , subLocation );
@@ -89,7 +89,7 @@ else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
89
89
continue ;
90
90
}
91
91
92
- enhance ( subLocation , className , enhancer , logger );
92
+ enhance ( subLocation , className , enhancer );
93
93
94
94
final boolean timestampReset = subLocation .setLastModified ( lastModified );
95
95
if ( !timestampReset ) {
@@ -103,8 +103,7 @@ else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
103
103
private static void discoverTypes (
104
104
File javaClassFile ,
105
105
String className ,
106
- Enhancer enhancer ,
107
- Logger logger ) {
106
+ Enhancer enhancer ) {
108
107
try {
109
108
enhancer .discoverTypes ( className , Files .readAllBytes ( javaClassFile .toPath () ) );
110
109
logger .info ( "Successfully discovered types for class : " + className );
@@ -117,11 +116,10 @@ private static void discoverTypes(
117
116
private static void enhance (
118
117
File javaClassFile ,
119
118
String className ,
120
- Enhancer enhancer ,
121
- Logger logger ) {
119
+ Enhancer enhancer ) {
122
120
final byte [] enhancedBytecode = doEnhancement ( javaClassFile , className , enhancer );
123
121
if ( enhancedBytecode != null ) {
124
- writeOutEnhancedClass ( enhancedBytecode , javaClassFile , logger );
122
+ writeOutEnhancedClass ( enhancedBytecode , javaClassFile );
125
123
logger .info ( "Successfully enhanced class : " + className );
126
124
}
127
125
else {
@@ -176,7 +174,7 @@ public boolean doExtendedEnhancement(UnloadedClass classDescriptor) {
176
174
return buildDefaultBytecodeProvider ().getEnhancer ( enhancementContext );
177
175
}
178
176
179
- private static void writeOutEnhancedClass (byte [] enhancedBytecode , File file , Logger logger ) {
177
+ private static void writeOutEnhancedClass (byte [] enhancedBytecode , File file ) {
180
178
try {
181
179
if ( file .delete () ) {
182
180
if ( !file .createNewFile () ) {
0 commit comments