simplify logic in OSS STS

Alluxio · Nov 17, 2022 · 25ca781 · 25ca781
1 parent 0b82ffa
commit 25ca781
Showing 1 changed file with 2 additions and 19 deletions.
diff --git a/underfs/oss/src/main/java/alluxio/underfs/oss/StsOssClientProvider.java b/underfs/oss/src/main/java/alluxio/underfs/oss/StsOssClientProvider.java
@@ -146,12 +146,8 @@ private void initializeOssClient(UnderFileSystemConfiguration ossConfiguration)
   }
 
   boolean tokenWillExpiredAfter(long after) {
-    boolean in = true;
-    Date now = convertLongToDate(System.currentTimeMillis());
-    if (null != mStsTokenExpiration && mStsTokenExpiration.getTime() - now.getTime() > after) {
-      in = false;
-    }
-    return in;
+    return null == mStsTokenExpiration
+        || mStsTokenExpiration.getTime() - System.currentTimeMillis() <= after;
   }
 
   private void createOrRefreshStsOssClient(
@@ -195,19 +191,6 @@ public OSS getOSSClient() {
     return mOssClient;
   }
 
-  private Date convertLongToDate(long timeMs) {
-    TimeZone zeroTimeZone = TimeZone.getTimeZone("ETC/GMT-0");
-    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-    sdf.setTimeZone(zeroTimeZone);
-    Date date = null;
-    try {
-      date = sdf.parse(sdf.format(new Date(timeMs)));
-    } catch (ParseException e) {
-      LOG.error("convert String to Date type error", e);
-    }
-    return date;
-  }
-
   private Date convertStringToDate(String dateString) {
     TimeZone zeroTimeZone = TimeZone.getTimeZone("ETC/GMT-0");
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");