Minor cleanups in OpenLineage plugin

Author: Praveen2112

plugin/trino-openlineage/src/main/java/io/trino/plugin/openlineage/OpenLineageListener.java

@@ -88,9 +88,7 @@ public OpenLineageListener(OpenLineage openLineage, OpenLineageClient client, Op
         this.jobNamespace = listenerConfig.getNamespace().orElse(trinoURI.toString());
         this.datasetNamespace = trinoURI.toString();
         this.includeQueryTypes = ImmutableSet.copyOf(listenerConfig.getIncludeQueryTypes());
-        this.interpolator = new FormatInterpolator(
-                                listenerConfig.getJobNameFormat(),
-                                OpenLineageJobInterpolatedValues.values());
+        this.interpolator = new FormatInterpolator<>(listenerConfig.getJobNameFormat(), OpenLineageJobInterpolatedValues.values());
     }
 
     @Override
@@ -291,9 +289,9 @@ private JobBuilder getBaseJobBuilder(QueryContext queryContext, QueryMetadata qu
                 .namespace(this.jobNamespace)
                 .name(interpolator.interpolate(new OpenLineageJobContext(queryContext, queryMetadata)))
                 .facets(openLineage.newJobFacetsBuilder()
-                            .jobType(openLineage.newJobTypeJobFacet("BATCH", "TRINO", "QUERY"))
-                            .sql(openLineage.newSQLJobFacet(queryMetadata.getQuery(), "trino"))
-                            .build());
+                        .jobType(openLineage.newJobTypeJobFacet("BATCH", "TRINO", "QUERY"))
+                        .sql(openLineage.newSQLJobFacet(queryMetadata.getQuery(), "trino"))
+                        .build());
     }
 
     private List<InputDataset> buildInputs(QueryMetadata queryMetadata)

plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/BaseTestOpenLineageQueries.java

@@ -31,9 +31,9 @@
 import static java.util.Objects.requireNonNull;
 
 /**
-* - TestOpenLineageEventsFromQueries requires sequential execution to properly reset memory listener
-* - TestOpenLineageEventListenerMarquezIntegration multiple parallel tests are flaky, as they increase wait time for marquez to register events
-*/
+ * - TestOpenLineageEventsFromQueries requires sequential execution to properly reset memory listener
+ * - TestOpenLineageEventListenerMarquezIntegration multiple parallel tests are flaky, as they increase wait time for marquez to register events
+ */
 @Execution(ExecutionMode.SAME_THREAD)
 public abstract class BaseTestOpenLineageQueries
         extends AbstractTestQueryFramework

plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/TestOpenLineageListener.java

@@ -53,7 +53,7 @@ void testGetCompleteEvent()
         assertThat(result)
                 .extracting(RunEvent::getRun)
                 .extracting(Run::getRunId)
-                 // random UUID part may differ, but prefix is timestamp based
+                // random UUID part may differ, but prefix is timestamp based
                 .matches(uuid -> uuid.toString().startsWith("01967c23-ae78-7"));
 
         assertThat(result)
@@ -66,8 +66,7 @@ void testGetCompleteEvent()
                 .extracting(Job::getName)
                 .isEqualTo("queryId");
 
-        Map<String, Object> trinoQueryMetadata =
-                result
+        Map<String, Object> trinoQueryMetadata = result
                 .getRun()
                 .getFacets()
                 .getAdditionalProperties()
@@ -82,11 +81,11 @@ void testGetCompleteEvent()
 
         Map<String, Object> trinoQueryContext =
                 result
-                .getRun()
-                .getFacets()
-                .getAdditionalProperties()
-                .get("trino_query_context")
-                .getAdditionalProperties();
+                        .getRun()
+                        .getFacets()
+                        .getAdditionalProperties()
+                        .get("trino_query_context")
+                        .getAdditionalProperties();
 
         assertThat(trinoQueryContext)
                 .containsOnly(
@@ -124,7 +123,7 @@ void testGetStartEvent()
         assertThat(result)
                 .extracting(RunEvent::getRun)
                 .extracting(Run::getRunId)
-                 // random UUID part may differ, but prefix is timestamp based
+                // random UUID part may differ, but prefix is timestamp based
                 .matches(uuid -> uuid.toString().startsWith("01967c23-ae78-7"));
 
         assertThat(result)
@@ -137,8 +136,7 @@ void testGetStartEvent()
                 .extracting(Job::getName)
                 .isEqualTo("queryId");
 
-        Map<String, Object> trinoQueryMetadata =
-                result
+        Map<String, Object> trinoQueryMetadata = result
                 .getRun()
                 .getFacets()
                 .getAdditionalProperties()
@@ -151,8 +149,7 @@ void testGetStartEvent()
                         entry("transaction_id", "transactionId"),
                         entry("query_plan", "queryPlan"));
 
-        Map<String, Object> trinoQueryContext =
-                result
+        Map<String, Object> trinoQueryContext = result
                 .getRun()
                 .getFacets()
                 .getAdditionalProperties()

plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/TestOpenLineageListenerConfig.java

@@ -125,7 +125,7 @@ void testIsJobNameFormatValid()
     private static OpenLineageListenerConfig configWithFormat(String format)
     {
         return new OpenLineageListenerConfig()
-            .setTrinoURI(URI.create("http://testtrino"))
-            .setJobNameFormat(format);
+                .setTrinoURI(URI.create("http://testtrino"))
+                .setJobNameFormat(format);
     }
 }

plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/TrinoEventData.java

@@ -51,8 +51,7 @@ private TrinoEventData()
         throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
     }
 
-    static
-    {
+    static {
         queryIOMetadata = new QueryIOMetadata(Collections.emptyList(), Optional.empty());
 
         queryContext = new QueryContext(

plugin/trino-openlineage/src/test/resources/marquez.yaml

@@ -1,11 +1,11 @@
 server:
     applicationConnectors:
-        - type: http
-          port: ${MARQUEZ_PORT:-5000}
-          httpCompliance: RFC7230_LEGACY
+        -   type: http
+            port: ${MARQUEZ_PORT:-5000}
+            httpCompliance: RFC7230_LEGACY
     adminConnectors:
-        - type: http
-          port: ${MARQUEZ_ADMIN_PORT:-5001}
+        -   type: http
+            port: ${MARQUEZ_ADMIN_PORT:-5001}
 
 db:
     driverClass: org.postgresql.Driver
@@ -21,10 +21,10 @@ graphql:
 logging:
     level: INFO
     appenders:
-        - type: console
+        -   type: console
 
 tags:
-    - name: PII
-      description: Personally identifiable information
-    - name: SENSITIVE
-      description: Contains sensitive information
+    -   name: PII
+        description: Personally identifiable information
+    -   name: SENSITIVE
+        description: Contains sensitive information