Skip to content

Commit db359ad

Browse files
authored
Minor fixes (#783)
* fix: remove unneeded Kind annotation and add comment where it's needed * fix: toString methods were incorrect
1 parent 2bbace6 commit db359ad

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/Event.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public ResourceID getRelatedCustomResourceID() {
1616

1717
@Override
1818
public String toString() {
19-
return "DefaultEvent{" +
19+
return "Event{" +
2020
"relatedCustomResource=" + relatedCustomResource +
2121
'}';
2222
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ResourceEvent.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ public ResourceEvent(ResourceAction action,
1515

1616
@Override
1717
public String toString() {
18-
return "CustomResourceEvent{" +
18+
return "ResourceEvent{" +
1919
"action=" + action +
20+
", associated resource id=" + getRelatedCustomResourceID() +
2021
'}';
2122
}
2223

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResource.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
import io.fabric8.kubernetes.client.CustomResource;
44
import io.fabric8.kubernetes.model.annotation.Group;
5-
import io.fabric8.kubernetes.model.annotation.Kind;
65
import io.fabric8.kubernetes.model.annotation.Version;
76

87
@Group("sample.javaoperatorsdk.io")
98
@Version("v1")
10-
@Kind("TestCustomResource")
119
public class TestCustomResource
1210
extends CustomResource<TestCustomResourceSpec, TestCustomResourceStatus> {
1311

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceV2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
@Group("sample.javaoperatorsdk.io")
99
@Version("v2")
10-
@Kind("TestCustomResource")
10+
@Kind("TestCustomResource") // this is needed to override the automatically generated kind
1111
public class TestCustomResourceV2
1212
extends CustomResource<TestCustomResourceSpec, TestCustomResourceStatus> {
1313

0 commit comments

Comments
 (0)