Skip to content

GH-3099: Parse Redis INFO output without using Properties.load() #3382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
won-seoop wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −17
Open

GH-3099: Parse Redis INFO output without using Properties.load() #3382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/main/java/org/springframework/data/redis/connection/convert/Converters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.springframework.data.redis.connection.convert;

import java.io.StringReader;
import java.nio.ByteBuffer;
import java.time.Duration;
import java.util.*;
Expand All @@ -30,7 +29,6 @@
import org.springframework.data.geo.GeoResults;
import org.springframework.data.geo.Metric;
import org.springframework.data.geo.Metrics;
import org.springframework.data.redis.RedisSystemException;
import org.springframework.data.redis.connection.ClusterSlotHashUtil;
import org.springframework.data.redis.connection.DataType;
import org.springframework.data.redis.connection.RedisClusterNode;
Expand Down Expand Up @@ -106,10 +104,15 @@ public static Properties toProperties(String source) {

Properties info = new Properties();

try (StringReader stringReader = new StringReader(source)) {
info.load(stringReader);
} catch (Exception ex) {
throw new RedisSystemException("Cannot read Redis info", ex);
for (String line : source.split("\\r?\\n")) {
String trimmed = line.trim();
if (trimmed.isEmpty() || trimmed.startsWith("#")) {
continue;
}
int colonIndex = trimmed.indexOf(':');
if (colonIndex > 0) {
info.setProperty(trimmed.substring(0, colonIndex).trim(), trimmed.substring(colonIndex + 1).trim());
}
}

return info;
Expand Down
16 changes: 5 additions & 11 deletions ...n/java/org/springframework/data/redis/connection/convert/StringToPropertiesConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
*/
package org.springframework.data.redis.connection.convert;

import java.io.StringReader;
import java.util.Properties;

import org.springframework.core.convert.converter.Converter;
import org.springframework.data.redis.RedisSystemException;

/**
* Converts Strings to {@link Properties}
* Converts Strings in Redis {@code INFO} / {@code CLUSTER INFO} key:value format to {@link Properties}.
* <p>
* Unlike {@link Properties#load}, this converter does not interpret escape sequences (e.g. {@code \u}) so that values
* containing backslashes — such as Windows-style file paths emitted by Redis on Windows — are preserved verbatim.
*
* @author Jennifer Hickey
* @author Christoph Strobl
Expand All @@ -31,13 +32,6 @@ public class StringToPropertiesConverter implements Converter<String, Properties

@Override
public Properties convert(String source) {

Properties info = new Properties();
try (StringReader stringReader = new StringReader(source)) {
info.load(stringReader);
} catch (Exception ex) {
throw new RedisSystemException("Cannot read Redis info", ex);
}
return info;
return Converters.toProperties(source);
}
}
Loading