fix: Fixed JSON propery names

Author: Julien Ruaux

src/main/java/com/redis/trino/RediSearchMetadata.java

@@ -266,7 +266,7 @@ public Optional<LimitApplicationResult<ConnectorTableHandle>> applyLimit(Connect
 
 		return Optional.of(new LimitApplicationResult<>(new RediSearchTableHandle(handle.getType(),
 				handle.getSchemaTableName(), handle.getConstraint(), OptionalLong.of(limit),
-				handle.getAggregationTerms(), handle.getAggregations(), handle.getWildcards()), true, false));
+				handle.getTermAggregations(), handle.getMetricAggregations(), handle.getWildcards()), true, false));
 	}
 
 	@Override
@@ -329,7 +329,7 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
 		}
 
 		handle = new RediSearchTableHandle(handle.getType(), handle.getSchemaTableName(), newDomain, handle.getLimit(),
-				handle.getAggregationTerms(), handle.getAggregations(), newWildcards);
+				handle.getTermAggregations(), handle.getMetricAggregations(), newWildcards);
 
 		return Optional.of(new ConstraintApplicationResult<>(handle, TupleDomain.withColumnDomains(unsupported),
 				newExpression, false));
@@ -420,7 +420,7 @@ public Optional<AggregationApplicationResult<ConnectorTableHandle>> applyAggrega
 		RediSearchTableHandle table = (RediSearchTableHandle) handle;
 		// Global aggregation is represented by [[]]
 		verify(!groupingSets.isEmpty(), "No grouping sets provided");
-		if (!table.getAggregationTerms().isEmpty()) {
+		if (!table.getTermAggregations().isEmpty()) {
 			return Optional.empty();
 		}
 		ImmutableList.Builder<ConnectorExpression> projections = ImmutableList.builder();

src/main/java/com/redis/trino/RediSearchQueryBuilder.java

@@ -238,8 +238,8 @@ private Reducer reducer(RediSearchAggregation aggregation) {
 	}
 
 	public Optional<Group> group(RediSearchTableHandle table) {
-		List<RediSearchAggregationTerm> terms = table.getAggregationTerms();
-		List<RediSearchAggregation> aggregates = table.getAggregations();
+		List<RediSearchAggregationTerm> terms = table.getTermAggregations();
+		List<RediSearchAggregation> aggregates = table.getMetricAggregations();
 		List<String> groupFields = new ArrayList<>();
 		if (terms != null && !terms.isEmpty()) {
 			groupFields = terms.stream().map(RediSearchAggregationTerm::getTerm).collect(Collectors.toList());

src/main/java/com/redis/trino/RediSearchTableHandle.java

@@ -63,15 +63,15 @@ public RediSearchTableHandle(Type type, SchemaTableName schemaTableName) {
 	public RediSearchTableHandle(@JsonProperty("type") Type type,
 			@JsonProperty("schemaTableName") SchemaTableName schemaTableName,
 			@JsonProperty("constraint") TupleDomain<ColumnHandle> constraint, @JsonProperty("limit") OptionalLong limit,
-			@JsonProperty("aggTerms") List<RediSearchAggregationTerm> aggregationTerms,
-			@JsonProperty("aggregates") List<RediSearchAggregation> aggregates,
+			@JsonProperty("aggTerms") List<RediSearchAggregationTerm> termAggregations,
+			@JsonProperty("aggregates") List<RediSearchAggregation> metricAggregations,
 			@JsonProperty("wildcards") Map<String, String> wildcards) {
 		this.type = requireNonNull(type, "type is null");
 		this.schemaTableName = requireNonNull(schemaTableName, "schemaTableName is null");
 		this.constraint = requireNonNull(constraint, "constraint is null");
 		this.limit = requireNonNull(limit, "limit is null");
-		this.aggregationTerms = requireNonNull(aggregationTerms, "aggTerms is null");
-		this.aggregations = requireNonNull(aggregates, "aggregates is null");
+		this.aggregationTerms = requireNonNull(termAggregations, "aggTerms is null");
+		this.aggregations = requireNonNull(metricAggregations, "aggregates is null");
 		this.wildcards = requireNonNull(wildcards, "wildcards is null");
 	}
 
@@ -96,12 +96,12 @@ public OptionalLong getLimit() {
 	}
 
 	@JsonProperty
-	public List<RediSearchAggregationTerm> getAggregationTerms() {
+	public List<RediSearchAggregationTerm> getTermAggregations() {
 		return aggregationTerms;
 	}
 
 	@JsonProperty
-	public List<RediSearchAggregation> getAggregations() {
+	public List<RediSearchAggregation> getMetricAggregations() {
 		return aggregations;
 	}