Skip to content

Commit a678dc5

Browse files
authored
refactor: remove Redis cache implementation leftovers (DEV-1503) (#2290)
1 parent 6007266 commit a678dc5

20 files changed

Lines changed: 12 additions & 531 deletions

File tree

‎docker-compose.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ services:
6969
- KNORA_WEBAPI_TRIPLESTORE_FUSEKI_USERNAME=admin
7070
- KNORA_WEBAPI_TRIPLESTORE_FUSEKI_PASSWORD=test
7171
- KNORA_WEBAPI_CACHE_SERVICE_ENABLED=true
72-
- KNORA_WEBAPI_CACHE_SERVICE_REDIS_HOST=redis
73-
- KNORA_WEBAPI_CACHE_SERVICE_REDIS_PORT=6379
7472
- KNORA_WEBAPI_ALLOW_RELOAD_OVER_HTTP=true
7573
- KNORA_WEBAPI_KNORA_API_EXTERNAL_HOST=0.0.0.0
7674
- KNORA_WEBAPI_KNORA_API_EXTERNAL_PORT=3333

‎docs/04-publishing-deployment/configuration.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ A number of core settings is additionally configurable through system environmen
5757
| app.triplestore.fuseki.username | KNORA_WEBAPI_TRIPLESTORE_FUSEKI_USERNAME | admin |
5858
| app.triplestore.fuseki.password | KNORA_WEBAPI_TRIPLESTORE_FUSEKI_PASSWORD | test |
5959
| app.cache-service.enabled | KNORA_WEBAPI_CACHE_SERVICE_ENABLED | true |
60-
| app.cache-service.redis.host | KNORA_WEBAPI_CACHE_SERVICE_REDIS_HOST | localhost |
61-
| app.cache-service.redis.port | KNORA_WEBAPI_CACHE_SERVICE_REDIS_PORT | 6379 |
6260

6361
## Selectively Disabling Routes
6462

‎docs/05-internals/development/building-and-running.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ With [Docker](https://www.docker.com/) installed,
1818
1919
to create the knora-test repository and initialize it with loading some test data into the triplestore (Fuseki).
2020
21-
1. Start the entire knora-stack (fuseki (db), sipi, redis, api, salsah1) with the following command:
21+
1. Start the entire knora-stack (fuseki (db), sipi, api, salsah1) with the following command:
2222
2323
```
2424
$ make stack-up
@@ -89,8 +89,8 @@ database container can be printed out using the following command:
8989
```
9090
$ make stack-logs-db
9191
```
92-
Similarly, the logs of the other containers can be printed out by running make with `stack-logs-api`, `stack-logs-sipi`,
93-
or `stack-logs-redis`. These commands print out and follow the logs, to only print the logs out without following, use
92+
Similarly, the logs of the other containers can be printed out by running make with `stack-logs-api` or `stack-logs-sipi`.
93+
These commands print out and follow the logs, to only print the logs out without following, use
9494
`-no-follow` version of the commands for example:
9595
9696
```

‎docs/05-internals/development/generating-client-test-data.md‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,13 @@ client code without the need for a running Knora instance.
1414

1515
Client test data is generated as a side effect of running E2E tests.
1616
E2E tests use `ClientTestDataCollector` to collect API requests and
17-
responses. The implementation of `ClientTestDataCollector` collects these
18-
in a Redis hash. When the E2E tests have completed, the script
17+
responses. When the E2E tests have completed, the script
1918
`webapi/scripts/dump-client-test-data.sh` saves the collected test data
2019
in a Zip file. It then checks the filenames in the Zip file by comparing them
2120
with the list in `webapi/scripts/expected-client-test-data.txt`.
2221

2322
## Usage
2423

25-
On macOS, you will need to install Redis in order to have the `redis-cli` command-line tool:
26-
27-
```
28-
brew install redis
29-
```
30-
3124
To generate client test data, type:
3225

3326
```

‎docs/05-internals/development/overview.md‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,3 @@ $ docker run --name sipi \
8989
daschswiss/sipi \
9090
/sipi/local/bin/sipi -config /localdir/sipi.test-config.lua
9191
```
92-
93-
## Redis Server
94-
95-
The DSP-API server uses Redis for caching.
96-
97-
On macOS you can install Redis through [Homebrew](https://brew.sh):
98-
99-
```bash
100-
$ brew install redis
101-
```
102-
103-
If you don't want to use Redis, you can disable caching in `application.conf`
104-
via the `app.use-redis-cache` key, by setting it to `false`.

‎project/Dependencies.scala‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ object Dependencies {
8383

8484
// caching
8585
val ehcache = "net.sf.ehcache" % "ehcache" % "2.10.9.2"
86-
val jedis = "redis.clients" % "jedis" % "4.3.1"
8786

8887
// serialization
8988
val chill = "com.twitter" %% "chill" % "0.10.0" // Scala 3 incompatible
@@ -145,7 +144,6 @@ object Dependencies {
145144
icu4j,
146145
jacksonDatabind,
147146
jakartaJSON,
148-
jedis,
149147
jenaText,
150148
jodd,
151149
jwtSprayJson,

‎webapi/scripts/zap-client-test-data.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
set -e
66

7-
# The name of the Zip file that contains client test data download from Redis.
7+
# The name of the Zip file that contains client test data download from cache.
88
zip_file_name=client-test-data.zip
99

1010
# Remove any existing client test data Zip file.

‎webapi/scripts/zip-client-test-data.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Downloads client test data from Redis into a Zip file.
3+
# Downloads client test data from cache into a Zip file.
44

55
# A pushd that produces no output.
66
pushd () {

‎webapi/src/it/scala/org/knora/webapi/store/cache/config/RedisTestConfig.scala‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎webapi/src/it/scala/org/knora/webapi/store/cache/impl/CacheRedisImplZSpec.scala‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

0 commit comments

Comments
 (0)