Register fields for reflection in kubernetes-client

Signed-off-by: Jorge Solórzano <[email protected]>
quarkusio · Jul 22, 2024 · 2795649 · 2795649
1 parent 85603bd
commit 2795649
Showing 1 changed file with 10 additions and 43 deletions.
diff --git a/...ment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java b/...ment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java
@@ -1,6 +1,5 @@
 package io.quarkus.kubernetes.client.deployment;
 
-import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -10,8 +9,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
@@ -159,32 +156,23 @@ public void process(ApplicationIndexBuildItem applicationIndex, CombinedIndexBui
         Collection<ClassInfo> visitableBuilderImpls = fullIndex.getAllKnownImplementors(VISITABLE_BUILDER);
 
         // default sizes determined experimentally - these are only set in order to prevent continuous expansion of the array list
-        List<String> withoutFieldsRegistration = new ArrayList<>(
+        List<String> withFieldsRegistration = new ArrayList<>(
                 kubernetesResourceImpls.size() + kubernetesResourceListImpls.size());
-        List<String> withFieldsRegistration = new ArrayList<>(2);
         List<DotName> ignoreJsonDeserialization = new ArrayList<>(
                 kubernetesResourceImpls.size() + kubernetesResourceListImpls.size());
 
         populateReflectionRegistrationLists(kubernetesResourceImpls, watchedClasses, ignoreJsonDeserialization,
-                withoutFieldsRegistration,
                 withFieldsRegistration);
         populateReflectionRegistrationLists(kubernetesResourceListImpls, watchedClasses, ignoreJsonDeserialization,
-                withoutFieldsRegistration,
                 withFieldsRegistration);
         populateReflectionRegistrationLists(visitableBuilderImpls, watchedClasses, ignoreJsonDeserialization,
-                withoutFieldsRegistration,
                 withFieldsRegistration);
 
         if (!withFieldsRegistration.isEmpty()) {
             reflectiveClasses.produce(ReflectiveClassBuildItem
                     .builder(withFieldsRegistration.toArray(EMPTY_STRINGS_ARRAY)).weak(true).methods().fields()
                     .build());
         }
-        if (!withoutFieldsRegistration.isEmpty()) {
-            reflectiveClasses.produce(ReflectiveClassBuildItem
-                    .builder(withoutFieldsRegistration.toArray(EMPTY_STRINGS_ARRAY)).weak(true).methods()
-                    .build());
-        }
 
         ignoredJsonDeserializationClasses.produce(new IgnoreJsonDeserializeClassBuildItem(ignoreJsonDeserialization));
 
@@ -233,9 +221,8 @@ public void process(ApplicationIndexBuildItem applicationIndex, CombinedIndexBui
                     .sorted()
                     .collect(Collectors.joining("\n"));
             log.debugv("Watched Classes:\n{0}", watchedClassNames);
-            List<String> modelClasses = new ArrayList<>(withFieldsRegistration.size() + withoutFieldsRegistration.size());
+            List<String> modelClasses = new ArrayList<>(withFieldsRegistration.size());
             modelClasses.addAll(withFieldsRegistration);
-            modelClasses.addAll(withoutFieldsRegistration);
             Collections.sort(modelClasses);
             log.debugv("Model Classes:\n{0}", String.join("\n", modelClasses));
         }
@@ -254,35 +241,15 @@ public void process(ApplicationIndexBuildItem applicationIndex, CombinedIndexBui
     private static void populateReflectionRegistrationLists(Collection<ClassInfo> kubernetesResourceImpls,
             Set<DotName> watchedClasses,
             List<DotName> ignoredJsonDeserializationClasses,
-            List<String> withoutFieldsRegistration,
             List<String> withFieldsRegistration) {
-        kubernetesResourceImpls
-                .stream()
-                .peek(c -> {
-                    // we need to make sure that the Jackson extension does not try to fully register the model classes
-                    // since we are going to register them weakly
-                    ignoredJsonDeserializationClasses.add(c.name());
-                })
-                .filter(c -> !watchedClasses.contains(c.name()))
-                .map(c -> {
-                    boolean registerFields = false;
-                    List<AnnotationInstance> jsonFormatInstances = c.annotationsMap().get(JSON_FORMAT);
-                    if (jsonFormatInstances != null) {
-                        for (AnnotationInstance jsonFormatInstance : jsonFormatInstances) {
-                            if (jsonFormatInstance.target().kind() == AnnotationTarget.Kind.FIELD) {
-                                registerFields = true;
-                                break;
-                            }
-                        }
-                    }
-                    return new AbstractMap.SimpleEntry<>(c.name(), registerFields);
-                }).forEach(e -> {
-                    if (e.getValue()) {
-                        withFieldsRegistration.add(e.getKey().toString());
-                    } else {
-                        withoutFieldsRegistration.add(e.getKey().toString());
-                    }
-                });
+        for (ClassInfo resource : kubernetesResourceImpls) {
+            // we need to make sure that the Jackson extension does not try to fully
+            // register the model classes since we are going to register them weakly
+            ignoredJsonDeserializationClasses.add(resource.name());
+            if (!watchedClasses.contains(resource.name())) {
+                withFieldsRegistration.add(resource.name().toString());
+            }
+        }
     }
 
     private void findWatchedClasses(final DotName implementedOrExtendedClass,