Merge pull request #5818 from dizzzz/refactor/improve_build

[refactor] Address build warnings -Xlint

Author: line-o

exist-ant/src/main/java/org/exist/ant/AbstractXMLDBTask.java

@@ -167,7 +167,7 @@ protected void registerDatabase() throws BuildException
             }
 
             final Class<?> clazz    = Class.forName( driver );
-            final Database database = (Database)clazz.newInstance();
+            final Database database = (Database)clazz.getDeclaredConstructor().newInstance();
             database.setProperty( "create-database", createDatabase ? "true" : "false" );
             database.setProperty( "ssl-enable", ssl ? "true" : "false" );
 

exist-ant/src/main/java/org/exist/ant/XMLDBXQueryTask.java

@@ -37,6 +37,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
+import java.net.URI;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -115,7 +116,7 @@ public void execute() throws BuildException {
                         final Resource resource = base.getResource(queryUri);
                         source = new BinarySource((byte[]) resource.getContent(), true);
                     } else {
-                        source = new URLSource(new URL(queryUri));
+                        source = new URLSource(URI.create(queryUri).toURL());
                     }
                 } else if (queryFile != null) {
                     log("XQuery file " + queryFile.getAbsolutePath(), Project.MSG_DEBUG);

exist-ant/src/test/java/org/exist/ant/FileTaskTest.java

@@ -38,8 +38,9 @@
 import java.net.URL;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+
 
 public class FileTaskTest extends AbstractTaskTest {
 

exist-ant/src/test/java/org/exist/ant/UserTaskTest.java

@@ -30,8 +30,8 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 public class UserTaskTest extends AbstractTaskTest {
 

exist-ant/src/test/java/org/exist/ant/XmldbTaskTest.java

@@ -43,6 +43,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.AllOf.allOf;
 import static org.junit.Assert.*;
 

exist-core/src/test/java/org/exist/deadlocks/GetReleaseBrokerDeadlocks.java

@@ -103,7 +103,7 @@ public void testingGetReleaseCycle() {
 		boolean debug = false;
 		try { 
 	        Configuration config = new Configuration();
-	        config.setProperty(FunctionFactory.PROPERTY_DISABLE_DEPRECATED_FUNCTIONS, new Boolean(false));
+	        config.setProperty(FunctionFactory.PROPERTY_DISABLE_DEPRECATED_FUNCTIONS, Boolean.FALSE);
 	        BrokerPool.configure(1, 5, config);
 
 	        Database db = BrokerPool.getInstance();

exist-parent/pom.xml

@@ -698,6 +698,12 @@
                     <version>3.14.0</version>
                     <configuration>
                         <encoding>${project.build.sourceEncoding}</encoding>
+                        <annotationProcessorPaths>
+                            <path>
+                                <groupId>com.google.code.findbugs</groupId>
+                                <artifactId>jsr305</artifactId>
+                            </path>
+                        </annotationProcessorPaths>
                     </configuration>
                 </plugin>
                 <plugin>

extensions/exiftool/src/main/java/org/exist/exiftool/xquery/MetadataFunctions.java

@@ -154,9 +154,10 @@ private Sequence extractMetadataFromWebResource(String uri) throws XPathExceptio
     private Sequence exifToolExtract(final Path binaryFile) throws XPathException {
         final ExiftoolModule module = (ExiftoolModule) getParentModule();
         try {
-            final Process p = Runtime.getRuntime().exec(module.getPerlPath() + " " + module.getExiftoolPath() + " -X -struct " + binaryFile.toAbsolutePath());
+            final String[] command = new String[]{module.getPerlPath(), module.getExiftoolPath(), "-X", "-struct", binaryFile.toAbsolutePath().toString()};
+            final Process p = Runtime.getRuntime().exec(command);
             try(final InputStream stdIn = p.getInputStream();
-                    final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+                    final UnsynchronizedByteArrayOutputStream baos =  UnsynchronizedByteArrayOutputStream.builder().get()) {
 
                 //buffer stdin
                 baos.write(stdIn);
@@ -176,10 +177,11 @@ private Sequence exifToolExtract(final Path binaryFile) throws XPathException {
     private Sequence exifToolWebExtract(final URI uri) throws XPathException {
         final ExiftoolModule module = (ExiftoolModule) getParentModule();
         try {
-            final Process p = Runtime.getRuntime().exec(module.getExiftoolPath()+" -fast -X -");
+            final String[] command = new String[]{module.getExiftoolPath(), "-fast", "-X", "-"};
+            final Process p = Runtime.getRuntime().exec(command);
 
             try(final InputStream stdIn = p.getInputStream();
-                    final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
+                    final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
 
                 try(final OutputStream stdOut = p.getOutputStream()) {
                     final Source src = SourceFactory.getSource(context.getBroker(), null, uri.toString(), false);

extensions/expath/src/main/java/org/expath/exist/ZipFileFunctions.java

@@ -137,7 +137,7 @@ private Sequence updateZip(XmldbURI uri, String[] paths, BinaryValue[] binaries)
             binariesTable.put(paths[i], binaries[i]);
         }
 
-        try(final UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream())
+        try(final UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get())
         {
             zis = zipFileSource.getStream();
             ZipOutputStream zos = new ZipOutputStream(baos); // zos is the output - the result

extensions/expath/src/main/java/org/expath/tools/model/exist/EXistSequence.java

@@ -82,7 +82,7 @@ public void serialize(final OutputStream out, final SerialParameters params) thr
         props.setProperty(Serializer.GENERATE_DOC_EVENTS, "false");
 
         final String encoding = props.getProperty(OutputKeys.ENCODING, StandardCharsets.UTF_8.name());
-        try(final Writer writer = new OutputStreamWriter(new CloseShieldOutputStream(out), encoding)) {
+        try(final Writer writer = new OutputStreamWriter(CloseShieldOutputStream.wrap(out), encoding)) {
             final XQuerySerializer xqSerializer = new XQuerySerializer(context.getBroker(), props, writer);
             xqSerializer.serialize(sequence);
         } catch(final SAXException | IOException | XPathException e) {