Merge pull request #1702 from yue9944882/bugfix/java-16-inaccessible-obj-pt1

Java 16 compatibility pt1: Reducing inaccessibility impact

Author: k8s-ci-robot

spring/src/main/java/io/kubernetes/client/spring/extended/manifests/KubernetesFromConfigMapProcessor.java

@@ -54,6 +54,12 @@ public class KubernetesFromConfigMapProcessor
   public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 
     for (Field field : bean.getClass().getDeclaredFields()) {
+      // skip if the field if the FromYaml annotation is missing
+      FromConfigMap fromConfigMapAnnotation = field.getAnnotation(FromConfigMap.class);
+      if (fromConfigMapAnnotation == null) {
+        continue;
+      }
+      // injecting
       ReflectionUtils.makeAccessible(field);
       try {
         if (field.get(bean) != null) {
@@ -64,11 +70,6 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
         continue;
       }
 
-      FromConfigMap fromConfigMapAnnotation = field.getAnnotation(FromConfigMap.class);
-      if (fromConfigMapAnnotation == null) {
-        continue; // skip if the field doesn't have the annotation
-      }
-
       if (!Map.class.isAssignableFrom(field.getType())) {
         log.warn(
             "Failed inject resource for @FromConfigMap annotated field {}, the declaring type should be Map<String, String>",

spring/src/main/java/io/kubernetes/client/spring/extended/manifests/KubernetesFromYamlProcessor.java

@@ -60,6 +60,12 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
     }
 
     for (Field field : bean.getClass().getDeclaredFields()) {
+      // skip if the field if the FromYaml annotation is missing
+      fromYamlAnnotation = field.getAnnotation(FromYaml.class);
+      if (fromYamlAnnotation == null) {
+        continue; // skip if the field doesn't have the annotation
+      }
+      // injecting
       ReflectionUtils.makeAccessible(field);
       try {
         if (field.get(bean) != null) {
@@ -70,11 +76,6 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
         continue;
       }
 
-      fromYamlAnnotation = field.getAnnotation(FromYaml.class);
-      if (fromYamlAnnotation == null) {
-        continue; // skip if the field doesn't have the annotation
-      }
-
       Object loadedObj = loadFromYaml(fromYamlAnnotation.filePath());
       ReflectionUtils.setField(field, bean, loadedObj);
     }