Skip to content

feat(#1531)!: change default custom validator mode from EXCLUSIVE to COMBINED #1532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bbortt wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −3
Open

feat(#1531)!: change default custom validator mode from EXCLUSIVE to COMBINED #1532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/citrus-api/src/main/java/org/citrusframework/CitrusSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ private CitrusSettings() {

public static final String CUSTOM_VALIDATOR_STRATEGY_PROPERTY = "citrus.custom.validator.strategy";
public static final String CUSTOM_VALIDATOR_STRATEGY_ENV = "CITRUS_CUSTOM_VALIDATOR_STRATEGY";
public static final CustomValidatorStrategy CUSTOM_VALIDATOR_STRATEGY_DEFAULT = CustomValidatorStrategy.EXCLUSIVE;
public static final CustomValidatorStrategy CUSTOM_VALIDATOR_STRATEGY_DEFAULT = CustomValidatorStrategy.COMBINED;

/**
* Flag to enable/disable input stream caching
Expand Down
4 changes: 2 additions & 2 deletions core/citrus-api/src/test/java/org/citrusframework/CitrusSettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ public void isStackTraceOutputEnabled_shouldReturnPropertyValue_overEnvVarValue(
}

@Test
public void getCustomValidatorStrategy_shouldReturnExclusiveByDefault() {
public void getCustomValidatorStrategy_shouldReturnCombinedByDefault() {
systemProperties.remove(CUSTOM_VALIDATOR_STRATEGY_PROPERTY);
environmentVariables.remove(CUSTOM_VALIDATOR_STRATEGY_ENV);

assertThat(CitrusSettings.getCustomValidatorStrategy())
.isEqualTo(EXCLUSIVE);
.isEqualTo(COMBINED);
}

@DataProvider
Expand Down
2 changes: 2 additions & 0 deletions core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,6 +1232,8 @@ public void testReceiveMessage_shouldInvokeValidationContexts_whenNoCustomValida
"""
)
public void testReceiveMessage_shouldIgnoreValidationContexts_whenCustomValidatorIsPresent_andValidationStrategyIsExclusive() {
environmentVariables.set(CUSTOM_VALIDATOR_STRATEGY_ENV, "EXCLUSIVE");

var testActor = new TestActor();
testActor.setName("TESTACTOR");

Expand Down
Loading