Refactor NetexValidatorsRunner (#578)

entur · Oct 21, 2024 · ebc0692 · ebc0692
1 parent 7e2cb60
commit ebc0692
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 50 deletions.
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
         <entur.google.pubsub.emulator.download.skip>false</entur.google.pubsub.emulator.download.skip>
         <camel.version>4.4.3</camel.version>
         <entur.helpers.version>2.32</entur.helpers.version>
-        <netex-validator-java.version>3.0.8</netex-validator-java.version>
+        <netex-validator-java.version>4.0.0</netex-validator-java.version>
         <commons-io.version>2.11.0</commons-io.version>
         <zt-zip.version>1.17</zt-zip.version>
         <redisson.version>3.37.0</redisson.version>

diff --git a/src/main/java/no/entur/antu/config/StopPlaceDataValidatorConfig.java b/src/main/java/no/entur/antu/config/StopPlaceDataValidatorConfig.java
@@ -77,10 +77,11 @@ public NetexValidatorsRunner stopPlaceDataValidatorsRunner(
       netexIdUniquenessValidator
     );
     NetexXMLParser netexXMLParser = new NetexXMLParser();
-    return new NetexValidatorsRunner(
-      netexXMLParser,
-      netexSchemaValidator,
-      netexValidators
-    );
+    return NetexValidatorsRunner
+      .of()
+      .withNetexXMLParser(netexXMLParser)
+      .withNetexSchemaValidator(netexSchemaValidator)
+      .withXPathValidators(netexValidators)
+      .build();
   }
 }
diff --git a/src/main/java/no/entur/antu/config/TimetableDataValidatorConfig.java b/src/main/java/no/entur/antu/config/TimetableDataValidatorConfig.java
@@ -41,10 +41,7 @@
 import no.entur.antu.validation.validator.servicelink.distance.UnexpectedDistanceInServiceLinkValidator;
 import no.entur.antu.validation.validator.servicelink.stoppoints.MismatchedStopPointsValidator;
 import no.entur.antu.validation.validator.xpath.EnturTimetableDataValidationTreeFactory;
-import org.entur.netex.validation.validator.DatasetValidator;
-import org.entur.netex.validation.validator.NetexValidatorsRunner;
-import org.entur.netex.validation.validator.ValidationReportEntryFactory;
-import org.entur.netex.validation.validator.XPathValidator;
+import org.entur.netex.validation.validator.*;
 import org.entur.netex.validation.validator.id.NetexIdUniquenessValidator;
 import org.entur.netex.validation.validator.id.NetexReferenceValidator;
 import org.entur.netex.validation.validator.id.ReferenceToValidEntityTypeValidator;
@@ -333,15 +330,16 @@ public NetexValidatorsRunner timetableDataValidatorsRunner(
       serviceJourneyInterchangeInfoCollector
     );
 
-    return new NetexValidatorsRunner(
-      netexXMLParser,
-      netexSchemaValidator,
-      xPathValidators,
-      jaxbValidators,
-      netexTimetableDatasetValidators,
-      commonDataCollectors,
-      netexDataRepository,
-      stopPlaceRepository
-    );
+    return NetexValidatorsRunner
+      .of()
+      .withNetexXMLParser(netexXMLParser)
+      .withNetexSchemaValidator(netexSchemaValidator)
+      .withXPathValidators(xPathValidators)
+      .withJaxbValidators(jaxbValidators)
+      .withDatasetValidators(netexTimetableDatasetValidators)
+      .withNetexDataCollectors(commonDataCollectors)
+      .withNetexDataRepository(netexDataRepository)
+      .withStopPlaceRepository(stopPlaceRepository)
+      .build();
   }
 }
diff --git a/src/main/java/no/entur/antu/config/flex/TimetableDataFlexMergingValidatorConfig.java b/src/main/java/no/entur/antu/config/flex/TimetableDataFlexMergingValidatorConfig.java
@@ -62,6 +62,10 @@ public NetexValidatorsRunner flexMergingTimetableDataValidatorsRunner(
     List<XPathValidator> netexValidators = List.of(netexIdUniquenessValidator);
     // do not ignore SiteFrame
     NetexXMLParser netexXMLParser = new NetexXMLParser(Set.of());
-    return new NetexValidatorsRunner(netexXMLParser, netexValidators);
+    return NetexValidatorsRunner
+      .of()
+      .withNetexXMLParser(netexXMLParser)
+      .withXPathValidators(netexValidators)
+      .build();
   }
 }
