Merge pull request internetarchive#468 from internetarchive/remove-jna

Author: ato

commons/pom.xml

@@ -167,12 +167,6 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>net.java.dev.jna</groupId>
-			<artifactId>jna</artifactId>
-			<version>3.2.3</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.netpreserve.commons</groupId>
 			<artifactId>webarchive-commons</artifactId>

commons/src/main/java/org/archive/bdb/BdbModule.java

@@ -27,6 +27,7 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.math.BigInteger;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -43,7 +44,6 @@
 import org.archive.checkpointing.Checkpoint;
 import org.archive.checkpointing.Checkpointable;
 import org.archive.spring.ConfigPath;
-import org.archive.util.FilesystemLinkMaker;
 import org.archive.util.IdentityCacheable;
 import org.archive.util.ObjectIdentityBdbManualCache;
 import org.archive.util.ObjectIdentityCache;
@@ -548,8 +548,10 @@ public void doCheckpoint(final Checkpoint checkpointInProgress) throws IOExcepti
                     filedata[i] += ","+f.length();
                     if(getUseHardLinkCheckpoints()) {
                         File hardLink = new File(envCpDir,filedata[i]);
-                        if (!FilesystemLinkMaker.makeHardLink(f.getAbsolutePath(), hardLink.getAbsolutePath())) {
-                            LOGGER.log(Level.SEVERE, "unable to create required checkpoint link "+hardLink); 
+                        try {
+                            Files.createLink(hardLink.toPath(), f.toPath().toAbsolutePath());
+                        } catch (IOException | UnsupportedOperationException e) {
+                            LOGGER.log(Level.SEVERE, "unable to create required checkpoint link " + hardLink, e);
                         }
                     }
                 }
@@ -600,10 +602,10 @@ protected void doRecover() throws IOException {
                         LOGGER.log(Level.SEVERE, "unable to delete obstructing file "+destFile);  
                     }
                 }
-                
-                boolean status = FilesystemLinkMaker.makeHardLink(cpFile.getAbsolutePath(), destFile.getAbsolutePath());
-                if (!status) {
-                    LOGGER.log(Level.SEVERE, "unable to create required restore link "+destFile); 
+                try {
+                    Files.createLink(destFile.toPath(), cpFile.toPath().toAbsolutePath());
+                } catch (IOException | UnsupportedOperationException e) {
+                    LOGGER.log(Level.SEVERE, "unable to create required restore link " + destFile, e);
                 }
             }
 

commons/src/main/java/org/archive/spring/PathSharingContext.java

@@ -23,6 +23,8 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
@@ -31,7 +33,6 @@
 
 import org.apache.commons.io.FileUtils;
 import org.archive.util.ArchiveUtils;
-import org.archive.util.FilesystemLinkMaker;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationContext;
@@ -161,9 +162,10 @@ protected void initLaunchDir() {
             // attempt to symlink "latest" to launch dir
             File latestSymlink = new File(getConfigurationFile().getParentFile(), "latest");
             latestSymlink.delete();
-            boolean success = FilesystemLinkMaker.makeSymbolicLink(currentLaunchDir.getName(), latestSymlink.getPath());
-            if (!success) {
-                LOGGER.warning("failed to create symlink from " + latestSymlink + " to " + currentLaunchDir);
+            try {
+                Files.createSymbolicLink(latestSymlink.toPath(), Paths.get(currentLaunchDir.getName()));
+            } catch (IOException | UnsupportedOperationException e) {
+                LOGGER.log(Level.WARNING, "failed to create symlink from " + latestSymlink + " to " + currentLaunchDir, e);
             }
         } catch (IOException e) {
             LOGGER.log(Level.SEVERE, "failed to initialize launch directory: " + e);

commons/src/main/java/org/archive/util/CLibrary.java

@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -42,7 +43,6 @@
 import org.archive.modules.seeds.SeedModule;
 import org.archive.spring.ConfigPath;
 import org.archive.util.ArchiveUtils;
-import org.archive.util.FilesystemLinkMaker;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -266,9 +266,10 @@ protected void actOn(File actionFile) {
                 if (!actionDoneDirFile.equals(doneDir.getFile())) {
                     actionDoneDirFile.mkdirs();
                     File doneSymlinkFile = new File(actionDoneDirFile, doneFile.getName());
-                    boolean success = FilesystemLinkMaker.makeSymbolicLink(doneFile.getPath(), doneSymlinkFile.getPath());
-                    if (!success) {
-                        LOGGER.warning("failed to create symlink from " + doneSymlinkFile + " to " + doneFile);
+                    try {
+                        Files.createSymbolicLink(doneSymlinkFile.toPath(), doneFile.toPath());
+                    } catch (IOException | UnsupportedOperationException e) {
+                        LOGGER.log(Level.WARNING, "failed to create symlink from " + doneSymlinkFile + " to " + doneFile, e);
                     }
                 }
             } catch (IOException e) {