Code cleanup

fuinorg · Dec 23, 2023 · 680cc58 · 680cc58
1 parent 39fae1a
commit 680cc58
Show file tree

Hide file tree

Showing 60 changed files with 188 additions and 292 deletions.
diff --git a/src/main/java/org/fuin/utils4j/ChangeTrackingMap.java b/src/main/java/org/fuin/utils4j/ChangeTrackingMap.java
@@ -17,12 +17,7 @@
  */
 package org.fuin.utils4j;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * A wrapper for maps that keeps track of all changes made to the map since construction. Only adding, replacing or deleting elements is

diff --git a/src/main/java/org/fuin/utils4j/ChangeTrackingUniqueList.java b/src/main/java/org/fuin/utils4j/ChangeTrackingUniqueList.java
@@ -17,12 +17,7 @@
  */
 package org.fuin.utils4j;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
+import java.util.*;
 
 /**
  * A wrapper for lists that keeps track of all changes made to the list since construction. Only adding, replacing or deleting elements is

diff --git a/src/main/java/org/fuin/utils4j/JandexUtils.java b/src/main/java/org/fuin/utils4j/JandexUtils.java
@@ -17,6 +17,8 @@
  */
 package org.fuin.utils4j;
 
+import org.jboss.jandex.Indexer;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,8 +27,6 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import org.jboss.jandex.Indexer;
-
 /**
  * Utilities related to Jandex.
  */

diff --git a/src/main/java/org/fuin/utils4j/PropertiesFile.java b/src/main/java/org/fuin/utils4j/PropertiesFile.java
@@ -17,20 +17,9 @@
  */
 package org.fuin.utils4j;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import java.io.*;
 import java.nio.channels.FileLock;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
+import java.util.*;
 
 /**
  * A properties file that is capable of merging concurrent changes made by another JVM or another process.

diff --git a/src/main/java/org/fuin/utils4j/PropertiesUtils.java b/src/main/java/org/fuin/utils4j/PropertiesUtils.java
@@ -17,21 +17,13 @@
  */
 package org.fuin.utils4j;
 
-import static org.fuin.utils4j.Utils4J.checkNotNull;
-import static org.fuin.utils4j.Utils4J.checkValidFile;
-import static org.fuin.utils4j.Utils4J.createUrl;
-import static org.fuin.utils4j.Utils4J.getPackagePath;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import static org.fuin.utils4j.Utils4J.*;
+
 /**
  * Utilities related to the {@link Properties} class.
  */

diff --git a/src/main/java/org/fuin/utils4j/RandomAccessFileInputStream.java b/src/main/java/org/fuin/utils4j/RandomAccessFileInputStream.java
@@ -17,11 +17,7 @@
  */
 package org.fuin.utils4j;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
+import java.io.*;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 

diff --git a/src/main/java/org/fuin/utils4j/RandomAccessFileOutputStream.java b/src/main/java/org/fuin/utils4j/RandomAccessFileOutputStream.java
@@ -17,11 +17,7 @@
  */
 package org.fuin.utils4j;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
+import java.io.*;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 

diff --git a/src/main/java/org/fuin/utils4j/Utils4J.java b/src/main/java/org/fuin/utils4j/Utils4J.java
@@ -17,25 +17,12 @@
  */
 package org.fuin.utils4j;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.RandomAccessFile;
-import java.io.Reader;
-import java.io.Writer;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.PBEParameterSpec;
+import java.io.*;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
@@ -48,25 +35,13 @@
 import java.security.GeneralSecurityException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
 /**
  * Common utility methods for use in Java applications and libraries.
  */

diff --git a/src/main/java/org/fuin/utils4j/VariableResolver.java b/src/main/java/org/fuin/utils4j/VariableResolver.java
@@ -17,13 +17,7 @@
  */
 package org.fuin.utils4j;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Resolves the references from variable values to other variable names.

diff --git a/src/main/java/org/fuin/utils4j/filter/ComparableFilter.java b/src/main/java/org/fuin/utils4j/filter/ComparableFilter.java
@@ -17,12 +17,12 @@
  */
 package org.fuin.utils4j.filter;
 
+import org.fuin.utils4j.Utils4J;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.fuin.utils4j.Utils4J;
-
 /**
  * Defines a filter on a Comparable value.
  */

diff --git a/src/main/java/org/fuin/utils4j/filter/RegExprFilter.java b/src/main/java/org/fuin/utils4j/filter/RegExprFilter.java
@@ -43,10 +43,10 @@ public class RegExprFilter implements Filter {
     private static final String[] TYPES = new String[] { "matches", "lookingAt", "find" };
 
     /** Compiled pattern. */
-    private Pattern p = null;
+    private Pattern p;
 
     /** String pattern to apply. */
-    private String pattern = null;
+    private String pattern;
 
     /** Type of matching. */
     private int type = 1;

diff --git a/src/main/java/org/fuin/utils4j/filter/StringFilter.java b/src/main/java/org/fuin/utils4j/filter/StringFilter.java
@@ -17,12 +17,12 @@
  */
 package org.fuin.utils4j.filter;
 
+import org.fuin.utils4j.Utils4J;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.fuin.utils4j.Utils4J;
-
 /**
  * Defines a filter on a String.
  */

diff --git a/src/main/java/org/fuin/utils4j/jaxb/JaxbUtils.java b/src/main/java/org/fuin/utils4j/jaxb/JaxbUtils.java
@@ -17,24 +17,16 @@
  */
 package org.fuin.utils4j.jaxb;
 
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-
-import javax.xml.stream.XMLStreamWriter;
-
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.Unmarshaller;
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
 import org.fuin.utils4j.Utils4J;
 
+import javax.xml.stream.XMLStreamWriter;
+import java.io.*;
+
 /**
  * JAXB releated functions.
  */

diff --git a/src/main/java/org/fuin/utils4j/jaxb/UnmarshallerBuilder.java b/src/main/java/org/fuin/utils4j/jaxb/UnmarshallerBuilder.java
@@ -1,27 +1,16 @@
 package org.fuin.utils4j.jaxb;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import jakarta.xml.bind.*;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import org.fuin.utils4j.Utils4J;
+import org.xml.sax.SAXException;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
-
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.PropertyException;
-import jakarta.xml.bind.Unmarshaller;
-import jakarta.xml.bind.ValidationEventHandler;
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.fuin.utils4j.Utils4J;
-import org.xml.sax.SAXException;
+import java.util.*;
 
 /**
  * Builder that helps creating an {@link Unmarshaller} instance.
@@ -290,6 +279,7 @@ private static void setProperties(final Unmarshaller unmarshaller, final Map<Str
     private Schema createSchema() {
         final SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
         try {
+            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
             return factory.newSchema(schemaSources.toArray(new Source[schemaSources.size()]));
         } catch (final SAXException ex) {
             throw new RuntimeException("Failed to create schema", ex);

diff --git a/src/test/java/org/fuin/utils4j/CancelableVolatileTest.java b/src/test/java/org/fuin/utils4j/CancelableVolatileTest.java
@@ -17,10 +17,10 @@
  */
 package org.fuin.utils4j;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 // CHECKSTYLE:OFF
 public class CancelableVolatileTest {