Merge branch 'develop' of github.com:OpenBankProject/OBP-API into dev…

…elop
OpenBankProject · Sep 14, 2023 · 2662972 · 2662972
2 parents 8dfd3e6 + 8e77839
commit 2662972
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/obp-api/src/main/scala/code/api/cache/InMemory.scala b/obp-api/src/main/scala/code/api/cache/InMemory.scala
@@ -1,5 +1,6 @@
 package code.api.cache
 
+import code.util.Helper.MdcLoggable
 import com.google.common.cache.CacheBuilder
 import scalacache.ScalaCache
 import scalacache.guava.GuavaCache
@@ -10,16 +11,18 @@ import scala.concurrent.duration.Duration
 import scala.language.postfixOps
 import com.openbankproject.commons.ExecutionContext.Implicits.global
 
-object InMemory {
+object InMemory extends MdcLoggable {
 
   val underlyingGuavaCache = CacheBuilder.newBuilder().maximumSize(10000L).build[String, Object]
   implicit val scalaCache  = ScalaCache(GuavaCache(underlyingGuavaCache))
 
   def memoizeSyncWithInMemory[A](cacheKey: Option[String])(@cacheKeyExclude ttl: Duration)(@cacheKeyExclude f: => A): A = {
+    logger.debug(s"InMemory.memoizeSyncWithInMemory.underlyingGuavaCache size ${underlyingGuavaCache.size()}, current cache key is $cacheKey")
     memoizeSync(ttl)(f)
   }
 
   def memoizeWithInMemory[A](cacheKey: Option[String])(@cacheKeyExclude ttl: Duration)(@cacheKeyExclude f: => Future[A])(implicit @cacheKeyExclude m: Manifest[A]): Future[A] = {
+    logger.debug(s"InMemory.memoizeWithInMemory.underlyingGuavaCache size ${underlyingGuavaCache.size()}, current cache key is $cacheKey")
     memoize(ttl)(f)
   }
 }
diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala
@@ -1613,6 +1613,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
     private val operationIdToResourceDoc: ConcurrentHashMap[String, ResourceDoc] = new ConcurrentHashMap[String, ResourceDoc]
 
     def getResourceDocs(operationIds: List[String]): List[ResourceDoc] = {
+      logger.debug(s"ResourceDoc operationIdToResourceDoc.size is ${operationIdToResourceDoc.size()}")
       val dynamicDocs = DynamicEntityHelper.doc ++ DynamicEndpointHelper.doc ++ DynamicEndpoints.dynamicResourceDocs
       operationIds.collect {
         case operationId if operationIdToResourceDoc.containsKey(operationId) =>

diff --git a/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala b/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala
@@ -521,6 +521,7 @@ object JSONFactory1_4_0 extends MdcLoggable{
     // We MUST recompute all resource doc values due to translation via Web UI props
     val endpointTags = getAllEndpointTagsBox(rd.operationId).map(endpointTag =>ResourceDocTag(endpointTag.tagName))
     val resourceDocUpdatedTags: ResourceDoc = rd.copy(tags = endpointTags++ rd.tags)
+    logger.debug(s"createResourceDocJson createResourceDocJsonMemo.size is ${createResourceDocJsonMemo.size()}")
     createResourceDocJsonMemo.compute(resourceDocUpdatedTags, (k, v) => {
       // There are multiple flavours of markdown. For instance, original markdown emphasises underscores (surrounds _ with (<em>))
       // But we don't want to have to escape underscores (\_) in our documentation