Updated Last-Modified headers

Introduces #597 This does not appear to be a bug in github-api but in OkHttp 2.7.5 (and/or the Cache implementation in that version).
hub4j · Nov 7, 2019 · 57ac6e9 · 57ac6e9
1 parent 319d2d1
commit 57ac6e9
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 13 deletions.
diff --git a/src/test/java/org/kohsuke/github/extras/OkHttpConnectorTest.java b/src/test/java/org/kohsuke/github/extras/OkHttpConnectorTest.java
@@ -8,6 +8,7 @@
 import com.squareup.okhttp.OkHttpClient;
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.kohsuke.github.*;
 
@@ -185,6 +186,7 @@ public void OkHttpConnector_Cache_MaxAge_Three() throws Exception {
         assertThat("getHitCount", cache.getHitCount(), is(maxAgeThreeHitCount));
     }
 
+    @Ignore("ISSUE #597 - Correctly formatted Last-Modified headers cause this test to fail")
     @Test
     public void OkHttpConnector_Cache_MaxAgeDefault_Zero() throws Exception {
         // The responses were recorded from github, but the Date headers

diff --git a/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10-5432b2.json b/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10-5432b2.json
@@ -22,7 +22,7 @@
         "Accept-Encoding"
       ],
       "ETag": "W/\"4f508593b64df214fee8f6ab42df633c\"",
-      "Last-Modified": "{{now offset='-1 seconds'}}",
+      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
       "X-Accepted-OAuth-Scopes": "repo",
       "X-GitHub-Media-Type": "github.v3; format=json",

diff --git a/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-11-11-2e2a6e.json b/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-11-11-2e2a6e.json
@@ -25,7 +25,7 @@
         "Accept-Encoding"
       ],
       "ETag": "\"4f508593b64df214fee8f6ab42df633c\"",
-      "Last-Modified": "{{now offset='-1 seconds'}}",
+      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
       "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",

diff --git a/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-12-12-a9ae79.json b/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-12-12-a9ae79.json
@@ -25,7 +25,7 @@
         "Accept-Encoding"
       ],
       "ETag": "\"4f508593b64df214fee8f6ab42df633c\"",
-      "Last-Modified": "{{now offset='-2 seconds'}}",
+      "Last-Modified": "{{now offset='-2 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
       "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",

diff --git a/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-13-13-b2221a.json b/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-13-13-b2221a.json
@@ -25,7 +25,7 @@
         "Accept-Encoding"
       ],
       "ETag": "\"4f508593b64df214fee8f6ab42df633c\"",
-      "Last-Modified": "{{now offset='-3 seconds'}}",
+      "Last-Modified": "{{now offset='-3 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
       "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",

diff --git a/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14-7e396e.json b/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14-7e396e.json
@@ -27,7 +27,7 @@
         "Accept-Encoding"
       ],
       "ETag": "W/\"31f73a7ecc35bbecec125851ce166af4\"",
-      "Last-Modified": "{{now offset='-7 seconds'}}",
+      "Last-Modified": "{{now offset='-7 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
       "X-Accepted-OAuth-Scopes": "repo",
       "X-GitHub-Media-Type": "github.v3; format=json",

diff --git a/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-15-15-bc8d8b.json b/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-15-15-bc8d8b.json
@@ -25,7 +25,7 @@
         "Accept-Encoding"
       ],
       "ETag": "\"31f73a7ecc35bbecec125851ce166af4\"",
-      "Last-Modified": "{{now offset='-10 seconds'}}",
+      "Last-Modified": "{{now offset='-10 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
       "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",

diff --git a/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-16-16-3857dc.json b/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-16-16-3857dc.json
@@ -25,7 +25,7 @@
         "Accept-Encoding"
       ],
       "ETag": "\"31f73a7ecc35bbecec125851ce166af4\"",
-      "Last-Modified": "{{now offset='-15 seconds'}}",
+      "Last-Modified": "{{now offset='-15 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
       "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",

diff --git a/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-17-17-4d123b.json b/..._Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-17-17-4d123b.json
@@ -25,7 +25,7 @@
         "Accept-Encoding"
       ],
       "ETag": "\"31f73a7ecc35bbecec125851ce166af4\"",
-      "Last-Modified": "{{now offset='-20 seconds'}}",
+      "Last-Modified": "{{now offset='-20 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
       "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",

diff --git a/...or_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4-b99f84.json b/...or_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4-b99f84.json
@@ -22,7 +22,7 @@
         "Accept-Encoding"
       ],
       "ETag": "W/\"295ae3430c604f3d10b6eb145fe511b5\"",
-      "Last-Modified": "{{now offset='-1 seconds'}}",
+      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
       "X-Accepted-OAuth-Scopes": "repo",
       "X-GitHub-Media-Type": "github.v3; format=json",

diff --git a/...or_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-5-5-5e7b86.json b/...or_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-5-5-5e7b86.json
@@ -25,7 +25,7 @@
         "Accept-Encoding"
       ],
       "ETag": "\"295ae3430c604f3d10b6eb145fe511b5\"",
-      "Last-Modified": "{{now offset='-1 seconds'}}",
+      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
       "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",

diff --git a/...or_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-6-6-e20958.json b/...or_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-6-6-e20958.json
@@ -25,7 +25,7 @@
         "Accept-Encoding"
       ],
       "ETag": "\"295ae3430c604f3d10b6eb145fe511b5\"",
-      "Last-Modified": "{{now offset='-2 seconds'}}",
+      "Last-Modified": "{{now offset='-2 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
       "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",

diff --git a/...or_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-7-7-597005.json b/...or_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-7-7-597005.json
@@ -25,7 +25,7 @@
         "Accept-Encoding"
       ],
       "ETag": "\"295ae3430c604f3d10b6eb145fe511b5\"",
-      "Last-Modified": "{{now offset='-3 seconds'}}",
+      "Last-Modified": "{{now offset='-3 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
       "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",

diff --git a/...or_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-8-8-441d13.json b/...or_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-8-8-441d13.json
@@ -20,7 +20,7 @@
         "Accept-Encoding"
       ],
       "ETag": "\"295ae3430c604f3d10b6eb145fe511b5\"",
-      "Last-Modified": "{{now offset='-7 seconds'}}",
+      "Last-Modified": "{{now offset='-7 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
       "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
       "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",