Merge branch 'main' into bug/#1269

hub4j · Nov 2, 2021 · 87b726e · 87b726e
2 parents 9c6efb6 + 913a2ed
commit 87b726e
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
     <spotbugs.version>4.4.2</spotbugs.version>
     <spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
     <hamcrest.version>2.2</hamcrest.version>
-    <okhttp3.version>4.4.1</okhttp3.version>
+    <okhttp3.version>4.9.2</okhttp3.version>
     <okio.version>2.10.0</okio.version>
     <!-- Using this as the minimum bar for code coverage.  Adding methods without covering them will fail this. -->
     <jacoco.coverage.target.bundle.method>0.70</jacoco.coverage.target.bundle.method>

diff --git a/src/test/java/org/kohsuke/github/extras/okhttp3/OkHttpConnectorTest.java b/src/test/java/org/kohsuke/github/extras/okhttp3/OkHttpConnectorTest.java
@@ -5,6 +5,7 @@
 import okhttp3.Cache;
 import okhttp3.OkHttpClient;
 import org.apache.commons.io.FileUtils;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.kohsuke.github.AbstractGitHubWireMockTest;
@@ -67,6 +68,7 @@ public OkHttpConnectorTest() {
     private static int maxAgeNoneHitCount = 11;
 
     private GHRateLimit rateLimitBefore;
+    private Cache cache = null;
 
     @Override
     protected WireMockConfiguration getWireMockOptions() {
@@ -88,6 +90,13 @@ public void setupRepo() throws Exception {
         }
     }
 
+    @After
+    public void deleteCache() throws IOException {
+        if (cache != null) {
+            cache.delete();
+        }
+    }
+
     @Test
     public void DefaultConnector() throws Exception {
 
@@ -120,7 +129,6 @@ public void OkHttpConnector_NoCache() throws Exception {
 
         checkRequestAndLimit(okhttpNetworkRequestCount, okhttpRateLimitUsed);
 
-        Cache cache = client.cache();
         assertThat("Cache", cache, is(nullValue()));
     }
 
@@ -147,8 +155,6 @@ public void OkHttpConnector_Cache_MaxAgeNone() throws Exception {
 
         checkRequestAndLimit(maxAgeNoneNetworkRequestCount, maxAgeNoneRateLimitUsed);
 
-        Cache cache = client.cache();
-
         // NOTE: this is actually bad.
         // This elevated hit count is the stale requests returning bad data took longer to detect a change.
         assertThat("getHitCount", cache.hitCount(), is(maxAgeNoneHitCount));
@@ -176,7 +182,6 @@ public void OkHttpConnector_Cache_MaxAge_Three() throws Exception {
 
         checkRequestAndLimit(maxAgeThreeNetworkRequestCount, maxAgeThreeRateLimitUsed);
 
-        Cache cache = client.cache();
         assertThat("getHitCount", cache.hitCount(), is(maxAgeThreeHitCount));
     }
 
@@ -202,7 +207,6 @@ public void OkHttpConnector_Cache_MaxAgeDefault_Zero() throws Exception {
 
         checkRequestAndLimit(maxAgeZeroNetworkRequestCount, maxAgeZeroRateLimitUsed);
 
-        Cache cache = client.cache();
         assertThat("getHitCount", cache.hitCount(), is(maxAgeZeroHitCount));
     }
 
@@ -228,7 +232,7 @@ private OkHttpClient createClient(boolean useCache) throws IOException {
             File cacheDir = new File("target/cache/" + baseFilesClassPath + "/" + mockGitHub.getMethodName());
             cacheDir.mkdirs();
             FileUtils.cleanDirectory(cacheDir);
-            Cache cache = new Cache(cacheDir, 100 * 1024L * 1024L);
+            cache = new Cache(cacheDir, 100 * 1024L * 1024L);
 
             builder.cache(cache);
         }

diff --git a/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-10-10.json b/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-10-10.json
@@ -3,7 +3,12 @@
   "name": "repos_hub4j-test-org_github-api",
   "request": {
     "url": "/repos/hub4j-test-org/github-api",
-    "method": "GET"
+    "method": "GET",
+    "headers": {
+      "If-None-Match": {
+        "absent" : true
+      }
+    }
   },
   "response": {
     "status": 200,

diff --git a/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-12-12.json b/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-12-12.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"4f508593b64df214fee8f6ab42df633c\""
+        "matches": "^(W/)?\"4f508593b64df214fee8f6ab42df633c\"$"
       }
     }
   },

diff --git a/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-13-13.json b/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-13-13.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"4f508593b64df214fee8f6ab42df633c\""
+        "matches": "^(W/)?\"4f508593b64df214fee8f6ab42df633c\"$"
       }
     }
   },

diff --git a/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-14-14.json b/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-14-14.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"4f508593b64df214fee8f6ab42df633c\""
+        "matches": "^(W/)?\"4f508593b64df214fee8f6ab42df633c\"$"
       }
     }
   },

diff --git a/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-16-16.json b/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-16-16.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"31f73a7ecc35bbecec125851ce166af4\""
+        "matches": "^(W/)?\"31f73a7ecc35bbecec125851ce166af4\"$"
       }
     }
   },

diff --git a/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-17-17.json b/...ttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-17-17.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"31f73a7ecc35bbecec125851ce166af4\""
+        "matches": "^(W/)?\"31f73a7ecc35bbecec125851ce166af4\"$"
       }
     }
   },

diff --git a/...kHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-4-4.json b/...kHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-4-4.json
@@ -3,7 +3,12 @@
   "name": "repos_hub4j-test-org_github-api",
   "request": {
     "url": "/repos/hub4j-test-org/github-api",
-    "method": "GET"
+    "method": "GET",
+    "headers": {
+      "If-None-Match": {
+        "absent" : true
+      }
+    }
   },
   "response": {
     "status": 200,

diff --git a/...kHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-6-6.json b/...kHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-6-6.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"295ae3430c604f3d10b6eb145fe511b5\""
+        "matches": "^(W/)?\"295ae3430c604f3d10b6eb145fe511b5\"$"
       }
     }
   },

diff --git a/...kHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-7-7.json b/...kHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-7-7.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "If-None-Match": {
-        "equalTo": "\"295ae3430c604f3d10b6eb145fe511b5\""
+        "matches": "^(W/)?\"295ae3430c604f3d10b6eb145fe511b5\"$"
       }
     }
   },

diff --git a/...kHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-8-8.json b/...kHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_hub4j-test-org_github-api-8-8.json
@@ -3,7 +3,12 @@
   "name": "repos_hub4j-test-org_github-api",
   "request": {
     "url": "/repos/hub4j-test-org/github-api",
-    "method": "GET"
+    "method": "GET",
+    "headers": {
+      "If-None-Match": {
+        "matches": "^(W/)?\"295ae3430c604f3d10b6eb145fe511b5\"$"
+      }
+    }
   },
   "response": {
     "status": 304,