Skip to content

Commit ee45dfa

Browse files
committed
Remove unnecessary function
Leftover from previous version
1 parent 31f8645 commit ee45dfa

File tree

1 file changed

+5
-24
lines changed

1 file changed

+5
-24
lines changed

operator-framework/src/main/java/com/github/containersolutions/operator/ControllerUtils.java

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,19 @@ private static <R extends CustomResource> Class<? extends CustomResourceDoneable
4848
if (isClassInPool(className)) {
4949
return generatedCustomResourceDoneable;
5050
}
51-
String superClassName = "io.fabric8.kubernetes.client.CustomResourceDoneable";
52-
CtClass customDoneable = getOrCreateClass(className, superClassName);
53-
51+
CtClass customDoneable = null;
5452
try {
55-
CtClass customResource = pool.get(customResourceClass.getName());
53+
CtClass superClass = pool.get("io.fabric8.kubernetes.client.CustomResourceDoneable");
5654
CtClass function = pool.get("io.fabric8.kubernetes.api.builder.Function");
55+
CtClass customResource = pool.get(customResourceClass.getName());
5756
CtClass[] argTypes = {customResource, function};
57+
customDoneable = pool.makeClass(className, superClass);
5858
CtConstructor ctConstructor = CtNewConstructor.make(argTypes, null, "super($1, $2);", customDoneable);
5959
customDoneable.addConstructor(ctConstructor);
6060

6161
} catch (CannotCompileException | NotFoundException e) {
62-
log.error("Error compiling constructor for CustomResourceDoneable class: {}", e);
62+
log.error("Error creating CustomResourceDoneable CtClass: {}", e);
6363
}
64-
6564
Class<? extends CustomResourceDoneable<R>> doneableClass = getClassFromCtClass(customDoneable);
6665
generatedCustomResourceDoneable = doneableClass;
6766
return doneableClass;
@@ -77,24 +76,6 @@ private static boolean isClassInPool(String className) {
7776
}
7877
}
7978

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-
9879
private static Controller getAnnotation(ResourceController controller) {
9980
return controller.getClass().getAnnotation(Controller.class);
10081
}

0 commit comments

Comments
 (0)