Skip to content

Commit a85ccb1

Browse files
committed
fix: more generics fixes
1 parent 421d4f8 commit a85ccb1

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

operator-framework/src/test/resources/compile-fixtures/AbstractController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import java.io.Serializable;
66

77

8-
public abstract class AbstractController<T extends CustomResource> implements Serializable,
8+
public abstract class AbstractController<T extends CustomResource<?,?>> implements Serializable,
99
ResourceController<T> {
1010

11-
public static class MyCustomResource extends CustomResource {
11+
public static class MyCustomResource extends CustomResource<Void,Void> {
1212

1313
}
1414
}

operator-framework/src/test/resources/compile-fixtures/AdditionalControllerInterface.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.io.Serializable;
66

77

8-
public interface AdditionalControllerInterface<R, T extends CustomResource> extends
8+
public interface AdditionalControllerInterface<R, T extends CustomResource<?,?>> extends
99
Serializable,
1010
ResourceController<T> {
1111
}

operator-framework/src/test/resources/compile-fixtures/ControllerImplemented2Interfaces.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@Controller
1212
public class ControllerImplemented2Interfaces implements Serializable, ResourceController<ControllerImplemented2Interfaces.MyCustomResource> {
1313

14-
public static class MyCustomResource extends CustomResource {
14+
public static class MyCustomResource extends CustomResource<Void,Void> {
1515
}
1616

1717
@Override

operator-framework/src/test/resources/compile-fixtures/MultilevelAbstractController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.io.Serializable;
55

66

7-
public abstract class MultilevelAbstractController<R, T extends CustomResource> implements
7+
public abstract class MultilevelAbstractController<R, T extends CustomResource<?,?>> implements
88
Serializable,
99
AdditionalControllerInterface<R, T> {
1010

operator-framework/src/test/resources/compile-fixtures/MultilevelController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public class MultilevelController extends
1111
MultilevelAbstractController<String, MultilevelController.MyCustomResource> {
1212

13-
public static class MyCustomResource extends CustomResource {
13+
public static class MyCustomResource extends CustomResource<Void,Void> {
1414

1515
}
1616

0 commit comments

Comments
 (0)