Code cleanup

Author: vpaturet

src/main/java/org/rutebanken/netex/OmitNullsToStringStyle.java

@@ -17,7 +17,7 @@
 
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-public class OmitNullsToStringStyle extends org.apache.commons.lang3.builder.ToStringStyle {
+public class OmitNullsToStringStyle extends ToStringStyle {
 
     /**
 	 * 

src/main/java/org/rutebanken/netex/client/PublicationDeliveryClient.java

@@ -15,14 +15,18 @@
 
 package org.rutebanken.netex.client;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 import org.rutebanken.netex.model.ObjectFactory;
 import org.rutebanken.netex.model.PublicationDeliveryStructure;
 import org.rutebanken.netex.validation.NeTExValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
-import jakarta.xml.bind.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;

src/main/java/org/rutebanken/netex/validation/PredefinedSchemaListClasspathResourceResolver.java

@@ -18,7 +18,12 @@
 import org.w3c.dom.ls.LSInput;
 import org.w3c.dom.ls.LSResourceResolver;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,10 +34,10 @@ public class PredefinedSchemaListClasspathResourceResolver implements LSResource
     public PredefinedSchemaListClasspathResourceResolver(String schemaList) throws IOException {
 
         InputStream resourceAsStream = getClass().getResourceAsStream(schemaList);
-        if(resourceAsStream == null) {
-        	throw new IOException("Unable to load "+schemaList+" as resource stream");
+        if (resourceAsStream == null) {
+            throw new IOException("Unable to load " + schemaList + " as resource stream");
         }
-        BufferedReader r = new BufferedReader(new InputStreamReader(resourceAsStream));
+        BufferedReader r = new BufferedReader(new InputStreamReader(resourceAsStream, StandardCharsets.UTF_8));
         String resource;
         while ((resource = r.readLine()) != null) {
             String name = resource.substring(resource.lastIndexOf('/') + 1);

src/test/java/org/rutebanken/netex/model/MarshalUnmarshalTest.java

@@ -30,8 +30,11 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.temporal.ChronoField;
@@ -45,7 +48,7 @@ class MarshalUnmarshalTest {
 
 	private static JAXBContext jaxbContext;
 
-	private static ObjectFactory factory = new ObjectFactory();
+	private static final ObjectFactory factory = new ObjectFactory();
 
 	@BeforeAll
 	public static void initContext() throws JAXBException {
@@ -256,16 +259,16 @@ void datedCallWithLocalDateTime() throws JAXBException {
 	}
 
 	@Test
-	void unmarshalPublicationDeliveryAndVerifyValidBetween() throws JAXBException, FileNotFoundException {
+	void unmarshalPublicationDeliveryAndVerifyValidBetween() throws JAXBException, IOException {
 
 		Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
 
 		@SuppressWarnings("unchecked")
 		JAXBElement<PublicationDeliveryStructure> jaxbElement = (JAXBElement<PublicationDeliveryStructure>) unmarshaller
-				.unmarshal(new FileInputStream(new File("src/test/resources/date_time_examples.xml")));
+				.unmarshal(Files.newInputStream(Paths.get("src/test/resources/date_time_examples.xml")));
 		PublicationDeliveryStructure actual = jaxbElement.getValue();
-		CompositeFrame compositeFrame = (CompositeFrame) ((JAXBElement<? extends Common_VersionFrameStructure>) actual.dataObjects.compositeFrameOrCommonFrame
-				.get(0)).getValue();
+		CompositeFrame compositeFrame = (CompositeFrame) actual.dataObjects.compositeFrameOrCommonFrame
+				.get(0).getValue();
 		ValidityConditions_RelStructure validityConditions = compositeFrame.getValidityConditions();
 		ValidBetween validBetweenWithTimezone = (ValidBetween) validityConditions.getValidityConditionRefOrValidBetweenOrValidityCondition_().get(0);
 		assertThat(validBetweenWithTimezone.getFromDate()).isNotNull();

src/test/java/org/rutebanken/netex/validation/NeTExValidatorTest.java

@@ -27,7 +27,7 @@
 
 class NeTExValidatorTest {
 
-    private NeTExValidator neTExValidator = NeTExValidator.getNeTExValidator();
+    private final NeTExValidator neTExValidator = NeTExValidator.getNeTExValidator();
 
     public NeTExValidatorTest() throws IOException, SAXException {    }
 
@@ -43,9 +43,7 @@ void validationFailsForInvalidXml() {
         String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
                 "<PublicationDelivery xmlns=\"http://www.netex.org.uk/netex\" xmlns:ns2=\"http://www.opengis.net/gml/3.2\" xmlns:ns3=\"http://www.siri.org.uk/siri\"></PublicationDelivery>";
 
-        assertThatThrownBy(() -> {
-            neTExValidator.validate(new StreamSource(new StringReader(xml)));
-        }).isInstanceOf(SAXParseException.class);
+        assertThatThrownBy(() -> neTExValidator.validate(new StreamSource(new StringReader(xml)))).isInstanceOf(SAXParseException.class);
     }
 
     @Test