Merge pull request #5669 from dizzzz/feature/more_syntax_tostring

[refactor] avoid unneeded conversions to String

Author: line-o

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

@@ -66,7 +66,7 @@ public void execute() throws BuildException
                 }
 
                 if( buffer.length() > 0 ) {
-                    log( "Setting output property " + outputproperty + " to " + buffer.toString(), Project.MSG_DEBUG );
+                    log( "Setting output property " + outputproperty + " to " + buffer, Project.MSG_DEBUG );
                     getProject().setNewProperty( outputproperty, buffer.toString() );
                 }
             }

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

@@ -67,7 +67,7 @@ public void execute() throws BuildException
                 }
 
                 if( buffer.length() > 0 ) {
-                    log( "Setting output property " + outputproperty + " to " + buffer.toString(), Project.MSG_DEBUG );
+                    log( "Setting output property " + outputproperty + " to " + buffer, Project.MSG_DEBUG );
                     getProject().setNewProperty( outputproperty, buffer.toString() );
                 }
             }

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

@@ -78,7 +78,7 @@ public void execute() throws BuildException {
                 if ((resource != null) && (destDir == null)) {
 
                     // extraction of a single resource
-                    log("Extracting resource: " + resource + " to " + destFile.toAbsolutePath().toString(), Project.MSG_INFO);
+                    log("Extracting resource: " + resource + " to " + destFile.toAbsolutePath(), Project.MSG_INFO);
                     final Resource res = base.getResource(resource);
 
                     if (res == null) {
@@ -138,7 +138,7 @@ private void extractResources(final Collection base, final String path) throws X
         if (!resources.isEmpty()) {
             Path dir = destDir;
 
-            log("Extracting to directory " + destDir.toAbsolutePath().toString(), Project.MSG_DEBUG);
+            log("Extracting to directory " + destDir.toAbsolutePath(), Project.MSG_DEBUG);
 
             if (path != null) {
                 dir =  destDir.resolve(path);
@@ -241,7 +241,7 @@ private void writeXMLResource(final XMLResource res, final Path dest) throws IOE
             final SAXSerializer serializer = (SAXSerializer) SerializerPool.getInstance().borrowObject(SAXSerializer.class);
 
             try (final Writer writer = getWriter(res, dest)) {
-                log("Writing resource " + res.getId() + " to destination " + dest.toAbsolutePath().toString(), Project.MSG_DEBUG);
+                log("Writing resource " + res.getId() + " to destination " + dest.toAbsolutePath(), Project.MSG_DEBUG);
                 serializer.setOutput(writer, outputProperties);
                 res.getContentAsSAX(serializer);
             } finally {

exist-core/src/main/java/org/exist/BTreeTest.java

@@ -65,7 +65,7 @@ public void create(int count) throws DBException, IOException {
 
             String prefixStr = "KEY";
             for (int i = 1; i <= count; i++) {
-                Value value = new Value(prefixStr + Integer.toString(i));
+                Value value = new Value(prefixStr + i);
                 btree.addValue(value, i);
             }
             btree.flush();
@@ -107,7 +107,7 @@ public void read(int count) throws DBException, IOException, TerminatedException
 
             String prefixStr = "KEY";
             for (int i = 1; i <= count; i++) {
-                Value value = new Value(prefixStr + Integer.toString(i));
+                Value value = new Value(prefixStr + i);
                 long r = btree.findValue(value);
                 if (r == -1) {
                     System.out.println("Key not found: " + i);

exist-core/src/main/java/org/exist/backup/ExportGUI.java

@@ -113,11 +113,11 @@ protected boolean checkOutputDir() {
 
         if (!Files.exists(dir)) {
 
-            if (JOptionPane.showConfirmDialog(this, "The output directory " + dir.toAbsolutePath().toString() + " does not exist. Create it?", "Confirm", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
+            if (JOptionPane.showConfirmDialog(this, "The output directory " + dir.toAbsolutePath() + " does not exist. Create it?", "Confirm", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
                 try {
                     Files.createDirectories(dir);
                 } catch (final IOException e) {
-                    JOptionPane.showMessageDialog(this, "Could not create output dir: " + dir.toAbsolutePath().toString(), "Configuration Error", JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(this, "Could not create output dir: " + dir.toAbsolutePath(), "Configuration Error", JOptionPane.ERROR_MESSAGE);
                     e.printStackTrace();
                     System.err.println("ERROR: Failed to create output dir: " + e.getMessage());
                 }
@@ -136,7 +136,7 @@ protected boolean startDB() {
         final Path confFile = Paths.get(dbConfig.getText()).normalize();
 
         if (!(Files.exists(confFile) && Files.isReadable(confFile))) {
-            JOptionPane.showMessageDialog(this, "The selected database configuration file " + confFile.toAbsolutePath().toString() + " does not exist or is not readable.", "Configuration Error", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(this, "The selected database configuration file " + confFile.toAbsolutePath() + " does not exist or is not readable.", "Configuration Error", JOptionPane.ERROR_MESSAGE);
             return false;
         }
 
@@ -494,7 +494,7 @@ public void error(final String message, final Throwable exception) {
 
                 final long end = System.currentTimeMillis();
 
-                displayMessage("Export to " + file.toAbsolutePath().toString() + " completed successfully.");
+                displayMessage("Export to " + file.toAbsolutePath() + " completed successfully.");
                 displayMessage("Export took " + (end - start) + "ms.");
 
             } catch (final EXistException e) {

exist-core/src/main/java/org/exist/backup/ExportMain.java

@@ -196,7 +196,7 @@ private static void process(final ParsedArguments arguments) {
                 if (!Files.exists(exportTarget)) {
                     Files.createDirectories(exportTarget);
                 } else if(!Files.isDirectory(exportTarget)) {
-                    System.err.println("Output dir already exists and is a file: " + exportTarget.toAbsolutePath().toString());
+                    System.err.println("Output dir already exists and is a file: " + exportTarget.toAbsolutePath());
                     System.exit(SystemExitCodes.INVALID_ARGUMENT_EXIT_CODE);
                 }
                 final SystemExport sysexport = new SystemExport(broker, transaction, new Callback(verbose), null, direct);

exist-core/src/main/java/org/exist/backup/FileSystemBackupDescriptor.java

@@ -54,7 +54,7 @@ public class FileSystemBackupDescriptor extends AbstractBackupDescriptor {
 
     public FileSystemBackupDescriptor(final Path root, final Path descriptor) throws FileNotFoundException {
         if (!FileUtils.fileName(descriptor).equals(BackupDescriptor.COLLECTION_DESCRIPTOR) || Files.isDirectory(descriptor) || !Files.isReadable(descriptor)) {
-            throw new FileNotFoundException(descriptor.toAbsolutePath().toString() + " is not a valid collection descriptor");
+            throw new FileNotFoundException(descriptor.toAbsolutePath() + " is not a valid collection descriptor");
         }
         this.descriptor = descriptor;
         this.root = root;

exist-core/src/main/java/org/exist/backup/Restore.java

@@ -145,7 +145,7 @@ private Deque<BackupDescriptor> getBackupDescriptors(Path contents) throws IOExc
                     contents = bd.getParentDir().resolve(previous);
 
                     if(!Files.isReadable(contents)) {
-                        throw new IOException("Required part of incremental backup not found: " + contents.toAbsolutePath().toString());
+                        throw new IOException("Required part of incremental backup not found: " + contents.toAbsolutePath());
                     }
                 }
             }

exist-core/src/main/java/org/exist/backup/SystemImport.java

@@ -141,7 +141,7 @@ private Deque<BackupDescriptor> getBackupDescriptors(Path contents) throws IOExc
                     contents = bd.getParentDir().resolve(previous);
 
                     if(!Files.isReadable(contents)) {
-                        throw new IOException("Required part of incremental backup not found: " + contents.toAbsolutePath().toString());
+                        throw new IOException("Required part of incremental backup not found: " + contents.toAbsolutePath());
                     }
                 }
             }

exist-core/src/main/java/org/exist/backup/ZipArchiveBackupDescriptor.java

@@ -95,12 +95,12 @@ public ZipArchiveBackupDescriptor(final Path fileArchive) throws IOException {
         }
 
         if (descriptor == null) {
-            throw new FileNotFoundException("Archive " + fileArchive.toAbsolutePath().toString() + " is not a valid eXist backup archive");
+            throw new FileNotFoundException("Archive " + fileArchive.toAbsolutePath() + " is not a valid eXist backup archive");
         }
 
         final Path fakeDbRoot = Paths.get("/db");
         if (!fakeDbRoot.resolve(Paths.get(base)).normalize().startsWith(fakeDbRoot)) {
-            throw new IOException("Detected archive exit attack! zipFile=" + fileArchive.toAbsolutePath().normalize().toString());
+            throw new IOException("Detected archive exit attack! zipFile=" + fileArchive.toAbsolutePath().normalize());
         }
 
         // Count number of files