Merge pull request #493 from joschi/remove-guava

Remove dependency on Google Guava

Author: TheSnoozer

core/pom.xml

@@ -21,10 +21,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <!-- JGit -->
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
@@ -48,5 +44,9 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.9.10.4</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
     </dependencies>
 </project>

core/src/main/java/pl/project13/core/GitDataProvider.java

@@ -17,8 +17,6 @@
 
 package pl.project13.core;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import pl.project13.core.git.GitDescribeConfig;
 import pl.project13.core.cibuild.BuildServerDataProvider;
 import pl.project13.core.cibuild.UnknownBuildServerData;
@@ -27,15 +25,12 @@
 
 import javax.annotation.Nonnull;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.*;
 import java.text.SimpleDateFormat;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-
 public abstract class GitDataProvider implements GitProvider {
 
   @Nonnull
@@ -229,7 +224,7 @@ protected String determineBranchName(@Nonnull Map<String, String> env) throws Gi
     BuildServerDataProvider buildServerDataProvider = BuildServerDataProvider.getBuildServerProvider(env,log);
     if (useBranchNameFromBuildEnvironment && !(buildServerDataProvider instanceof UnknownBuildServerData)) {
       String branchName = buildServerDataProvider.getBuildBranch();
-      if (isNullOrEmpty(branchName)) {
+      if (branchName == null || branchName.isEmpty()) {
         log.info("Detected that running on CI environment, but using repository branch, no GIT_BRANCH detected.");
         return getBranchName();
       }
@@ -262,7 +257,6 @@ protected void maybePut(@Nonnull Properties properties, String key, SupplierEx<S
 
   @FunctionalInterface
   public interface SupplierEx<T> {
-    @CanIgnoreReturnValue
     T get() throws GitCommitIdExecutionException;
   }
 

core/src/main/java/pl/project13/core/JGitProvider.java

@@ -17,8 +17,6 @@
 
 package pl.project13.core;
 
-import com.google.common.annotations.VisibleForTesting;
-
 import org.eclipse.jgit.api.FetchCommand;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -285,7 +283,8 @@ public void finalCleanUp() {
     }
   }
 
-  @VisibleForTesting String getGitDescribe(@Nonnull Repository repository) throws GitCommitIdExecutionException {
+  // Visible for testing
+  String getGitDescribe(@Nonnull Repository repository) throws GitCommitIdExecutionException {
     try {
       DescribeResult describeResult = DescribeCommand
           .on(evaluateOnCommit, repository, log)
@@ -356,7 +355,6 @@ private void fetch() {
 
   // SETTERS FOR TESTS ----------------------------------------------------
 
-  @VisibleForTesting
   public void setRepository(Repository git) {
     this.git = git;
   }

core/src/main/java/pl/project13/core/NativeGitProvider.java

@@ -24,8 +24,6 @@
 
 import javax.annotation.Nonnull;
 
-import com.google.common.annotations.VisibleForTesting;
-
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
@@ -586,8 +584,8 @@ private void fetch(String remoteBranch) {
       log.error("Failed to execute fetch", e);
     }
   }
-  
-  @VisibleForTesting
+
+  // Visible for testing
   public void setEvaluateOnCommit(String evaluateOnCommit) {
     this.evaluateOnCommit = evaluateOnCommit;
   }

core/src/main/java/pl/project13/core/PropertiesFileGenerator.java

@@ -19,16 +19,14 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.io.Files;
 import org.sonatype.plexus.build.incremental.BuildContext;
-import pl.project13.core.GitCommitIdExecutionException;
-import pl.project13.core.GitCommitPropertyConstant;
 import pl.project13.core.log.LoggerBridge;
 import pl.project13.core.util.SortedProperties;
 
 import javax.annotation.Nonnull;
 import java.io.*;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -86,7 +84,7 @@ public void maybeGeneratePropertiesFile(@Nonnull Properties localProperties, Fil
       }
 
       if (shouldGenerate) {
-        Files.createParentDirs(gitPropsFile);
+        Files.createDirectories(gitPropsFile.getParentFile().toPath());
         try (OutputStream outputStream = new FileOutputStream(gitPropsFile)) {
           SortedProperties sortedLocalProperties = new SortedProperties();
           sortedLocalProperties.putAll(localProperties);

core/src/main/java/pl/project13/core/cibuild/GitHubBuildServerData.java

@@ -23,8 +23,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-
 public class GitHubBuildServerData extends BuildServerDataProvider {
 
   private static final String BRANCH_REF_PREFIX = "refs/heads/";
@@ -49,7 +47,7 @@ void loadBuildNumber(@Nonnull Properties properties) {
   @Override
   public String getBuildBranch() {
     String gitHubRef = env.get("GITHUB_REF");
-    if (!isNullOrEmpty(gitHubRef)) {
+    if (gitHubRef != null && !gitHubRef.isEmpty()) {
       if (gitHubRef.startsWith(BRANCH_REF_PREFIX)) {
         String branchName = gitHubRef.substring(BRANCH_REF_PREFIX.length());
         log.info("Using environment variable based branch name. GITHUB_REF = {} (branch = {})", gitHubRef, branchName);

core/src/main/java/pl/project13/core/cibuild/HudsonJenkinsBuildServerData.java

@@ -24,8 +24,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import static com.google.common.base.Strings.isNullOrEmpty;
-
 public class HudsonJenkinsBuildServerData extends BuildServerDataProvider {
 
   HudsonJenkinsBuildServerData(@Nonnull LoggerBridge log, @Nonnull Map<String, String> env) {
@@ -50,7 +48,7 @@ void loadBuildNumber(@Nonnull Properties properties) {
   @Override
   public String getBuildBranch() {
     String environmentBasedLocalBranch = env.get("GIT_LOCAL_BRANCH");
-    if (!isNullOrEmpty(environmentBasedLocalBranch)) {
+    if (environmentBasedLocalBranch != null && !environmentBasedLocalBranch.isEmpty()) {
       log.info("Using environment variable based branch name. GIT_LOCAL_BRANCH = {}",
           environmentBasedLocalBranch);
       return environmentBasedLocalBranch;

core/src/main/java/pl/project13/core/jgit/DescribeCommand.java

@@ -17,9 +17,6 @@
 
 package pl.project13.core.jgit;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-
 import org.eclipse.jgit.api.GitCommand;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.ObjectId;
@@ -144,8 +141,12 @@ public DescribeCommand forceLongFormat(@Nullable Boolean forceLongFormat) {
   @Nonnull
   public DescribeCommand abbrev(@Nullable Integer n) {
     if (n != null) {
-      Preconditions.checkArgument(n < 41, String.format("N (commit abbrev length) must be < 41. (Was:[%s])", n));
-      Preconditions.checkArgument(n >= 0, String.format("N (commit abbrev length) must be positive! (Was [%s])", n));
+      if (n >= 41) {
+        throw new IllegalArgumentException("N (commit abbrev length) must be < 41. (Was:[" + n + "])");
+      }
+      if (n < 0) {
+        throw new IllegalArgumentException("N (commit abbrev length) must be positive! (Was [" + n + "])");
+      }
       log.info("--abbrev = {}", n);
       abbrev = n;
     }
@@ -332,12 +333,12 @@ private static boolean foundZeroTags(@Nonnull Map<ObjectId, List<String>> tags)
     return tags.isEmpty();
   }
 
-  @VisibleForTesting
+  // Visible for testing
   boolean findDirtyState(Repository repo) throws GitAPIException {
     return JGitCommon.isRepositoryInDirtyState(repo);
   }
 
-  @VisibleForTesting
+  // Visible for testing
   static boolean hasTags(ObjectId headCommit, @Nonnull Map<ObjectId, List<String>> tagObjectIdToName) {
     return tagObjectIdToName.containsKey(headCommit);
   }

core/src/main/java/pl/project13/core/jgit/DescribeResult.java

@@ -17,7 +17,6 @@
 
 package pl.project13.core.jgit;
 
-import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.util.*;
 
@@ -96,7 +95,9 @@ public DescribeResult(@Nonnull String tagName, boolean dirty, @Nonnull Optional<
 
   @Nonnull
   public DescribeResult withCommitIdAbbrev(int n) {
-    Preconditions.checkArgument(n >= 0, String.format("The --abbrev parameter must be >= 0, but it was: [%s]", n));
+    if (n < 0) {
+      throw new IllegalArgumentException("The --abbrev parameter must be >= 0, but it was: [" + n + "]");
+    }
     this.abbrev = n;
     this.abbreviatedObjectId = createAbbreviatedCommitId(this.objectReader, this.commitId.get(), this.abbrev);
     return this;

core/src/main/java/pl/project13/core/jgit/JGitCommon.java

@@ -35,7 +35,6 @@
 
 import pl.project13.core.jgit.dummy.DatedRevTag;
 
-import com.google.common.annotations.VisibleForTesting;
 import pl.project13.core.git.GitDescribeConfig;
 import pl.project13.core.log.LoggerBridge;
 import pl.project13.core.util.Pair;
@@ -238,7 +237,7 @@ private Comparator<DatedRevTag> datedRevTagComparator() {
     return (revTag, revTag2) -> revTag2.date.compareTo(revTag.date);
   }
 
-  @VisibleForTesting
+  // Visible for testing
   protected String trimFullTagName(@Nonnull String tagName) {
     return tagName.replaceFirst("refs/tags/", "");
   }