Moving wherehows-frontend models to wherehows-dao models (#630)

wherehows-dao/build.gradle

@@ -4,4 +4,7 @@ dependencies {
   compile externalDependency.commons_lang3
   compile externalDependency.slf4j_api
   compile externalDependency.spring_jdbc
+  compile externalDependency.jackson_databind
+  compile externalDependency.jackson_core
+  compile externalDependency.jackson_annotations
 }

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class ColumnComment {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class CompanyUser {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 
 public class DashboardBarData {

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 import java.util.List;
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class DashboardOwnerStat {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 import com.fasterxml.jackson.databind.JsonNode;
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 import java.util.List;
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 import java.util.List;
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class DatasetColumnComment {
   public long id;

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class DatasetComment {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 import java.util.List;
 import java.util.Map;

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class DatasetDependency {
 

wherehows-dao/src/main/java/wherehows/models/DatasetFieldEntity.java

@@ -1,4 +1,17 @@
-package models;
+/**
+ * Copyright 2015 LinkedIn Corp. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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;
 
 public class DatasetFieldEntity {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class DatasetInstance {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class DatasetListViewNode {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class DatasetOwner {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 import java.util.List;
 

wherehows-dao/src/main/java/wherehows/models/DatasetPrivacyCompliance.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 models;
+package wherehows.models;
 
 import java.util.List;
 

wherehows-dao/src/main/java/wherehows/models/DatasetSecurity.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 models;
+package wherehows.models;
 
 import java.util.List;
 import java.util.Map;

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class Flow {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class FlowJob {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class FlowListViewNode {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class Group {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class IdpcInfo {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class ImpactDataset {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class JiraTicket {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class Job {
     public Long id;

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class LdapInfo {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class LineageEdge {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class LineageLink {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 import java.util.List;
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class LineagePathInfo {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class Metric {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class MetricListViewNode {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class Project {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class SchemaDataset {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class SchemaHistoryData {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class ScriptInfo {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class ScriptLineage {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class ScriptRuntime {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class SimilarColumns {
   public Long datasetId;

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class SimilarComments {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class TreeNode {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class User {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class UserEntity {
 

wherehows-dao/src/main/java/wherehows/models/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 models;
+package wherehows.models;
 
 public class UserSetting {
 

wherehows-frontend/app/controllers/api/v1/Dataset.java

@@ -23,16 +23,15 @@ import dao.ReturnCode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import models.DatasetCompliance;
-import models.DatasetDependency;
-import models.DatasetPrivacyCompliance;
-import models.DatasetSecurity;
-import models.ImpactDataset;
+import wherehows.models.DatasetCompliance;
+import wherehows.models.DatasetDependency;
+import wherehows.models.DatasetPrivacyCompliance;
+import wherehows.models.DatasetSecurity;
+import wherehows.models.ImpactDataset;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
 import play.Logger;
-import play.Play;
 import play.libs.F.Promise;
 import play.libs.Json;
 import play.mvc.Controller;
@@ -107,7 +106,7 @@ public class Dataset extends Controller
     public static Result getDatasetByID(int id)
     {
         String username = session("user");
-        models.Dataset dataset = DatasetsDAO.getDatasetByID(id, username);
+        wherehows.models.Dataset dataset = DatasetsDAO.getDatasetByID(id, username);
 
         ObjectNode result = Json.newObject();
 

wherehows-frontend/app/controllers/api/v1/Jira.java

@@ -15,16 +15,13 @@ package controllers.api.v1;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import dao.JiraDAO;
-import dao.UserDAO;
-import models.JiraTicket;
-import org.apache.commons.lang3.StringUtils;
+import wherehows.models.JiraTicket;
 import play.libs.Json;
 import play.mvc.Controller;
 import play.mvc.Result;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 public class Jira extends Controller
 {

wherehows-frontend/app/controllers/api/v1/Lineage.java

@@ -15,7 +15,6 @@ package controllers.api.v1;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import dao.DatasetsDAO;
-import dao.FlowsDAO;
 import dao.LineageDAO;
 import play.Play;
 import play.libs.Json;
@@ -39,7 +38,7 @@ public class Lineage extends Controller
             return ok(result);
         }
 
-        models.Dataset dataset = DatasetsDAO.getDatasetByID(id, username);
+        wherehows.models.Dataset dataset = DatasetsDAO.getDatasetByID(id, username);
         if (dataset == null || StringUtils.isBlank(dataset.urn))
         {
             result.put("status", "error");

wherehows-frontend/app/controllers/api/v1/Metric.java

@@ -180,7 +180,7 @@ public class Metric extends Controller
     public static Result getMetricByID(int id)
     {
         String user = session("user");
-        models.Metric metric = MetricsDAO.getMetricByID(id, user);
+        wherehows.models.Metric metric = MetricsDAO.getMetricByID(id, user);
 
         ObjectNode result = Json.newObject();
 

wherehows-frontend/app/controllers/api/v1/User.java

@@ -16,9 +16,9 @@ package controllers.api.v1;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import dao.UserDAO;
 import java.util.List;
-import models.CompanyUser;
-import models.Group;
-import models.UserEntity;
+import wherehows.models.CompanyUser;
+import wherehows.models.Group;
+import wherehows.models.UserEntity;
 import org.apache.commons.lang3.StringUtils;
 import play.cache.Cache;
 import play.libs.Json;
@@ -45,7 +45,7 @@ public class User extends Controller
             return ok(result);
         }
 
-        models.User user = UserDAO.getCurrentUser(username);
+        wherehows.models.User user = UserDAO.getCurrentUser(username);
         if (StringUtils.isBlank(user.userName))
         {
             result.put("status", "failed");

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 models.Dataset;
-import models.FlowJob;
-import models.Metric;
+import wherehows.models.Dataset;
+import wherehows.models.FlowJob;
+import wherehows.models.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 models.ColumnComment;
+import wherehows.models.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 models.DashboardBarData;
-import models.DashboardDataset;
-import models.DashboardOwnerStat;
-import models.LdapInfo;
+import wherehows.models.DashboardBarData;
+import wherehows.models.DashboardDataset;
+import wherehows.models.DashboardOwnerStat;
+import wherehows.models.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 models.DatasetColumnComment;
+import wherehows.models.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 models.DatasetComment;
+import wherehows.models.DatasetComment;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.jdbc.core.RowMapper;
 

wherehows-frontend/app/dao/DatasetOwnerRowMapper.java

@@ -13,7 +13,7 @@
  */
 package dao;
 
-import models.DatasetOwner;
+import wherehows.models.DatasetOwner;
 import org.springframework.jdbc.core.RowMapper;
 import java.sql.ResultSet;
 import java.sql.SQLException;

wherehows-frontend/app/dao/DatasetRowMapper.java

@@ -13,18 +13,16 @@
  */
 package dao;
 
-import models.Dataset;
-import models.User;
+import wherehows.models.Dataset;
+import wherehows.models.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.jdbc.core.RowMapper;
-import play.Logger;
 import play.Play;
 
 import java.sql.Time;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Arrays;
 
 public class DatasetRowMapper implements RowMapper<Dataset>
 {

wherehows-frontend/app/dao/DatasetWithUserRowMapper.java

@@ -13,18 +13,16 @@
  */
 package dao;
 
-import models.Dataset;
-import models.User;
+import wherehows.models.Dataset;
+import wherehows.models.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.jdbc.core.RowMapper;
 import play.Play;
-import play.Logger;
 
 import java.sql.Time;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Arrays;
 
 public class DatasetWithUserRowMapper implements RowMapper<Dataset>
 {

wherehows-frontend/app/dao/DatasetsDAO.java

@@ -43,8 +43,7 @@ import org.springframework.transaction.support.TransactionTemplate;
 import play.Logger;
 import play.Play;
 import play.libs.Json;
-import models.*;
-import wherehows.models.DatasetColumn;
+import wherehows.models.*;
 
 public class DatasetsDAO extends AbstractMySQLOpenSourceDAO
 {

wherehows-frontend/app/dao/FlowRowMapper.java

@@ -13,7 +13,7 @@
  */
 package dao;
 
-import models.Flow;
+import wherehows.models.Flow;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;

wherehows-frontend/app/dao/FlowsDAO.java

@@ -19,7 +19,6 @@ import java.util.Map;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import models.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
@@ -28,6 +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;
 
 public class FlowsDAO extends AbstractMySQLOpenSourceDAO
 {

wherehows-frontend/app/dao/ImpactDatasetRowMapper.java

@@ -13,8 +13,8 @@
  */
 package dao;
 
-import models.ImpactDataset;
-import models.LineagePathInfo;
+import wherehows.models.ImpactDataset;
+import wherehows.models.LineagePathInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.jdbc.core.RowMapper;
 import utils.Lineage;

wherehows-frontend/app/dao/JiraDAO.java

@@ -15,7 +15,8 @@ package dao;
 
 import java.util.*;
 
-import models.*;
+import wherehows.models.JiraTicket;
+import wherehows.models.LdapInfo;
 
 public class JiraDAO extends AbstractMySQLOpenSourceDAO
 {

wherehows-frontend/app/dao/JiraTicketRowMapper.java

@@ -13,11 +13,7 @@
  */
 package dao;
 
-import controllers.api.v1.Jira;
-import models.DatasetComment;
-import models.JiraTicket;
-import models.LdapInfo;
-import org.apache.commons.lang3.StringUtils;
+import wherehows.models.JiraTicket;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;

wherehows-frontend/app/dao/LdapInfoRowMapper.java

@@ -13,9 +13,7 @@
  */
 package dao;
 
-import models.DatasetComment;
-import models.LdapInfo;
-import org.apache.commons.lang3.StringUtils;
+import wherehows.models.LdapInfo;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;

wherehows-frontend/app/dao/LineageDAO.java

@@ -18,7 +18,6 @@ import java.util.*;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import models.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -28,6 +27,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import play.Logger;
 import play.libs.Json;
 import utils.Lineage;
+import wherehows.models.*;
 
 
 public class LineageDAO extends AbstractMySQLOpenSourceDAO

wherehows-frontend/app/dao/MetricRowMapper.java

@@ -13,7 +13,7 @@
  */
 package dao;
 
-import models.Metric;
+import wherehows.models.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 models.MetricListViewNode;
-import models.TreeNode;
+import wherehows.models.MetricListViewNode;
+import wherehows.models.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 models.Metric;
+import wherehows.models.Metric;
 
 public class MetricsDAO extends AbstractMySQLOpenSourceDAO
 {

wherehows-frontend/app/dao/ProjectRowMapper.java

@@ -13,13 +13,11 @@
  */
 package dao;
 
-import models.Project;
+import wherehows.models.Project;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.sql.Date;
 
 public class ProjectRowMapper implements RowMapper<Project>
 {

wherehows-frontend/app/dao/SchemaDatasetRowMapper.java

@@ -13,7 +13,7 @@
  */
 package dao;
 
-import models.SchemaDataset;
+import wherehows.models.SchemaDataset;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.jdbc.core.RowMapper;
 

wherehows-frontend/app/dao/SchemaHistoryDAO.java

@@ -16,7 +16,6 @@ package dao;
 import java.util.List;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import models.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
@@ -25,6 +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;
 
 public class SchemaHistoryDAO extends AbstractMySQLOpenSourceDAO{
 

wherehows-frontend/app/dao/SchemaHistoryDataRowMapper.java

@@ -14,8 +14,7 @@
 package dao;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import models.SchemaDataset;
-import models.SchemaHistoryData;
+import wherehows.models.SchemaHistoryData;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.jdbc.core.RowMapper;
 import play.Logger;
@@ -23,8 +22,6 @@ import play.libs.Json;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Date;
-import java.sql.Time;
 
 public class SchemaHistoryDataRowMapper implements RowMapper<SchemaHistoryData>
 {

wherehows-frontend/app/dao/ScriptFinderDAO.java

@@ -13,7 +13,6 @@
  */
 package dao;
 
-import java.sql.Types;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -21,8 +20,6 @@ import java.util.Map;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.primitives.Ints;
-import models.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -32,6 +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;
 
 public class ScriptFinderDAO extends AbstractMySQLOpenSourceDAO{
 

wherehows-frontend/app/dao/ScriptInfoRowMapper.java

@@ -13,14 +13,11 @@
  */
 package dao;
 
-import models.ScriptInfo;
-import org.apache.commons.lang3.StringUtils;
+import wherehows.models.ScriptInfo;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
 
 public class ScriptInfoRowMapper implements RowMapper<ScriptInfo>
 {

wherehows-frontend/app/dao/ScriptLineageRowMapper.java

@@ -13,7 +13,7 @@
  */
 package dao;
 
-import models.ScriptLineage;
+import wherehows.models.ScriptLineage;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.*;

wherehows-frontend/app/dao/ScriptRuntimeRowMapper.java

@@ -13,7 +13,7 @@
  */
 package dao;
 
-import models.ScriptRuntime;
+import wherehows.models.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 models.*;
-
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import wherehows.models.Dataset;
+import wherehows.models.FlowJob;
+import wherehows.models.Metric;
 
 
 public class SearchDAO extends AbstractMySQLOpenSourceDAO

wherehows-frontend/app/dao/UserDAO.java

@@ -15,10 +15,13 @@ package dao;
 
 import java.util.*;
 
-import models.*;
 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;
 
 public class UserDAO extends AbstractMySQLOpenSourceDAO
 {

wherehows-frontend/app/dao/UserRowMapper.java

@@ -13,8 +13,8 @@
  */
 package dao;
 
-import models.User;
-import models.UserSetting;
+import wherehows.models.User;
+import wherehows.models.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 models.User;
+import wherehows.models.User;
 import org.apache.commons.lang3.StringUtils;
 import play.Logger;
 import play.Play;

wherehows-frontend/app/utils/Lineage.java

@@ -13,19 +13,10 @@
  */
 package utils;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import models.LineagePathInfo;
+import wherehows.models.LineagePathInfo;
 import org.apache.commons.lang3.StringUtils;
 
-import play.Logger;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 public class Lineage
 {