From b584382c65b59b491d4f52aa30b1a5dca444e4c7 Mon Sep 17 00:00:00 2001 From: sureshms Date: Sun, 24 Oct 2021 08:29:03 -0700 Subject: [PATCH] Additional default methods to prevent repository classes having to override the methods --- .../openmetadata/catalog/jdbi3/BotsRepository.java | 10 ---------- .../openmetadata/catalog/jdbi3/ChartRepository.java | 11 ----------- .../catalog/jdbi3/DashboardRepository.java | 11 ----------- .../catalog/jdbi3/DashboardServiceRepository.java | 12 ------------ .../catalog/jdbi3/DatabaseRepository.java | 11 ----------- .../catalog/jdbi3/DatabaseServiceRepository.java | 12 ------------ .../catalog/jdbi3/EntityRepository.java | 13 +++++++++---- .../catalog/jdbi3/MessagingServiceRepository.java | 12 ------------ .../catalog/jdbi3/MetricsRepository.java | 11 ----------- .../openmetadata/catalog/jdbi3/ModelRepository.java | 11 ----------- .../catalog/jdbi3/PipelineRepository.java | 11 ----------- .../catalog/jdbi3/PipelineServiceRepository.java | 12 ------------ .../catalog/jdbi3/ReportRepository.java | 11 ----------- .../openmetadata/catalog/jdbi3/TableRepository.java | 11 ----------- .../openmetadata/catalog/jdbi3/TaskRepository.java | 11 ----------- .../openmetadata/catalog/jdbi3/TeamRepository.java | 11 ----------- .../openmetadata/catalog/jdbi3/TopicRepository.java | 10 ---------- .../openmetadata/catalog/jdbi3/UserRepository.java | 12 +----------- 18 files changed, 10 insertions(+), 193 deletions(-) diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/BotsRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/BotsRepository.java index b97686a9326..25131b81a56 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/BotsRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/BotsRepository.java @@ -47,11 +47,6 @@ public class BotsRepository extends EntityRepository{ return bots; } - @Override - public String getFullyQualifiedName(Bots entity) { - return entity.getName(); - } - @Override public Bots setFields(Bots entity, Fields fields) throws IOException, ParseException { return entity; @@ -60,11 +55,6 @@ public class BotsRepository extends EntityRepository{ @Override public void restorePatchAttributes(Bots original, Bots update) throws IOException, ParseException { } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, int total) throws GeneralSecurityException, UnsupportedEncodingException { - return new BotsList(entities); - } - @Override public EntityInterface getEntityInterface(Bots entity) { return new BotsEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ChartRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ChartRepository.java index 631e23a7f3f..9720f51a488 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ChartRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ChartRepository.java @@ -121,11 +121,6 @@ public class ChartRepository extends EntityRepository { chart.setOwner(owner); } - @Override - public String getFullyQualifiedName(Chart entity) { - return entity.getFullyQualifiedName(); - } - @Override public Chart setFields(Chart chart, Fields fields) throws IOException { chart.setOwner(fields.contains("owner") ? getOwner(chart) : null); @@ -142,12 +137,6 @@ public class ChartRepository extends EntityRepository { .withService(original.getService()).withId(original.getId()); } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, int total) - throws GeneralSecurityException, UnsupportedEncodingException { - return new ResultList<>(entities, beforeCursor, afterCursor, total); - } - @Override public EntityInterface getEntityInterface(Chart entity) { return new ChartEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardRepository.java index 120769b929f..932e83c206f 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardRepository.java @@ -59,17 +59,6 @@ public class DashboardRepository extends EntityRepository { return (dashboard.getService().getName() + "." + dashboard.getName()); } - @Override - public String getFullyQualifiedName(Dashboard entity) { - return entity.getFullyQualifiedName(); - } - - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, - int total) throws GeneralSecurityException, UnsupportedEncodingException { - return new DashboardList(entities, beforeCursor, afterCursor, total); - } - @Override public EntityInterface getEntityInterface(Dashboard entity) { return new DashboardEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardServiceRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardServiceRepository.java index 4789e76b0d9..add59bf71f9 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardServiceRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardServiceRepository.java @@ -70,11 +70,6 @@ public class DashboardServiceRepository extends EntityRepository getResultList(List entities, String beforeCursor, - String afterCursor, int total) - throws GeneralSecurityException, UnsupportedEncodingException { - return new DashboardServiceList(entities); - } - @Override public EntityInterface getEntityInterface(DashboardService entity) { return new DashboardServiceEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseRepository.java index 25c71125857..3caa5614166 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseRepository.java @@ -118,11 +118,6 @@ public class DatabaseRepository extends EntityRepository { return tables; } - @Override - public String getFullyQualifiedName(Database entity) { - return entity.getFullyQualifiedName(); - } - public Database setFields(Database database, Fields fields) throws IOException { database.setOwner(fields.contains("owner") ? getOwner(database) : null); database.setTables(fields.contains("tables") ? getTables(database) : null); @@ -139,12 +134,6 @@ public class DatabaseRepository extends EntityRepository { .withService(original.getService()).withId(original.getId()); } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, - int total) throws GeneralSecurityException, UnsupportedEncodingException { - return new DatabaseList(entities, beforeCursor, afterCursor, total); - } - @Override public EntityInterface getEntityInterface(Database entity) { return new DatabaseEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseServiceRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseServiceRepository.java index 99d52469b72..4a930304acb 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseServiceRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseServiceRepository.java @@ -68,11 +68,6 @@ public class DatabaseServiceRepository extends EntityRepository dao.relationshipDAO().deleteAll(id.toString()); } - @Override - public String getFullyQualifiedName(DatabaseService entity) { - return entity.getName(); - } - @Override public DatabaseService setFields(DatabaseService entity, Fields fields) throws IOException, ParseException { return entity; @@ -84,13 +79,6 @@ public class DatabaseServiceRepository extends EntityRepository } - @Override - public ResultList getResultList(List entities, String beforeCursor, - String afterCursor, int total) - throws GeneralSecurityException, UnsupportedEncodingException { - return new DatabaseServiceList(entities); - } - @Override public EntityInterface getEntityInterface(DatabaseService entity) { return new DatabaseServiceEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/EntityRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/EntityRepository.java index d9ff3e1f586..29b591ec3bc 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/EntityRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/EntityRepository.java @@ -39,14 +39,10 @@ public abstract class EntityRepository { /** * Entity related operations that should be implemented or overridden by entities */ - public abstract String getFullyQualifiedName(T entity); - public abstract ResultList getResultList(List entities, String beforeCursor, String afterCursor, - int total) throws GeneralSecurityException, UnsupportedEncodingException; public abstract EntityInterface getEntityInterface(T entity); public abstract T setFields(T entity, Fields fields) throws IOException, ParseException; public abstract void restorePatchAttributes(T original, T updated) throws IOException, ParseException; - public abstract void validate(T entity) throws IOException; public abstract void store(T entity, boolean update) throws IOException; public abstract void storeRelationships(T entity) throws IOException; @@ -156,6 +152,15 @@ public abstract class EntityRepository { return updated; } + public final String getFullyQualifiedName(T entity) { + return getEntityInterface(entity).getFullyQualifiedName(); + } + + public final ResultList getResultList(List entities, String beforeCursor, String afterCursor, int total) + throws GeneralSecurityException, UnsupportedEncodingException { + return new ResultList<>(entities, beforeCursor, afterCursor, total); + } + private T createInternal(T entity) throws IOException { store(entity, false); storeRelationships(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MessagingServiceRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MessagingServiceRepository.java index 6d775394b44..3aa3e10935e 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MessagingServiceRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MessagingServiceRepository.java @@ -70,11 +70,6 @@ public class MessagingServiceRepository extends EntityRepository getResultList(List entities, String beforeCursor, - String afterCursor, int total) - throws GeneralSecurityException, UnsupportedEncodingException { - return new MessagingServiceList(entities); - } - @Override public EntityInterface getEntityInterface(MessagingService entity) { return new MessagingServiceEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MetricsRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MetricsRepository.java index 74703c71ed0..028e2272765 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MetricsRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MetricsRepository.java @@ -49,11 +49,6 @@ public class MetricsRepository extends EntityRepository { return (metrics.getService().getName() + "." + metrics.getName()); } - @Override - public String getFullyQualifiedName(Metrics entity) { - return entity.getFullyQualifiedName(); - } - @Override public Metrics setFields(Metrics metrics, Fields fields) throws IOException { metrics.setOwner(fields.contains("owner") ? getOwner(metrics) : null); @@ -67,12 +62,6 @@ public class MetricsRepository extends EntityRepository { public void restorePatchAttributes(Metrics original, Metrics updated) throws IOException, ParseException { } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, - int total) throws GeneralSecurityException, UnsupportedEncodingException { - return new MetricsList(entities); - } - @Override public EntityInterface getEntityInterface(Metrics entity) { return new MetricsEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ModelRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ModelRepository.java index 5b8bbab33b1..1cb7ac3db40 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ModelRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ModelRepository.java @@ -91,11 +91,6 @@ public class ModelRepository extends EntityRepository { return EntityUtil.populateOwner(dao.userDAO(), dao.teamDAO(), model.getOwner()); } - @Override - public String getFullyQualifiedName(Model entity) { - return entity.getFullyQualifiedName(); - } - @Override public Model setFields(Model model, Fields fields) throws IOException { model.setDisplayName(model.getDisplayName()); @@ -113,12 +108,6 @@ public class ModelRepository extends EntityRepository { } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, int total) - throws GeneralSecurityException, UnsupportedEncodingException { - return new ModelList(entities, beforeCursor, afterCursor, total); - } - @Override public EntityInterface getEntityInterface(Model entity) { return new ModelEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineRepository.java index 225a8a1c0be..b941405187c 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineRepository.java @@ -89,11 +89,6 @@ public class PipelineRepository extends EntityRepository { return EntityUtil.populateOwner(dao.userDAO(), dao.teamDAO(), pipeline.getOwner()); } - @Override - public String getFullyQualifiedName(Pipeline entity) { - return entity.getFullyQualifiedName(); - } - @Override public Pipeline setFields(Pipeline pipeline, Fields fields) throws IOException { pipeline.setDisplayName(pipeline.getDisplayName()); @@ -115,12 +110,6 @@ public class PipelineRepository extends EntityRepository { .withService(original.getService()).withId(original.getId()); } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, - int total) throws GeneralSecurityException, UnsupportedEncodingException { - return new PipelineList(entities, beforeCursor, afterCursor, total); - } - @Override public EntityInterface getEntityInterface(Pipeline entity) { return new PipelineEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineServiceRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineServiceRepository.java index 6b50c12dce7..07c0ca638d9 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineServiceRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineServiceRepository.java @@ -71,11 +71,6 @@ public class PipelineServiceRepository extends EntityRepository dao.relationshipDAO().deleteAll(id.toString()); } - @Override - public String getFullyQualifiedName(PipelineService entity) { - return entity.getName(); - } - @Override public PipelineService setFields(PipelineService entity, Fields fields) throws IOException, ParseException { return entity; @@ -87,13 +82,6 @@ public class PipelineServiceRepository extends EntityRepository } - @Override - public ResultList getResultList(List entities, String beforeCursor, - String afterCursor, int total) - throws GeneralSecurityException, UnsupportedEncodingException { - return new PipelineServiceList(entities); - } - @Override public EntityInterface getEntityInterface(PipelineService entity) { return new PipelineServiceEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ReportRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ReportRepository.java index 47eabb06dff..e98820b47c1 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ReportRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ReportRepository.java @@ -44,11 +44,6 @@ public class ReportRepository extends EntityRepository { this.dao = dao; } - @Override - public String getFullyQualifiedName(Report entity) { - return entity.getFullyQualifiedName(); - } - @Override public Report setFields(Report report, Fields fields) throws IOException { report.setOwner(fields.contains("owner") ? getOwner(report) : null); @@ -63,12 +58,6 @@ public class ReportRepository extends EntityRepository { } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, int total) - throws GeneralSecurityException, UnsupportedEncodingException { - return new ReportList(entities); - } - @Override public EntityInterface getEntityInterface(Report entity) { return new ReportEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java index e7ca6209acc..5e5ad6e8dfc 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java @@ -81,11 +81,6 @@ public class TableRepository extends EntityRepository { this.dao = dao; } - @Override - public String getFullyQualifiedName(Table entity) { - return entity.getFullyQualifiedName(); - } - @Override public Table setFields(Table table, Fields fields) throws IOException, ParseException { table.setColumns(fields.contains("columns") ? table.getColumns() : null); @@ -111,12 +106,6 @@ public class TableRepository extends EntityRepository
{ .withDatabase(original.getDatabase()).withId(original.getId()); } - @Override - public ResultList
getResultList(List
entities, String beforeCursor, String afterCursor, int total) - throws GeneralSecurityException, UnsupportedEncodingException { - return new TableList(entities, beforeCursor, afterCursor, total); - } - @Override public EntityInterface
getEntityInterface(Table entity) { return new TableEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TaskRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TaskRepository.java index 92f909e2262..b5a5627a7ae 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TaskRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TaskRepository.java @@ -121,11 +121,6 @@ public class TaskRepository extends EntityRepository { task.setOwner(owner); } - @Override - public String getFullyQualifiedName(Task entity) { - return entity.getFullyQualifiedName(); - } - @Override public Task setFields(Task task, Fields fields) throws IOException { task.setTaskUrl(task.getTaskUrl()); @@ -144,12 +139,6 @@ public class TaskRepository extends EntityRepository { } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, int total) - throws GeneralSecurityException, UnsupportedEncodingException { - return new TaskList(entities, beforeCursor, afterCursor, total); - } - @Override public EntityInterface getEntityInterface(Task entity) { return new TaskEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TeamRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TeamRepository.java index e5577013404..3cff41faa6c 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TeamRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TeamRepository.java @@ -86,11 +86,6 @@ public class TeamRepository extends EntityRepository { } } - @Override - public String getFullyQualifiedName(Team entity) { - return entity.getName(); - } - @Override public Team setFields(Team team, Fields fields) throws IOException { if (!fields.contains("profile")) { @@ -107,12 +102,6 @@ public class TeamRepository extends EntityRepository { updated.withName(original.getName()).withId(original.getId()); } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, int total) - throws GeneralSecurityException, UnsupportedEncodingException { - return new TeamList(entities, beforeCursor, afterCursor, total); - } - @Override public EntityInterface getEntityInterface(Team entity) { return new TeamEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TopicRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TopicRepository.java index 8bfd0924e73..e42628c36e9 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TopicRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TopicRepository.java @@ -124,11 +124,6 @@ public class TopicRepository extends EntityRepository { topic.setOwner(owner); } - @Override - public String getFullyQualifiedName(Topic entity) { - return entity.getFullyQualifiedName(); - } - @Override public Topic setFields(Topic topic, Fields fields) throws IOException { topic.setOwner(fields.contains("owner") ? getOwner(topic) : null); @@ -143,11 +138,6 @@ public class TopicRepository extends EntityRepository { } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, int total) throws GeneralSecurityException, UnsupportedEncodingException { - return new TopicList(entities, beforeCursor, afterCursor, total); - } - @Override public EntityInterface getEntityInterface(Topic entity) { return new TopicEntityInterface(entity); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java index 75b840d02f0..db54c2f2031 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java @@ -60,17 +60,12 @@ public class UserRepository extends EntityRepository { this.dao = dao; } - @Override - public ResultList getResultList(List entities, String beforeCursor, String afterCursor, - int total) throws GeneralSecurityException, UnsupportedEncodingException { - return new UserList(entities, beforeCursor, afterCursor, total); - } - @Override public EntityInterface getEntityInterface(User entity) { return new UserEntityInterface(entity); } + @Override public void validate(User entity) throws IOException { @@ -122,11 +117,6 @@ public class UserRepository extends EntityRepository { dao.relationshipDAO().deleteFrom(id.toString(), FOLLOWS.ordinal()); } - @Override - public String getFullyQualifiedName(User entity) { - return entity.getName(); - } - @Override public User setFields(User user, Fields fields) throws IOException { user.setProfile(fields.contains("profile") ? user.getProfile() : null);