From d8d6dce33c613f11f132b5446f885754e579e945 Mon Sep 17 00:00:00 2001 From: sureshms Date: Mon, 2 Aug 2021 16:05:59 -0700 Subject: [PATCH] Fix #24 - Change old name StreamlineData to OpenMetadata --- .../org/openmetadata/catalog/jdbi3/TableRepository.java | 9 +++++---- .../catalog/resources/databases/TableResource.java | 4 ++-- .../main/resources/json/schema/entity/data/table.json | 6 +++--- .../resources/databases/SecureTableResourceTest.java | 6 +++--- .../catalog/resources/databases/TableResourceTest.java | 8 ++++---- pom.xml | 6 +++--- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java index 0b7375417ec..7f4034602f1 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java @@ -17,10 +17,10 @@ package org.openmetadata.catalog.jdbi3; import com.fasterxml.jackson.core.JsonProcessingException; -import com.streamlinedata.catalog.type.ColumnJoin; -import com.streamlinedata.catalog.type.JoinedWith; -import com.streamlinedata.catalog.type.TableData; -import com.streamlinedata.catalog.type.TableJoins; +import org.openmetadata.catalog.type.ColumnJoin; +import org.openmetadata.catalog.type.JoinedWith; +import org.openmetadata.catalog.type.TableData; +import org.openmetadata.catalog.type.TableJoins; import org.openmetadata.catalog.Entity; import org.openmetadata.catalog.entity.data.Database; import org.openmetadata.catalog.entity.data.Table; @@ -35,6 +35,7 @@ import org.openmetadata.catalog.resources.databases.TableResource; import org.openmetadata.catalog.type.Column; import org.openmetadata.catalog.type.DailyCount; import org.openmetadata.catalog.type.EntityReference; +import org.openmetadata.catalog.type.TableJoins; import org.openmetadata.catalog.type.TagLabel; import org.openmetadata.catalog.util.EntityUtil; import org.openmetadata.catalog.util.EntityUtil.Fields; diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java index 7694fc9a5ad..2b1f92111cd 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java @@ -17,8 +17,8 @@ package org.openmetadata.catalog.resources.databases; import com.google.inject.Inject; -import com.streamlinedata.catalog.type.TableData; -import com.streamlinedata.catalog.type.TableJoins; +import org.openmetadata.catalog.type.TableData; +import org.openmetadata.catalog.type.TableJoins; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/data/table.json b/catalog-rest-service/src/main/resources/json/schema/entity/data/table.json index d00b5ef8622..0b8a7f9d920 100644 --- a/catalog-rest-service/src/main/resources/json/schema/entity/data/table.json +++ b/catalog-rest-service/src/main/resources/json/schema/entity/data/table.json @@ -172,7 +172,7 @@ }, "columnJoins": { "type": "object", - "javaType": "com.streamlinedata.catalog.type.ColumnJoin", + "javaType": "org.openmetadata.catalog.type.ColumnJoin", "description": "Information on other tables that this table column is frequently joined with", "properties": { "columnName": { @@ -198,7 +198,7 @@ }, "tableJoins": { "type": "object", - "javaType": "com.streamlinedata.catalog.type.TableJoins", + "javaType": "org.openmetadata.catalog.type.TableJoins", "properties": { "startDate": { "description": "Date can be only from today going back to last 29 days", @@ -219,7 +219,7 @@ }, "tableData": { "type": "object", - "javaType": "com.streamlinedata.catalog.type.TableData", + "javaType": "org.openmetadata.catalog.type.TableData", "description": "Information on other tables that this table column is frequently joined with", "properties": { "columns": { diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/SecureTableResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/SecureTableResourceTest.java index a369580dcfa..0f37a8ec196 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/SecureTableResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/SecureTableResourceTest.java @@ -1,9 +1,6 @@ package org.openmetadata.catalog.resources.databases; import com.fasterxml.jackson.core.JsonProcessingException; -import com.streamlinedata.catalog.type.ColumnJoin; -import com.streamlinedata.catalog.type.JoinedWith; -import com.streamlinedata.catalog.type.TableData; import org.apache.http.client.HttpResponseException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -33,7 +30,10 @@ import org.openmetadata.catalog.resources.teams.TeamResourceTest; import org.openmetadata.catalog.resources.teams.UserResourceTest; import org.openmetadata.catalog.type.Column; import org.openmetadata.catalog.type.ColumnDataType; +import org.openmetadata.catalog.type.ColumnJoin; import org.openmetadata.catalog.type.EntityReference; +import org.openmetadata.catalog.type.JoinedWith; +import org.openmetadata.catalog.type.TableData; import org.openmetadata.catalog.type.TableType; import org.openmetadata.catalog.type.TagLabel; import org.openmetadata.catalog.util.JsonUtils; diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/TableResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/TableResourceTest.java index 78e327a2302..c8e231bb538 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/TableResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/TableResourceTest.java @@ -1,10 +1,10 @@ package org.openmetadata.catalog.resources.databases; import com.fasterxml.jackson.core.JsonProcessingException; -import com.streamlinedata.catalog.type.ColumnJoin; -import com.streamlinedata.catalog.type.JoinedWith; -import com.streamlinedata.catalog.type.TableData; -import com.streamlinedata.catalog.type.TableJoins; +import org.openmetadata.catalog.type.ColumnJoin; +import org.openmetadata.catalog.type.JoinedWith; +import org.openmetadata.catalog.type.TableData; +import org.openmetadata.catalog.type.TableJoins; import org.apache.http.client.HttpResponseException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.MethodOrderer; diff --git a/pom.xml b/pom.xml index fc98062b9b9..8c926f3e37a 100644 --- a/pom.xml +++ b/pom.xml @@ -31,9 +31,9 @@ pom - scm:git:git@github.com:StreamlineData/catalog - scm:git:git@github.com:StreamlineData/catalog - scm:git:git@github.com:StreamlineData/catalog + scm:git:git@github.com:Open-Metadata/OpenMetadata + scm:git:git@github.com:Open-Metadata/OpenMetadata + scm:git:git@github.com:Open-Metadata/OpenMetadata