From beeb208f19cf46b7e7f001e59abdf7be18209e44 Mon Sep 17 00:00:00 2001
From: aman bansal <bansalaman2905@gmail.com>
Date: Mon, 27 Nov 2023 20:27:58 +0530
Subject: [PATCH] Revert "chore | add support for multi filter arguments
 (#151)" (#152)

This reverts commit fd15f6eb33f8f49a861f7d59d2a76e8c86514241.
---
 .../utils/gateway/GatewayUtilsModule.java     |  5 --
 .../utils/gateway/MultiFilterConverter.java   | 70 -------------------
 2 files changed, 75 deletions(-)
 delete mode 100644 hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/MultiFilterConverter.java

diff --git a/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/GatewayUtilsModule.java b/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/GatewayUtilsModule.java
index d02a81e8..78fa0750 100644
--- a/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/GatewayUtilsModule.java
+++ b/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/GatewayUtilsModule.java
@@ -58,11 +58,6 @@ protected void configure() {
             new TypeLiteral<
                 Converter<Collection<AttributeAssociation<FilterArgument>>, Filter>>() {}))
         .to(FilterConverter.class);
-    bind(Key.get(
-            new TypeLiteral<
-                Converter<
-                    Collection<Collection<AttributeAssociation<FilterArgument>>>, Filter>>() {}))
-        .to(MultiFilterConverter.class);
 
     bind(Key.get(new TypeLiteral<Converter<AttributeModel, ColumnIdentifier>>() {}))
         .to(ColumnIdentifierConverter.class);
diff --git a/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/MultiFilterConverter.java b/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/MultiFilterConverter.java
deleted file mode 100644
index da8e78a4..00000000
--- a/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/MultiFilterConverter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.hypertrace.core.graphql.utils.gateway;
-
-import static io.reactivex.rxjava3.core.Single.zip;
-
-import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.core.Single;
-import java.util.Collection;
-import java.util.stream.Collectors;
-import javax.inject.Inject;
-import org.hypertrace.core.graphql.common.request.AttributeAssociation;
-import org.hypertrace.core.graphql.common.schema.results.arguments.filter.FilterArgument;
-import org.hypertrace.core.graphql.common.utils.Converter;
-import org.hypertrace.gateway.service.v1.common.Filter;
-import org.hypertrace.gateway.service.v1.common.Operator;
-
-public class MultiFilterConverter
-    implements Converter<Collection<Collection<AttributeAssociation<FilterArgument>>>, Filter> {
-
-  private final AttributeExpressionConverter attributeExpressionConverter;
-  private final OperatorConverter operatorConverter;
-  private final LiteralConstantExpressionConverter literalConstantExpressionConverter;
-
-  @Inject
-  MultiFilterConverter(
-      AttributeExpressionConverter attributeExpressionConverter,
-      OperatorConverter operatorConverter,
-      LiteralConstantExpressionConverter literalConstantExpressionConverter) {
-    this.attributeExpressionConverter = attributeExpressionConverter;
-    this.operatorConverter = operatorConverter;
-    this.literalConstantExpressionConverter = literalConstantExpressionConverter;
-  }
-
-  @Override
-  public Single<Filter> convert(
-      Collection<Collection<AttributeAssociation<FilterArgument>>> filters) {
-    if (filters.isEmpty()) {
-      return Single.just(Filter.getDefaultInstance());
-    }
-
-    return Observable.fromIterable(filters)
-        .flatMapSingle(this::buildAndFilterOperations)
-        .collect(Collectors.toUnmodifiableList())
-        .map(
-            filterList ->
-                Filter.newBuilder().setOperator(Operator.OR).addAllChildFilter(filterList).build());
-  }
-
-  private Single<Filter> buildAndFilterOperations(
-      Collection<AttributeAssociation<FilterArgument>> andFilters) {
-    return Observable.fromIterable(andFilters)
-        .flatMapSingle(this::buildFilter)
-        .collect(Collectors.toUnmodifiableList())
-        .map(
-            filterList ->
-                Filter.newBuilder()
-                    .setOperator(Operator.AND)
-                    .addAllChildFilter(filterList)
-                    .build());
-  }
-
-  private Single<Filter> buildFilter(AttributeAssociation<FilterArgument> filter) {
-    return zip(
-        this.attributeExpressionConverter.convert(
-            AttributeAssociation.of(filter.attribute(), filter.value().keyExpression())),
-        this.operatorConverter.convert(filter.value().operator()),
-        this.literalConstantExpressionConverter.convert(filter.value().value()),
-        (key, operator, value) ->
-            Filter.newBuilder().setLhs(key).setOperator(operator).setRhs(value).build());
-  }
-}