Skip to content

fix: support @Indexed(alias) on nested Map fields for uppercase JSON … #662

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

Merged
merged 1 commit into from
Sep 10, 2025
Merged

fix: support @Indexed(alias) on nested Map fields for uppercase JSON … #662

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
6 changes: 5 additions & 1 deletion redis-om-spring/src/main/java/com/redis/om/spring/indexing/RediSearchIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,11 @@ else if (Map.class.isAssignableFrom(fieldType) && isDocument) {
String nestedJsonPath = (prefix == null || prefix.isBlank()) ?
"$." + field.getName() + ".*." + subfield.getName() :
"$." + prefix + "." + field.getName() + ".*." + subfield.getName();
String nestedFieldAlias = field.getName() + "_" + subfield.getName();
// Respect the alias annotation on the nested field
String subfieldAlias = (subfieldIndexed.alias() != null && !subfieldIndexed.alias().isEmpty()) ?
subfieldIndexed.alias() :
subfield.getName();
String nestedFieldAlias = field.getName() + "_" + subfieldAlias;

logger.info(String.format("Processing nested field %s in Map value type, path: %s, alias: %s",
subfield.getName(), nestedJsonPath, nestedFieldAlias));
Expand Down
31 changes: 25 additions & 6 deletions redis-om-spring/src/main/java/com/redis/om/spring/repository/query/RediSearchQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,12 +409,15 @@ private void processMapContainsQuery(String methodName) {
List<Pair<String, QueryClause>> currentOrPart = new ArrayList<>();

for (String clause : clauses) {
// Remove leading And/Or if present
String cleanClause = clause.replaceFirst("^(And|Or)", "");

// Check if this clause contains MapContains pattern
if (clause.contains("MapContains")) {
if (cleanClause.contains("MapContains")) {
// Extract the Map field and nested field
Pattern pattern = Pattern.compile(
"([A-Za-z]+)MapContains([A-Za-z]+)(GreaterThan|LessThan|After|Before|Between|NotEqual|In)?");
Matcher matcher = pattern.matcher(clause);
Matcher matcher = pattern.matcher(cleanClause);

if (matcher.find()) {
String mapFieldName = matcher.group(1);
Expand All @@ -436,8 +439,15 @@ private void processMapContainsQuery(String methodName) {
// Find the nested field in the value type
Field nestedField = ReflectionUtils.findField(valueType, nestedFieldName);
if (nestedField != null) {
// Build the index field name: mapField_nestedField
String indexFieldName = mapFieldName + "_" + nestedFieldName;
// Build the index field name: mapField_nestedField (respecting alias if present)
String actualNestedFieldName = nestedFieldName;
if (nestedField.isAnnotationPresent(Indexed.class)) {
Indexed indexed = nestedField.getAnnotation(Indexed.class);
if (indexed.alias() != null && !indexed.alias().isEmpty()) {
actualNestedFieldName = indexed.alias();
}
}
String indexFieldName = mapFieldName + "_" + actualNestedFieldName;

// Determine the field type and part type
Class<?> nestedFieldType = ClassUtils.resolvePrimitiveIfNecessary(nestedField.getType());
Expand Down Expand Up @@ -470,7 +480,7 @@ private void processMapContainsQuery(String methodName) {
} else {
// Handle regular field patterns - delegate to standard parsing
// This is a simplified version - in production would need full parsing
String fieldName = clause.replaceAll("(GreaterThan|LessThan|Between|NotEqual|In).*", "");
String fieldName = cleanClause.replaceAll("(GreaterThan|LessThan|Between|NotEqual|In).*", "");
fieldName = Character.toLowerCase(fieldName.charAt(0)) + fieldName.substring(1);

Field field = ReflectionUtils.findField(domainType, fieldName);
Expand All @@ -482,11 +492,20 @@ private void processMapContainsQuery(String methodName) {
partType = Part.Type.LESS_THAN;
}

// Check for @Indexed alias on regular fields
String actualFieldName = fieldName;
if (field.isAnnotationPresent(Indexed.class)) {
Indexed indexed = field.getAnnotation(Indexed.class);
if (indexed.alias() != null && !indexed.alias().isEmpty()) {
actualFieldName = indexed.alias();
}
}

Class<?> fieldType = ClassUtils.resolvePrimitiveIfNecessary(field.getType());
FieldType redisFieldType = getRedisFieldType(fieldType);
if (redisFieldType != null) {
QueryClause queryClause = QueryClause.get(redisFieldType, partType);
currentOrPart.add(Pair.of(fieldName, queryClause));
currentOrPart.add(Pair.of(actualFieldName, queryClause));
}
}
}
Expand Down
Loading