refactor: attribute association expression rename (#92)

aaron-steinfeld · web-flow · commit 43f084b87851 · 2022-01-09T07:15:16.000-08:00
* refactor: attribute association expression rename

* fix: vulnerable dependency
diff --git a/hypertrace-core-graphql-common-schema/src/main/java/org/hypertrace/core/graphql/common/request/AttributeRequest.java b/hypertrace-core-graphql-common-schema/src/main/java/org/hypertrace/core/graphql/common/request/AttributeRequest.java
@@ -3,9 +3,9 @@
 import org.hypertrace.core.graphql.common.schema.attributes.arguments.AttributeExpression;
 
 public interface AttributeRequest {
-  AttributeAssociation<AttributeExpression> attributeExpression();
+  AttributeAssociation<AttributeExpression> attributeExpressionAssociation();
 
   default String asMapKey() {
-    return attributeExpression().value().asAlias();
+    return attributeExpressionAssociation().value().asAlias();
   }
 }
diff --git a/hypertrace-core-graphql-common-schema/src/main/java/org/hypertrace/core/graphql/common/request/DefaultAttributeRequestBuilder.java b/hypertrace-core-graphql-common-schema/src/main/java/org/hypertrace/core/graphql/common/request/DefaultAttributeRequestBuilder.java
@@ -117,6 +117,6 @@ private Stream<AttributeExpression> resolveAttributeExpression(SelectedField att
   @Value
   @Accessors(fluent = true)
   static class DefaultAttributeRequest implements AttributeRequest {
-    AttributeAssociation<AttributeExpression> attributeExpression;
+    AttributeAssociation<AttributeExpression> attributeExpressionAssociation;
   }
 }
diff --git a/hypertrace-core-graphql-common-schema/src/test/java/org/hypertrace/core/graphql/common/request/DefaultAttributeRequestBuilderTest.java b/hypertrace-core-graphql-common-schema/src/test/java/org/hypertrace/core/graphql/common/request/DefaultAttributeRequestBuilderTest.java
@@ -70,6 +70,6 @@ void canBuildRequestForSelectionSet() {
             .blockingGet();
 
     assertEquals(1, returned.size());
-    assertEquals(expectedResultExpression, returned.get(0).attributeExpression());
+    assertEquals(expectedResultExpression, returned.get(0).attributeExpressionAssociation());
   }
 }
diff --git a/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/AttributeExpressionConverter.java b/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/AttributeExpressionConverter.java
@@ -11,11 +11,12 @@ class AttributeExpressionConverter
     implements Converter<AttributeAssociation<AttributeExpression>, Expression> {
 
   @Override
-  public Single<Expression> convert(AttributeAssociation<AttributeExpression> attributeExpression) {
+  public Single<Expression> convert(
+      AttributeAssociation<AttributeExpression> attributeExpressionAssociation) {
     Builder builder = org.hypertrace.gateway.service.v1.common.AttributeExpression.newBuilder();
-    builder.setAttributeId(attributeExpression.attribute().id());
-    attributeExpression.value().subpath().ifPresent(builder::setSubpath);
-    builder.setAlias(attributeExpression.value().asAlias());
+    builder.setAttributeId(attributeExpressionAssociation.attribute().id());
+    attributeExpressionAssociation.value().subpath().ifPresent(builder::setSubpath);
+    builder.setAlias(attributeExpressionAssociation.value().asAlias());
     return Single.just(Expression.newBuilder().setAttributeExpression(builder).build());
   }
 }
diff --git a/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/AttributeMapConverter.java b/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/AttributeMapConverter.java
@@ -41,9 +41,10 @@ private Single<Entry<AttributeExpression, Object>> buildAttributeMapEntry(
     return this.valueConverter
         .convert(
             response.get(attributeRequest.asMapKey()),
-            attributeRequest.attributeExpression().attribute())
+            attributeRequest.attributeExpressionAssociation().attribute())
         .map(
             value ->
-                new SimpleImmutableEntry<>(attributeRequest.attributeExpression().value(), value));
+                new SimpleImmutableEntry<>(
+                    attributeRequest.attributeExpressionAssociation().value(), value));
   }
 }
