You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2023/08/20 09:42:18 UTC

[httpcomponents-client] 06/38: Avoid using deprecated DateUtils.

This is an automated email from the ASF dual-hosted git repository.

olegk pushed a commit to branch 5.4.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git

commit 2d39f4433ab848b097870fc0f8e9f859cf213572
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Mar 16 16:58:49 2023 +0100

    Avoid using deprecated DateUtils.
---
 .../http/impl/cache/TestResponseCachingPolicy.java | 30 ++++++++++------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java
index 075adc5c5..be291f88b 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestResponseCachingPolicy.java
@@ -26,8 +26,8 @@
  */
 package org.apache.hc.client5.http.impl.cache;
 
+import java.time.Duration;
 import java.time.Instant;
-import java.util.Date;
 import java.util.Random;
 
 import org.apache.hc.client5.http.auth.StandardAuthScheme;
@@ -913,12 +913,11 @@ public class TestResponseCachingPolicy {
     void testIsResponseCacheableNullCacheControl() {
 
         // Set up test data
-        final long now = System.currentTimeMillis();
-        final long tenSecondsFromNow = now + 10000;
+        final Duration tenSecondsFromNow = Duration.ofSeconds(10);
 
         response = new BasicHttpResponse(HttpStatus.SC_OK, "");
-        response.setHeader(HttpHeaders.DATE, DateUtils.formatDate(new Date(now), DateUtils.PATTERN_RFC1123));
-        response.setHeader(HttpHeaders.EXPIRES, DateUtils.formatDate(new Date(tenSecondsFromNow), DateUtils.PATTERN_RFC1123));
+        response.setHeader(HttpHeaders.DATE, DateUtils.formatStandardDate(Instant.now()));
+       response.setHeader(HttpHeaders.EXPIRES, DateUtils.formatStandardDate(Instant.now().plus(tenSecondsFromNow)));
 
 
         // Create ResponseCachingPolicy instance and test the method
@@ -935,12 +934,11 @@ public class TestResponseCachingPolicy {
     void testIsResponseCacheableNotNullCacheControlSmaxAge60() {
 
         // Set up test data
-        final long now = System.currentTimeMillis();
-        final long tenSecondsFromNow = now + 10000;
+        final Duration tenSecondsFromNow = Duration.ofSeconds(10);
 
         response = new BasicHttpResponse(HttpStatus.SC_OK, "");
-        response.setHeader(HttpHeaders.DATE, DateUtils.formatDate(new Date(now), DateUtils.PATTERN_RFC1123));
-        response.setHeader(HttpHeaders.EXPIRES, DateUtils.formatDate(new Date(tenSecondsFromNow), DateUtils.PATTERN_RFC1123));
+        response.setHeader(HttpHeaders.DATE, DateUtils.formatStandardDate(Instant.now()));
+       response.setHeader(HttpHeaders.EXPIRES, DateUtils.formatStandardDate(Instant.now().plus(tenSecondsFromNow)));
 
 
         // Create ResponseCachingPolicy instance and test the method
@@ -957,12 +955,11 @@ public class TestResponseCachingPolicy {
     void testIsResponseCacheableNotNullCacheControlMaxAge60() {
 
         // Set up test data
-        final long now = System.currentTimeMillis();
-        final long tenSecondsFromNow = now + 10000;
+        final Duration tenSecondsFromNow = Duration.ofSeconds(10);
 
         response = new BasicHttpResponse(HttpStatus.SC_OK, "");
-        response.setHeader(HttpHeaders.DATE, DateUtils.formatDate(new Date(now), DateUtils.PATTERN_RFC1123));
-        response.setHeader(HttpHeaders.EXPIRES, DateUtils.formatDate(new Date(tenSecondsFromNow), DateUtils.PATTERN_RFC1123));
+        response.setHeader(HttpHeaders.DATE, DateUtils.formatStandardDate(Instant.now()));
+        response.setHeader(HttpHeaders.EXPIRES, DateUtils.formatStandardDate(Instant.now().plus(tenSecondsFromNow)));
 
 
         // Create ResponseCachingPolicy instance and test the method
@@ -979,12 +976,11 @@ public class TestResponseCachingPolicy {
     void testIsResponseCacheableNotExsiresAndDate() {
 
         // Set up test data
-        final long now = System.currentTimeMillis();
-        final long tenSecondsFromNow = now + 10000;
+        final Duration tenSecondsFromNow = Duration.ofSeconds(10);
 
         response = new BasicHttpResponse(HttpStatus.SC_OK, "");
-        response.setHeader(HttpHeaders.DATE, DateUtils.formatDate(new Date(now), DateUtils.PATTERN_RFC1123));
-        response.setHeader(HttpHeaders.EXPIRES, DateUtils.formatDate(new Date(tenSecondsFromNow), DateUtils.PATTERN_RFC1123));
+        response.setHeader(HttpHeaders.DATE, DateUtils.formatStandardDate(Instant.now()));
+        response.setHeader(HttpHeaders.EXPIRES, DateUtils.formatStandardDate(Instant.now().plus(tenSecondsFromNow)));
 
 
         // Create ResponseCachingPolicy instance and test the method