From cd5f72b7ee8088b79f6cb3e043ac526c12e6295a Mon Sep 17 00:00:00 2001 From: "Yi (Alan) Wang" Date: Tue, 5 Sep 2017 09:59:35 -0700 Subject: [PATCH] Rename DAO and model into table and view sub-package (#722) --- .../app/controllers/Application.java | 2 +- .../kafka/GobblinTrackingAuditProcessor.java | 4 +-- .../main/java/wherehows/dao/DaoFactory.java | 7 +++++ .../wherehows/dao/{ => table}/BaseDao.java | 2 +- .../dao/{ => table}/ClusterInfoDao.java | 4 +-- .../{ => table}/ConnectionPoolProperties.java | 2 +- .../{ => table}/DatasetClassificationDao.java | 4 +-- .../dao/{ => table}/DatasetSchemaInfoDao.java | 4 +-- .../dao/{ => table}/DatasetsDao.java | 8 +++--- .../dao/{ => table}/DictDatasetDao.java | 5 ++-- .../dao/{ => table}/FieldDetailDao.java | 5 ++-- .../dao/{ => view}/MetadataReadOnlyDao.java | 6 ++-- .../models/{ => table}/ClusterInfo.java | 2 +- .../models/{ => table}/ColumnComment.java | 2 +- .../models/{ => table}/CompanyUser.java | 2 +- .../models/{ => table}/DashboardBarData.java | 2 +- .../models/{ => table}/DashboardDataset.java | 2 +- .../{ => table}/DashboardOwnerStat.java | 2 +- .../wherehows/models/{ => table}/Dataset.java | 2 +- .../models/{ => table}/DatasetAccessItem.java | 2 +- .../{ => table}/DatasetAccessibility.java | 2 +- .../{ => table}/DatasetClassification.java | 2 +- .../{ => table}/DatasetColumnComment.java | 2 +- .../models/{ => table}/DatasetComment.java | 2 +- .../models/{ => table}/DatasetCompliance.java | 2 +- .../models/{ => table}/DatasetDependency.java | 2 +- .../{ => table}/DatasetFieldEntity.java | 2 +- .../{ => table}/DatasetFieldSchema.java | 2 +- .../models/{ => table}/DatasetInstance.java | 2 +- .../{ => table}/DatasetListViewNode.java | 2 +- .../models/{ => table}/DatasetPartition.java | 2 +- .../models/{ => table}/DatasetSchemaInfo.java | 2 +- .../models/{ => table}/DictDataset.java | 2 +- .../models/{ => table}/DictFieldDetail.java | 2 +- .../wherehows/models/{ => table}/Flow.java | 2 +- .../wherehows/models/{ => table}/FlowJob.java | 2 +- .../models/{ => table}/FlowListViewNode.java | 2 +- .../wherehows/models/{ => table}/Group.java | 2 +- .../models/{ => table}/IdpcInfo.java | 2 +- .../models/{ => table}/ImpactDataset.java | 2 +- .../models/{ => table}/JiraTicket.java | 2 +- .../wherehows/models/{ => table}/Job.java | 2 +- .../models/{ => table}/LdapInfo.java | 2 +- .../models/{ => table}/LineageEdge.java | 2 +- .../models/{ => table}/LineageLink.java | 2 +- .../models/{ => table}/LineageNode.java | 2 +- .../models/{ => table}/LineagePathInfo.java | 2 +- .../wherehows/models/{ => table}/Metric.java | 2 +- .../{ => table}/MetricListViewNode.java | 2 +- .../wherehows/models/{ => table}/Project.java | 2 +- .../models/{ => table}/SchemaDataset.java | 2 +- .../models/{ => table}/SchemaHistoryData.java | 2 +- .../models/{ => table}/ScriptInfo.java | 2 +- .../models/{ => table}/ScriptLineage.java | 2 +- .../models/{ => table}/ScriptRuntime.java | 2 +- .../models/{ => table}/SimilarColumns.java | 2 +- .../models/{ => table}/SimilarComments.java | 2 +- .../models/{ => table}/TreeNode.java | 2 +- .../wherehows/models/{ => table}/User.java | 2 +- .../models/{ => table}/UserEntity.java | 2 +- .../models/{ => table}/UserSetting.java | 2 +- .../models/{ => view}/DatasetColumn.java | 2 +- .../models/{ => view}/DatasetOwner.java | 2 +- .../app/controllers/Application.java | 2 +- .../app/controllers/api/v1/Dataset.java | 20 ++++++------- .../app/controllers/api/v1/Jira.java | 2 +- .../app/controllers/api/v1/Lineage.java | 3 +- .../app/controllers/api/v1/Metric.java | 2 +- .../app/controllers/api/v1/User.java | 8 +++--- wherehows-frontend/app/dao/AdvSearchDAO.java | 6 ++-- .../app/dao/ColumnCommentRowMapper.java | 2 +- wherehows-frontend/app/dao/DashboardDAO.java | 8 +++--- .../dao/DatasetColumnCommentRowMapper.java | 2 +- .../app/dao/DatasetCommentRowMapper.java | 2 +- .../app/dao/DatasetRowMapper.java | 4 +-- .../app/dao/DatasetWithUserRowMapper.java | 4 +-- wherehows-frontend/app/dao/DatasetsDAO.java | 28 +++++++++---------- wherehows-frontend/app/dao/FlowRowMapper.java | 2 +- wherehows-frontend/app/dao/FlowsDAO.java | 8 +++--- .../app/dao/ImpactDatasetRowMapper.java | 4 +-- wherehows-frontend/app/dao/JiraDAO.java | 4 +-- .../app/dao/JiraTicketRowMapper.java | 2 +- .../app/dao/LdapInfoRowMapper.java | 2 +- wherehows-frontend/app/dao/LineageDAO.java | 6 +++- .../app/dao/MetricRowMapper.java | 2 +- wherehows-frontend/app/dao/MetricsDAO.java | 6 ++-- .../app/dao/ProjectRowMapper.java | 2 +- .../app/dao/SchemaDatasetRowMapper.java | 2 +- .../app/dao/SchemaHistoryDAO.java | 4 +-- .../app/dao/SchemaHistoryDataRowMapper.java | 2 +- .../app/dao/ScriptFinderDAO.java | 8 +++--- .../app/dao/ScriptInfoRowMapper.java | 2 +- .../app/dao/ScriptLineageRowMapper.java | 2 +- .../app/dao/ScriptRuntimeRowMapper.java | 2 +- wherehows-frontend/app/dao/SearchDAO.java | 6 ++-- wherehows-frontend/app/dao/UserDAO.java | 8 +++--- wherehows-frontend/app/dao/UserRowMapper.java | 4 +-- .../app/security/AuthenticationManager.java | 2 +- wherehows-frontend/app/utils/Lineage.java | 2 +- .../java/wherehows/main/ApplicationStart.java | 2 +- .../service/GobblinTrackingAuditService.java | 8 +++--- .../service/MetadataChangeService.java | 14 +++++----- .../java/wherehows/utils/ClusterUtil.java | 2 +- 103 files changed, 183 insertions(+), 173 deletions(-) rename wherehows-dao/src/main/java/wherehows/dao/{ => table}/BaseDao.java (97%) rename wherehows-dao/src/main/java/wherehows/dao/{ => table}/ClusterInfoDao.java (95%) rename wherehows-dao/src/main/java/wherehows/dao/{ => table}/ConnectionPoolProperties.java (98%) rename wherehows-dao/src/main/java/wherehows/dao/{ => table}/DatasetClassificationDao.java (92%) rename wherehows-dao/src/main/java/wherehows/dao/{ => table}/DatasetSchemaInfoDao.java (95%) rename wherehows-dao/src/main/java/wherehows/dao/{ => table}/DatasetsDao.java (98%) rename wherehows-dao/src/main/java/wherehows/dao/{ => table}/DictDatasetDao.java (95%) rename wherehows-dao/src/main/java/wherehows/dao/{ => table}/FieldDetailDao.java (95%) rename wherehows-dao/src/main/java/wherehows/dao/{ => view}/MetadataReadOnlyDao.java (98%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/ClusterInfo.java (97%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/ColumnComment.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/CompanyUser.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DashboardBarData.java (94%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DashboardDataset.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DashboardOwnerStat.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/Dataset.java (97%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetAccessItem.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetAccessibility.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetClassification.java (97%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetColumnComment.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetComment.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetCompliance.java (99%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetDependency.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetFieldEntity.java (97%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetFieldSchema.java (98%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetInstance.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetListViewNode.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetPartition.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DatasetSchemaInfo.java (98%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DictDataset.java (98%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/DictFieldDetail.java (98%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/Flow.java (97%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/FlowJob.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/FlowListViewNode.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/Group.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/IdpcInfo.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/ImpactDataset.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/JiraTicket.java (97%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/Job.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/LdapInfo.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/LineageEdge.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/LineageLink.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/LineageNode.java (98%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/LineagePathInfo.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/Metric.java (97%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/MetricListViewNode.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/Project.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/SchemaDataset.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/SchemaHistoryData.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/ScriptInfo.java (96%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/ScriptLineage.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/ScriptRuntime.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/SimilarColumns.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/SimilarComments.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/TreeNode.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/User.java (97%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/UserEntity.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => table}/UserSetting.java (95%) rename wherehows-dao/src/main/java/wherehows/models/{ => view}/DatasetColumn.java (98%) rename wherehows-dao/src/main/java/wherehows/models/{ => view}/DatasetOwner.java (98%) diff --git a/wherehows-backend/app/controllers/Application.java b/wherehows-backend/app/controllers/Application.java index 6f40b017a9..96fee56439 100644 --- a/wherehows-backend/app/controllers/Application.java +++ b/wherehows-backend/app/controllers/Application.java @@ -25,7 +25,7 @@ import play.Logger; import play.Play; import play.mvc.Controller; import play.mvc.Result; -import wherehows.dao.ConnectionPoolProperties; +import wherehows.dao.table.ConnectionPoolProperties; import wherehows.dao.DaoFactory; diff --git a/wherehows-backend/app/models/kafka/GobblinTrackingAuditProcessor.java b/wherehows-backend/app/models/kafka/GobblinTrackingAuditProcessor.java index d64da6b29d..80942b5382 100644 --- a/wherehows-backend/app/models/kafka/GobblinTrackingAuditProcessor.java +++ b/wherehows-backend/app/models/kafka/GobblinTrackingAuditProcessor.java @@ -31,8 +31,8 @@ import wherehows.common.schemas.Record; import wherehows.common.utils.StringUtil; import play.libs.Json; import play.Logger; -import wherehows.dao.DatasetClassificationDao; -import wherehows.models.DatasetClassification; +import wherehows.dao.table.DatasetClassificationDao; +import wherehows.models.table.DatasetClassification; public class GobblinTrackingAuditProcessor extends KafkaConsumerProcessor { diff --git a/wherehows-dao/src/main/java/wherehows/dao/DaoFactory.java b/wherehows-dao/src/main/java/wherehows/dao/DaoFactory.java index 3bc990faef..ce86e46e50 100644 --- a/wherehows-dao/src/main/java/wherehows/dao/DaoFactory.java +++ b/wherehows-dao/src/main/java/wherehows/dao/DaoFactory.java @@ -14,6 +14,13 @@ package wherehows.dao; import javax.persistence.EntityManagerFactory; +import wherehows.dao.table.ClusterInfoDao; +import wherehows.dao.table.DatasetClassificationDao; +import wherehows.dao.table.DatasetSchemaInfoDao; +import wherehows.dao.table.DatasetsDao; +import wherehows.dao.table.DictDatasetDao; +import wherehows.dao.table.FieldDetailDao; +import wherehows.dao.view.MetadataReadOnlyDao; public class DaoFactory { diff --git a/wherehows-dao/src/main/java/wherehows/dao/BaseDao.java b/wherehows-dao/src/main/java/wherehows/dao/table/BaseDao.java similarity index 97% rename from wherehows-dao/src/main/java/wherehows/dao/BaseDao.java rename to wherehows-dao/src/main/java/wherehows/dao/table/BaseDao.java index 0c26b8d428..4f019042ca 100644 --- a/wherehows-dao/src/main/java/wherehows/dao/BaseDao.java +++ b/wherehows-dao/src/main/java/wherehows/dao/table/BaseDao.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.dao; +package wherehows.dao.table; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; diff --git a/wherehows-dao/src/main/java/wherehows/dao/ClusterInfoDao.java b/wherehows-dao/src/main/java/wherehows/dao/table/ClusterInfoDao.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/dao/ClusterInfoDao.java rename to wherehows-dao/src/main/java/wherehows/dao/table/ClusterInfoDao.java index 2353c1c618..f4abe66348 100644 --- a/wherehows-dao/src/main/java/wherehows/dao/ClusterInfoDao.java +++ b/wherehows-dao/src/main/java/wherehows/dao/table/ClusterInfoDao.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.dao; +package wherehows.dao.table; import java.util.List; import javax.persistence.EntityManager; @@ -20,7 +20,7 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import lombok.SneakyThrows; -import wherehows.models.ClusterInfo; +import wherehows.models.table.ClusterInfo; public class ClusterInfoDao extends BaseDao { diff --git a/wherehows-dao/src/main/java/wherehows/dao/ConnectionPoolProperties.java b/wherehows-dao/src/main/java/wherehows/dao/table/ConnectionPoolProperties.java similarity index 98% rename from wherehows-dao/src/main/java/wherehows/dao/ConnectionPoolProperties.java rename to wherehows-dao/src/main/java/wherehows/dao/table/ConnectionPoolProperties.java index 5a96eaf6c4..347e633a76 100644 --- a/wherehows-dao/src/main/java/wherehows/dao/ConnectionPoolProperties.java +++ b/wherehows-dao/src/main/java/wherehows/dao/table/ConnectionPoolProperties.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.dao; +package wherehows.dao.table; import java.util.HashMap; import java.util.Map; diff --git a/wherehows-dao/src/main/java/wherehows/dao/DatasetClassificationDao.java b/wherehows-dao/src/main/java/wherehows/dao/table/DatasetClassificationDao.java similarity index 92% rename from wherehows-dao/src/main/java/wherehows/dao/DatasetClassificationDao.java rename to wherehows-dao/src/main/java/wherehows/dao/table/DatasetClassificationDao.java index 48bb9a5226..e1b2c85a77 100644 --- a/wherehows-dao/src/main/java/wherehows/dao/DatasetClassificationDao.java +++ b/wherehows-dao/src/main/java/wherehows/dao/table/DatasetClassificationDao.java @@ -11,11 +11,11 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.dao; +package wherehows.dao.table; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import wherehows.models.DatasetClassification; +import wherehows.models.table.DatasetClassification; public class DatasetClassificationDao extends BaseDao { diff --git a/wherehows-dao/src/main/java/wherehows/dao/DatasetSchemaInfoDao.java b/wherehows-dao/src/main/java/wherehows/dao/table/DatasetSchemaInfoDao.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/dao/DatasetSchemaInfoDao.java rename to wherehows-dao/src/main/java/wherehows/dao/table/DatasetSchemaInfoDao.java index 5ef2281372..f683e4a051 100644 --- a/wherehows-dao/src/main/java/wherehows/dao/DatasetSchemaInfoDao.java +++ b/wherehows-dao/src/main/java/wherehows/dao/table/DatasetSchemaInfoDao.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.dao; +package wherehows.dao.table; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -19,7 +19,7 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import lombok.SneakyThrows; -import wherehows.models.DatasetSchemaInfo; +import wherehows.models.table.DatasetSchemaInfo; public class DatasetSchemaInfoDao extends BaseDao { diff --git a/wherehows-dao/src/main/java/wherehows/dao/DatasetsDao.java b/wherehows-dao/src/main/java/wherehows/dao/table/DatasetsDao.java similarity index 98% rename from wherehows-dao/src/main/java/wherehows/dao/DatasetsDao.java rename to wherehows-dao/src/main/java/wherehows/dao/table/DatasetsDao.java index 618a305edf..32502303a5 100644 --- a/wherehows-dao/src/main/java/wherehows/dao/DatasetsDao.java +++ b/wherehows-dao/src/main/java/wherehows/dao/table/DatasetsDao.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.dao; +package wherehows.dao.table; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -29,9 +29,9 @@ import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.BatchPreparedStatementSetter; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; -import wherehows.models.DatasetCompliance; -import wherehows.models.DatasetFieldEntity; -import wherehows.models.DatasetOwner; +import wherehows.models.table.DatasetCompliance; +import wherehows.models.table.DatasetFieldEntity; +import wherehows.models.view.DatasetOwner; import static wherehows.util.JsonUtil.*; diff --git a/wherehows-dao/src/main/java/wherehows/dao/DictDatasetDao.java b/wherehows-dao/src/main/java/wherehows/dao/table/DictDatasetDao.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/dao/DictDatasetDao.java rename to wherehows-dao/src/main/java/wherehows/dao/table/DictDatasetDao.java index da7deed2b4..bf68ef84a0 100644 --- a/wherehows-dao/src/main/java/wherehows/dao/DictDatasetDao.java +++ b/wherehows-dao/src/main/java/wherehows/dao/table/DictDatasetDao.java @@ -11,16 +11,15 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.dao; +package wherehows.dao.table; -import java.util.Objects; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import lombok.SneakyThrows; -import wherehows.models.DictDataset; +import wherehows.models.table.DictDataset; public class DictDatasetDao extends BaseDao { diff --git a/wherehows-dao/src/main/java/wherehows/dao/FieldDetailDao.java b/wherehows-dao/src/main/java/wherehows/dao/table/FieldDetailDao.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/dao/FieldDetailDao.java rename to wherehows-dao/src/main/java/wherehows/dao/table/FieldDetailDao.java index 1ddf8989e7..1296af31f4 100644 --- a/wherehows-dao/src/main/java/wherehows/dao/FieldDetailDao.java +++ b/wherehows-dao/src/main/java/wherehows/dao/table/FieldDetailDao.java @@ -11,17 +11,16 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.dao; +package wherehows.dao.table; import java.util.List; -import java.util.Objects; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import lombok.SneakyThrows; -import wherehows.models.DictFieldDetail; +import wherehows.models.table.DictFieldDetail; public class FieldDetailDao extends BaseDao { diff --git a/wherehows-dao/src/main/java/wherehows/dao/MetadataReadOnlyDao.java b/wherehows-dao/src/main/java/wherehows/dao/view/MetadataReadOnlyDao.java similarity index 98% rename from wherehows-dao/src/main/java/wherehows/dao/MetadataReadOnlyDao.java rename to wherehows-dao/src/main/java/wherehows/dao/view/MetadataReadOnlyDao.java index bf2aa9c764..4d48986ff3 100644 --- a/wherehows-dao/src/main/java/wherehows/dao/MetadataReadOnlyDao.java +++ b/wherehows-dao/src/main/java/wherehows/dao/view/MetadataReadOnlyDao.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.dao; +package wherehows.dao.view; import java.util.HashMap; import java.util.List; @@ -22,8 +22,8 @@ import javax.persistence.Query; import lombok.SneakyThrows; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import wherehows.models.DatasetOwner; -import wherehows.models.DatasetColumn; +import wherehows.models.view.DatasetOwner; +import wherehows.models.view.DatasetColumn; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/wherehows-dao/src/main/java/wherehows/models/ClusterInfo.java b/wherehows-dao/src/main/java/wherehows/models/table/ClusterInfo.java similarity index 97% rename from wherehows-dao/src/main/java/wherehows/models/ClusterInfo.java rename to wherehows-dao/src/main/java/wherehows/models/table/ClusterInfo.java index 244aa4a00d..16a0795343 100644 --- a/wherehows-dao/src/main/java/wherehows/models/ClusterInfo.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/ClusterInfo.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.util.Date; import javax.persistence.Column; diff --git a/wherehows-dao/src/main/java/wherehows/models/ColumnComment.java b/wherehows-dao/src/main/java/wherehows/models/table/ColumnComment.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/ColumnComment.java rename to wherehows-dao/src/main/java/wherehows/models/table/ColumnComment.java index 00e0ee1031..4abe592550 100644 --- a/wherehows-dao/src/main/java/wherehows/models/ColumnComment.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/ColumnComment.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class ColumnComment { diff --git a/wherehows-dao/src/main/java/wherehows/models/CompanyUser.java b/wherehows-dao/src/main/java/wherehows/models/table/CompanyUser.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/CompanyUser.java rename to wherehows-dao/src/main/java/wherehows/models/table/CompanyUser.java index c10f9b8f09..12a1c514e7 100644 --- a/wherehows-dao/src/main/java/wherehows/models/CompanyUser.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/CompanyUser.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/wherehows-dao/src/main/java/wherehows/models/DashboardBarData.java b/wherehows-dao/src/main/java/wherehows/models/table/DashboardBarData.java similarity index 94% rename from wherehows-dao/src/main/java/wherehows/models/DashboardBarData.java rename to wherehows-dao/src/main/java/wherehows/models/table/DashboardBarData.java index 60261f6362..77782e03ec 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DashboardBarData.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DashboardBarData.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class DashboardBarData { diff --git a/wherehows-dao/src/main/java/wherehows/models/DashboardDataset.java b/wherehows-dao/src/main/java/wherehows/models/table/DashboardDataset.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/DashboardDataset.java rename to wherehows-dao/src/main/java/wherehows/models/table/DashboardDataset.java index 857184db58..77d31d9fcd 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DashboardDataset.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DashboardDataset.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.util.List; diff --git a/wherehows-dao/src/main/java/wherehows/models/DashboardOwnerStat.java b/wherehows-dao/src/main/java/wherehows/models/table/DashboardOwnerStat.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/DashboardOwnerStat.java rename to wherehows-dao/src/main/java/wherehows/models/table/DashboardOwnerStat.java index 7895952e69..20f6b288cd 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DashboardOwnerStat.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DashboardOwnerStat.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class DashboardOwnerStat { diff --git a/wherehows-dao/src/main/java/wherehows/models/Dataset.java b/wherehows-dao/src/main/java/wherehows/models/table/Dataset.java similarity index 97% rename from wherehows-dao/src/main/java/wherehows/models/Dataset.java rename to wherehows-dao/src/main/java/wherehows/models/table/Dataset.java index ee34a93650..ec3621102b 100644 --- a/wherehows-dao/src/main/java/wherehows/models/Dataset.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/Dataset.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import com.fasterxml.jackson.databind.JsonNode; diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetAccessItem.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetAccessItem.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/DatasetAccessItem.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetAccessItem.java index 7ceccfade6..01e9934a20 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetAccessItem.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetAccessItem.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.util.List; diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetAccessibility.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetAccessibility.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/DatasetAccessibility.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetAccessibility.java index 18228fae2c..3bf294c3ed 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetAccessibility.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetAccessibility.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.util.List; diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetClassification.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetClassification.java similarity index 97% rename from wherehows-dao/src/main/java/wherehows/models/DatasetClassification.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetClassification.java index 8bc12f82cf..9f5fca1952 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetClassification.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetClassification.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.util.Date; diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetColumnComment.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetColumnComment.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/DatasetColumnComment.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetColumnComment.java index f85bb632d8..a8980580e0 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetColumnComment.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetColumnComment.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class DatasetColumnComment { public long id; diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetComment.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetComment.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/DatasetComment.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetComment.java index d59ba7f917..e17ef9e135 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetComment.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetComment.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class DatasetComment { diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetCompliance.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetCompliance.java similarity index 99% rename from wherehows-dao/src/main/java/wherehows/models/DatasetCompliance.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetCompliance.java index 4e599175e5..ad5e181d26 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetCompliance.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetCompliance.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.util.List; import java.util.Map; diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetDependency.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetDependency.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/DatasetDependency.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetDependency.java index 669ad6066f..aff4a53d82 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetDependency.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetDependency.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class DatasetDependency { diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetFieldEntity.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetFieldEntity.java similarity index 97% rename from wherehows-dao/src/main/java/wherehows/models/DatasetFieldEntity.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetFieldEntity.java index 99517df09d..44f43ecdf0 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetFieldEntity.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetFieldEntity.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class DatasetFieldEntity { diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetFieldSchema.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetFieldSchema.java similarity index 98% rename from wherehows-dao/src/main/java/wherehows/models/DatasetFieldSchema.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetFieldSchema.java index 794abd9d3b..c594f5b15b 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetFieldSchema.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetFieldSchema.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.io.Serializable; import javax.persistence.Column; diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetInstance.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetInstance.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/DatasetInstance.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetInstance.java index bf3e6f5111..630aeb65b1 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetInstance.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetInstance.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class DatasetInstance { diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetListViewNode.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetListViewNode.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/DatasetListViewNode.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetListViewNode.java index 27808b9d0e..6cf77509ad 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetListViewNode.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetListViewNode.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class DatasetListViewNode { diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetPartition.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetPartition.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/DatasetPartition.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetPartition.java index da195a8ce3..3ac80959cc 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetPartition.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetPartition.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.util.List; diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetSchemaInfo.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetSchemaInfo.java similarity index 98% rename from wherehows-dao/src/main/java/wherehows/models/DatasetSchemaInfo.java rename to wherehows-dao/src/main/java/wherehows/models/table/DatasetSchemaInfo.java index 9ebf35afb3..c481be36c9 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetSchemaInfo.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetSchemaInfo.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/wherehows-dao/src/main/java/wherehows/models/DictDataset.java b/wherehows-dao/src/main/java/wherehows/models/table/DictDataset.java similarity index 98% rename from wherehows-dao/src/main/java/wherehows/models/DictDataset.java rename to wherehows-dao/src/main/java/wherehows/models/table/DictDataset.java index 72df8e72e8..2bd4e6d29f 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DictDataset.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DictDataset.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/wherehows-dao/src/main/java/wherehows/models/DictFieldDetail.java b/wherehows-dao/src/main/java/wherehows/models/table/DictFieldDetail.java similarity index 98% rename from wherehows-dao/src/main/java/wherehows/models/DictFieldDetail.java rename to wherehows-dao/src/main/java/wherehows/models/table/DictFieldDetail.java index 259fcd3dd0..6d877ad205 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DictFieldDetail.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DictFieldDetail.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.util.Date; import javax.persistence.Column; diff --git a/wherehows-dao/src/main/java/wherehows/models/Flow.java b/wherehows-dao/src/main/java/wherehows/models/table/Flow.java similarity index 97% rename from wherehows-dao/src/main/java/wherehows/models/Flow.java rename to wherehows-dao/src/main/java/wherehows/models/table/Flow.java index 1c757fa373..81a0f47511 100644 --- a/wherehows-dao/src/main/java/wherehows/models/Flow.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/Flow.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.io.Serializable; import javax.persistence.Column; diff --git a/wherehows-dao/src/main/java/wherehows/models/FlowJob.java b/wherehows-dao/src/main/java/wherehows/models/table/FlowJob.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/FlowJob.java rename to wherehows-dao/src/main/java/wherehows/models/table/FlowJob.java index f4655676e4..ee04dd845d 100644 --- a/wherehows-dao/src/main/java/wherehows/models/FlowJob.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/FlowJob.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class FlowJob { diff --git a/wherehows-dao/src/main/java/wherehows/models/FlowListViewNode.java b/wherehows-dao/src/main/java/wherehows/models/table/FlowListViewNode.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/FlowListViewNode.java rename to wherehows-dao/src/main/java/wherehows/models/table/FlowListViewNode.java index 30b06e93fa..9c6fac0c6c 100644 --- a/wherehows-dao/src/main/java/wherehows/models/FlowListViewNode.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/FlowListViewNode.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class FlowListViewNode { diff --git a/wherehows-dao/src/main/java/wherehows/models/Group.java b/wherehows-dao/src/main/java/wherehows/models/table/Group.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/Group.java rename to wherehows-dao/src/main/java/wherehows/models/table/Group.java index a0200fd437..0ce31c854e 100644 --- a/wherehows-dao/src/main/java/wherehows/models/Group.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/Group.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import lombok.Data; diff --git a/wherehows-dao/src/main/java/wherehows/models/IdpcInfo.java b/wherehows-dao/src/main/java/wherehows/models/table/IdpcInfo.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/IdpcInfo.java rename to wherehows-dao/src/main/java/wherehows/models/table/IdpcInfo.java index 4ab250be99..82f8b59b14 100644 --- a/wherehows-dao/src/main/java/wherehows/models/IdpcInfo.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/IdpcInfo.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class IdpcInfo { diff --git a/wherehows-dao/src/main/java/wherehows/models/ImpactDataset.java b/wherehows-dao/src/main/java/wherehows/models/table/ImpactDataset.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/ImpactDataset.java rename to wherehows-dao/src/main/java/wherehows/models/table/ImpactDataset.java index 20a26cc755..1d82712f37 100644 --- a/wherehows-dao/src/main/java/wherehows/models/ImpactDataset.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/ImpactDataset.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class ImpactDataset { diff --git a/wherehows-dao/src/main/java/wherehows/models/JiraTicket.java b/wherehows-dao/src/main/java/wherehows/models/table/JiraTicket.java similarity index 97% rename from wherehows-dao/src/main/java/wherehows/models/JiraTicket.java rename to wherehows-dao/src/main/java/wherehows/models/table/JiraTicket.java index b29712500f..f7f80df095 100644 --- a/wherehows-dao/src/main/java/wherehows/models/JiraTicket.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/JiraTicket.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/wherehows-dao/src/main/java/wherehows/models/Job.java b/wherehows-dao/src/main/java/wherehows/models/table/Job.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/Job.java rename to wherehows-dao/src/main/java/wherehows/models/table/Job.java index 0e3aee3a8d..441591a69b 100644 --- a/wherehows-dao/src/main/java/wherehows/models/Job.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/Job.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class Job { public Long id; diff --git a/wherehows-dao/src/main/java/wherehows/models/LdapInfo.java b/wherehows-dao/src/main/java/wherehows/models/table/LdapInfo.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/LdapInfo.java rename to wherehows-dao/src/main/java/wherehows/models/table/LdapInfo.java index 4bef547909..1f5a8aa29a 100644 --- a/wherehows-dao/src/main/java/wherehows/models/LdapInfo.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/LdapInfo.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class LdapInfo { diff --git a/wherehows-dao/src/main/java/wherehows/models/LineageEdge.java b/wherehows-dao/src/main/java/wherehows/models/table/LineageEdge.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/LineageEdge.java rename to wherehows-dao/src/main/java/wherehows/models/table/LineageEdge.java index 0e8ca0365e..1182efee96 100644 --- a/wherehows-dao/src/main/java/wherehows/models/LineageEdge.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/LineageEdge.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class LineageEdge { diff --git a/wherehows-dao/src/main/java/wherehows/models/LineageLink.java b/wherehows-dao/src/main/java/wherehows/models/table/LineageLink.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/LineageLink.java rename to wherehows-dao/src/main/java/wherehows/models/table/LineageLink.java index 974a3e19b9..ec51596914 100644 --- a/wherehows-dao/src/main/java/wherehows/models/LineageLink.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/LineageLink.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class LineageLink { diff --git a/wherehows-dao/src/main/java/wherehows/models/LineageNode.java b/wherehows-dao/src/main/java/wherehows/models/table/LineageNode.java similarity index 98% rename from wherehows-dao/src/main/java/wherehows/models/LineageNode.java rename to wherehows-dao/src/main/java/wherehows/models/table/LineageNode.java index 282eda6c54..635b620d93 100644 --- a/wherehows-dao/src/main/java/wherehows/models/LineageNode.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/LineageNode.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import java.util.List; diff --git a/wherehows-dao/src/main/java/wherehows/models/LineagePathInfo.java b/wherehows-dao/src/main/java/wherehows/models/table/LineagePathInfo.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/LineagePathInfo.java rename to wherehows-dao/src/main/java/wherehows/models/table/LineagePathInfo.java index c0d6e9a040..aab9aa5f53 100644 --- a/wherehows-dao/src/main/java/wherehows/models/LineagePathInfo.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/LineagePathInfo.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class LineagePathInfo { diff --git a/wherehows-dao/src/main/java/wherehows/models/Metric.java b/wherehows-dao/src/main/java/wherehows/models/table/Metric.java similarity index 97% rename from wherehows-dao/src/main/java/wherehows/models/Metric.java rename to wherehows-dao/src/main/java/wherehows/models/table/Metric.java index b616e9e995..a16e0d0b12 100644 --- a/wherehows-dao/src/main/java/wherehows/models/Metric.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/Metric.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class Metric { diff --git a/wherehows-dao/src/main/java/wherehows/models/MetricListViewNode.java b/wherehows-dao/src/main/java/wherehows/models/table/MetricListViewNode.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/MetricListViewNode.java rename to wherehows-dao/src/main/java/wherehows/models/table/MetricListViewNode.java index 667d7d7705..6d961d76d0 100644 --- a/wherehows-dao/src/main/java/wherehows/models/MetricListViewNode.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/MetricListViewNode.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class MetricListViewNode { diff --git a/wherehows-dao/src/main/java/wherehows/models/Project.java b/wherehows-dao/src/main/java/wherehows/models/table/Project.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/Project.java rename to wherehows-dao/src/main/java/wherehows/models/table/Project.java index e9caaaba58..143f428e65 100644 --- a/wherehows-dao/src/main/java/wherehows/models/Project.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/Project.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class Project { diff --git a/wherehows-dao/src/main/java/wherehows/models/SchemaDataset.java b/wherehows-dao/src/main/java/wherehows/models/table/SchemaDataset.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/SchemaDataset.java rename to wherehows-dao/src/main/java/wherehows/models/table/SchemaDataset.java index eeb19e9a0a..332543d846 100644 --- a/wherehows-dao/src/main/java/wherehows/models/SchemaDataset.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/SchemaDataset.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class SchemaDataset { diff --git a/wherehows-dao/src/main/java/wherehows/models/SchemaHistoryData.java b/wherehows-dao/src/main/java/wherehows/models/table/SchemaHistoryData.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/SchemaHistoryData.java rename to wherehows-dao/src/main/java/wherehows/models/table/SchemaHistoryData.java index 818f458b8e..6c34bf0034 100644 --- a/wherehows-dao/src/main/java/wherehows/models/SchemaHistoryData.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/SchemaHistoryData.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class SchemaHistoryData { diff --git a/wherehows-dao/src/main/java/wherehows/models/ScriptInfo.java b/wherehows-dao/src/main/java/wherehows/models/table/ScriptInfo.java similarity index 96% rename from wherehows-dao/src/main/java/wherehows/models/ScriptInfo.java rename to wherehows-dao/src/main/java/wherehows/models/table/ScriptInfo.java index f460c380fa..c873e45f5a 100644 --- a/wherehows-dao/src/main/java/wherehows/models/ScriptInfo.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/ScriptInfo.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class ScriptInfo { diff --git a/wherehows-dao/src/main/java/wherehows/models/ScriptLineage.java b/wherehows-dao/src/main/java/wherehows/models/table/ScriptLineage.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/ScriptLineage.java rename to wherehows-dao/src/main/java/wherehows/models/table/ScriptLineage.java index 5b393b9a7e..78fb6f4475 100644 --- a/wherehows-dao/src/main/java/wherehows/models/ScriptLineage.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/ScriptLineage.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class ScriptLineage { diff --git a/wherehows-dao/src/main/java/wherehows/models/ScriptRuntime.java b/wherehows-dao/src/main/java/wherehows/models/table/ScriptRuntime.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/ScriptRuntime.java rename to wherehows-dao/src/main/java/wherehows/models/table/ScriptRuntime.java index 2125f27e5d..cd46be6f91 100644 --- a/wherehows-dao/src/main/java/wherehows/models/ScriptRuntime.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/ScriptRuntime.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class ScriptRuntime { diff --git a/wherehows-dao/src/main/java/wherehows/models/SimilarColumns.java b/wherehows-dao/src/main/java/wherehows/models/table/SimilarColumns.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/SimilarColumns.java rename to wherehows-dao/src/main/java/wherehows/models/table/SimilarColumns.java index 41cbca9d6f..6e09091376 100644 --- a/wherehows-dao/src/main/java/wherehows/models/SimilarColumns.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/SimilarColumns.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class SimilarColumns { public Long datasetId; diff --git a/wherehows-dao/src/main/java/wherehows/models/SimilarComments.java b/wherehows-dao/src/main/java/wherehows/models/table/SimilarComments.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/SimilarComments.java rename to wherehows-dao/src/main/java/wherehows/models/table/SimilarComments.java index 8e76807dab..93366cbd0f 100644 --- a/wherehows-dao/src/main/java/wherehows/models/SimilarComments.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/SimilarComments.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class SimilarComments { diff --git a/wherehows-dao/src/main/java/wherehows/models/TreeNode.java b/wherehows-dao/src/main/java/wherehows/models/table/TreeNode.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/TreeNode.java rename to wherehows-dao/src/main/java/wherehows/models/table/TreeNode.java index 4d7ba06e08..8dd86b5427 100644 --- a/wherehows-dao/src/main/java/wherehows/models/TreeNode.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/TreeNode.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class TreeNode { diff --git a/wherehows-dao/src/main/java/wherehows/models/User.java b/wherehows-dao/src/main/java/wherehows/models/table/User.java similarity index 97% rename from wherehows-dao/src/main/java/wherehows/models/User.java rename to wherehows-dao/src/main/java/wherehows/models/table/User.java index 9b5f7f007e..b76f6e2a35 100644 --- a/wherehows-dao/src/main/java/wherehows/models/User.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/User.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/wherehows-dao/src/main/java/wherehows/models/UserEntity.java b/wherehows-dao/src/main/java/wherehows/models/table/UserEntity.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/UserEntity.java rename to wherehows-dao/src/main/java/wherehows/models/table/UserEntity.java index e2512fa77c..77c49b853c 100644 --- a/wherehows-dao/src/main/java/wherehows/models/UserEntity.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/UserEntity.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; public class UserEntity { diff --git a/wherehows-dao/src/main/java/wherehows/models/UserSetting.java b/wherehows-dao/src/main/java/wherehows/models/table/UserSetting.java similarity index 95% rename from wherehows-dao/src/main/java/wherehows/models/UserSetting.java rename to wherehows-dao/src/main/java/wherehows/models/table/UserSetting.java index 2b0bd46604..af1d2611fa 100644 --- a/wherehows-dao/src/main/java/wherehows/models/UserSetting.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/UserSetting.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.table; import lombok.Data; diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetColumn.java b/wherehows-dao/src/main/java/wherehows/models/view/DatasetColumn.java similarity index 98% rename from wherehows-dao/src/main/java/wherehows/models/DatasetColumn.java rename to wherehows-dao/src/main/java/wherehows/models/view/DatasetColumn.java index c98dcb75c6..d7a93a7f58 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetColumn.java +++ b/wherehows-dao/src/main/java/wherehows/models/view/DatasetColumn.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.view; import com.fasterxml.jackson.annotation.JsonIgnore; import javax.persistence.Column; diff --git a/wherehows-dao/src/main/java/wherehows/models/DatasetOwner.java b/wherehows-dao/src/main/java/wherehows/models/view/DatasetOwner.java similarity index 98% rename from wherehows-dao/src/main/java/wherehows/models/DatasetOwner.java rename to wherehows-dao/src/main/java/wherehows/models/view/DatasetOwner.java index 5175e762fc..4a5ec49798 100644 --- a/wherehows-dao/src/main/java/wherehows/models/DatasetOwner.java +++ b/wherehows-dao/src/main/java/wherehows/models/view/DatasetOwner.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -package wherehows.models; +package wherehows.models.view; import java.io.Serializable; import javax.persistence.Column; diff --git a/wherehows-frontend/app/controllers/Application.java b/wherehows-frontend/app/controllers/Application.java index e6e34dcc75..a770e5f931 100644 --- a/wherehows-frontend/app/controllers/Application.java +++ b/wherehows-frontend/app/controllers/Application.java @@ -37,7 +37,7 @@ import play.mvc.Result; import play.mvc.Security; import security.AuthenticationManager; import utils.Tree; -import wherehows.dao.ConnectionPoolProperties; +import wherehows.dao.table.ConnectionPoolProperties; import wherehows.dao.DaoFactory; import static play.data.Form.*; diff --git a/wherehows-frontend/app/controllers/api/v1/Dataset.java b/wherehows-frontend/app/controllers/api/v1/Dataset.java index 6c01bc5fef..c8dc47c23f 100644 --- a/wherehows-frontend/app/controllers/api/v1/Dataset.java +++ b/wherehows-frontend/app/controllers/api/v1/Dataset.java @@ -34,15 +34,15 @@ import play.libs.F.Promise; import play.libs.Json; import play.mvc.Controller; import play.mvc.Result; -import wherehows.dao.DatasetClassificationDao; -import wherehows.dao.DatasetsDao; -import wherehows.dao.MetadataReadOnlyDao; -import wherehows.models.DatasetClassification; -import wherehows.models.DatasetColumn; -import wherehows.models.DatasetCompliance; -import wherehows.models.DatasetDependency; -import wherehows.models.DatasetOwner; -import wherehows.models.ImpactDataset; +import wherehows.dao.table.DatasetClassificationDao; +import wherehows.dao.table.DatasetsDao; +import wherehows.dao.view.MetadataReadOnlyDao; +import wherehows.models.table.DatasetClassification; +import wherehows.models.view.DatasetColumn; +import wherehows.models.table.DatasetCompliance; +import wherehows.models.table.DatasetDependency; +import wherehows.models.view.DatasetOwner; +import wherehows.models.table.ImpactDataset; public class Dataset extends Controller { @@ -104,7 +104,7 @@ public class Dataset extends Controller { public static Result getDatasetByID(int id) { String username = session("user"); - wherehows.models.Dataset dataset = DatasetsDAO.getDatasetByID(id, username); + wherehows.models.table.Dataset dataset = DatasetsDAO.getDatasetByID(id, username); ObjectNode result = Json.newObject(); diff --git a/wherehows-frontend/app/controllers/api/v1/Jira.java b/wherehows-frontend/app/controllers/api/v1/Jira.java index 4e6e4a18a2..7f7da673d9 100644 --- a/wherehows-frontend/app/controllers/api/v1/Jira.java +++ b/wherehows-frontend/app/controllers/api/v1/Jira.java @@ -20,7 +20,7 @@ import java.util.List; import play.libs.Json; import play.mvc.Controller; import play.mvc.Result; -import wherehows.models.JiraTicket; +import wherehows.models.table.JiraTicket; public class Jira extends Controller { diff --git a/wherehows-frontend/app/controllers/api/v1/Lineage.java b/wherehows-frontend/app/controllers/api/v1/Lineage.java index 9e70d095dd..26278e8bdf 100644 --- a/wherehows-frontend/app/controllers/api/v1/Lineage.java +++ b/wherehows-frontend/app/controllers/api/v1/Lineage.java @@ -22,6 +22,7 @@ import play.Play; import play.libs.Json; import play.mvc.Controller; import play.mvc.Result; +import wherehows.models.table.Dataset; public class Lineage extends Controller { @@ -36,7 +37,7 @@ public class Lineage extends Controller { return ok(result); } - wherehows.models.Dataset dataset = DatasetsDAO.getDatasetByID(id, username); + Dataset dataset = DatasetsDAO.getDatasetByID(id, username); if (dataset == null || StringUtils.isBlank(dataset.urn)) { result.put("status", "error"); result.put("message", "wrong dataset id"); diff --git a/wherehows-frontend/app/controllers/api/v1/Metric.java b/wherehows-frontend/app/controllers/api/v1/Metric.java index 0d18c8eb59..33cc377f94 100644 --- a/wherehows-frontend/app/controllers/api/v1/Metric.java +++ b/wherehows-frontend/app/controllers/api/v1/Metric.java @@ -138,7 +138,7 @@ public class Metric extends Controller { public static Result getMetricByID(int id) { String user = session("user"); - wherehows.models.Metric metric = MetricsDAO.getMetricByID(id, user); + wherehows.models.table.Metric metric = MetricsDAO.getMetricByID(id, user); ObjectNode result = Json.newObject(); diff --git a/wherehows-frontend/app/controllers/api/v1/User.java b/wherehows-frontend/app/controllers/api/v1/User.java index 49a970152f..4e744e385d 100644 --- a/wherehows-frontend/app/controllers/api/v1/User.java +++ b/wherehows-frontend/app/controllers/api/v1/User.java @@ -22,9 +22,9 @@ import play.cache.Cache; import play.libs.Json; import play.mvc.Controller; import play.mvc.Result; -import wherehows.models.CompanyUser; -import wherehows.models.Group; -import wherehows.models.UserEntity; +import wherehows.models.table.CompanyUser; +import wherehows.models.table.Group; +import wherehows.models.table.UserEntity; public class User extends Controller { @@ -42,7 +42,7 @@ public class User extends Controller { return ok(result); } - wherehows.models.User user = UserDAO.getCurrentUser(username); + wherehows.models.table.User user = UserDAO.getCurrentUser(username); if (StringUtils.isBlank(user.getUserName())) { result.put("status", "failed"); result.put("message", "can't find user info"); diff --git a/wherehows-frontend/app/dao/AdvSearchDAO.java b/wherehows-frontend/app/dao/AdvSearchDAO.java index 35bd55fd2e..c0171ceb5a 100644 --- a/wherehows-frontend/app/dao/AdvSearchDAO.java +++ b/wherehows-frontend/app/dao/AdvSearchDAO.java @@ -15,9 +15,9 @@ package dao; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import wherehows.models.Dataset; -import wherehows.models.FlowJob; -import wherehows.models.Metric; +import wherehows.models.table.Dataset; +import wherehows.models.table.FlowJob; +import wherehows.models.table.Metric; import org.apache.commons.lang3.StringUtils; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/wherehows-frontend/app/dao/ColumnCommentRowMapper.java b/wherehows-frontend/app/dao/ColumnCommentRowMapper.java index fe2ba19be5..164b69baff 100644 --- a/wherehows-frontend/app/dao/ColumnCommentRowMapper.java +++ b/wherehows-frontend/app/dao/ColumnCommentRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.ColumnComment; +import wherehows.models.table.ColumnComment; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/wherehows-frontend/app/dao/DashboardDAO.java b/wherehows-frontend/app/dao/DashboardDAO.java index 5db0a280be..0e9ab0cc32 100644 --- a/wherehows-frontend/app/dao/DashboardDAO.java +++ b/wherehows-frontend/app/dao/DashboardDAO.java @@ -23,10 +23,10 @@ import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Map; -import wherehows.models.DashboardBarData; -import wherehows.models.DashboardDataset; -import wherehows.models.DashboardOwnerStat; -import wherehows.models.LdapInfo; +import wherehows.models.table.DashboardBarData; +import wherehows.models.table.DashboardDataset; +import wherehows.models.table.DashboardOwnerStat; +import wherehows.models.table.LdapInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.datasource.DataSourceTransactionManager; diff --git a/wherehows-frontend/app/dao/DatasetColumnCommentRowMapper.java b/wherehows-frontend/app/dao/DatasetColumnCommentRowMapper.java index d2ec21d06a..886e73b268 100644 --- a/wherehows-frontend/app/dao/DatasetColumnCommentRowMapper.java +++ b/wherehows-frontend/app/dao/DatasetColumnCommentRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.DatasetColumnComment; +import wherehows.models.table.DatasetColumnComment; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.core.RowMapper; diff --git a/wherehows-frontend/app/dao/DatasetCommentRowMapper.java b/wherehows-frontend/app/dao/DatasetCommentRowMapper.java index 58afeb2ab0..226d3e3441 100644 --- a/wherehows-frontend/app/dao/DatasetCommentRowMapper.java +++ b/wherehows-frontend/app/dao/DatasetCommentRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.DatasetComment; +import wherehows.models.table.DatasetComment; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.core.RowMapper; diff --git a/wherehows-frontend/app/dao/DatasetRowMapper.java b/wherehows-frontend/app/dao/DatasetRowMapper.java index 3d19a2f2ba..3360f24dbc 100644 --- a/wherehows-frontend/app/dao/DatasetRowMapper.java +++ b/wherehows-frontend/app/dao/DatasetRowMapper.java @@ -13,8 +13,8 @@ */ package dao; -import wherehows.models.Dataset; -import wherehows.models.User; +import wherehows.models.table.Dataset; +import wherehows.models.table.User; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.core.RowMapper; import play.Play; diff --git a/wherehows-frontend/app/dao/DatasetWithUserRowMapper.java b/wherehows-frontend/app/dao/DatasetWithUserRowMapper.java index 5c72440308..32e90e959c 100644 --- a/wherehows-frontend/app/dao/DatasetWithUserRowMapper.java +++ b/wherehows-frontend/app/dao/DatasetWithUserRowMapper.java @@ -13,8 +13,8 @@ */ package dao; -import wherehows.models.Dataset; -import wherehows.models.User; +import wherehows.models.table.Dataset; +import wherehows.models.table.User; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.core.RowMapper; import play.Play; diff --git a/wherehows-frontend/app/dao/DatasetsDAO.java b/wherehows-frontend/app/dao/DatasetsDAO.java index 7c537d3192..11bca61b62 100644 --- a/wherehows-frontend/app/dao/DatasetsDAO.java +++ b/wherehows-frontend/app/dao/DatasetsDAO.java @@ -40,20 +40,20 @@ import org.springframework.transaction.support.TransactionTemplate; import play.Logger; import play.Play; import play.libs.Json; -import wherehows.models.DashboardDataset; -import wherehows.models.Dataset; -import wherehows.models.DatasetAccessItem; -import wherehows.models.DatasetAccessibility; -import wherehows.models.DatasetColumnComment; -import wherehows.models.DatasetComment; -import wherehows.models.DatasetDependency; -import wherehows.models.DatasetInstance; -import wherehows.models.DatasetListViewNode; -import wherehows.models.DatasetPartition; -import wherehows.models.ImpactDataset; -import wherehows.models.SimilarColumns; -import wherehows.models.SimilarComments; -import wherehows.models.User; +import wherehows.models.table.DashboardDataset; +import wherehows.models.table.Dataset; +import wherehows.models.table.DatasetAccessItem; +import wherehows.models.table.DatasetAccessibility; +import wherehows.models.table.DatasetColumnComment; +import wherehows.models.table.DatasetComment; +import wherehows.models.table.DatasetDependency; +import wherehows.models.table.DatasetInstance; +import wherehows.models.table.DatasetListViewNode; +import wherehows.models.table.DatasetPartition; +import wherehows.models.table.ImpactDataset; +import wherehows.models.table.SimilarColumns; +import wherehows.models.table.SimilarComments; +import wherehows.models.table.User; public class DatasetsDAO extends AbstractMySQLOpenSourceDAO diff --git a/wherehows-frontend/app/dao/FlowRowMapper.java b/wherehows-frontend/app/dao/FlowRowMapper.java index 3f8d6a2d28..9311e926ca 100644 --- a/wherehows-frontend/app/dao/FlowRowMapper.java +++ b/wherehows-frontend/app/dao/FlowRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.Flow; +import wherehows.models.table.Flow; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/wherehows-frontend/app/dao/FlowsDAO.java b/wherehows-frontend/app/dao/FlowsDAO.java index e885a5a118..ac4ca71235 100644 --- a/wherehows-frontend/app/dao/FlowsDAO.java +++ b/wherehows-frontend/app/dao/FlowsDAO.java @@ -27,10 +27,10 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; import play.Logger; import play.libs.Json; -import wherehows.models.Flow; -import wherehows.models.FlowListViewNode; -import wherehows.models.Job; -import wherehows.models.TreeNode; +import wherehows.models.table.Flow; +import wherehows.models.table.FlowListViewNode; +import wherehows.models.table.Job; +import wherehows.models.table.TreeNode; public class FlowsDAO extends AbstractMySQLOpenSourceDAO { diff --git a/wherehows-frontend/app/dao/ImpactDatasetRowMapper.java b/wherehows-frontend/app/dao/ImpactDatasetRowMapper.java index 64c4f3232b..64382c3ea1 100644 --- a/wherehows-frontend/app/dao/ImpactDatasetRowMapper.java +++ b/wherehows-frontend/app/dao/ImpactDatasetRowMapper.java @@ -13,8 +13,8 @@ */ package dao; -import wherehows.models.ImpactDataset; -import wherehows.models.LineagePathInfo; +import wherehows.models.table.ImpactDataset; +import wherehows.models.table.LineagePathInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.core.RowMapper; import utils.Lineage; diff --git a/wherehows-frontend/app/dao/JiraDAO.java b/wherehows-frontend/app/dao/JiraDAO.java index 68439b1a8c..ba0725ff9b 100644 --- a/wherehows-frontend/app/dao/JiraDAO.java +++ b/wherehows-frontend/app/dao/JiraDAO.java @@ -15,8 +15,8 @@ package dao; import java.util.*; -import wherehows.models.JiraTicket; -import wherehows.models.LdapInfo; +import wherehows.models.table.JiraTicket; +import wherehows.models.table.LdapInfo; public class JiraDAO extends AbstractMySQLOpenSourceDAO { diff --git a/wherehows-frontend/app/dao/JiraTicketRowMapper.java b/wherehows-frontend/app/dao/JiraTicketRowMapper.java index 437490509a..e5b41389db 100644 --- a/wherehows-frontend/app/dao/JiraTicketRowMapper.java +++ b/wherehows-frontend/app/dao/JiraTicketRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.JiraTicket; +import wherehows.models.table.JiraTicket; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/wherehows-frontend/app/dao/LdapInfoRowMapper.java b/wherehows-frontend/app/dao/LdapInfoRowMapper.java index ecd36bd7a8..69fbc0e239 100644 --- a/wherehows-frontend/app/dao/LdapInfoRowMapper.java +++ b/wherehows-frontend/app/dao/LdapInfoRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.LdapInfo; +import wherehows.models.table.LdapInfo; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/wherehows-frontend/app/dao/LineageDAO.java b/wherehows-frontend/app/dao/LineageDAO.java index b2d7e14a44..8ea39df2d5 100644 --- a/wherehows-frontend/app/dao/LineageDAO.java +++ b/wherehows-frontend/app/dao/LineageDAO.java @@ -27,7 +27,11 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import play.Logger; import play.libs.Json; import utils.Lineage; -import wherehows.models.*; +import wherehows.models.table.ImpactDataset; +import wherehows.models.table.LineageEdge; +import wherehows.models.table.LineageNode; +import wherehows.models.table.LineagePathInfo; +import wherehows.models.table.ScriptInfo; public class LineageDAO extends AbstractMySQLOpenSourceDAO diff --git a/wherehows-frontend/app/dao/MetricRowMapper.java b/wherehows-frontend/app/dao/MetricRowMapper.java index 77aee4712b..2f496d09dc 100644 --- a/wherehows-frontend/app/dao/MetricRowMapper.java +++ b/wherehows-frontend/app/dao/MetricRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.Metric; +import wherehows.models.table.Metric; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.core.RowMapper; diff --git a/wherehows-frontend/app/dao/MetricsDAO.java b/wherehows-frontend/app/dao/MetricsDAO.java index fc987c2f10..f547f873ed 100644 --- a/wherehows-frontend/app/dao/MetricsDAO.java +++ b/wherehows-frontend/app/dao/MetricsDAO.java @@ -21,8 +21,8 @@ import java.util.Map; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.primitives.Ints; -import wherehows.models.MetricListViewNode; -import wherehows.models.TreeNode; +import wherehows.models.table.MetricListViewNode; +import wherehows.models.table.TreeNode; import org.apache.commons.lang3.StringUtils; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; @@ -32,7 +32,7 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; import play.Logger; import play.libs.Json; -import wherehows.models.Metric; +import wherehows.models.table.Metric; public class MetricsDAO extends AbstractMySQLOpenSourceDAO { diff --git a/wherehows-frontend/app/dao/ProjectRowMapper.java b/wherehows-frontend/app/dao/ProjectRowMapper.java index 654abefdd5..e077bd6953 100644 --- a/wherehows-frontend/app/dao/ProjectRowMapper.java +++ b/wherehows-frontend/app/dao/ProjectRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.Project; +import wherehows.models.table.Project; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/wherehows-frontend/app/dao/SchemaDatasetRowMapper.java b/wherehows-frontend/app/dao/SchemaDatasetRowMapper.java index 58901107c7..b729d6071b 100644 --- a/wherehows-frontend/app/dao/SchemaDatasetRowMapper.java +++ b/wherehows-frontend/app/dao/SchemaDatasetRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.SchemaDataset; +import wherehows.models.table.SchemaDataset; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.core.RowMapper; diff --git a/wherehows-frontend/app/dao/SchemaHistoryDAO.java b/wherehows-frontend/app/dao/SchemaHistoryDAO.java index cee1b324b4..81375223b0 100644 --- a/wherehows-frontend/app/dao/SchemaHistoryDAO.java +++ b/wherehows-frontend/app/dao/SchemaHistoryDAO.java @@ -24,8 +24,8 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; import play.Logger; import play.libs.Json; -import wherehows.models.SchemaDataset; -import wherehows.models.SchemaHistoryData; +import wherehows.models.table.SchemaDataset; +import wherehows.models.table.SchemaHistoryData; public class SchemaHistoryDAO extends AbstractMySQLOpenSourceDAO{ diff --git a/wherehows-frontend/app/dao/SchemaHistoryDataRowMapper.java b/wherehows-frontend/app/dao/SchemaHistoryDataRowMapper.java index f3bcbcc4a2..18c3442955 100644 --- a/wherehows-frontend/app/dao/SchemaHistoryDataRowMapper.java +++ b/wherehows-frontend/app/dao/SchemaHistoryDataRowMapper.java @@ -14,7 +14,7 @@ package dao; import com.fasterxml.jackson.databind.JsonNode; -import wherehows.models.SchemaHistoryData; +import wherehows.models.table.SchemaHistoryData; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.core.RowMapper; import play.Logger; diff --git a/wherehows-frontend/app/dao/ScriptFinderDAO.java b/wherehows-frontend/app/dao/ScriptFinderDAO.java index 6c34968626..45f8e70b09 100644 --- a/wherehows-frontend/app/dao/ScriptFinderDAO.java +++ b/wherehows-frontend/app/dao/ScriptFinderDAO.java @@ -29,9 +29,9 @@ import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; import play.Logger; import play.libs.Json; -import wherehows.models.ScriptInfo; -import wherehows.models.ScriptLineage; -import wherehows.models.ScriptRuntime; +import wherehows.models.table.ScriptInfo; +import wherehows.models.table.ScriptLineage; +import wherehows.models.table.ScriptRuntime; public class ScriptFinderDAO extends AbstractMySQLOpenSourceDAO{ @@ -63,7 +63,7 @@ public class ScriptFinderDAO extends AbstractMySQLOpenSourceDAO{ private final static String GET_SCRIPT_LINEAGE = "SELECT * FROM " + "job_execution_data_lineage WHERE app_id = ? AND job_exec_id = ? ORDER BY source_target_type DESC"; - + public static List getAllScriptTypes() { return getJdbcTemplate().queryForList(GET_SCRIPT_TYPE, String.class); diff --git a/wherehows-frontend/app/dao/ScriptInfoRowMapper.java b/wherehows-frontend/app/dao/ScriptInfoRowMapper.java index 8fdb0f6262..32ca065b94 100644 --- a/wherehows-frontend/app/dao/ScriptInfoRowMapper.java +++ b/wherehows-frontend/app/dao/ScriptInfoRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.ScriptInfo; +import wherehows.models.table.ScriptInfo; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/wherehows-frontend/app/dao/ScriptLineageRowMapper.java b/wherehows-frontend/app/dao/ScriptLineageRowMapper.java index 58bb8b7b0c..73c7452f91 100644 --- a/wherehows-frontend/app/dao/ScriptLineageRowMapper.java +++ b/wherehows-frontend/app/dao/ScriptLineageRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.ScriptLineage; +import wherehows.models.table.ScriptLineage; import org.springframework.jdbc.core.RowMapper; import java.sql.*; diff --git a/wherehows-frontend/app/dao/ScriptRuntimeRowMapper.java b/wherehows-frontend/app/dao/ScriptRuntimeRowMapper.java index 03570f7cb4..9e2fb1637a 100644 --- a/wherehows-frontend/app/dao/ScriptRuntimeRowMapper.java +++ b/wherehows-frontend/app/dao/ScriptRuntimeRowMapper.java @@ -13,7 +13,7 @@ */ package dao; -import wherehows.models.ScriptRuntime; +import wherehows.models.table.ScriptRuntime; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.core.RowMapper; diff --git a/wherehows-frontend/app/dao/SearchDAO.java b/wherehows-frontend/app/dao/SearchDAO.java index 95e6f18070..5cb29ff37c 100644 --- a/wherehows-frontend/app/dao/SearchDAO.java +++ b/wherehows-frontend/app/dao/SearchDAO.java @@ -31,9 +31,9 @@ import play.Play; import play.libs.F.Promise; import play.libs.Json; import play.libs.ws.*; -import wherehows.models.Dataset; -import wherehows.models.FlowJob; -import wherehows.models.Metric; +import wherehows.models.table.Dataset; +import wherehows.models.table.FlowJob; +import wherehows.models.table.Metric; public class SearchDAO extends AbstractMySQLOpenSourceDAO diff --git a/wherehows-frontend/app/dao/UserDAO.java b/wherehows-frontend/app/dao/UserDAO.java index 535d465676..f44dde8193 100644 --- a/wherehows-frontend/app/dao/UserDAO.java +++ b/wherehows-frontend/app/dao/UserDAO.java @@ -18,10 +18,10 @@ import java.util.*; import org.apache.commons.lang3.StringUtils; import org.springframework.dao.EmptyResultDataAccessException; import play.Logger; -import wherehows.models.CompanyUser; -import wherehows.models.Group; -import wherehows.models.User; -import wherehows.models.UserEntity; +import wherehows.models.table.CompanyUser; +import wherehows.models.table.Group; +import wherehows.models.table.User; +import wherehows.models.table.UserEntity; public class UserDAO extends AbstractMySQLOpenSourceDAO { diff --git a/wherehows-frontend/app/dao/UserRowMapper.java b/wherehows-frontend/app/dao/UserRowMapper.java index 05caa3182a..a9f1de3354 100644 --- a/wherehows-frontend/app/dao/UserRowMapper.java +++ b/wherehows-frontend/app/dao/UserRowMapper.java @@ -13,8 +13,8 @@ */ package dao; -import wherehows.models.User; -import wherehows.models.UserSetting; +import wherehows.models.table.User; +import wherehows.models.table.UserSetting; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/wherehows-frontend/app/security/AuthenticationManager.java b/wherehows-frontend/app/security/AuthenticationManager.java index 2b54ce4024..74b82cd150 100644 --- a/wherehows-frontend/app/security/AuthenticationManager.java +++ b/wherehows-frontend/app/security/AuthenticationManager.java @@ -14,7 +14,7 @@ package security; import dao.UserDAO; -import wherehows.models.User; +import wherehows.models.table.User; import org.apache.commons.lang3.StringUtils; import play.Logger; import play.Play; diff --git a/wherehows-frontend/app/utils/Lineage.java b/wherehows-frontend/app/utils/Lineage.java index 541ab07a6a..5687ecc2c1 100644 --- a/wherehows-frontend/app/utils/Lineage.java +++ b/wherehows-frontend/app/utils/Lineage.java @@ -15,7 +15,7 @@ package utils; import java.util.List; import org.apache.commons.lang3.StringUtils; -import wherehows.models.LineagePathInfo; +import wherehows.models.table.LineagePathInfo; public class Lineage { diff --git a/wherehows-kafka/src/main/java/wherehows/main/ApplicationStart.java b/wherehows-kafka/src/main/java/wherehows/main/ApplicationStart.java index 6ddf493418..c8cf7b48e5 100644 --- a/wherehows-kafka/src/main/java/wherehows/main/ApplicationStart.java +++ b/wherehows-kafka/src/main/java/wherehows/main/ApplicationStart.java @@ -22,7 +22,7 @@ import javax.persistence.EntityManagerFactory; import lombok.extern.slf4j.Slf4j; import org.hibernate.hikaricp.internal.HikariCPConnectionProvider; import wherehows.actors.KafkaConsumerMaster; -import wherehows.dao.ConnectionPoolProperties; +import wherehows.dao.table.ConnectionPoolProperties; import wherehows.dao.DaoFactory; diff --git a/wherehows-kafka/src/main/java/wherehows/service/GobblinTrackingAuditService.java b/wherehows-kafka/src/main/java/wherehows/service/GobblinTrackingAuditService.java index 58e69eb293..30bf444cc8 100644 --- a/wherehows-kafka/src/main/java/wherehows/service/GobblinTrackingAuditService.java +++ b/wherehows-kafka/src/main/java/wherehows/service/GobblinTrackingAuditService.java @@ -25,10 +25,10 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.avro.generic.GenericData; import org.apache.commons.lang3.StringUtils; -import wherehows.dao.DatasetClassificationDao; -import wherehows.dao.DictDatasetDao; -import wherehows.models.DatasetClassification; -import wherehows.models.DictDataset; +import wherehows.dao.table.DatasetClassificationDao; +import wherehows.dao.table.DictDatasetDao; +import wherehows.models.table.DatasetClassification; +import wherehows.models.table.DictDataset; import wherehows.utils.StringUtil; diff --git a/wherehows-kafka/src/main/java/wherehows/service/MetadataChangeService.java b/wherehows-kafka/src/main/java/wherehows/service/MetadataChangeService.java index 938aff00ae..26855c8875 100644 --- a/wherehows-kafka/src/main/java/wherehows/service/MetadataChangeService.java +++ b/wherehows-kafka/src/main/java/wherehows/service/MetadataChangeService.java @@ -24,13 +24,13 @@ import java.util.regex.Pattern; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import wherehows.common.utils.StringUtil; -import wherehows.dao.DatasetSchemaInfoDao; -import wherehows.dao.DictDatasetDao; -import wherehows.dao.FieldDetailDao; -import wherehows.models.DatasetFieldSchema; -import wherehows.models.DatasetSchemaInfo; -import wherehows.models.DictDataset; -import wherehows.models.DictFieldDetail; +import wherehows.dao.table.DatasetSchemaInfoDao; +import wherehows.dao.table.DictDatasetDao; +import wherehows.dao.table.FieldDetailDao; +import wherehows.models.table.DatasetFieldSchema; +import wherehows.models.table.DatasetSchemaInfo; +import wherehows.models.table.DictDataset; +import wherehows.models.table.DictFieldDetail; import wherehows.util.Urn; diff --git a/wherehows-kafka/src/main/java/wherehows/utils/ClusterUtil.java b/wherehows-kafka/src/main/java/wherehows/utils/ClusterUtil.java index f57bd1ce93..e6a9e418fa 100644 --- a/wherehows-kafka/src/main/java/wherehows/utils/ClusterUtil.java +++ b/wherehows-kafka/src/main/java/wherehows/utils/ClusterUtil.java @@ -15,7 +15,7 @@ package wherehows.utils; import java.util.ArrayList; import java.util.List; -import wherehows.models.ClusterInfo; +import wherehows.models.table.ClusterInfo; public class ClusterUtil {