From dbb485d80dbd1ca1cdade7ec5eec8c5cf0c7afc8 Mon Sep 17 00:00:00 2001
From: Daz DeBoer <daz@gradle.com>
Date: Wed, 15 Sep 2021 11:20:33 -0600
Subject: [PATCH] Only perform  post-restore and pre-save cache actions when
 required

---
 src/cache-gradle-user-home.ts | 6 ++----
 src/cache-utils.ts            | 9 +++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/cache-gradle-user-home.ts b/src/cache-gradle-user-home.ts
index e1ac2f4..1fe8bb4 100644
--- a/src/cache-gradle-user-home.ts
+++ b/src/cache-gradle-user-home.ts
@@ -32,8 +32,7 @@ export class GradleUserHomeCache extends AbstractCache {
         super('gradle', 'Gradle User Home')
     }
 
-    async restore(): Promise<void> {
-        await super.restore()
+    async afterRestore(): Promise<void> {
         await this.reportCacheEntrySize('as restored from cache')
         await this.restoreCommonArtifacts()
         await this.reportCacheEntrySize('after restoring common artifacts')
@@ -119,9 +118,8 @@ export class GradleUserHomeCache extends AbstractCache {
         core.info('-----------------------')
     }
 
-    async save(): Promise<void> {
+    async beforeSave(): Promise<void> {
         await this.saveCommonArtifacts()
-        await super.save()
     }
 
     private async saveCommonArtifacts(): Promise<void> {
diff --git a/src/cache-utils.ts b/src/cache-utils.ts
index a5531b5..acf862e 100644
--- a/src/cache-utils.ts
+++ b/src/cache-utils.ts
@@ -109,6 +109,9 @@ export abstract class AbstractCache {
         core.info(
             `${this.cacheDescription} restored from cache key: ${cacheResult}`
         )
+
+        await this.afterRestore()
+
         return
     }
 
@@ -134,6 +137,8 @@ export abstract class AbstractCache {
         }
     }
 
+    protected async afterRestore(): Promise<void> {}
+
     async save(): Promise<void> {
         if (!this.cacheOutputExists()) {
             this.debug(`No ${this.cacheDescription} to cache.`)
@@ -157,6 +162,8 @@ export abstract class AbstractCache {
             return
         }
 
+        await this.beforeSave()
+
         core.info(
             `Caching ${this.cacheDescription} with cache key: ${cacheKey}`
         )
@@ -166,6 +173,8 @@ export abstract class AbstractCache {
         return
     }
 
+    protected async beforeSave(): Promise<void> {}
+
     protected async saveCache(
         cachePath: string[],
         cacheKey: string