[FLINK-34496] Break circular dependency in static initialization

apache · Feb 23, 2024 · 2d78c10 · 2d78c10
1 parent cf5bb80
commit 2d78c10
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/...planner/src/main/java/org/apache/flink/table/planner/plan/utils/ExecNodeMetadataUtil.java b/...planner/src/main/java/org/apache/flink/table/planner/plan/utils/ExecNodeMetadataUtil.java
@@ -28,7 +28,6 @@
 import org.apache.flink.table.planner.plan.nodes.exec.ExecNode;
 import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
 import org.apache.flink.table.planner.plan.nodes.exec.MultipleExecNodeMetadata;
-import org.apache.flink.table.planner.plan.nodes.exec.serde.JsonSerdeUtil;
 import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecAsyncCalc;
 import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecCalc;
 import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecChangelogNormalize;
@@ -79,8 +78,12 @@
 import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecWindowRank;
 import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecWindowTableFunction;
 
+import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
+
 import javax.annotation.Nullable;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -232,7 +235,7 @@ public static <T extends ExecNode<?>> List<ExecNodeMetadata> extractMetadataFrom
  }
 
  private static void addToLookupMap(Class<? extends ExecNode<?>> execNodeClass) {
- if (!JsonSerdeUtil.hasJsonCreatorAnnotation(execNodeClass)) {
+ if (!hasJsonCreatorAnnotation(execNodeClass)) {
  throw new IllegalStateException(
  String.format(
  "ExecNode: %s does not implement @JsonCreator annotation on "
@@ -366,4 +369,16 @@ public int hashCode() {
  return Objects.hash(name, version);
  }
  }
+
+ /** Return true if the given class's constructors have @JsonCreator annotation, else false. */
+ static boolean hasJsonCreatorAnnotation(Class<?> clazz) {
+ for (Constructor<?> constructor : clazz.getDeclaredConstructors()) {
+ for (Annotation annotation : constructor.getAnnotations()) {
+ if (annotation instanceof JsonCreator) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
 }
diff --git a/...ner/src/test/java/org/apache/flink/table/planner/plan/utils/ExecNodeMetadataUtilTest.java b/...ner/src/test/java/org/apache/flink/table/planner/plan/utils/ExecNodeMetadataUtilTest.java
@@ -32,7 +32,6 @@
 import org.apache.flink.table.planner.plan.nodes.exec.ExecNodeMetadata;
 import org.apache.flink.table.planner.plan.nodes.exec.InputProperty;
 import org.apache.flink.table.planner.plan.nodes.exec.MultipleExecNodeMetadata;
-import org.apache.flink.table.planner.plan.nodes.exec.serde.JsonSerdeUtil;
 import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecNode;
 import org.apache.flink.table.types.logical.LogicalType;
 
@@ -239,7 +238,7 @@ void testStreamExecNodeJsonSerdeCoverage() {
  List<Class<? extends ExecNode<?>>> classesWithJsonCreatorInUnsupportedList =
  new ArrayList<>();
  for (Class<? extends ExecNode<?>> clazz : subClasses) {
- boolean hasJsonCreator = JsonSerdeUtil.hasJsonCreatorAnnotation(clazz);
+ boolean hasJsonCreator = ExecNodeMetadataUtil.hasJsonCreatorAnnotation(clazz);
  if (hasJsonCreator && UNSUPPORTED_JSON_SERDE_CLASSES.contains(clazz)) {
  classesWithJsonCreatorInUnsupportedList.add(clazz);
  }