@@ -48,20 +48,19 @@ private static <R extends CustomResource> Class<? extends CustomResourceDoneable
48
48
if (isClassInPool (className )) {
49
49
return generatedCustomResourceDoneable ;
50
50
}
51
- String superClassName = "io.fabric8.kubernetes.client.CustomResourceDoneable" ;
52
- CtClass customDoneable = getOrCreateClass (className , superClassName );
53
-
51
+ CtClass customDoneable = null ;
54
52
try {
55
- CtClass customResource = pool .get (customResourceClass . getName () );
53
+ CtClass superClass = pool .get ("io.fabric8.kubernetes.client.CustomResourceDoneable" );
56
54
CtClass function = pool .get ("io.fabric8.kubernetes.api.builder.Function" );
55
+ CtClass customResource = pool .get (customResourceClass .getName ());
57
56
CtClass [] argTypes = {customResource , function };
57
+ customDoneable = pool .makeClass (className , superClass );
58
58
CtConstructor ctConstructor = CtNewConstructor .make (argTypes , null , "super($1, $2);" , customDoneable );
59
59
customDoneable .addConstructor (ctConstructor );
60
60
61
61
} catch (CannotCompileException | NotFoundException e ) {
62
- log .error ("Error compiling constructor for CustomResourceDoneable class : {}" , e );
62
+ log .error ("Error creating CustomResourceDoneable CtClass : {}" , e );
63
63
}
64
-
65
64
Class <? extends CustomResourceDoneable <R >> doneableClass = getClassFromCtClass (customDoneable );
66
65
generatedCustomResourceDoneable = doneableClass ;
67
66
return doneableClass ;
@@ -77,24 +76,6 @@ private static boolean isClassInPool(String className) {
77
76
}
78
77
}
79
78
80
- private static CtClass getOrCreateClass (String className , String superClassName ){
81
- CtClass customClass ;
82
- try {
83
- customClass = pool .get (className );
84
- customClass .defrost ();
85
- } catch (NotFoundException ce ) {
86
- log .info ("Class not found, creating new: {}" , className );
87
- CtClass superClass = null ;
88
- try {
89
- superClass = pool .get (superClassName );
90
- } catch (NotFoundException sce ) {
91
- log .error ("Error getting superClass: {}" , sce );
92
- }
93
- customClass = pool .makeClass (className , superClass );
94
- }
95
- return customClass ;
96
- }
97
-
98
79
private static Controller getAnnotation (ResourceController controller ) {
99
80
return controller .getClass ().getAnnotation (Controller .class );
100
81
}
0 commit comments