FindBugs fixups, mostly related to possible toString() NPEs

SingularityExecutor/src/main/java/com/hubspot/singularity/executor/task/SingularityExecutorArtifactFetcher.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Objects;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -151,7 +152,7 @@ private void downloadFilesFromLocalDownloadService(List<S3Artifact> s3Artifacts,
     private void downloadRemoteArtifact(RemoteArtifact remoteArtifact, ArtifactManager artifactManager, SingularityExecutorTask task) {
       Path fetched = artifactManager.fetch(remoteArtifact);
 
-      if (fetched.getFileName().toString().endsWith(".tar.gz")) {
+      if (Objects.toString(fetched.getFileName()).endsWith(".tar.gz")) {
         artifactManager.untar(fetched, task.getTaskDefinition().getTaskDirectoryPath());
       } else {
         artifactManager.copy(fetched, task.getTaskDefinition().getTaskAppDirectoryPath());

SingularityExecutor/src/main/java/com/hubspot/singularity/executor/task/SingularityExecutorTaskLogManager.java

@@ -7,8 +7,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-
-import org.slf4j.Logger;
+import java.util.Objects;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
@@ -24,6 +23,8 @@
 import com.hubspot.singularity.runner.base.shared.SimpleProcessManager;
 import com.hubspot.singularity.runner.base.shared.TailMetadata;
 
+import org.slf4j.Logger;
+
 public class SingularityExecutorTaskLogManager {
 
   private final SingularityExecutorTaskDefinition taskDefinition;
@@ -162,7 +163,7 @@ private boolean writeTailMetadata(boolean finished) {
    */
   private String getS3Glob() {
     List<String> fileNames = new ArrayList<>(configuration.getS3UploaderAdditionalFiles());
-    fileNames.add(taskDefinition.getServiceLogOutPath().getFileName().toString());
+    fileNames.add(Objects.toString(taskDefinition.getServiceLogOutPath().getFileName()));
 
     return String.format("{%s}*.gz*", Joiner.on(",").join(fileNames));
   }
@@ -184,7 +185,12 @@ public Path getLogrotateConfPath() {
   }
 
   private boolean writeS3MetadataFile(boolean finished) {
-    Path logrotateDirectory = taskDefinition.getServiceLogOutPath().getParent().resolve(configuration.getLogrotateToDirectory());
+    final Path serviceLogOutPath = taskDefinition.getServiceLogOutPath();
+    final Path parent = serviceLogOutPath.getParent();
+    if (parent == null) {
+      throw new IllegalStateException("S3 metadata file " + serviceLogOutPath + " has no parent");
+    }
+    final Path logrotateDirectory = parent.resolve(configuration.getLogrotateToDirectory());
 
     S3UploadMetadata s3UploadMetadata = new S3UploadMetadata(logrotateDirectory.toString(), getS3Glob(), configuration.getS3UploaderBucket(), getS3KeyPattern(), finished, Optional.<String> absent(), Optional.<Integer> absent(), Optional.<String> absent(),
         Optional.<String> absent(), Optional.<Long> absent());

SingularityExecutorCleanup/src/main/java/com/hubspot/singularity/executor/cleanup/SingularityExecutorCleanup.java

@@ -12,6 +12,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import com.hubspot.singularity.executor.config.SingularityExecutorModule;
@@ -108,7 +109,7 @@ public SingularityExecutorCleanupStatistics clean() {
     }
 
     for (Path file : JavaUtils.iterable(directory)) {
-      if (!file.getFileName().toString().endsWith(executorConfiguration.getGlobalTaskDefinitionSuffix())) {
+      if (!Objects.toString(file.getFileName()).endsWith(executorConfiguration.getGlobalTaskDefinitionSuffix())) {
         LOG.debug("Ignoring file {} that doesn't have suffix {}", file, executorConfiguration.getGlobalTaskDefinitionSuffix());
         statisticsBldr.incrInvalidTasks();
         continue;
@@ -215,7 +216,11 @@ private boolean cleanTask(SingularityExecutorTaskDefinition taskDefinition, Opti
 
   private Iterator<Path> getUncompressedLogrotatedFileIterator(SingularityExecutorTaskDefinition taskDefinition) {
     final Path serviceLogOutPath = taskDefinition.getServiceLogOutPath();
-    final Path logrotateToPath = taskDefinition.getServiceLogOutPath().getParent().resolve(executorConfiguration.getLogrotateToDirectory());
+    final Path parent = serviceLogOutPath.getParent();
+    if (parent == null) {
+      throw new IllegalStateException("Service log path " + serviceLogOutPath + " has no parent");
+    }
+    final Path logrotateToPath = parent.resolve(executorConfiguration.getLogrotateToDirectory());
 
     if (!logrotateToPath.toFile().exists() || !logrotateToPath.toFile().isDirectory()) {
       LOG.warn("Skipping uncompressed logrotated file cleanup for {} -- {} does not exist or is not a directory (task sandbox was probably garbage collected by Mesos)", taskDefinition.getTaskId(), logrotateToPath);
@@ -240,14 +245,13 @@ private void checkForUncompressedLogrotatedFile(SingularityExecutorTaskDefinitio
     while (iterator.hasNext()) {
       Path path = iterator.next();
 
-      if (path.getFileName().toString().endsWith(".gz")) {
+      final String fileName = Objects.toString(path.getFileName());
+      if (fileName.endsWith(".gz")) {
         try {
           if (Files.size(path) == 0) {
             Files.deleteIfExists(path);
 
-            String pathString = path.getFileName().toString();
-
-            emptyPaths.add(pathString.substring(0, pathString.length() - 3)); // removing .gz
+            emptyPaths.add(fileName.substring(0, fileName.length() - 3)); // removing .gz
           }
         } catch (IOException ioe) {
           LOG.error("Failed to handle empty gz file {}", path, ioe);
@@ -258,7 +262,7 @@ private void checkForUncompressedLogrotatedFile(SingularityExecutorTaskDefinitio
     }
 
     for (Path path : ungzippedFiles) {
-      if (emptyPaths.contains(path.getFileName().toString())) {
+      if (emptyPaths.contains(Objects.toString(path.getFileName()))) {
         LOG.info("Gzipping abandoned file {}", path);
         try {
           new SimpleProcessManager(LOG).runCommand(ImmutableList.<String> of("gzip", path.toString()));

SingularityS3Base/src/main/java/com/hubspot/singularity/s3/base/ArtifactManager.java

@@ -92,10 +92,13 @@ private void downloadAndCheck(RemoteArtifact artifact, Path downloadTo) {
   public void extract(EmbeddedArtifact embeddedArtifact, Path directory) {
     final Path extractTo = directory.resolve(embeddedArtifact.getFilename());
 
+    final Path parent = extractTo.getParent();
     try {
-      Files.createDirectories(extractTo.getParent());
+      if (parent != null) {
+        Files.createDirectories(parent);
+      }
     } catch (IOException e) {
-      throw new RuntimeException(String.format("Couldn't extract %s, unable to create directory %s", embeddedArtifact.getName(), extractTo.getParent()), e);
+      throw new RuntimeException(String.format("Couldn't extract %s, unable to create directory %s", embeddedArtifact.getName(), parent), e);
     }
 
     log.info("Extracting {} bytes of {} to {}", embeddedArtifact.getContent().length, embeddedArtifact.getName(), extractTo);

SingularityS3Downloader/src/main/java/com/hubspot/singularity/s3downloader/server/SingularityS3DownloaderAsyncHandler.java

@@ -2,6 +2,7 @@
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Objects;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -49,7 +50,7 @@ private void download() throws Exception {
       return;
     }
 
-    if (fetched.getFileName().toString().endsWith(".tar.gz")) {
+    if (Objects.toString(fetched.getFileName()).endsWith(".tar.gz")) {
       artifactManager.untar(fetched, targetDirectory);
     } else {
       artifactManager.copy(fetched, targetDirectory);

SingularityS3Uploader/src/main/java/com/hubspot/singularity/s3uploader/SingularityS3Uploader.java

@@ -9,6 +9,7 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
@@ -198,8 +199,8 @@ private void uploadSingle(int sequence, Path file) throws Exception {
   }
 
   class Uploader implements Callable<Boolean> {
-    private int sequence;
-    private Path file;
+    private final int sequence;
+    private final Path file;
 
     public Uploader(int sequence, Path file) {
       this.file = file;
@@ -210,7 +211,7 @@ public Uploader(int sequence, Path file) {
     public Boolean call() throws Exception {
       final long start = System.currentTimeMillis();
 
-      final String key = SingularityS3FormatHelper.getKey(uploadMetadata.getS3KeyFormat(), sequence, Files.getLastModifiedTime(file).toMillis(), file.getFileName().toString(), Optional.of(hostname));
+      final String key = SingularityS3FormatHelper.getKey(uploadMetadata.getS3KeyFormat(), sequence, Files.getLastModifiedTime(file).toMillis(), Objects.toString(file.getFileName()), Optional.of(hostname));
 
       long fileSizeBytes = Files.size(file);
       LOG.info("{} Uploading {} to {}/{} (size {})", logIdentifier, file, s3Bucket.getName(), key, fileSizeBytes);