This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/dev/pr-13095-1d89fd018efed24d18c7c15f2f65c0c3f37d9d72 in repository https://gitbox.apache.org/repos/asf/seatunnel.git
commit 223a8e26ba770681ccd6a4c92902c1e1990e9cfc Author: Meganexxx <[email protected]> AuthorDate: Sat Nov 7 03:00:21 2026 +0000 [Improve][Connector-V2][Assert] Validate rules with OptionRule (#13095) --- .../seatunnel/assertion/sink/AssertSink.java | 11 ++- .../assertion/sink/AssertSinkFactory.java | 6 +- .../flink/assertion/AssertFactoryTest.java | 48 ++++++++++ .../seatunnel/flink/assertion/AssertSinkTest.java | 101 +++++++++++++++++++++ 4 files changed, 161 insertions(+), 5 deletions(-) diff --git a/seatunnel-connectors-v2/connector-assert/src/main/java/org/apache/seatunnel/connectors/seatunnel/assertion/sink/AssertSink.java b/seatunnel-connectors-v2/connector-assert/src/main/java/org/apache/seatunnel/connectors/seatunnel/assertion/sink/AssertSink.java index b4c899180a5..6beec466ab9 100644 --- a/seatunnel-connectors-v2/connector-assert/src/main/java/org/apache/seatunnel/connectors/seatunnel/assertion/sink/AssertSink.java +++ b/seatunnel-connectors-v2/connector-assert/src/main/java/org/apache/seatunnel/connectors/seatunnel/assertion/sink/AssertSink.java @@ -59,14 +59,17 @@ public class AssertSink extends AbstractSimpleSink<SeaTunnelRow, Void> public AssertSink(ReadonlyConfig pluginConfig, CatalogTable catalogTable) { this.seaTunnelRowType = catalogTable.getSeaTunnelRowType(); - if (!pluginConfig.getOptional(RULES).isPresent()) { - Throwables.throwIfUnchecked(new ConfigException.Missing(RULES.key())); - } assertFieldRules = new ConcurrentHashMap<>(); assertRowRules = new ConcurrentHashMap<>(); assertCatalogTableRule = new ConcurrentHashMap<>(); catalogTableName = catalogTable.getTablePath().getFullName(); - Config ruleConfig = ConfigFactory.parseMap(pluginConfig.get(RULES)); + + // Factory validation rejects missing rules; keep a safeguard for direct construction. + Map<String, Object> rules = pluginConfig.get(RULES); + if (rules == null) { + throw new ConfigException.Missing(RULES.key()); + } + Config ruleConfig = ConfigFactory.parseMap(rules); if (ruleConfig.hasPath(ConnectorCommonOptions.TABLE_CONFIGS.key())) { List<? extends Config> tableConfigs = ruleConfig.getConfigList(ConnectorCommonOptions.TABLE_CONFIGS.key()); diff --git a/seatunnel-connectors-v2/connector-assert/src/main/java/org/apache/seatunnel/connectors/seatunnel/assertion/sink/AssertSinkFactory.java b/seatunnel-connectors-v2/connector-assert/src/main/java/org/apache/seatunnel/connectors/seatunnel/assertion/sink/AssertSinkFactory.java index 9caedab7315..866b17b2013 100644 --- a/seatunnel-connectors-v2/connector-assert/src/main/java/org/apache/seatunnel/connectors/seatunnel/assertion/sink/AssertSinkFactory.java +++ b/seatunnel-connectors-v2/connector-assert/src/main/java/org/apache/seatunnel/connectors/seatunnel/assertion/sink/AssertSinkFactory.java @@ -25,6 +25,7 @@ import org.apache.seatunnel.api.table.factory.TableSinkFactoryContext; import com.google.auto.service.AutoService; +import static org.apache.seatunnel.api.configuration.util.Conditions.mapNotEmpty; import static org.apache.seatunnel.connectors.seatunnel.assertion.sink.AssertSinkOptions.MULTI_TABLE_SINK_REPLICA; import static org.apache.seatunnel.connectors.seatunnel.assertion.sink.AssertSinkOptions.RULES; @@ -38,7 +39,10 @@ public class AssertSinkFactory implements TableSinkFactory { @Override public OptionRule optionRule() { - return OptionRule.builder().required(RULES).optional(MULTI_TABLE_SINK_REPLICA).build(); + return OptionRule.builder() + .required(RULES, mapNotEmpty(RULES)) + .optional(MULTI_TABLE_SINK_REPLICA) + .build(); } @Override diff --git a/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertFactoryTest.java b/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertFactoryTest.java index cf9473b5f19..f8a6bfc7c69 100644 --- a/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertFactoryTest.java +++ b/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertFactoryTest.java @@ -17,18 +17,66 @@ package org.apache.seatunnel.flink.assertion; +import org.apache.seatunnel.api.configuration.ReadonlyConfig; +import org.apache.seatunnel.api.configuration.util.ConditionOperator; +import org.apache.seatunnel.api.configuration.util.ConfigValidator; import org.apache.seatunnel.api.configuration.util.OptionRule; +import org.apache.seatunnel.api.configuration.util.OptionValidationException; import org.apache.seatunnel.connectors.seatunnel.assertion.sink.AssertSinkFactory; +import org.apache.seatunnel.connectors.seatunnel.assertion.sink.AssertSinkOptions; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + public class AssertFactoryTest { + private static final OptionRule SINK_RULE = new AssertSinkFactory().optionRule(); + @Test public void testOptionRule() throws Exception { AssertSinkFactory factory = new AssertSinkFactory(); OptionRule optionRule = factory.optionRule(); Assertions.assertNotNull(optionRule); + Assertions.assertEquals(1, optionRule.getValueConstraints().size()); + Assertions.assertEquals( + ConditionOperator.MAP_NOT_EMPTY, + optionRule.getValueConstraints().get(0).getOperator()); + Assertions.assertEquals( + AssertSinkOptions.RULES, optionRule.getValueConstraints().get(0).getOption()); + } + + @Test + public void testMissingRulesRejectedByFactoryRule() { + Assertions.assertThrows( + OptionValidationException.class, () -> validateSink(Collections.emptyMap())); + } + + @Test + public void testEmptyRulesRejectedByFactoryRule() { + Map<String, Object> config = new HashMap<>(); + config.put(AssertSinkOptions.RULES.key(), Collections.emptyMap()); + + Assertions.assertThrows(OptionValidationException.class, () -> validateSink(config)); + } + + @Test + public void testNonEmptyRulesAcceptedByFactoryRule() { + Map<String, Object> rowRule = new HashMap<>(); + rowRule.put("rule_type", "MAX_ROW"); + rowRule.put("rule_value", 10); + Map<String, Object> rules = new HashMap<>(); + rules.put("row_rules", Collections.singletonList(rowRule)); + Map<String, Object> config = new HashMap<>(); + config.put(AssertSinkOptions.RULES.key(), rules); + + Assertions.assertDoesNotThrow(() -> validateSink(config)); + } + + private static void validateSink(Map<String, Object> config) { + ConfigValidator.of(ReadonlyConfig.fromMap(config)).validate(SINK_RULE); } } diff --git a/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertSinkTest.java b/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertSinkTest.java new file mode 100644 index 00000000000..7decedaff6e --- /dev/null +++ b/seatunnel-connectors-v2/connector-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertSinkTest.java @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.seatunnel.flink.assertion; + +import org.apache.seatunnel.shade.com.typesafe.config.ConfigException; + +import org.apache.seatunnel.api.configuration.ReadonlyConfig; +import org.apache.seatunnel.api.options.ConnectorCommonOptions; +import org.apache.seatunnel.api.table.catalog.CatalogTable; +import org.apache.seatunnel.api.table.catalog.CatalogTableUtil; +import org.apache.seatunnel.api.table.type.BasicType; +import org.apache.seatunnel.api.table.type.SeaTunnelDataType; +import org.apache.seatunnel.api.table.type.SeaTunnelRowType; +import org.apache.seatunnel.connectors.seatunnel.assertion.sink.AssertSink; +import org.apache.seatunnel.connectors.seatunnel.assertion.sink.AssertSinkOptions; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +public class AssertSinkTest { + + @Test + public void testMissingRulesRejectedAtRuntime() { + ReadonlyConfig config = ReadonlyConfig.fromMap(Collections.emptyMap()); + + ConfigException.Missing exception = + Assertions.assertThrows( + ConfigException.Missing.class, + () -> new AssertSink(config, createCatalogTable())); + + Assertions.assertTrue(exception.getMessage().contains(AssertSinkOptions.RULES.key())); + } + + @Test + public void testEmptyRulesRejectedAtRuntime() { + Map<String, Object> config = new HashMap<>(); + config.put(AssertSinkOptions.RULES.key(), Collections.emptyMap()); + + ConfigException.BadValue exception = + Assertions.assertThrows( + ConfigException.BadValue.class, + () -> new AssertSink(ReadonlyConfig.fromMap(config), createCatalogTable())); + + Assertions.assertTrue(exception.getMessage().contains("Assert rule config is empty")); + } + + @Test + public void testEffectivelyEmptyRulesRejectedAtRuntime() { + Map<String, Object> rules = new HashMap<>(); + rules.put(ConnectorCommonOptions.TABLE_NAMES.key(), Collections.emptyList()); + Map<String, Object> config = new HashMap<>(); + config.put(AssertSinkOptions.RULES.key(), rules); + + ConfigException.BadValue exception = + Assertions.assertThrows( + ConfigException.BadValue.class, + () -> new AssertSink(ReadonlyConfig.fromMap(config), createCatalogTable())); + + Assertions.assertTrue(exception.getMessage().contains("Assert rule config is empty")); + } + + @Test + public void testValidRulesAcceptedAtRuntime() { + Map<String, Object> rowRule = new HashMap<>(); + rowRule.put("rule_type", "MAX_ROW"); + rowRule.put("rule_value", 10); + Map<String, Object> rules = new HashMap<>(); + rules.put("row_rules", Collections.singletonList(rowRule)); + Map<String, Object> config = new HashMap<>(); + config.put(AssertSinkOptions.RULES.key(), rules); + + Assertions.assertDoesNotThrow( + () -> new AssertSink(ReadonlyConfig.fromMap(config), createCatalogTable())); + } + + private CatalogTable createCatalogTable() { + SeaTunnelRowType rowType = + new SeaTunnelRowType( + new String[] {"id"}, new SeaTunnelDataType[] {BasicType.INT_TYPE}); + return CatalogTableUtil.getCatalogTable("test", rowType); + } +}
