Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use Editable when possible instead of reflection to infer builder #5756

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −17
Draft

feat: use Editable when possible instead of reflection to infer builder #5756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions ...s-client-api/src/main/java/io/fabric8/kubernetes/client/utils/KubernetesResourceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,10 +480,6 @@ public static <T extends HasMetadata> Class<? extends KubernetesResourceList> in
return (Class<? extends KubernetesResourceList>) loadRelated(type, "List", DefaultKubernetesResourceList.class);
}

public static <T extends HasMetadata, V extends VisitableBuilder<T, V>> Class<V> inferBuilderType(Class<T> type) {
return (Class<V>) loadRelated(type, "Builder", null);
}

private static Class<?> loadRelated(Class<?> type, String suffix, Class<?> defaultClass) {
try {
return Thread.currentThread().getContextClassLoader().loadClass(type.getName() + suffix);
Expand Down
27 changes: 14 additions & 13 deletions kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/ResourceHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package io.fabric8.kubernetes.client.impl;

import com.fasterxml.jackson.databind.util.ClassUtil;
import io.fabric8.kubernetes.api.builder.Editable;
import io.fabric8.kubernetes.api.builder.VisitableBuilder;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
Expand All @@ -34,35 +36,34 @@ class ResourceHandlerImpl<T extends HasMetadata, V extends VisitableBuilder<T, V

private final ResourceDefinitionContext context;
private final Class<T> type;
private final Class<V> builderClass;
private final Class<? extends KubernetesResourceList<T>> defaultListClass;
private final Function<Client, HasMetadataOperation<T, ?, Resource<T>>> operationConstructor;

ResourceHandlerImpl(Class<T> type, Function<Client, HasMetadataOperation<T, ?, Resource<T>>> operationConstructor) {
this.type = type;
this.context = ResourceDefinitionContext.fromResourceType(type);
this.builderClass = KubernetesResourceUtil.inferBuilderType(type);
this.defaultListClass = (Class<? extends KubernetesResourceList<T>>) KubernetesResourceUtil.inferListType(type);
this.operationConstructor = operationConstructor;
this(type, (Class<? extends KubernetesResourceList<T>>) KubernetesResourceUtil.inferListType(type), ResourceDefinitionContext.fromResourceType(type), operationConstructor);
}

ResourceHandlerImpl(Class<T> type, Class<? extends KubernetesResourceList<T>> listClass, ResourceDefinitionContext context) {
this(type, listClass, context, null);
}

private ResourceHandlerImpl(Class<T> type, Class<? extends KubernetesResourceList<T>> listClass, ResourceDefinitionContext context, Function<Client, HasMetadataOperation<T, ?, Resource<T>>> operationConstructor) {
this.type = type;
this.context = context;
this.defaultListClass = listClass;
this.builderClass = KubernetesResourceUtil.inferBuilderType(type);
this.operationConstructor = null;
this.operationConstructor = operationConstructor;
}


@Override
public V edit(T item) {
if (this.builderClass == null) {
throw new KubernetesClientException(String.format("Cannot edit %s with visitors, no builder was found", type.getName()));
if (!(item instanceof Editable)) {
throw new KubernetesClientException(String.format("Cannot edit %s with visitors as it is not Editable", type.getName()));
}
try {
return this.builderClass.getDeclaredConstructor(item.getClass()).newInstance(item);
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
| NoSuchMethodException | SecurityException e) {
final Editable<?> editable = (Editable<?>) item;
return (V) editable.edit();
} catch (ClassCastException e) {
throw KubernetesClientException.launderThrowable(e);
}
}
Expand Down