Skip to content

Commit

Permalink
revert rename
Browse files Browse the repository at this point in the history
  • Loading branch information
bencegelei committed Jan 20, 2025
1 parent 2acd045 commit d2800ca
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class JudoDefaultModuleConfiguration {
@Builder.Default
Boolean metricsCollectorVerbose = false;
@Builder.Default
String payloadValidatorRequiredStringValidatorOption = DefaultPayloadValidatorProvider.REJECT_EMPTY;
String payloadValidatorRequiredStringValidatorOption = DefaultPayloadValidatorProvider.ACCEPT_NON_EMPTY;
@Builder.Default
Boolean threadContextDebugThreadFork = false;
@Builder.Default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

public class DefaultPayloadValidatorProvider implements Provider<PayloadValidator> {

public static final String REJECT_EMPTY = "REJECT_EMPTY";
public static final String ACCEPT_NON_EMPTY = "ACCEPT_NON_EMPTY";
@Inject
JudoModelLoader models;

Expand All @@ -61,7 +61,7 @@ public PayloadValidator get() {
.identifierProvider(identifierProvider)
.validatorProvider(validatorProvider)
.requiredStringValidatorOption(
DefaultPayloadValidator.RequiredStringValidatorOption.valueOf(Objects.requireNonNullElse(requiredStringValidatorOption, REJECT_EMPTY)))
DefaultPayloadValidator.RequiredStringValidatorOption.valueOf(Objects.requireNonNullElse(requiredStringValidatorOption, ACCEPT_NON_EMPTY)))
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ public ValidatorProvider validatorProvider(DAO dao) {
@SuppressWarnings("unchecked")
public PayloadValidator getPayloadValidator(ValidatorProvider validatorProvider) {
// TODO: Parameters
String requiredStringValidatorOption = "REJECT_EMPTY";
String requiredStringValidatorOption = "ACCEPT_NON_EMPTY";

AsmUtils asm = new AsmUtils(asmModel.getResourceSet());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
public class DefaultPayloadValidator implements PayloadValidator {

public enum RequiredStringValidatorOption {
ACCEPT_EMPTY, REJECT_EMPTY
ACCEPT_EMPTY, ACCEPT_NON_EMPTY
}

private final AsmModel asmModel;
Expand Down Expand Up @@ -347,7 +347,7 @@ public Collection<ValidationResult> validateAttribute(final EAttribute attribute
}
if (value != null
&& AsmUtils.isString(attribute.getEAttributeType())
&& RequiredStringValidatorOption.REJECT_EMPTY.equals(requiredStringValidatorOption)
&& RequiredStringValidatorOption.ACCEPT_NON_EMPTY.equals(requiredStringValidatorOption)
&& ((String) value).isEmpty()
&& (attribute.isRequired() || asmUtils.getMappedAttribute(attribute).map(EAttribute::isRequired).orElse(false))
&& (validateMissingFeatures || instance.containsKey(attribute.getName()))) {
Expand Down

0 comments on commit d2800ca

Please sign in to comment.