File tree Expand file tree Collapse file tree 2 files changed +13
-7
lines changed
main/java/io/javaoperatorsdk/operator
test/java/io/javaoperatorsdk/operator Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -13,13 +13,17 @@ static String getFinalizer(ResourceController controller) {
13
13
if (!Controller .NULL .equals (annotationFinalizerName )) {
14
14
return annotationFinalizerName ;
15
15
}
16
+ return getDefaultFinalizerIdentifier (controller );
17
+ }
18
+
19
+ static String getDefaultFinalizerIdentifier (ResourceController controller ) {
16
20
return controller .getClass ().getCanonicalName () + FINALIZER_NAME_SUFFIX ;
17
21
}
18
-
22
+
19
23
static boolean getGenerationEventProcessing (ResourceController controller ) {
20
24
return getAnnotation (controller ).generationAwareEventProcessing ();
21
25
}
22
-
26
+
23
27
static <R extends CustomResource > Class <R > getCustomResourceClass (ResourceController <R > controller ) {
24
28
return (Class <R >) getAnnotation (controller ).customResourceClass ();
25
29
}
Original file line number Diff line number Diff line change 9
9
import org .junit .jupiter .api .Assertions ;
10
10
import org .junit .jupiter .api .Test ;
11
11
12
- import static org .junit .jupiter .api .Assertions .*;
12
+ import static org .junit .jupiter .api .Assertions .assertEquals ;
13
+ import static org .junit .jupiter .api .Assertions .assertFalse ;
13
14
14
15
class ControllerUtilsTest {
15
16
16
17
public static final String CUSTOM_FINALIZER_NAME = "a.custom/finalizer" ;
17
18
18
19
@ Test
19
20
public void returnsValuesFromControllerAnnotationFinalizer () {
20
- Assertions .assertEquals (TestCustomResourceController .CRD_NAME + "/finalizer" , ControllerUtils .getFinalizer (new TestCustomResourceController (null )));
21
- assertEquals (TestCustomResource .class , ControllerUtils .getCustomResourceClass (new TestCustomResourceController (null )));
22
- Assertions .assertEquals (TestCustomResourceController .CRD_NAME , ControllerUtils .getCrdName (new TestCustomResourceController (null )));
23
- assertFalse (ControllerUtils .getGenerationEventProcessing (new TestCustomResourceController (null )));
21
+ final TestCustomResourceController controller = new TestCustomResourceController (null );
22
+ Assertions .assertEquals (ControllerUtils .getDefaultFinalizerIdentifier (controller ), ControllerUtils .getFinalizer (controller ));
23
+ assertEquals (TestCustomResource .class , ControllerUtils .getCustomResourceClass (controller ));
24
+ Assertions .assertEquals (TestCustomResourceController .CRD_NAME , ControllerUtils .getCrdName (controller ));
25
+ assertFalse (ControllerUtils .getGenerationEventProcessing (controller ));
24
26
}
25
27
26
28
@ Controller (crdName = "test.crd" , customResourceClass = TestCustomResource .class , finalizerName = CUSTOM_FINALIZER_NAME )
You can’t perform that action at this time.
0 commit comments