Skip to content

Commit

Permalink
Remove version suffix
Browse files Browse the repository at this point in the history
  • Loading branch information
sazzad16 committed Sep 4, 2023
1 parent fd56dda commit 9498a4d
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 22 deletions.
4 changes: 0 additions & 4 deletions src/main/java/redis/clients/jedis/Connection.java
Expand Up @@ -432,10 +432,6 @@ private void initializeFromClientConfig(final JedisClientConfig config) {

String libVersion = JedisMetaInfo.getVersion();
if (libVersion != null && validateClientInfo(libVersion)) {
String libVerSuffix = setInfoConfig.libVerSuffix();
if (libVerSuffix != null && validateClientInfo(libVerSuffix)) {
libVersion = libVersion + libVerSuffix;
}
fireAndForgetMsg.add(new CommandArguments(Command.CLIENT).add(Keyword.SETINFO)
.add(ClientAttributeOption.LIB_VER.getRaw()).add(libVersion));
}
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/redis/clients/jedis/DefaultJedisClientConfig.java
Expand Up @@ -266,7 +266,6 @@ public static class SetInfoBuilder {

private boolean disable = false;
private String libNameSuffix = null;
private String libVerSuffix = null;

private SetInfoBuilder() {
}
Expand All @@ -283,11 +282,6 @@ public boolean disable() {
public String libNameSuffix() {
return libNameSuffix;
}

@Override
public String libVerSuffix() {
return libVerSuffix;
}
};
}

Expand All @@ -300,11 +294,6 @@ public SetInfoBuilder libNameSuffix(String suffix) {
this.libNameSuffix = suffix;
return this;
}

public SetInfoBuilder libVerSuffix(String suffix) {
this.libVerSuffix = suffix;
return this;
}
}

public static DefaultJedisClientConfig create(int connectionTimeoutMillis, int soTimeoutMillis,
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/redis/clients/jedis/JedisClientConfig.java
Expand Up @@ -89,10 +89,6 @@ default boolean disable() {
default String libNameSuffix() {
return null;
}

default String libVerSuffix() {
return null;
}
}

default ClientSetInfoConfig getClientSetInfoConfig() {
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/redis/clients/jedis/JedisTest.java
Expand Up @@ -317,15 +317,13 @@ public void clientSetInfoDisable() {
@Test
public void clientSetInfoCustom() {
final String libNameSuffix = "-for-redis";
final String libVerSuffix = "-custom";
ClientSetInfoConfig setInfoConfig = DefaultJedisClientConfig.setInfoBuilder()
.libNameSuffix(libNameSuffix).libVerSuffix(libVerSuffix).build();
.libNameSuffix(libNameSuffix).build();
try (Jedis jedis = new Jedis(hnp, DefaultJedisClientConfig.builder().password("foobared")
.clientSetInfoConfig(setInfoConfig).build())) {
assertEquals("PONG", jedis.ping());
String info = jedis.clientInfo();
assertTrue(info.contains("lib-name=" + JedisMetaInfo.getArtifactId() + libNameSuffix));
assertTrue(info.contains("lib-ver=" + JedisMetaInfo.getVersion() + libVerSuffix));
}
}

Expand Down

0 comments on commit 9498a4d

Please sign in to comment.