Skip to content

Commit 1941f3a

Browse files
ggallottiggallotti
authored
#HouseKeeping: Redis & MemCached implementation refactoring. Prepare for import using gradle (#650)
* no message * Bump Redis SDK * Add missing dependencies * Bump Jedis SDK
1 parent e15f606 commit 1941f3a

File tree

8 files changed

+92
-24
lines changed

8 files changed

+92
-24
lines changed

‎.github/workflows/RedisTests.yml renamed to ‎.github/workflows/cache-redis-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,5 @@ jobs:
5353
- name: Test Redis
5454
run: |
5555
export EXECUTE_REDIS_TESTS=true
56-
mvn -B -pl java test --file $POM_PATH
56+
mvn -B -pl gxcache-redis test --file $POM_PATH
57+

‎gxcache-memcached/pom.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>com.genexus</groupId>
9+
<artifactId>parent</artifactId>
10+
<version>${revision}${changelist}</version>
11+
</parent>
12+
13+
<artifactId>gxcache-memcached</artifactId>
14+
<name>GeneXus Cache Memcached</name>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>${project.groupId}</groupId>
19+
<artifactId>gxcommon</artifactId>
20+
<version>${project.version}</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>${project.groupId}</groupId>
24+
<artifactId>gxclassR</artifactId>
25+
<version>${project.version}</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>net.spy</groupId>
29+
<artifactId>spymemcached</artifactId>
30+
<version>2.12.3</version>
31+
</dependency>
32+
</dependencies>
33+
</project>

‎java/src/main/java/com/genexus/Memcached.java renamed to ‎gxcache-memcached/src/main/java/com/genexus/cache/memcached/Memcached.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
package com.genexus;
1+
package com.genexus.cache.memcached;
22

33
import java.io.Closeable;
44
import java.io.IOException;
55
import java.util.ArrayList;
66
import java.util.List;
77
import java.util.Map;
8+
9+
import com.genexus.Application;
10+
import com.genexus.CommonUtil;
11+
import com.genexus.ICacheService2;
812
import com.genexus.util.GXService;
913
import com.genexus.util.GXServices;
1014

‎gxcache-redis/pom.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>com.genexus</groupId>
9+
<artifactId>parent</artifactId>
10+
<version>${revision}${changelist}</version>
11+
</parent>
12+
13+
<artifactId>gxcache-redis</artifactId>
14+
<name>GeneXus Cache Redis</name>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>${project.groupId}</groupId>
19+
<artifactId>gxclassR</artifactId>
20+
<version>${project.version}</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>${project.groupId}</groupId>
24+
<artifactId>gxcommon</artifactId>
25+
<version>${project.version}</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>com.fasterxml.jackson.core</groupId>
29+
<artifactId>jackson-core</artifactId>
30+
<version>${jackson.version}</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>redis.clients</groupId>
34+
<artifactId>jedis</artifactId>
35+
<version>4.3.1</version>
36+
</dependency>
37+
</dependencies>
38+
</project>

‎java/src/main/java/com/genexus/cache/redis/RedisClient.java renamed to ‎gxcache-redis/src/main/java/com/genexus/cache/redis/RedisClient.java

File renamed without changes.

‎java/src/test/java/com/genexus/cache/redis/TestRedisCacheClient.java renamed to ‎gxcache-redis/src/test/java/com/genexus/test/cache/redis/TestRedisCacheClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.genexus.cache.redis;
1+
package com.genexus.test.cache.redis;
22

3+
import com.genexus.cache.redis.RedisClient;
34
import com.genexus.db.CacheValue;
45
import org.apache.logging.log4j.LogManager;
56
import org.apache.logging.log4j.Logger;
@@ -8,7 +9,6 @@
89
import org.junit.Before;
910
import org.junit.Test;
1011
import redis.clients.jedis.Jedis;
11-
import redis.clients.jedis.JedisPool;
1212

1313
import java.net.URISyntaxException;
1414
import java.util.concurrent.ThreadLocalRandom;

‎java/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@
110110
<artifactId>jackson-databind</artifactId>
111111
<version>${jackson.version}</version>
112112
</dependency>
113-
<dependency>
114-
<groupId>net.spy</groupId>
115-
<artifactId>spymemcached</artifactId>
116-
<version>2.10.3</version>
117-
</dependency>
118113
<dependency>
119114
<groupId>com.lowagie</groupId>
120115
<artifactId>itext</artifactId>
@@ -130,11 +125,6 @@
130125
<groupId>com.lowagie</groupId>
131126
<artifactId>itextasian</artifactId>
132127
<version>1.5.2</version>
133-
</dependency>
134-
<dependency>
135-
<groupId>redis.clients</groupId>
136-
<artifactId>jedis</artifactId>
137-
<version>2.9.0</version>
138128
</dependency>
139129
<dependency>
140130
<groupId>com.sap.conn.jco</groupId>

‎pom.xml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,18 @@
101101
<module>gxwebsocketjakarta</module>
102102
<module>gxawsserverless</module>
103103
<module>androidreports</module>
104-
<module>gxqueue</module>
105-
<module>gxqueueawssqs</module>
106-
<module>gxqueueazure</module>
107-
<module>gxcloudstorage-common</module>
108-
<module>gxcloudstorage-awss3</module>
109-
<module>gxcloudstorage-googlecloudstorage</module>
110-
<module>gxcloudstorage-azureblob</module>
111-
<module>gxcloudstorage-ibmcos</module>
112-
<module>gxcloudstorage-tests</module>
113-
</modules>
104+
<module>gxqueue</module>
105+
<module>gxqueueawssqs</module>
106+
<module>gxqueueazure</module>
107+
<module>gxcache-redis</module>
108+
<module>gxcache-memcached</module>
109+
<module>gxcloudstorage-common</module>
110+
<module>gxcloudstorage-awss3</module>
111+
<module>gxcloudstorage-googlecloudstorage</module>
112+
<module>gxcloudstorage-azureblob</module>
113+
<module>gxcloudstorage-ibmcos</module>
114+
<module>gxcloudstorage-tests</module>
115+
</modules>
114116

115117
<dependencies>
116118
<dependency>

0 commit comments

Comments
 (0)