modify process to the return value of method RecordTransformerRules.…

…loadTransformerRules()
qlangtech · Sep 7, 2024 · 42e4b3e · 42e4b3e
1 parent 5a952d4
commit 42e4b3e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/core/src/main/java/com/alibaba/datax/core/job/TransformerUtil.java b/core/src/main/java/com/alibaba/datax/core/job/TransformerUtil.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Function;
 
 /**
@@ -91,9 +92,12 @@ static TransformerBuildInfo buildTransformerInfo(IJobContainerContext containerC
         TransformerInfo transformerInfo = null;
         TransformerExecution texec = null;
         IPluginContext pluginContext = IPluginContext.namedContext(containerContext.getCollectionName());
-        RecordTransformerRules transformers = RecordTransformerRules.loadTransformerRules(
+        Optional<RecordTransformerRules> transformersOpt = RecordTransformerRules.loadTransformerRules(
                 pluginContext, tabRelevantTransformer);
-        if (CollectionUtils.isEmpty(transformers.rules)) {
+        RecordTransformerRules transformers = null;
+        if (transformersOpt == null
+                || (transformers = transformersOpt.orElseThrow(() -> new IllegalStateException("tabRelevantTransformer:" + tabRelevantTransformer + " relevant transformersOpt must be present"))) == null
+                || CollectionUtils.isEmpty(transformers.rules)) {
             throw new IllegalStateException("transformer:" + tabRelevantTransformer + " can not be empty");
         }
 
@@ -129,6 +133,11 @@ public List<IColMetaGetter> originColsWithContextParams() {
                 return transformerCfg.originColsWithContextParams();
             }
 
+            @Override
+            public List<IColMetaGetter> tranformerColsWithoutContextParams() {
+                return transformerCfg.tranformerColsWithoutContextParams();
+            }
+
             @Override
             public boolean containContextParams() {
                 return transformerCfg.containContextParams();