diff --git a/src/main/java/no/entur/antu/config/flex/TimetableDataFlexValidatorConfig.java b/src/main/java/no/entur/antu/config/flex/TimetableDataFlexValidatorConfig.java
@@ -159,16 +159,15 @@ public NetexValidatorsRunner flexTimetableDataValidatorsRunner(
     List<JAXBValidator> jaxbValidators = List.of(invalidFlexibleAreaValidator);
     // do not ignore SiteFrame
     NetexXMLParser netexXMLParser = new NetexXMLParser(Set.of());
-    return new NetexValidatorsRunner(
-      netexXMLParser,
-      netexSchemaValidator,
-      xpathValidators,
-      jaxbValidators,
-      List.of(),
-      List.of(),
-      netexDataRepository,
-      stopPlaceRepository
-    );
+    return NetexValidatorsRunner
+      .of()
+      .withNetexXMLParser(netexXMLParser)
+      .withNetexSchemaValidator(netexSchemaValidator)
+      .withXPathValidators(xpathValidators)
+      .withJaxbValidators(jaxbValidators)
+      .withNetexDataRepository(netexDataRepository)
+      .withStopPlaceRepository(stopPlaceRepository)
+      .build();
   }
 
   /**
@@ -208,15 +207,14 @@ public NetexValidatorsRunner importFlexTimetableDataValidatorsRunner(
 
     // do not ignore SiteFrame
     NetexXMLParser netexXMLParser = new NetexXMLParser(Set.of());
-    return new NetexValidatorsRunner(
-      netexXMLParser,
-      netexSchemaValidator,
-      xpathValidators,
-      jaxbValidators,
-      List.of(),
-      List.of(),
-      netexDataRepository,
-      stopPlaceRepository
-    );
+    return NetexValidatorsRunner
+      .of()
+      .withNetexXMLParser(netexXMLParser)
+      .withNetexSchemaValidator(netexSchemaValidator)
+      .withXPathValidators(xpathValidators)
+      .withJaxbValidators(jaxbValidators)
+      .withNetexDataRepository(netexDataRepository)
+      .withStopPlaceRepository(stopPlaceRepository)
+      .build();
   }
 }
diff --git a/src/main/java/no/entur/antu/sweden/config/TimetableDataSwedenValidatorConfig.java b/src/main/java/no/entur/antu/sweden/config/TimetableDataSwedenValidatorConfig.java
@@ -29,10 +29,7 @@
 import no.entur.antu.validation.validator.id.ReferenceToNsrValidator;
 import org.entur.netex.validation.configuration.DefaultValidationConfigLoader;
 import org.entur.netex.validation.configuration.ValidationConfigLoader;
-import org.entur.netex.validation.validator.DefaultValidationEntryFactory;
-import org.entur.netex.validation.validator.NetexValidatorsRunner;
-import org.entur.netex.validation.validator.ValidationReportEntryFactory;
-import org.entur.netex.validation.validator.XPathValidator;
+import org.entur.netex.validation.validator.*;
 import org.entur.netex.validation.validator.id.BlockJourneyReferencesIgnorer;
 import org.entur.netex.validation.validator.id.ExternalReferenceValidator;
 import org.entur.netex.validation.validator.id.NetexIdRepository;
@@ -174,10 +171,11 @@ public NetexValidatorsRunner swedenTimetableDataSwedenValidatorsRunner(
     NetexXMLParser netexXMLParser = new NetexXMLParser(
       Set.of("navigationPaths", "equipments")
     );
-    return new NetexValidatorsRunner(
-      netexXMLParser,
-      netexSchemaValidator,
-      netexValidators
-    );
+    return NetexValidatorsRunner
+      .of()
+      .withNetexXMLParser(netexXMLParser)
+      .withNetexSchemaValidator(netexSchemaValidator)
+      .withXPathValidators(netexValidators)
+      .build();
   }
 }