From fc58c9f5ee2927b9db1fc6fbf604c4771dcc5c6f Mon Sep 17 00:00:00 2001 From: Suresh Srinivas Date: Sat, 4 Dec 2021 11:44:29 -0800 Subject: [PATCH] Fixes #1552 Use logger from the base class CatalogApplicationTest in all the Resource tests (#1553) Co-authored-by: sureshms --- .../openmetadata/catalog/CatalogApplicationTest.java | 2 +- .../catalog/resources/CollectionRegistryTest.java | 2 -- .../catalog/resources/EntityResourceTest.java | 3 --- .../resources/databases/TableResourceTest.java | 11 ++++------- .../resources/dbtmodels/DbtModelResourceTest.java | 5 +---- .../resources/locations/LocationResourceTest.java | 3 --- .../catalog/resources/tags/TagResourceTest.java | 3 --- .../catalog/resources/usage/UsageResourceTest.java | 3 --- 8 files changed, 6 insertions(+), 26 deletions(-) diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/CatalogApplicationTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/CatalogApplicationTest.java index b11c9207c5e..458e906e80e 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/CatalogApplicationTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/CatalogApplicationTest.java @@ -31,7 +31,7 @@ import javax.ws.rs.client.WebTarget; @ExtendWith(EmbeddedMySqlSupport.class) @ExtendWith(DropwizardExtensionsSupport.class) public abstract class CatalogApplicationTest { - private static final Logger LOG = LoggerFactory.getLogger(CatalogApplicationTest.class); + public static final Logger LOG = LoggerFactory.getLogger(CatalogApplicationTest.class); private static final String CONFIG_PATH; public static final DropwizardAppExtension APP; diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/CollectionRegistryTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/CollectionRegistryTest.java index 30c53a5a483..65a0029019d 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/CollectionRegistryTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/CollectionRegistryTest.java @@ -23,8 +23,6 @@ import java.util.Map; import static org.junit.jupiter.api.Assertions.assertNotEquals; public class CollectionRegistryTest { - private static final Logger LOG = LoggerFactory.getLogger(CollectionRegistryTest.class); - @Test public void testCollections() { CollectionRegistry.getInstance(); diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/EntityResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/EntityResourceTest.java index b7364a433a2..e44d671c497 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/EntityResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/EntityResourceTest.java @@ -57,8 +57,6 @@ import org.openmetadata.catalog.util.RestUtil; import org.openmetadata.catalog.util.ResultList; import org.openmetadata.catalog.util.TestUtils; import org.openmetadata.common.utils.JsonSchemaUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.json.JsonPatch; import javax.ws.rs.client.WebTarget; @@ -99,7 +97,6 @@ import static org.openmetadata.catalog.util.TestUtils.checkUserFollowing; import static org.openmetadata.catalog.util.TestUtils.userAuthHeaders; public abstract class EntityResourceTest extends CatalogApplicationTest { - private static final Logger LOG = LoggerFactory.getLogger(EntityResourceTest.class); private final String entityName; private final Class entityClass; private final Class> entityListClass; 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 7cbbd97f4d0..396ceea38e5 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 @@ -38,11 +38,8 @@ import org.openmetadata.catalog.resources.databases.TableResource.TableList; import org.openmetadata.catalog.resources.services.DatabaseServiceResourceTest; import org.openmetadata.catalog.resources.services.StorageServiceResourceTest; import org.openmetadata.catalog.resources.tags.TagResourceTest; -import org.openmetadata.catalog.type.StorageServiceType; -import org.openmetadata.catalog.type.Column; -import org.openmetadata.catalog.type.SQLQuery; -import org.openmetadata.catalog.type.TableConstraint.ConstraintType; import org.openmetadata.catalog.type.ChangeDescription; +import org.openmetadata.catalog.type.Column; import org.openmetadata.catalog.type.ColumnConstraint; import org.openmetadata.catalog.type.ColumnDataType; import org.openmetadata.catalog.type.ColumnJoin; @@ -50,7 +47,10 @@ import org.openmetadata.catalog.type.ColumnProfile; import org.openmetadata.catalog.type.EntityReference; import org.openmetadata.catalog.type.FieldChange; import org.openmetadata.catalog.type.JoinedWith; +import org.openmetadata.catalog.type.SQLQuery; +import org.openmetadata.catalog.type.StorageServiceType; import org.openmetadata.catalog.type.TableConstraint; +import org.openmetadata.catalog.type.TableConstraint.ConstraintType; import org.openmetadata.catalog.type.TableData; import org.openmetadata.catalog.type.TableJoins; import org.openmetadata.catalog.type.TableProfile; @@ -61,8 +61,6 @@ import org.openmetadata.catalog.util.JsonUtils; import org.openmetadata.catalog.util.RestUtil; import org.openmetadata.catalog.util.ResultList; import org.openmetadata.catalog.util.TestUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response.Status; @@ -112,7 +110,6 @@ import static org.openmetadata.common.utils.CommonUtil.getDateStringByOffset; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TableResourceTest extends EntityResourceTest { - private static final Logger LOG = LoggerFactory.getLogger(TableResourceTest.class); public static Database DATABASE; public static List COLUMNS; diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/dbtmodels/DbtModelResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/dbtmodels/DbtModelResourceTest.java index 252bc72e40f..c3a6ab87274 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/dbtmodels/DbtModelResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/dbtmodels/DbtModelResourceTest.java @@ -24,8 +24,8 @@ import org.openmetadata.catalog.CatalogApplicationTest; import org.openmetadata.catalog.Entity; import org.openmetadata.catalog.api.data.CreateDatabase; import org.openmetadata.catalog.api.data.CreateDbtModel; -import org.openmetadata.catalog.entity.data.DbtModel; import org.openmetadata.catalog.entity.data.Database; +import org.openmetadata.catalog.entity.data.DbtModel; import org.openmetadata.catalog.entity.services.DatabaseService; import org.openmetadata.catalog.exception.CatalogExceptionMessage; import org.openmetadata.catalog.jdbi3.DbtModelRepository.DbtModelEntityInterface; @@ -45,8 +45,6 @@ import org.openmetadata.catalog.util.EntityUtil.Fields; import org.openmetadata.catalog.util.JsonUtils; import org.openmetadata.catalog.util.ResultList; import org.openmetadata.catalog.util.TestUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response.Status; @@ -91,7 +89,6 @@ import static org.openmetadata.catalog.util.TestUtils.userAuthHeaders; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class DbtModelResourceTest extends EntityResourceTest { - private static final Logger LOG = LoggerFactory.getLogger(DbtModelResourceTest.class); public static Database DATABASE; public static final List COLUMNS = Arrays.asList( diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/locations/LocationResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/locations/LocationResourceTest.java index 12675f1ba48..ebddb7ff690 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/locations/LocationResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/locations/LocationResourceTest.java @@ -40,8 +40,6 @@ import org.openmetadata.catalog.type.TagLabel; import org.openmetadata.catalog.util.JsonUtils; import org.openmetadata.catalog.util.TestUtils; import org.openmetadata.common.utils.JsonSchemaUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.json.JsonPatch; import javax.ws.rs.client.WebTarget; @@ -75,7 +73,6 @@ import static org.openmetadata.catalog.util.TestUtils.existsInEntityReferenceLis import static org.openmetadata.catalog.util.TestUtils.userAuthHeaders; public class LocationResourceTest extends CatalogApplicationTest { - private static final Logger LOG = LoggerFactory.getLogger(LocationResourceTest.class); public static User USER1; public static EntityReference USER_OWNER1; public static Team TEAM1; diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/tags/TagResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/tags/TagResourceTest.java index 53531590e18..4a427606795 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/tags/TagResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/tags/TagResourceTest.java @@ -30,8 +30,6 @@ import org.openmetadata.catalog.type.Tag; import org.openmetadata.catalog.type.TagCategory; import org.openmetadata.catalog.util.JsonUtils; import org.openmetadata.catalog.util.TestUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response.Status; @@ -58,7 +56,6 @@ import static org.openmetadata.catalog.util.TestUtils.authHeaders; */ @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class TagResourceTest extends CatalogApplicationTest { - public static final Logger LOG = LoggerFactory.getLogger(TagResourceTest.class); public static String BASE_URL; @BeforeAll diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/usage/UsageResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/usage/UsageResourceTest.java index aa53c0144d2..e073156b6e3 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/usage/UsageResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/usage/UsageResourceTest.java @@ -34,8 +34,6 @@ import org.openmetadata.catalog.type.EntityUsage; import org.openmetadata.catalog.type.UsageDetails; import org.openmetadata.catalog.util.RestUtil; import org.openmetadata.catalog.util.TestUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import javax.ws.rs.client.WebTarget; import java.io.IOException; @@ -60,7 +58,6 @@ import static org.openmetadata.common.utils.CommonUtil.getDateStringByOffset; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class UsageResourceTest extends CatalogApplicationTest { - private static final Logger LOG = LoggerFactory.getLogger(UsageResourceTest.class); public static final List
TABLES = new ArrayList<>(); public static final int TABLE_COUNT = 10; public static final int DAYS_OF_USAGE = 32;