diff --git a/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/SelectionExpressionSetConverter.java b/hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/SelectionExpressionSetConverter.java
@@ -31,7 +31,7 @@ public Single<Set<Expression>> convert(Collection<AttributeRequest> attributeReq
 
   private Single<Expression> buildAliasedSelectionExpression(AttributeRequest attributeRequest) {
     return this.attributeExpressionConverter
-        .convert(attributeRequest.attributeExpression())
+        .convert(attributeRequest.attributeExpressionAssociation())
         .map(Expression::toBuilder)
         .map(Builder::build);
   }
diff --git a/hypertrace-core-graphql-log-event-schema/src/test/java/org/hypertrace/core/graphql/log/event/dao/BaseDaoTest.java b/hypertrace-core-graphql-log-event-schema/src/test/java/org/hypertrace/core/graphql/log/event/dao/BaseDaoTest.java
@@ -36,7 +36,7 @@ static class DefaultLogEventRequest implements LogEventRequest {
   @Value
   @Accessors(fluent = true)
   static class DefaultAttributeRequest implements AttributeRequest {
-    AttributeAssociation<AttributeExpression> attributeExpression;
+    AttributeAssociation<AttributeExpression> attributeExpressionAssociation;
   }
 
   @Value
diff --git a/hypertrace-core-graphql-platform/build.gradle.kts b/hypertrace-core-graphql-platform/build.gradle.kts
@@ -16,7 +16,10 @@ dependencies {
     api("io.github.graphql-java:graphql-java-annotations:8.3")
     api("org.slf4j:slf4j-api:1.7.30")
     api("io.reactivex.rxjava3:rxjava:3.0.9")
-    api("com.google.protobuf:protobuf-java-util:3.14.0")
+    api("com.google.protobuf:protobuf-java-util:3.19.2")
+    api("com.google.protobuf:protobuf-java:3.19.2") {
+      because("https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEPROTOBUF-2331703")
+    }
 
     api("org.projectlombok:lombok:1.18.18")
     api("com.google.code.findbugs:jsr305:3.0.2")
diff --git a/hypertrace-core-graphql-span-schema/src/main/java/org/hypertrace/core/graphql/span/dao/GatewayServiceSpanConverter.java b/hypertrace-core-graphql-span-schema/src/main/java/org/hypertrace/core/graphql/span/dao/GatewayServiceSpanConverter.java
@@ -51,7 +51,11 @@ private Single<Span> convert(
                 new ConvertedSpan(
                     attrMap
                         .get(
-                            request.spanEventsRequest().idAttribute().attributeExpression().value())
+                            request
+                                .spanEventsRequest()
+                                .idAttribute()
+                                .attributeExpressionAssociation()
+                                .value())
                         .toString(),
                     attrMap,
                     spanIdToLogEvents));
diff --git a/hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/DaoTestUtil.java b/hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/DaoTestUtil.java
@@ -35,7 +35,7 @@ class DaoTestUtil {
   @Value
   @Accessors(fluent = true)
   static class DefaultAttributeRequest implements AttributeRequest {
-    AttributeAssociation<AttributeExpression> attributeExpression;
+    AttributeAssociation<AttributeExpression> attributeExpressionAssociation;
   }
 
   @Value
diff --git a/hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/SpanLogEventRequestBuilderTest.java b/hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/SpanLogEventRequestBuilderTest.java
@@ -109,18 +109,18 @@ protected void configure() {
               return Single.just(
                   List.of(
                       AttributeAssociation.of(
-                          spanIdAttribute.attributeExpression().attribute(),
+                          spanIdAttribute.attributeExpressionAssociation().attribute(),
                           new NormalizedFilter(
                               AttributeExpression.forAttributeKey(
-                                  spanIdAttribute.attributeExpression().value().key()),
+                                  spanIdAttribute.attributeExpressionAssociation().value().key()),
                               filterArgument.operator(),
                               filterArgument.value()))));
             })
         .when(filterRequestBuilder)
         .build(any(), any(), anyCollection());
 
     when(attributeStore.getForeignIdAttribute(any(), anyString(), anyString()))
-        .thenReturn(Single.just(spanIdAttribute.attributeExpression().attribute()));
+        .thenReturn(Single.just(spanIdAttribute.attributeExpressionAssociation().attribute()));
 
     doAnswer(
             invocation -> {
diff --git a/hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/SpanLogEventResponseConverterTest.java b/hypertrace-core-graphql-span-schema/src/test/java/org/hypertrace/core/graphql/span/dao/SpanLogEventResponseConverterTest.java
@@ -58,9 +58,9 @@ void testBuildResponse() {
         List.of(spanIdAttribute, traceIdAttribute, attributesAttribute);
 
     when(attributeStore.getForeignIdAttribute(any(), anyString(), anyString()))
-        .thenReturn(Single.just(spanIdAttribute.attributeExpression().attribute()));
+        .thenReturn(Single.just(spanIdAttribute.attributeExpressionAssociation().attribute()));
     when(attributeRequestBuilder.buildForAttribute(
-            spanIdAttribute.attributeExpression().attribute()))
+            spanIdAttribute.attributeExpressionAssociation().attribute()))
         .thenReturn(spanIdAttribute);
 
     doAnswer(
@@ -91,9 +91,9 @@ void testBuildResponse_spanIdNotRequested() {
     Collection<AttributeRequest> attributeRequests = List.of(traceIdAttribute, attributesAttribute);
 
     when(attributeStore.getForeignIdAttribute(any(), anyString(), anyString()))
-        .thenReturn(Single.just(spanIdAttribute.attributeExpression().attribute()));
+        .thenReturn(Single.just(spanIdAttribute.attributeExpressionAssociation().attribute()));
     when(attributeRequestBuilder.buildForAttribute(
-            spanIdAttribute.attributeExpression().attribute()))
+            spanIdAttribute.attributeExpressionAssociation().attribute()))
         .thenReturn(spanIdAttribute);
 
     doAnswer(
diff --git a/hypertrace-core-graphql-trace-schema/src/main/java/org/hypertrace/core/graphql/trace/dao/GatewayServiceTraceConverter.java b/hypertrace-core-graphql-trace-schema/src/main/java/org/hypertrace/core/graphql/trace/dao/GatewayServiceTraceConverter.java
@@ -45,7 +45,9 @@ private Single<Trace> convert(
         .map(
             attrMap ->
                 new ConvertedTrace(
-                    attrMap.get(request.idAttribute().attributeExpression().value()).toString(),
+                    attrMap
+                        .get(request.idAttribute().attributeExpressionAssociation().value())
+                        .toString(),
                     attrMap));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`import org.hypertrace.core.graphql.common.schema.attributes.arguments.AttributeExpression;`
`4`	`4`
`5`	`5`	`public interface AttributeRequest {`
`6`		`- AttributeAssociation<AttributeExpression> attributeExpression();`
	`6`	`+ AttributeAssociation<AttributeExpression> attributeExpressionAssociation();`
`7`	`7`
`8`	`8`	`default String asMapKey() {`
`9`		`- return attributeExpression().value().asAlias();`
	`9`	`+ return attributeExpressionAssociation().value().asAlias();`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,6 @@ private Stream<AttributeExpression> resolveAttributeExpression(SelectedField att`
`117`	`117`	`@Value`
`118`	`118`	`@Accessors(fluent = true)`
`119`	`119`	`static class DefaultAttributeRequest implements AttributeRequest {`
`120`		`- AttributeAssociation<AttributeExpression> attributeExpression;`
	`120`	`+ AttributeAssociation<AttributeExpression> attributeExpressionAssociation;`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,6 @@ void canBuildRequestForSelectionSet() {`
`70`	`70`	`.blockingGet();`
`71`	`71`
`72`	`72`	`assertEquals(1, returned.size());`
`73`		`- assertEquals(expectedResultExpression, returned.get(0).attributeExpression());`
	`73`	`+ assertEquals(expectedResultExpression, returned.get(0).attributeExpressionAssociation());`
`74`	`74`	`}`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,10 @@ private Single<Entry<AttributeExpression, Object>> buildAttributeMapEntry(`
`41`	`41`	`return this.valueConverter`
`42`	`42`	`.convert(`
`43`	`43`	`response.get(attributeRequest.asMapKey()),`
`44`		`- attributeRequest.attributeExpression().attribute())`
	`44`	`+ attributeRequest.attributeExpressionAssociation().attribute())`
`45`	`45`	`.map(`
`46`	`46`	`value ->`
`47`		`- new SimpleImmutableEntry<>(attributeRequest.attributeExpression().value(), value));`
	`47`	`+ new SimpleImmutableEntry<>(`
	`48`	`+ attributeRequest.attributeExpressionAssociation().value(), value));`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public Single<Set<Expression>> convert(Collection<AttributeRequest> attributeReq`
`31`	`31`
`32`	`32`	`private Single<Expression> buildAliasedSelectionExpression(AttributeRequest attributeRequest) {`
`33`	`33`	`return this.attributeExpressionConverter`
`34`		`- .convert(attributeRequest.attributeExpression())`
	`34`	`+ .convert(attributeRequest.attributeExpressionAssociation())`
`35`	`35`	`.map(Expression::toBuilder)`
`36`	`36`	`.map(Builder::build);`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ static class DefaultLogEventRequest implements LogEventRequest {`
`36`	`36`	`@Value`
`37`	`37`	`@Accessors(fluent = true)`
`38`	`38`	`static class DefaultAttributeRequest implements AttributeRequest {`
`39`		`- AttributeAssociation<AttributeExpression> attributeExpression;`
	`39`	`+ AttributeAssociation<AttributeExpression> attributeExpressionAssociation;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Value`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class DaoTestUtil {`
`35`	`35`	`@Value`
`36`	`36`	`@Accessors(fluent = true)`
`37`	`37`	`static class DefaultAttributeRequest implements AttributeRequest {`
`38`		`- AttributeAssociation<AttributeExpression> attributeExpression;`
	`38`	`+ AttributeAssociation<AttributeExpression> attributeExpressionAssociation;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Value`