replaced static collection constructors from Google with standard Java ones

Author: autayeu

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

@@ -27,10 +27,11 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
-import static com.google.common.collect.Lists.newArrayList;
-
 /**
  * Represents the result of a <code>git describe</code> command.
  *
@@ -134,9 +135,9 @@ public String toString() {
     List<String> parts;
 
     if (abbrevZeroHidesCommitsPartOfDescribe()) {
-      parts = newArrayList(tag());
+      parts = new ArrayList<>(Collections.singletonList(tag()));
     } else {
-      parts = newArrayList(tag(), commitsAwayFromTag(), prefixedCommitId());
+      parts = new ArrayList<>(Arrays.asList(tag(), commitsAwayFromTag(), prefixedCommitId()));
     }
 
     return Joiner.on("-").skipNulls().join(parts) + dirtyMarker(); // like in the describe spec the entire "-dirty" is configurable (incl. "-")

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

@@ -17,9 +17,6 @@
 
 package pl.project13.jgit;
 
-import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Maps.newHashMap;
-
 import java.io.IOException;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -108,7 +105,7 @@ public String getClosestTagCommitCount(@NotNull Repository repo, RevCommit headC
   }
 
   private Map<ObjectId, List<DatedRevTag>> getClosestTagAsMap(@NotNull Repository repo){
-    Map<ObjectId, List<DatedRevTag>> mapWithClosestTagOnly = newHashMap();
+    Map<ObjectId, List<DatedRevTag>> mapWithClosestTagOnly = new HashMap<>();
     String matchPattern = ".*";
     Map<ObjectId, List<DatedRevTag>> commitIdsToTags = getCommitIdsToTags(repo, true, matchPattern);
     LinkedHashMap<ObjectId, List<DatedRevTag>> sortedCommitIdsToTags = sortByDatedRevTag(commitIdsToTags);
@@ -144,7 +141,7 @@ public int compare(Map.Entry<ObjectId, List<DatedRevTag>> m1, Map.Entry<ObjectId
   }
 
   protected Map<ObjectId, List<DatedRevTag>> getCommitIdsToTags(@NotNull Repository repo, boolean includeLightweightTags, String matchPattern){
-    Map<ObjectId, List<DatedRevTag>> commitIdsToTags = newHashMap();
+    Map<ObjectId, List<DatedRevTag>> commitIdsToTags = new HashMap<>();
 
     try (RevWalk walk = new RevWalk(repo)) {
       walk.markStart(walk.parseCommit(repo.resolve("HEAD")));
@@ -176,7 +173,7 @@ protected Map<ObjectId, List<DatedRevTag>> getCommitIdsToTags(@NotNull Repositor
           if (commitIdsToTags.containsKey(taggedCommitId)) {
             commitIdsToTags.get(taggedCommitId).add(new DatedRevTag(revTag));
           } else {
-            commitIdsToTags.put(taggedCommitId, newArrayList(new DatedRevTag(revTag)));
+            commitIdsToTags.put(taggedCommitId, new ArrayList<>(Collections.singletonList(new DatedRevTag(revTag))));
           }
 
         } catch (IncorrectObjectTypeException ex) {
@@ -190,7 +187,7 @@ protected Map<ObjectId, List<DatedRevTag>> getCommitIdsToTags(@NotNull Repositor
             if (commitIdsToTags.containsKey(resolvedCommitId)) {
               commitIdsToTags.get(resolvedCommitId).add(datedRevTag);
             } else {
-              commitIdsToTags.put(resolvedCommitId, newArrayList(datedRevTag));
+              commitIdsToTags.put(resolvedCommitId, new ArrayList<>(Collections.singletonList(datedRevTag)));
             }
           }
         } catch (Exception ignored) {
@@ -214,7 +211,7 @@ private boolean isTagId(ObjectId objectId) {
   }
 
   protected HashMap<ObjectId, List<String>> transformRevTagsMapToDateSortedTagNames(Map<ObjectId, List<DatedRevTag>> commitIdsToTags) {
-    HashMap<ObjectId, List<String>> commitIdsToTagNames = newHashMap();
+    HashMap<ObjectId, List<String>> commitIdsToTagNames = new HashMap<>();
     for (Map.Entry<ObjectId, List<DatedRevTag>> objectIdListEntry : commitIdsToTags.entrySet()) {
       List<String> tagNames = transformRevTagsMapEntryToDateSortedTagNames(objectIdListEntry);
 
@@ -226,7 +223,7 @@ protected HashMap<ObjectId, List<String>> transformRevTagsMapToDateSortedTagName
   private List<String> transformRevTagsMapEntryToDateSortedTagNames(Map.Entry<ObjectId, List<DatedRevTag>> objectIdListEntry) {
     List<DatedRevTag> tags = objectIdListEntry.getValue();
 
-    List<DatedRevTag> newTags = newArrayList(tags);
+    List<DatedRevTag> newTags = new ArrayList<>(tags);
     Collections.sort(newTags, datedRevTagComparator());
 
     List<String> tagNames = Lists.transform(newTags, new Function<DatedRevTag, String>() {
@@ -341,4 +338,4 @@ private void seeAllParents(@NotNull RevWalk revWalk, RevCommit child, @NotNull S
     }
   }
 
-}
+}