remove http cache not static behaviour

AntL4b · Jul 11, 2023 · 3ee9d60 · 3ee9d60
1 parent 0a9bbfc
commit 3ee9d60
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 25 deletions.
diff --git a/src/core/cache/cache.ts b/src/core/cache/cache.ts
@@ -9,8 +9,6 @@ export abstract class AHCache<T, U> {
   currentCacheSize: number = 0;
   cacheConfig: AHCacheConfig;
 
-  constructor() {}
-
   /**
    * Set the cache config
    * @param cacheConfig The cache config to set
@@ -44,7 +42,7 @@ export abstract class AHCache<T, U> {
     // Delete data to free up space
     while (this.currentCacheSize + dataToAddSize > this.cacheConfig.maxCacheSize) {
       AHLogger.getInstance().debug(
-        'Current cache size will exceed max cache size: older data in cache deleted to free up space',
+        "Current cache size will exceed max cache size: older data in cache deleted to free up space",
       );
       this.currentCacheSize = this.currentCacheSize - AHObjectHelper.getSizeOf(this.data[0]);
       this.data.splice(0, 1);

diff --git a/src/core/cache/http-request-cache.ts b/src/core/cache/http-request-cache.ts
@@ -7,23 +7,6 @@ import { AHHttpRequestParameters } from "../models/cache/http-request-parameters
 
 
 export class AHHttpRequestCache extends AHCache<AHHttpRequestParameters, AHHttpResponse> {
-  private static instance: AHHttpRequestCache;
-
-  constructor() {
-    super();
-  }
-
-  /**
-   * Singleton getInstance method
-   * @returns The singleton instance
-   */
-  static getInstance(): AHHttpRequestCache {
-    if (!AHHttpRequestCache.instance) {
-      AHHttpRequestCache.instance = new AHHttpRequestCache();
-    }
-
-    return AHHttpRequestCache.instance;
-  }
 
   /**
    * Get a cache item with its id

diff --git a/src/framework/features/rest-handler.ts b/src/framework/features/rest-handler.ts
@@ -31,6 +31,7 @@ export class AHRestHandler {
   private callable: AHCallable;
   private cacheConfig: AHCacheConfig = AHRestHandler.defaultCacheConfig;
   private options: AHRestHandlerOptions = AHRestHandler.defaultOptions;
+  private httpCache: AHHttpRequestCache = new AHHttpRequestCache();
 
   constructor(params: AHRestHandlerParams) {
     if (!/^[a-zA-z_]+[a-zA-z0-9]*$/.test(params.name)) {
@@ -130,8 +131,8 @@ export class AHRestHandler {
 
       if (this.cacheConfig.cachable) {
         tracker.startSegment("cache-configuration");
-        AHHttpRequestCache.getInstance().setConfig(this.cacheConfig);
-        AHHttpRequestCache.getInstance().flushCache(this.cacheConfig.ttl);
+        this.httpCache.setConfig(this.cacheConfig);
+        this.httpCache.flushCache(this.cacheConfig.ttl);
         tracker.stopSegment("cache-configuration");
       }
 
@@ -168,7 +169,7 @@ export class AHRestHandler {
         tracker.startSegment("cache-retrieving");
 
         AHLogger.getInstance().debug("Try to get last http response from cache");
-        const cacheResponse = AHHttpRequestCache.getInstance().getCacheItem(
+        const cacheResponse = this.httpCache.getCacheItem(
           AHHttpRequestCache.buildCacheRequestParameters(ev),
         );
 
@@ -193,7 +194,7 @@ export class AHRestHandler {
       tracker.stopSegment("callable-run");
 
       if (this.cacheConfig.cachable) {
-        AHHttpRequestCache.getInstance().addDataInCache(
+        this.httpCache.addDataInCache(
           AHHttpRequestCache.buildCacheRequestParameters(ev),
           callableReponse,
         );

diff --git a/src/tests/http-request-cache.test.ts b/src/tests/http-request-cache.test.ts
@@ -8,7 +8,7 @@ describe('AHHttpRequestCache', () => {
   const requestCache = AHHttpRequestCache.buildCacheRequestParameters(AHTestResource.getBaseEvent({ path: '/test' }));
   const requestCache2 = AHHttpRequestCache.buildCacheRequestParameters(AHTestResource.getBaseEvent({ path: '/test2' }));
   const response = new AHHttpResponse(200, { status: AHHttpResponseBodyStatusEnum.Success });
-  const httpRequestCache = AHHttpRequestCache.getInstance();
+  const httpRequestCache = new AHHttpRequestCache();
 
   // Set default cache config
   httpRequestCache.setConfig({