Skip to content

Commit e5c3c71

Browse files
authored
feature: add from first reference to ResourceID too (#846)
1 parent c43965e commit e5c3c71

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

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

+10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ public static ResourceID fromResource(HasMetadata resource) {
1313
resource.getMetadata().getNamespace());
1414
}
1515

16+
public static Optional<ResourceID> fromFirstOwnerReference(HasMetadata resource) {
17+
var ownerReferences = resource.getMetadata().getOwnerReferences();
18+
if (!ownerReferences.isEmpty()) {
19+
return Optional.of(new ResourceID(ownerReferences.get(0).getName(),
20+
resource.getMetadata().getNamespace()));
21+
} else {
22+
return Optional.empty();
23+
}
24+
}
25+
1626
private final String name;
1727
private final String namespace;
1828

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/Mappers.java

+2-9
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,8 @@ public static <T extends HasMetadata> PrimaryResourcesRetriever<T> fromLabel(
3030
}
3131

3232
public static <T extends HasMetadata> PrimaryResourcesRetriever<T> fromOwnerReference() {
33-
return resource -> {
34-
var ownerReferences = resource.getMetadata().getOwnerReferences();
35-
if (!ownerReferences.isEmpty()) {
36-
return Set.of(new ResourceID(ownerReferences.get(0).getName(),
37-
resource.getMetadata().getNamespace()));
38-
} else {
39-
return Collections.emptySet();
40-
}
41-
};
33+
return resource -> ResourceID.fromFirstOwnerReference(resource).map(Set::of)
34+
.orElse(Collections.emptySet());
4235
}
4336

4437
private static <T extends HasMetadata> PrimaryResourcesRetriever<T> fromMetadata(

0 commit comments

Comments
 (0)