Fix package and file name in OpenLineage

trinodb · Aug 16, 2024 · 4375c0c · 4375c0c
1 parent a004921
commit 4375c0c
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 25 deletions.
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
@@ -30,7 +30,6 @@
 import io.openlineage.client.OpenLineage.RunFacet;
 import io.openlineage.client.OpenLineage.RunFacetsBuilder;
 import io.openlineage.client.OpenLineageClient;
-import io.trino.plugin.openlineage.config.OpenLineageListenerConfig;
 import io.trino.spi.eventlistener.EventListener;
 import io.trino.spi.eventlistener.OutputColumnMetadata;
 import io.trino.spi.eventlistener.QueryCompletedEvent;

diff --git a/...age/config/OpenLineageListenerConfig.java → ...penlineage/OpenLineageListenerConfig.java b/...age/config/OpenLineageListenerConfig.java → ...penlineage/OpenLineageListenerConfig.java
@@ -11,13 +11,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.openlineage.config;
+package io.trino.plugin.openlineage;
 
 import com.google.common.collect.ImmutableSet;
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
-import io.trino.plugin.openlineage.OpenLineageTransport;
-import io.trino.plugin.openlineage.OpenLineageTrinoFacet;
 import io.trino.spi.resourcegroups.QueryType;
 import jakarta.validation.constraints.NotNull;
 

diff --git a/...rino-openlineage/src/main/java/io/trino/plugin/openlineage/OpenLineageListenerModule.java b/...rino-openlineage/src/main/java/io/trino/plugin/openlineage/OpenLineageListenerModule.java
@@ -19,11 +19,10 @@
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.openlineage.client.OpenLineageClient;
-import io.trino.plugin.openlineage.config.OpenLineageListenerConfig;
-import io.trino.plugin.openlineage.config.http.OpenLineageClientHttpTransportConfig;
-import io.trino.plugin.openlineage.transport.OpenLineageConsoleTransport;
 import io.trino.plugin.openlineage.transport.OpenLineageTransport;
+import io.trino.plugin.openlineage.transport.console.OpenLineageConsoleTransport;
 import io.trino.plugin.openlineage.transport.http.OpenLineageHttpTransport;
+import io.trino.plugin.openlineage.transport.http.OpenLineageHttpTransportConfig;
 
 import static io.airlift.configuration.ConditionalModule.conditionalModule;
 import static io.airlift.configuration.ConfigBinder.configBinder;
@@ -49,7 +48,7 @@ protected void setup(Binder binder)
                 OpenLineageListenerConfig.class,
                 config -> config.getTransport().equals(HTTP),
                 internalBinder -> {
-                    configBinder(internalBinder).bindConfig(OpenLineageClientHttpTransportConfig.class);
+                    configBinder(internalBinder).bindConfig(OpenLineageHttpTransportConfig.class);
                     internalBinder.bind(OpenLineageTransport.class).to(OpenLineageHttpTransport.class);
                 }));
     }

diff --git a/...ransport/OpenLineageConsoleTransport.java → .../console/OpenLineageConsoleTransport.java b/...ransport/OpenLineageConsoleTransport.java → .../console/OpenLineageConsoleTransport.java
@@ -11,9 +11,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.openlineage.transport;
+package io.trino.plugin.openlineage.transport.console;
 
 import io.openlineage.client.transports.ConsoleTransport;
+import io.trino.plugin.openlineage.transport.OpenLineageTransport;
 
 public class OpenLineageConsoleTransport
         implements OpenLineageTransport

diff --git a/...ge/src/main/java/io/trino/plugin/openlineage/transport/http/OpenLineageHttpTransport.java b/...ge/src/main/java/io/trino/plugin/openlineage/transport/http/OpenLineageHttpTransport.java
@@ -17,7 +17,6 @@
 import io.openlineage.client.transports.HttpConfig;
 import io.openlineage.client.transports.HttpTransport;
 import io.openlineage.client.transports.TokenProvider;
-import io.trino.plugin.openlineage.config.http.OpenLineageClientHttpTransportConfig;
 import io.trino.plugin.openlineage.transport.OpenLineageTransport;
 
 import java.net.URI;
@@ -36,7 +35,7 @@ public class OpenLineageHttpTransport
     private final Map<String, String> headers;
 
     @Inject
