#1527

Committed 22 Aug 2025 02:21PM UTC coverage: 90.345%. Remained the same

Build # #1527

Build Type

push

Committed by

Commit Message

Improve timeline handling

Run Details

5191 of 6416 new or added lines in 219 files covered. (80.91%)

886 existing lines in 78 files now uncovered.

36717 of 40641 relevant lines covered (90.34%)

0.9 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

84.0

/src/main/java/de/gwdg/metadataqa/marc/analysis/validator/ControlFieldValidator.java

package de.gwdg.metadataqa.marc.analysis.validator;

import de.gwdg.metadataqa.marc.dao.Control005;
import de.gwdg.metadataqa.marc.dao.MarcControlField;
import de.gwdg.metadataqa.marc.dao.MarcPositionalControlField;
import de.gwdg.metadataqa.marc.dao.SimpleControlField;
import de.gwdg.metadataqa.marc.definition.ControlValue;
import de.gwdg.metadataqa.marc.model.validation.ValidationError;

import java.util.ArrayList;
import java.util.List;

public class ControlFieldValidator extends AbstractValidator {

  public ControlFieldValidator() {
    super(new ValidatorConfiguration());
  }

  public ControlFieldValidator(ValidatorConfiguration configuration) {
    super(configuration);
  }

  public boolean validate(MarcControlField controlField) {
    // Reset the validation errors on every validation
    validationErrors = new ArrayList<>();

    if (controlField instanceof SimpleControlField) {
      return validateSimpleControlField((SimpleControlField) controlField);
    }
    if (controlField instanceof MarcPositionalControlField) {
      return validateMarcPositionalControlField((MarcPositionalControlField) controlField);
    }
    return true;
  }

  private boolean validateMarcPositionalControlField(MarcPositionalControlField controlField) {
    if (!controlField.getInitializationErrors().isEmpty()) {
      // Add all initialization errors which aren't ignored
      List<ValidationError> initializationErrors = controlField.getInitializationErrors();
      initializationErrors = filterErrors(initializationErrors);
      validationErrors.addAll(initializationErrors);
    }

    ControlValueValidator validator = new ControlValueValidator(configuration);
    for (ControlValue controlValue : controlField.getValuesList()) {
      if (!validator.validate(controlValue)) {
        validationErrors.addAll(validator.getValidationErrors());
      }
    }
    return validationErrors.isEmpty();
  }

  private boolean validateSimpleControlField(SimpleControlField controlField) {
    if (controlField instanceof Control005) {
      Control005 control = (Control005) controlField;
      control.validate(configuration.getMarcVersion());
      validationErrors.addAll(filterErrors(control.getValidationErrors()));
    }
    return validationErrors.isEmpty();
  }
}

1	package de.gwdg.metadataqa.marc.analysis.validator;
2
3	import de.gwdg.metadataqa.marc.dao.Control005;
4	import de.gwdg.metadataqa.marc.dao.MarcControlField;
5	import de.gwdg.metadataqa.marc.dao.MarcPositionalControlField;
6	import de.gwdg.metadataqa.marc.dao.SimpleControlField;
7	import de.gwdg.metadataqa.marc.definition.ControlValue;
8	import de.gwdg.metadataqa.marc.model.validation.ValidationError;
9
10	import java.util.ArrayList;
11	import java.util.List;
12
13	public class ControlFieldValidator extends AbstractValidator {
14
15	public ControlFieldValidator() {
16	super(new ValidatorConfiguration());	1✔
17	}	1✔
18
19	public ControlFieldValidator(ValidatorConfiguration configuration) {
20	super(configuration);	1✔
21	}	1✔
22
23	public boolean validate(MarcControlField controlField) {
24	// Reset the validation errors on every validation
25	validationErrors = new ArrayList<>();	1✔
26
27	if (controlField instanceof SimpleControlField) {	1✔
28	return validateSimpleControlField((SimpleControlField) controlField);	1✔
29	}
30	if (controlField instanceof MarcPositionalControlField) {	1✔
31	return validateMarcPositionalControlField((MarcPositionalControlField) controlField);	1✔
32	}
NEW 33	return true;	×
34	}
35
36	private boolean validateMarcPositionalControlField(MarcPositionalControlField controlField) {
37	if (!controlField.getInitializationErrors().isEmpty()) {	1✔
38	// Add all initialization errors which aren't ignored
NEW 39	List<ValidationError> initializationErrors = controlField.getInitializationErrors();	×
NEW 40	initializationErrors = filterErrors(initializationErrors);	×
NEW 41	validationErrors.addAll(initializationErrors);	×
42	}
43
44	ControlValueValidator validator = new ControlValueValidator(configuration);	1✔
45	for (ControlValue controlValue : controlField.getValuesList()) {	1✔
46	if (!validator.validate(controlValue)) {	1✔
47	validationErrors.addAll(validator.getValidationErrors());	1✔
48	}
49	}	1✔
50	return validationErrors.isEmpty();	1✔
51	}
52
53	private boolean validateSimpleControlField(SimpleControlField controlField) {
54	if (controlField instanceof Control005) {	1✔
55	Control005 control = (Control005) controlField;	1✔
56	control.validate(configuration.getMarcVersion());	1✔
57	validationErrors.addAll(filterErrors(control.getValidationErrors()));	1✔
58	}
59	return validationErrors.isEmpty();	1✔
60	}
61	}

pkiraly / metadata-qa-marc / #1527

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous