Rename DAO and model into table and view sub-package (#722)

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;
 
 

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 {

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 {

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;

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 {

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;

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 {

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 {

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.*;
 

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 {

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 {

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;
 

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;

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 {
 

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;

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 {

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;
 

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 {
 

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;
 

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;
 

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;
 

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;
 

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;

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 {
 

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;

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 {
 

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 {
 

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;

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 {
 

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 {
 

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;
 

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;

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;

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;

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;

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 {
 

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 {
 

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;
 

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 {
 

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 {
 

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;

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;

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 {
 

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 {
 

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 {
 

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;
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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;

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 {
 

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 {
 

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;

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 {
 

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;
 

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;

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;

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.*;

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();
 

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 {

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");

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();
 

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");

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;

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;

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;

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;
 

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;
 

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;

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;

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

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;

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 {

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;

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
 {

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;

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;

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

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;
 

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
 {

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;

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;
 

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{
 

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;

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<String> getAllScriptTypes()
 	{
 		return getJdbcTemplate().queryForList(GET_SCRIPT_TYPE, String.class);

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;

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.*;

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;
 

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

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
 {

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;

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;

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 {

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;