-    public OpenLineageHttpTransport(OpenLineageClientHttpTransportConfig config)
+    public OpenLineageHttpTransport(OpenLineageHttpTransportConfig config)
     {
         this.url = config.getUrl();
         this.endpoint = config.getEndpoint();

diff --git a/...OpenLineageClientHttpTransportConfig.java → .../http/OpenLineageHttpTransportConfig.java b/...OpenLineageClientHttpTransportConfig.java → .../http/OpenLineageHttpTransportConfig.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.openlineage.config.http;
+package io.trino.plugin.openlineage.transport.http;
 
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
@@ -31,7 +31,7 @@
 
 import static java.lang.String.format;
 
-public class OpenLineageClientHttpTransportConfig
+public class OpenLineageHttpTransportConfig
 {
     private URI url;
     private String endpoint;
@@ -48,7 +48,7 @@ public URI getUrl()
 
     @Config("openlineage-event-listener.transport.url")
     @ConfigDescription("URL of receiving server. Explicitly set the scheme https:// to use symmetric encryption")
-    public OpenLineageClientHttpTransportConfig setUrl(URI url)
+    public OpenLineageHttpTransportConfig setUrl(URI url)
     {
         this.url = url;
         return this;
@@ -61,7 +61,7 @@ public String getEndpoint()
 
     @Config("openlineage-event-listener.transport.endpoint")
     @ConfigDescription("Custom path for API receiving the events.")
-    public OpenLineageClientHttpTransportConfig setEndpoint(String endpoint)
+    public OpenLineageHttpTransportConfig setEndpoint(String endpoint)
     {
         this.endpoint = endpoint;
         return this;
@@ -75,7 +75,7 @@ public Optional<String> getApiKey()
     @Config("openlineage-event-listener.transport.api-key")
     @ConfigDescription("API Key to use when authenticating against OpenLineage API")
     @ConfigSecuritySensitive
-    public OpenLineageClientHttpTransportConfig setApiKey(String apiKey)
+    public OpenLineageHttpTransportConfig setApiKey(String apiKey)
     {
         this.apiKey = Optional.ofNullable(apiKey);
         return this;
@@ -90,7 +90,7 @@ public Duration getTimeout()
 
     @Config("openlineage-event-listener.transport.timeout")
     @ConfigDescription("Timeout when making HTTP Requests.")
-    public OpenLineageClientHttpTransportConfig setTimeout(Duration timeout)
+    public OpenLineageHttpTransportConfig setTimeout(Duration timeout)
     {
         this.timeout = timeout;
         return this;
@@ -103,7 +103,7 @@ public Map<String, String> getHeaders()
 
     @Config("openlineage-event-listener.transport.headers")
     @ConfigDescription("List of custom custom HTTP headers provided as: \"Header-Name-1: header value 1, Header-Value-2: header value 2, ...\" ")
-    public OpenLineageClientHttpTransportConfig setHeaders(List<String> headers)
+    public OpenLineageHttpTransportConfig setHeaders(List<String> headers)
     {
         try {
             this.headers = headers
@@ -124,7 +124,7 @@ public Map<String, String> getUrlParams()
 
     @Config("openlineage-event-listener.transport.url-params")
     @ConfigDescription("List of custom custom url params provided as: \"url-param-1: url param value 1, ...\" ")
-    public OpenLineageClientHttpTransportConfig setUrlParams(List<String> urlParas)
+    public OpenLineageHttpTransportConfig setUrlParams(List<String> urlParas)
     {
         try {
             this.urlParams = urlParas

diff --git a/...-openlineage/src/test/java/io/trino/plugin/openlineage/TestOpenLineageListenerConfig.java b/...-openlineage/src/test/java/io/trino/plugin/openlineage/TestOpenLineageListenerConfig.java
@@ -15,7 +15,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import io.trino.plugin.openlineage.config.OpenLineageListenerConfig;
 import org.junit.jupiter.api.Test;
 
 import java.net.URI;

diff --git a/...OpenLineageClientHttpTransportConfig.java → ...p/TestOpenLineageHttpTransportConfig.java b/...OpenLineageClientHttpTransportConfig.java → ...p/TestOpenLineageHttpTransportConfig.java
@@ -11,12 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.plugin.openlineage;
+package io.trino.plugin.openlineage.http;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.airlift.units.Duration;
-import io.trino.plugin.openlineage.config.http.OpenLineageClientHttpTransportConfig;
+import io.trino.plugin.openlineage.transport.http.OpenLineageHttpTransportConfig;
 import org.junit.jupiter.api.Test;
 
 import java.net.URI;
@@ -26,12 +26,12 @@
 import static io.airlift.configuration.testing.ConfigAssertions.assertRecordedDefaults;
 import static io.airlift.configuration.testing.ConfigAssertions.recordDefaults;
 
-final class TestOpenLineageClientHttpTransportConfig
+final class TestOpenLineageHttpTransportConfig
 {
     @Test
     void testDefaults()
     {
-        assertRecordedDefaults(recordDefaults(OpenLineageClientHttpTransportConfig.class)
+        assertRecordedDefaults(recordDefaults(OpenLineageHttpTransportConfig.class)
                 .setUrl(null)
                 .setEndpoint(null)
                 .setTimeout(Duration.valueOf("5s"))
@@ -54,7 +54,7 @@ void testExplicitPropertyMappings()
 
                 .buildOrThrow();
 
-        OpenLineageClientHttpTransportConfig expected = new OpenLineageClientHttpTransportConfig()
+        OpenLineageHttpTransportConfig expected = new OpenLineageHttpTransportConfig()
                 .setUrl(new URI("http://testurl"))
                 .setEndpoint("/test/endpoint")
                 .setApiKey("dummy")