remove Redis comments leftovers

dasch-swiss · Nov 21, 2022 · f4b1c6b · f4b1c6b
1 parent 88f2023
commit f4b1c6b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/webapi/scripts/zap-client-test-data.sh b/webapi/scripts/zap-client-test-data.sh
@@ -4,7 +4,7 @@
 
 set -e
 
-# The name of the Zip file that contains client test data download from Redis.
+# The name of the Zip file that contains client test data download from cache.
 zip_file_name=client-test-data.zip
 
 # Remove any existing client test data Zip file.

diff --git a/webapi/scripts/zip-client-test-data.sh b/webapi/scripts/zip-client-test-data.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Downloads client test data from Redis into a Zip file.
+# Downloads client test data from cache into a Zip file.
 
 # A pushd that produces no output.
 pushd () {

diff --git a/webapi/src/main/scala/org/knora/webapi/instrumentation/InstrumentationSupport.scala b/webapi/src/main/scala/org/knora/webapi/instrumentation/InstrumentationSupport.scala
@@ -54,17 +54,9 @@ trait InstrumentationSupport {
     }
   }
 
-  //    def counter(name: String) = Kamon.metrics.counter(name)
-  //    def minMaxCounter(name: String) = Kamon.metrics.minMaxCounter(name)
-  //    def time[A](name: String)(thunk: => A) = Latency.measure(Kamon.metrics.histogram(name))(thunk)
-  //    def traceFuture[A](name:String)(future: => Future[A]):Future[A] =
-  //        Tracer.withContext(Kamon.tracer.newContext(name)) {
-  //            future.andThen { case completed ⇒ Tracer.currentContext.finish() }(SameThreadExecutionContext)
-  //        }
-
   /**
    * Based on the current class name, create a logger with the name in the
-   * form 'M-ClassName', e.g., 'M-RedisManager'.
+   * form 'M-ClassName', e.g., 'M-CacheManager'.
    * All loggers returned by this method can be configured in 'logback.xml',
    * i.e., turned on or off.
    */

diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/StoresResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/StoresResponderADM.scala
@@ -85,7 +85,7 @@ class StoresResponderADM(responderData: ResponderData) extends Responder(respond
       _ = log.debug(s"resetTriplestoreContent - load ontology done - {}", loadOntologiesResponse.toString)
 
       _ <- appActor.ask(CacheServiceFlushDB(systemUser))
-      _  = log.debug(s"resetTriplestoreContent - flushing Redis store done.")
+      _  = log.debug(s"resetTriplestoreContent - flushing cache store done.")
 
       result = ResetTriplestoreContentResponseADM(message = "success")
 

diff --git a/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala b/webapi/src/main/scala/org/knora/webapi/responders/admin/UsersResponderADM.scala
@@ -2196,7 +2196,7 @@ class UsersResponderADM(responderData: ResponderData) extends Responder(responde
   private def invalidateCachedUserADM(maybeUser: Option[UserADM]): Future[Unit] =
     if (cacheServiceSettings.cacheServiceEnabled) {
       val keys: Set[String] = Seq(maybeUser.map(_.id), maybeUser.map(_.email), maybeUser.map(_.username)).flatten.toSet
-      // only send to Redis if keys are not empty
+      // only send to cache if keys are not empty
       if (keys.nonEmpty) {
         val result = appActor.ask(CacheServiceRemoveValues(keys))
         result.map { res =>