Skip to content

Commit 7c7358c

Browse files
yangbodong22011yangbodong22011
authored
Merge pull request #2 from valkey-io/feature-change-name-to-valkey-java
Chore: change name to valkey-java
2 parents 6c23176 + aca3a00 commit 7c7358c

File tree

703 files changed

+3517
-3583
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

703 files changed

+3517
-3583
lines changed

‎.github/workflows/integration.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
path: |
4343
~/.m2/repository
4444
/var/cache/apt
45-
key: jackey-${{hashFiles('**/pom.xml')}}
45+
key: valkey-java-${{hashFiles('**/pom.xml')}}
4646
- name: Maven offline
4747
run: |
4848
mvn -q dependency:go-offline

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MIT License
22

33
Copyright (c) 2021-2023, Redis, inc.
4-
Copyright (c) 2024-now, jackey contributors
4+
Copyright (c) 2024-now, valkey-java contributors
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

‎README.md

+27-22
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
1-
# Jackey
2-
Jackey is [Valkey](https://github.com/valkey-io/valkey)'s Java client, derived from [Jedis](https://github.com/redis/jedis) fork, dedicated to maintaining simplicity and high performance.
1+
# Valkey-Java
2+
valkey-java is [Valkey](https://github.com/valkey-io/valkey)'s Java client, derived from [Jedis](https://github.com/redis/jedis) fork, dedicated to maintaining simplicity and high performance.
33

44

55
# Getting started
66
Add the following dependencies to your `pom.xml` file:
77
```
88
<dependency>
9-
<groupId>io.jackey</groupId>
10-
<artifactId>jackey</artifactId>
11-
<version>5.2.0</version>
9+
<groupId>io.valkey</groupId>
10+
<artifactId>valkey-java</artifactId>
11+
<version>5.3.0(coming soon)</version>
1212
</dependency>
1313
```
1414

1515
## Connect to Valkey
16+
1617
```java
17-
public class JackeyTest {
18+
public class ValkeyTest {
1819
// can be static or singleton, thread safety.
19-
private static io.jackey.JedisPool jedisPool;
20-
20+
private static io.valkey.JedisPool jedisPool;
21+
2122
public static void main(String[] args) {
22-
io.jackey.JedisPoolConfig config = new io.jackey.JedisPoolConfig();
23+
io.valkey.JedisPoolConfig config = new io.valkey.JedisPoolConfig();
2324
// It is recommended that you set maxTotal = maxIdle = 2*minIdle for best performance
2425
config.setMaxTotal(32);
2526
config.setMaxIdle(32);
2627
config.setMinIdle(16);
27-
jedisPool = new io.jackey.JedisPool(config, <host>, <port>, <timeout>, <password>);
28-
try (io.jackey.Jedis jedis = jedisPool.getResource()) {
28+
jedisPool = new io.valkey.JedisPool(config, < host >, <port >, <timeout >, <password >);
29+
try (io.valkey.Jedis jedis = jedisPool.getResource()) {
2930
jedis.set("key", "value");
3031
System.out.println(jedis.get("key"));
3132
} catch (Exception e) {
@@ -37,18 +38,20 @@ public class JackeyTest {
3738
```
3839

3940
## Connect to the Valkey cluster
41+
4042
```java
4143
import java.util.HashSet;
4244
import java.util.Set;
43-
import io.jackey.HostAndPort;
4445

45-
public class JackeyClusterTest {
46+
import io.valkey.HostAndPort;
47+
48+
public class ValkeyClusterTest {
4649
private static final int DEFAULT_TIMEOUT = 2000;
4750
private static final int DEFAULT_REDIRECTIONS = 5;
48-
private static io.jackey.JedisCluster jc; // be static or singleton, thread safety.
51+
private static io.valkey.JedisCluster jc; // be static or singleton, thread safety.
4952

5053
public static void main(String[] args) {
51-
io.jackey.ConnectionPoolConfig config = new io.jackey.ConnectionPoolConfig();
54+
io.valkey.ConnectionPoolConfig config = new io.valkey.ConnectionPoolConfig();
5255
// It is recommended that you set maxTotal = maxIdle = 2*minIdle for best performance
5356
// In cluster mode, please note that each business machine will contain up to maxTotal links,
5457
// and the total number of connections = maxTotal * number of machines
@@ -58,11 +61,11 @@ public class JackeyClusterTest {
5861

5962
Set<HostAndPort> jedisClusterNode = new HashSet<HostAndPort>();
6063
jedisClusterNode.add(new HostAndPort(host, port));
61-
jc = new io.jackey.JedisCluster(jedisClusterNode, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT, DEFAULT_REDIRECTIONS,
64+
jc = new io.valkey.JedisCluster(jedisClusterNode, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT, DEFAULT_REDIRECTIONS,
6265
password, null, config);
6366

6467
jc.set("key", "value"); // Note that there is no need to call jc.close() here,
65-
// the connection recycling is actively completed internally.
68+
// the connection recycling is actively completed internally.
6669
System.out.println(jc.get("key"));
6770

6871
jc.close(); // when app exit, close the resource.
@@ -71,19 +74,21 @@ public class JackeyClusterTest {
7174
```
7275

7376
## Connect using TLS method
77+
7478
```java
7579
import java.io.FileInputStream;
7680
import java.io.InputStream;
7781
import java.security.KeyStore;
7882
import java.security.SecureRandom;
83+
7984
import javax.net.ssl.SSLContext;
8085
import javax.net.ssl.SSLSocketFactory;
8186
import javax.net.ssl.TrustManager;
8287
import javax.net.ssl.TrustManagerFactory;
8388

8489
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
8590

86-
public class JackeySSLTest {
91+
public class ValkeySSLTest {
8792
private static SSLSocketFactory createTrustStoreSSLSocketFactory(String jksFile) throws Exception {
8893
KeyStore trustStore = KeyStore.getInstance("jks");
8994
InputStream inputStream = null;
@@ -105,11 +110,11 @@ public class JackeySSLTest {
105110

106111
public static void main(String[] args) throws Exception {
107112
// When you don't have a jks file, just set sslSocketFactory to null.
108-
final SSLSocketFactory sslSocketFactory = createTrustStoreSSLSocketFactory(<your_jks_file_path>);
109-
io.jackey.JedisPool jedisPool = new io.jackey.JedisPool(new GenericObjectPoolConfig(), <host>,
110-
<port>, <timeout>, <password>, 0, true, sslSocketFactory, null, null);
113+
final SSLSocketFactory sslSocketFactory = createTrustStoreSSLSocketFactory( < your_jks_file_path >);
114+
io.valkey.JedisPool jedisPool = new io.valkey.JedisPool(new GenericObjectPoolConfig(), < host >,
115+
<port >, <timeout >, <password >, 0, true, sslSocketFactory, null, null);
111116

112-
try (io.jackey.Jedis jedis = pool.getResource()) {
117+
try (io.valkey.Jedis jedis = pool.getResource()) {
113118
jedis.set("key", "value");
114119
System.out.println(jedis.get("key"));
115120
} catch (Exception e) {

‎pom.xml

+9-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<packaging>jar</packaging>
6-
<groupId>io.jackey</groupId>
7-
<artifactId>jackey</artifactId>
6+
<groupId>io.valkey</groupId>
7+
<artifactId>valkey-java</artifactId>
88
<version>5.2.0</version>
99

10-
<name>jackey</name>
10+
<name>valkey-java</name>
1111
<description>Java client for valkey.</description>
12-
<url>https://github.com/valkey-io/jackey</url>
12+
<url>https://github.com/valkey-io/valkey-java</url>
1313

1414
<licenses>
1515
<license>
1616
<name>MIT</name>
17-
<url>https://github.com/valkey-io/jackey/blob/master/LICENSE</url>
17+
<url>https://github.com/valkey-io/valkey-java/blob/master/LICENSE</url>
1818
<distribution>repo</distribution>
1919
</license>
2020
</licenses>
@@ -27,20 +27,19 @@
2727
</developers>
2828

2929
<scm>
30-
<url>https://github.com/valkey-io/jackey</url>
31-
<connection>scm:https://github.com/valkey-io/jackey.git</connection>
32-
<developerConnection>scm:git:https://github.com/valkeykey-io/jackey.git</developerConnection>
30+
<url>https://github.com/valkey-io/valkey-java</url>
31+
<connection>scm:https://github.com/valkey-io/valkey-java.git</connection>
32+
<developerConnection>scm:git:https://github.com/valkeykey-io/valkey-java.git</developerConnection>
3333
<tag>HEAD</tag>
3434
</scm>
3535

3636
<issueManagement>
3737
<system>github</system>
38-
<url>https://github.com/valkey-io/jackey/issues</url>
38+
<url>https://github.com/valkey-io/valkey-java/issues</url>
3939
</issueManagement>
4040

4141
<properties>
4242
<java.version>1.8</java.version>
43-
<jackey.module.name>io.jackey</jackey.module.name>
4443
<slf4j.version>1.7.36</slf4j.version>
4544
<resilience4j.version>1.7.1</resilience4j.version>
4645
<jackson.version>2.17.0</jackson.version>

‎src/main/java/io/jackey/commands/ProtocolCommand.java

-6
This file was deleted.

‎src/main/java/io/jackey/commands/RedisModuleCommands.java

-18
This file was deleted.

‎src/main/java/io/jackey/commands/RedisModulePipelineCommands.java

-16
This file was deleted.

‎src/main/java/io/jackey/AbstractPipeline.java ‎src/main/java/io/valkey/AbstractPipeline.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.jackey;
1+
package io.valkey;
22

33
import java.io.Closeable;
44

‎src/main/java/io/jackey/AbstractTransaction.java ‎src/main/java/io/valkey/AbstractTransaction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.jackey;
1+
package io.valkey;
22

33
import java.io.Closeable;
44
import java.util.List;

‎src/main/java/io/jackey/BinaryJedisPubSub.java ‎src/main/java/io/valkey/BinaryJedisPubSub.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.jackey;
1+
package io.valkey;
22

33
public abstract class BinaryJedisPubSub extends JedisPubSubBase<byte[]> {
44

‎src/main/java/io/jackey/BinaryJedisShardedPubSub.java ‎src/main/java/io/valkey/BinaryJedisShardedPubSub.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.jackey;
1+
package io.valkey;
22

33
public abstract class BinaryJedisShardedPubSub extends JedisShardedPubSubBase<byte[]> {
44

‎src/main/java/io/jackey/Builder.java ‎src/main/java/io/valkey/Builder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.jackey;
1+
package io.valkey;
22

33
public abstract class Builder<T> {
44

‎src/main/java/io/jackey/BuilderFactory.java ‎src/main/java/io/valkey/BuilderFactory.java

+31-32
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,39 @@
1-
package io.jackey;
1+
package io.valkey;
22

33
import java.io.Serializable;
44
import java.util.*;
55
import java.util.stream.Collectors;
66

7-
import io.jackey.exceptions.JedisDataException;
8-
import io.jackey.resps.AccessControlLogEntry;
9-
import io.jackey.resps.AccessControlUser;
10-
import io.jackey.resps.ClusterShardInfo;
11-
import io.jackey.resps.ClusterShardNodeInfo;
12-
import io.jackey.resps.CommandDocument;
13-
import io.jackey.resps.CommandInfo;
14-
import io.jackey.resps.GeoRadiusResponse;
15-
import io.jackey.resps.LCSMatchResult;
16-
import io.jackey.resps.LatencyHistoryInfo;
17-
import io.jackey.resps.LatencyLatestInfo;
18-
import io.jackey.resps.LibraryInfo;
19-
import io.jackey.resps.ScanResult;
20-
import io.jackey.resps.StreamConsumerFullInfo;
21-
import io.jackey.resps.StreamConsumerInfo;
22-
import io.jackey.resps.StreamConsumersInfo;
23-
import io.jackey.resps.StreamEntry;
24-
import io.jackey.resps.StreamFullInfo;
25-
import io.jackey.resps.StreamGroupFullInfo;
26-
import io.jackey.resps.StreamGroupInfo;
27-
import io.jackey.resps.StreamInfo;
28-
import io.jackey.resps.StreamPendingEntry;
29-
import io.jackey.resps.StreamPendingSummary;
30-
import io.jackey.resps.Tuple;
31-
import io.jackey.resps.*;
32-
import io.jackey.resps.LCSMatchResult.MatchedPosition;
33-
import io.jackey.resps.LCSMatchResult.Position;
34-
import io.jackey.util.DoublePrecision;
35-
import io.jackey.util.JedisByteHashMap;
36-
import io.jackey.util.KeyValue;
37-
import io.jackey.util.SafeEncoder;
7+
import io.valkey.exceptions.JedisDataException;
8+
import io.valkey.resps.AccessControlLogEntry;
9+
import io.valkey.resps.AccessControlUser;
10+
import io.valkey.resps.ClusterShardInfo;
11+
import io.valkey.resps.ClusterShardNodeInfo;
12+
import io.valkey.resps.CommandDocument;
13+
import io.valkey.resps.CommandInfo;
14+
import io.valkey.resps.GeoRadiusResponse;
15+
import io.valkey.resps.LCSMatchResult;
16+
import io.valkey.resps.LatencyHistoryInfo;
17+
import io.valkey.resps.LatencyLatestInfo;
18+
import io.valkey.resps.LibraryInfo;
19+
import io.valkey.resps.ScanResult;
20+
import io.valkey.resps.StreamConsumerFullInfo;
21+
import io.valkey.resps.StreamConsumerInfo;
22+
import io.valkey.resps.StreamConsumersInfo;
23+
import io.valkey.resps.StreamEntry;
24+
import io.valkey.resps.StreamFullInfo;
25+
import io.valkey.resps.StreamGroupFullInfo;
26+
import io.valkey.resps.StreamGroupInfo;
27+
import io.valkey.resps.StreamInfo;
28+
import io.valkey.resps.StreamPendingEntry;
29+
import io.valkey.resps.StreamPendingSummary;
30+
import io.valkey.resps.Tuple;
31+
import io.valkey.resps.LCSMatchResult.MatchedPosition;
32+
import io.valkey.resps.LCSMatchResult.Position;
33+
import io.valkey.util.DoublePrecision;
34+
import io.valkey.util.JedisByteHashMap;
35+
import io.valkey.util.KeyValue;
36+
import io.valkey.util.SafeEncoder;
3837

3938
public final class BuilderFactory {
4039

‎src/main/java/io/jackey/ClientCapaConfig.java ‎src/main/java/io/valkey/ClientCapaConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.jackey;
1+
package io.valkey;
22

33
public class ClientCapaConfig {
44
private final boolean disabled;

‎src/main/java/io/jackey/ClientSetInfoConfig.java ‎src/main/java/io/valkey/ClientSetInfoConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.jackey;
1+
package io.valkey;
22

33
import java.util.Arrays;
44
import java.util.HashSet;
5-
import io.jackey.exceptions.JedisValidationException;
5+
import io.valkey.exceptions.JedisValidationException;
66

77
public final class ClientSetInfoConfig {
88

‎src/main/java/io/jackey/ClusterCommandArguments.java ‎src/main/java/io/valkey/ClusterCommandArguments.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.jackey;
1+
package io.valkey;
22

3-
import io.jackey.commands.ProtocolCommand;
4-
import io.jackey.exceptions.JedisClusterOperationException;
5-
import io.jackey.util.JedisClusterCRC16;
3+
import io.valkey.commands.ProtocolCommand;
4+
import io.valkey.exceptions.JedisClusterOperationException;
5+
import io.valkey.util.JedisClusterCRC16;
66

77
public class ClusterCommandArguments extends CommandArguments {
88

‎src/main/java/io/jackey/ClusterCommandObjects.java ‎src/main/java/io/valkey/ClusterCommandObjects.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package io.jackey;
1+
package io.valkey;
22

33
import java.util.Set;
44

5-
import io.jackey.Protocol.Command;
6-
import io.jackey.Protocol.Keyword;
7-
import io.jackey.commands.ProtocolCommand;
8-
import io.jackey.params.ScanParams;
9-
import io.jackey.resps.ScanResult;
10-
import io.jackey.util.JedisClusterHashTag;
11-
import io.jackey.util.KeyValue;
5+
import io.valkey.Protocol.Command;
6+
import io.valkey.Protocol.Keyword;
7+
import io.valkey.commands.ProtocolCommand;
8+
import io.valkey.params.ScanParams;
9+
import io.valkey.resps.ScanResult;
10+
import io.valkey.util.JedisClusterHashTag;
11+
import io.valkey.util.KeyValue;
1212

1313
public class ClusterCommandObjects extends CommandObjects {
1414

0 commit comments

Comments
 (0)