Minor cleanups in OpenLineage plugin

Praveen2112 · Praveen2112 · commit c8fa9431c5d2 · 2025-09-02T11:55:01.000+05:30
diff --git a/plugin/trino-openlineage/src/main/java/io/trino/plugin/openlineage/OpenLineageListener.java b/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)
diff --git a/plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/BaseTestOpenLineageQueries.java b/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
diff --git a/plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/TestOpenLineageListener.java b/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)
@@ -68,11 +68,11 @@ void testGetCompleteEvent()
 
         Map<String, Object> trinoQueryMetadata =
                 result
-                .getRun()
-                .getFacets()
-                .getAdditionalProperties()
-                .get("trino_metadata")
-                .getAdditionalProperties();
+                        .getRun()
+                        .getFacets()
+                        .getAdditionalProperties()
+                        .get("trino_metadata")
+                        .getAdditionalProperties();
 
         assertThat(trinoQueryMetadata)
                 .containsOnly(
@@ -82,11 +82,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 +124,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)
@@ -139,11 +139,11 @@ void testGetStartEvent()
 
         Map<String, Object> trinoQueryMetadata =
                 result
-                .getRun()
-                .getFacets()
-                .getAdditionalProperties()
-                .get("trino_metadata")
-                .getAdditionalProperties();
+                        .getRun()
+                        .getFacets()
+                        .getAdditionalProperties()
+                        .get("trino_metadata")
+                        .getAdditionalProperties();
 
         assertThat(trinoQueryMetadata)
                 .containsOnly(
@@ -153,11 +153,11 @@ void testGetStartEvent()
 
         Map<String, Object> trinoQueryContext =
                 result
-                .getRun()
-                .getFacets()
-                .getAdditionalProperties()
-                .get("trino_query_context")
-                .getAdditionalProperties();
+                        .getRun()
+                        .getFacets()
+                        .getAdditionalProperties()
+                        .get("trino_query_context")
+                        .getAdditionalProperties();
 
         assertThat(trinoQueryContext)
                 .containsOnly(
diff --git a/plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/TestOpenLineageListenerConfig.java b/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);
     }
 }
diff --git a/plugin/trino-openlineage/src/test/java/io/trino/plugin/openlineage/TrinoEventData.java b/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(
diff --git a/plugin/trino-openlineage/src/test/resources/marquez.yaml b/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

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ void testIsJobNameFormatValid()`
`125`	`125`	`private static OpenLineageListenerConfig configWithFormat(String format)`
`126`	`126`	`{`
`127`	`127`	`return new OpenLineageListenerConfig()`
`128`		`- .setTrinoURI(URI.create("http://testtrino"))`
`129`		`- .setJobNameFormat(format);`
	`128`	`+ .setTrinoURI(URI.create("http://testtrino"))`
	`129`	`+ .setJobNameFormat(format);`
`130`	`130`	`}`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ private TrinoEventData()`
`51`	`51`	`throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");`
`52`	`52`	`}`
`53`	`53`
`54`		`- static`
`55`		`- {`
	`54`	`+ static {`
`56`	`55`	`queryIOMetadata = new QueryIOMetadata(Collections.emptyList(), Optional.empty());`
`57`	`56`
`58`	`57`	`queryContext = new QueryContext(`