use hypertrace core common logical operator (#216)

hypertrace · Feb 7, 2024 · 19b76eb · 19b76eb
1 parent e136480
commit 19b76eb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 20 deletions.
diff --git a/hypertrace-core-graphql b/hypertrace-core-graphql
diff --git a/...main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanFilterConverter.java b/...main/java/org/hypertrace/graphql/spanprocessing/dao/ConfigServiceSpanFilterConverter.java
@@ -11,7 +11,6 @@
 import lombok.experimental.Accessors;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingFilterField;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalFilter;
-import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalOperator;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRelationalFilter;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRelationalOperator;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRuleFilter;
@@ -26,15 +25,17 @@
 
 public class ConfigServiceSpanFilterConverter {
 
-  private static final ImmutableBiMap<LogicalOperator, SpanProcessingLogicalOperator>
+  private static final ImmutableBiMap<
+          LogicalOperator, org.hypertrace.core.graphql.common.schema.operator.LogicalOperator>
       LOGICAL_OPERATOR_OPERATOR_BI_MAP =
           ImmutableBiMap.of(
               LogicalOperator.LOGICAL_OPERATOR_AND,
-              SpanProcessingLogicalOperator.AND,
+                  org.hypertrace.core.graphql.common.schema.operator.LogicalOperator.AND,
               LogicalOperator.LOGICAL_OPERATOR_OR,
-              SpanProcessingLogicalOperator.OR);
+                  org.hypertrace.core.graphql.common.schema.operator.LogicalOperator.OR);
 
-  private static final ImmutableBiMap<SpanProcessingLogicalOperator, LogicalOperator>
+  private static final ImmutableBiMap<
+          org.hypertrace.core.graphql.common.schema.operator.LogicalOperator, LogicalOperator>
       OPERATOR_LOGICAL_OPERATOR_IMMUTABLE_BI_MAP = LOGICAL_OPERATOR_OPERATOR_BI_MAP.inverse();
 
   private static final ImmutableBiMap<RelationalOperator, SpanProcessingRelationalOperator>
@@ -223,7 +224,7 @@ private static class ConvertedSpanProcessingRelationalFilter
   @Value
   @Accessors(fluent = true)
   private static class ConvertedSpanProcessingLogicalFilter implements SpanProcessingLogicalFilter {
-    SpanProcessingLogicalOperator logicalOperator;
+    org.hypertrace.core.graphql.common.schema.operator.LogicalOperator logicalOperator;
     List<SpanProcessingRuleFilter> spanFilters;
   }
 

diff --git a/...hypertrace/graphql/spanprocessing/deserialization/DefaultSpanProcessingLogicalFilter.java b/...hypertrace/graphql/spanprocessing/deserialization/DefaultSpanProcessingLogicalFilter.java
@@ -5,15 +5,15 @@
 import lombok.Value;
 import lombok.experimental.Accessors;
 import lombok.extern.jackson.Jacksonized;
+import org.hypertrace.core.graphql.common.schema.operator.LogicalOperator;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalFilter;
-import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingLogicalOperator;
 import org.hypertrace.graphql.spanprocessing.schema.rule.filter.SpanProcessingRuleFilter;
 
 @Value
 @Accessors(fluent = true)
 @Jacksonized
 @Builder
 public class DefaultSpanProcessingLogicalFilter implements SpanProcessingLogicalFilter {
-  SpanProcessingLogicalOperator logicalOperator;
+  LogicalOperator logicalOperator;
   List<SpanProcessingRuleFilter> spanFilters;
 }
diff --git a/...org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalFilter.java b/...org/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalFilter.java
@@ -4,6 +4,7 @@
 import graphql.annotations.annotationTypes.GraphQLName;
 import graphql.annotations.annotationTypes.GraphQLNonNull;
 import java.util.List;
+import org.hypertrace.core.graphql.common.schema.operator.LogicalOperator;
 
 @GraphQLName(SpanProcessingLogicalFilter.TYPE_NAME)
 public interface SpanProcessingLogicalFilter {
@@ -15,7 +16,7 @@ public interface SpanProcessingLogicalFilter {
   @GraphQLField
   @GraphQLName(SPAN_PROCESSING_LOGICAL_OPERATOR_KEY)
   @GraphQLNonNull
-  SpanProcessingLogicalOperator logicalOperator();
+  LogicalOperator logicalOperator();
 
   @GraphQLField
   @GraphQLName(SPAN_PROCESSING_FILTERS_KEY)

diff --git a/...g/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalOperator.java b/...g/hypertrace/graphql/spanprocessing/schema/rule/filter/SpanProcessingLogicalOperator.java