Merge pull request #384 from MarkEWaite/use-JGit-5.2

Use JGit 5.2.0 & adapt one test
jenkinsci · Dec 11, 2018 · 69e00ad · 69e00ad
2 parents c72d9b8 + c1c3110
commit 69e00ad
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,7 @@
     <argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
     <jenkins.version>2.60.3</jenkins.version>
     <java.level>8</java.level>
-    <jgit.version>5.1.3.201810200350-r</jgit.version>
+    <jgit.version>5.2.0.201812061821-r</jgit.version>
   </properties>
 
   <dependencies>

diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/jgit/PreemptiveAuthHttpClientConnection.java b/src/main/java/org/jenkinsci/plugins/gitclient/jgit/PreemptiveAuthHttpClientConnection.java
@@ -103,10 +103,12 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * A {@link HttpConnection} which uses {@link HttpClient} and attempts to
@@ -331,14 +333,19 @@ private void execute() throws IOException, ClientProtocolException {
     }
 
     public Map<String, List<String>> getHeaderFields() {
-        Map<String, List<String>> ret = new HashMap<>();
+        Map<String, List<String>> ret = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         for (Header hdr : resp.getAllHeaders()) {
             List<String> list = new LinkedList<>();
             for (HeaderElement hdrElem : hdr.getElements())
                 list.add(hdrElem.toString());
-            ret.put(hdr.getName(), list);
+            ret.put(hdr.getName(), Collections.unmodifiableList(list));
         }
-        return ret;
+        return Collections.unmodifiableMap(ret);
+    }
+
+    public List<String> getHeaderFields(@org.eclipse.jgit.annotations.NonNull String name) {
+        Map<String, List<String>> allHeaders = getHeaderFields();
+        return allHeaders.get(name);
     }
 
     public void setRequestProperty(String name, String value) {

diff --git a/src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java b/src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java
@@ -2124,15 +2124,34 @@ public void test_submodule_checkout_and_clean_transitions() throws Exception {
          */
         // w.git.checkout().ref(notSubRefName).execute();
         w.git.checkout().ref(notSubRefName).branch(notSubBranchName).deleteBranchIfExist(true).execute();
-        assertDirExists(ntpDir);
-        assertFileExists(ntpContributingFile);
-        assertFileContains(ntpContributingFile, contributingFileContentFromNonsubmoduleBranch);
         if (w.git instanceof CliGitAPIImpl) {
+            /*
+             * Transition from "with submodule" to "without submodule"
+             * where the "without submodule" case includes the file
+             * ntpContributingFile and the directory ntpDir.
+             */
+            assertDirExists(ntpDir);
+            assertFileExists(ntpContributingFile);
+            assertFileContains(ntpContributingFile, contributingFileContentFromNonsubmoduleBranch);
             /* submodule dirs exist because git.clean() won't remove untracked submodules */
             assertDirExists(firewallDir);
             assertDirExists(sshkeysDir);
             assertFileExists(sshkeysModuleFile);
         } else {
+            /*
+             * Transition from "with submodule" to "without submodule"
+             * where the "without submodule" case includes the file
+             * ntpContributingFile and the directory ntpDir.
+             *
+             * JGit 5.2.0 handles the transition from "with submodule"
+             * to "without submodule" differently than CLI git and
+             * differently than JGit versions prior to JGit 5.2.0.
+             * It does not checkout ntpDir or the ntpContributingFile.
+             *
+             * Prior to JGit 5.2.0 and the CheckoutCommand bug fix,
+             * the ntpDir would remain along with ntpContributingFile.
+             */
+            assertDirNotFound(ntpDir);
             /* firewallDir and sshKeysDir don't exist because JGit submodule update never created them */
             assertDirNotFound(firewallDir);
             assertDirNotFound(sshkeysDir);