yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2026-01-07 13:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change RepositoryHelper class name to Repository

Browse Source
This commit is contained in:
sureshms 2021-10-22 09:42:51 -07:00
parent 934824d2cd
commit 4bbc9e7ce5
51 changed files with 163 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/CatalogHealthCheck.java
View File

@ -19,7 +19,7 @@ package org.openmetadata.catalog;
import com.codahale.metrics.health.HealthCheck;
import org.jdbi.v3.core.Jdbi;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.UserRepositoryHelper;
import org.openmetadata.catalog.jdbi3.UserRepository;
import org.openmetadata.catalog.util.EntityUtil;
import java.io.IOException;
@ -27,19 +27,19 @@ import java.io.IOException;
import static org.openmetadata.catalog.resources.teams.UserResource.FIELD_LIST;
public class CatalogHealthCheck extends HealthCheck {
private final UserRepositoryHelper userRepositoryHelper;
private final UserRepository userRepository;
private final EntityUtil.Fields fields = new EntityUtil.Fields(FIELD_LIST, "profile");
public CatalogHealthCheck(CatalogApplicationConfig config, Jdbi jdbi) {
super();
CollectionDAO repo = jdbi.onDemand(CollectionDAO.class);
this.userRepositoryHelper = new UserRepositoryHelper(repo);
this.userRepository = new UserRepository(repo);
}
@Override
protected Result check() throws Exception {
try {
userRepositoryHelper.listAfter(fields, null, 1, "");
userRepository.listAfter(fields, null, 1, "");
return Result.healthy();
} catch (IOException e) {
return Result.unhealthy(e.getMessage());

4
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/BotsRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/BotsRepository.java
View File

@ -24,9 +24,9 @@ import org.openmetadata.catalog.util.JsonUtils;
import java.io.IOException;
import java.util.List;
public class BotsRepositoryHelper {
public class BotsRepository {
public BotsRepositoryHelper(CollectionDAO repo3) { this.repo3 = repo3; }
public BotsRepository(CollectionDAO repo3) { this.repo3 = repo3; }
private final CollectionDAO repo3;

4
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ChartRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ChartRepository.java
View File

@ -46,11 +46,11 @@ import java.util.UUID;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class ChartRepositoryHelper extends EntityRepository<Chart>{
public class ChartRepository extends EntityRepository<Chart>{
private static final Fields CHART_UPDATE_FIELDS = new Fields(ChartResource.FIELD_LIST, "owner");
private static final Fields CHART_PATCH_FIELDS = new Fields(ChartResource.FIELD_LIST, "owner,service,tags");
public ChartRepositoryHelper(CollectionDAO repo3) {
public ChartRepository(CollectionDAO repo3) {
super(Chart.class, repo3.chartDAO());
this.repo3 = repo3;
}

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/CollectionDAO.java
View File

@ -175,7 +175,7 @@ public interface CollectionDAO {
// Find to operations
//
@SqlQuery("SELECT toId, toEntity FROM entity_relationship WHERE fromId = :fromId AND relation = :relation")
@RegisterRowMapper(ToEntityReferenceMapper3.class)
@RegisterRowMapper(ToEntityReferenceMapper.class)
List<EntityReference> findTo(@Bind("fromId") String fromId, @Bind("relation") int relation);
@SqlQuery("SELECT toId FROM entity_relationship WHERE " +
@ -197,12 +197,12 @@ public interface CollectionDAO {
@SqlQuery("SELECT fromId, fromEntity FROM entity_relationship WHERE toId = :toId AND relation = :relation " +
"ORDER BY fromId")
@RegisterRowMapper(FromEntityReferenceMapper3.class)
@RegisterRowMapper(FromEntityReferenceMapper.class)
List<EntityReference> findFrom(@Bind("toId") String toId, @Bind("relation") int relation);
@SqlQuery("SELECT fromId, fromEntity FROM entity_relationship WHERE toId = :toId AND relation = :relation AND " +
"fromEntity = :fromEntity ORDER BY fromId")
@RegisterRowMapper(FromEntityReferenceMapper3.class)
@RegisterRowMapper(FromEntityReferenceMapper.class)
List<EntityReference> findFromEntity(@Bind("toId") String toId, @Bind("relation") int relation,
@Bind("fromEntity") String fromEntity);

4
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardRepository.java
View File

@ -49,13 +49,13 @@ import java.util.UUID;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class DashboardRepositoryHelper extends EntityRepository<Dashboard> {
public class DashboardRepository extends EntityRepository<Dashboard> {
private static final Fields DASHBOARD_UPDATE_FIELDS = new Fields(DashboardResource.FIELD_LIST,
"owner,service,tags,charts");
private static final Fields DASHBOARD_PATCH_FIELDS = new Fields(DashboardResource.FIELD_LIST,
"owner,service,tags,charts");
public DashboardRepositoryHelper(CollectionDAO repo3) {
public DashboardRepository(CollectionDAO repo3) {
super(Dashboard.class, repo3.dashboardDAO());
this.repo3 = repo3;
}

4
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardServiceRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DashboardServiceRepository.java
View File

@ -38,10 +38,10 @@ import java.util.List;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class DashboardServiceRepositoryHelper extends EntityRepository<DashboardService> {
public class DashboardServiceRepository extends EntityRepository<DashboardService> {
private final CollectionDAO repo3;
public DashboardServiceRepositoryHelper(CollectionDAO repo3) {
public DashboardServiceRepository(CollectionDAO repo3) {
super(DashboardService.class, repo3.dashboardServiceDAO());
this.repo3 = repo3;
}

7
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseRepository.java
View File

@ -42,7 +42,6 @@ import javax.ws.rs.core.Response.Status;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -51,13 +50,13 @@ import java.util.UUID;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class DatabaseRepositoryHelper extends EntityRepository<Database> {
private static final Logger LOG = LoggerFactory.getLogger(DatabaseRepositoryHelper.class);
public class DatabaseRepository extends EntityRepository<Database> {
private static final Logger LOG = LoggerFactory.getLogger(DatabaseRepository.class);
private static final Fields DATABASE_UPDATE_FIELDS = new Fields(DatabaseResource.FIELD_LIST, "owner");
private static final Fields DATABASE_PATCH_FIELDS = new Fields(DatabaseResource.FIELD_LIST,
"owner,service, usageSummary");
public DatabaseRepositoryHelper(CollectionDAO repo3) {
public DatabaseRepository(CollectionDAO repo3) {
super(Database.class, repo3.databaseDAO());
this.repo3 = repo3;
}

4
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseServiceRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/DatabaseServiceRepository.java
View File

@ -38,10 +38,10 @@ import java.util.List;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class DatabaseServiceRepositoryHelper extends EntityRepository<DatabaseService> {
public class DatabaseServiceRepository extends EntityRepository<DatabaseService> {
private final CollectionDAO repo3;
public DatabaseServiceRepositoryHelper(CollectionDAO repo3) {
public DatabaseServiceRepository(CollectionDAO repo3) {
super(DatabaseService.class, repo3.dbServiceDAO());
this.repo3 = repo3;
}

4
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/FeedRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/FeedRepository.java
View File

@ -35,8 +35,8 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
public class FeedRepositoryHelper {
public FeedRepositoryHelper(CollectionDAO repo3) { this.repo3 = repo3; }
public class FeedRepository {
public FeedRepository(CollectionDAO repo3) { this.repo3 = repo3; }
private final CollectionDAO repo3;

2
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/FromEntityReferenceMapper3.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/FromEntityReferenceMapper.java
View File

@ -23,7 +23,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.UUID;
public class FromEntityReferenceMapper3 implements RowMapper<EntityReference> {
public class FromEntityReferenceMapper implements RowMapper<EntityReference> {
@Override
public EntityReference map(ResultSet rs, org.jdbi.v3.core.statement.StatementContext ctx) throws SQLException {
return new EntityReference().withId(UUID.fromString(rs.getString("fromId")))

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/LineageRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/LineageRepository.java
View File

@ -33,10 +33,10 @@ import java.util.stream.Collectors;
import static org.openmetadata.catalog.util.EntityUtil.getEntityReference;
public class LineageRepositoryHelper {
private static final Logger LOG = LoggerFactory.getLogger(LineageRepositoryHelper.class);
public class LineageRepository {
private static final Logger LOG = LoggerFactory.getLogger(LineageRepository.class);
public LineageRepositoryHelper(CollectionDAO repo3) { this.repo3 = repo3; }
public LineageRepository(CollectionDAO repo3) { this.repo3 = repo3; }
private final CollectionDAO repo3;

4
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MessagingServiceRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MessagingServiceRepository.java
View File

@ -37,10 +37,10 @@ import java.util.List;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class MessagingServiceRepositoryHelper extends EntityRepository<MessagingService> {
public class MessagingServiceRepository extends EntityRepository<MessagingService> {
private final CollectionDAO repo3;
public MessagingServiceRepositoryHelper(CollectionDAO repo3) {
public MessagingServiceRepository(CollectionDAO repo3) {
super(MessagingService.class, repo3.messagingServiceDAO());
this.repo3 = repo3;
}

4
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MetricsRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MetricsRepository.java
View File

@ -40,10 +40,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
public class MetricsRepositoryHelper extends EntityRepository<Metrics> {
public class MetricsRepository extends EntityRepository<Metrics> {
private static final Fields METRICS_UPDATE_FIELDS = new Fields(MetricsResource.FIELD_LIST, "owner,service");
public MetricsRepositoryHelper(CollectionDAO repo3) {
public MetricsRepository(CollectionDAO repo3) {
super(Metrics.class, repo3.metricsDAO());
this.repo3 = repo3;
}

12
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ModelRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ModelRepository.java
View File

@ -32,7 +32,6 @@ import org.openmetadata.catalog.util.EntityUtil.Fields;
import org.openmetadata.catalog.util.JsonUtils;
import org.openmetadata.catalog.util.RestUtil.PutResponse;
import org.openmetadata.catalog.util.ResultList;
import org.openmetadata.common.utils.CipherText;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -41,21 +40,20 @@ import javax.ws.rs.core.Response.Status;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class ModelRepositoryHelper extends EntityRepository<Model> {
private static final Logger LOG = LoggerFactory.getLogger(ModelRepositoryHelper.class);
public class ModelRepository extends EntityRepository<Model> {
private static final Logger LOG = LoggerFactory.getLogger(ModelRepository.class);
private static final Fields MODEL_UPDATE_FIELDS = new Fields(ModelResource.FIELD_LIST,
"owner,dashboard,tags");
private static final Fields MODEL_PATCH_FIELDS = new Fields(ModelResource.FIELD_LIST,
"owner,dashboard,tags");
public ModelRepositoryHelper(CollectionDAO repo3) {
public ModelRepository(CollectionDAO repo3) {
super(Model.class, repo3.modelDAO());
this.repo3 = repo3;
}
@ -200,7 +198,7 @@ public class ModelRepositoryHelper extends EntityRepository<Model> {
updated.withFullyQualifiedName(original.getFullyQualifiedName()).withName(original.getName())
.withId(original.getId());
validateRelationships(updated);
ModelRepositoryHelper.ModelUpdater modelUpdater = new ModelRepositoryHelper.ModelUpdater(original, updated, true);
ModelRepository.ModelUpdater modelUpdater = new ModelRepository.ModelUpdater(original, updated, true);
modelUpdater.updateAll();
modelUpdater.store();
}
@ -315,7 +313,7 @@ public class ModelRepositoryHelper extends EntityRepository<Model> {
final Model updated;
public ModelUpdater(Model orig, Model updated, boolean patchOperation) {
super(new ModelRepositoryHelper.ModelEntityInterface(orig), new ModelRepositoryHelper.ModelEntityInterface(updated), patchOperation, repo3.relationshipDAO(),
super(new ModelRepository.ModelEntityInterface(orig), new ModelRepository.ModelEntityInterface(updated), patchOperation, repo3.relationshipDAO(),
repo3.tagDAO());
this.orig = orig;
this.updated = updated;

9
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineRepository.java
View File

@ -33,7 +33,6 @@ import org.openmetadata.catalog.util.EntityUtil;
import org.openmetadata.catalog.util.EntityUtil.Fields;
import org.openmetadata.catalog.util.RestUtil.PutResponse;
import org.openmetadata.catalog.util.ResultList;
import org.openmetadata.common.utils.CipherText;
import javax.json.JsonPatch;
import javax.ws.rs.core.Response.Status;
@ -48,13 +47,13 @@ import java.util.UUID;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class PipelineRepositoryHelper extends EntityRepository<Pipeline> {
public class PipelineRepository extends EntityRepository<Pipeline> {
private static final Fields PIPELINE_UPDATE_FIELDS = new Fields(PipelineResource.FIELD_LIST,
"owner,service,tags,tasks");
private static final Fields PIPELINE_PATCH_FIELDS = new Fields(PipelineResource.FIELD_LIST,
"owner,service,tags,tasks");
public PipelineRepositoryHelper(CollectionDAO repo3) {
public PipelineRepository(CollectionDAO repo3) {
super(Pipeline.class, repo3.pipelineDAO());
this.repo3 = repo3;
}
@ -229,7 +228,7 @@ public class PipelineRepositoryHelper extends EntityRepository<Pipeline> {
updated.withFullyQualifiedName(original.getFullyQualifiedName()).withName(original.getName())
.withService(original.getService()).withId(original.getId());
validateRelationships(updated);
PipelineRepositoryHelper.PipelineUpdater pipelineUpdater = new PipelineRepositoryHelper.PipelineUpdater(original, updated, true);
PipelineRepository.PipelineUpdater pipelineUpdater = new PipelineRepository.PipelineUpdater(original, updated, true);
pipelineUpdater.updateAll();
pipelineUpdater.store();
}
@ -372,7 +371,7 @@ public class PipelineRepositoryHelper extends EntityRepository<Pipeline> {
final Pipeline updated;
public PipelineUpdater(Pipeline orig, Pipeline updated, boolean patchOperation) {
super(new PipelineRepositoryHelper.PipelineEntityInterface(orig), new PipelineRepositoryHelper.PipelineEntityInterface(updated), patchOperation, repo3.relationshipDAO(),
super(new PipelineRepository.PipelineEntityInterface(orig), new PipelineRepository.PipelineEntityInterface(updated), patchOperation, repo3.relationshipDAO(),
repo3.tagDAO());
this.orig = orig;
this.updated = updated;

4
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineServiceRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/PipelineServiceRepository.java
View File

@ -38,8 +38,8 @@ import java.util.List;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class PipelineServiceRepositoryHelper extends EntityRepository<PipelineService> {
public PipelineServiceRepositoryHelper(CollectionDAO repo3) {
public class PipelineServiceRepository extends EntityRepository<PipelineService> {
public PipelineServiceRepository(CollectionDAO repo3) {
super(PipelineService.class, repo3.pipelineServiceDAO());
this.repo3 = repo3;
}

4
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ReportRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ReportRepository.java
View File

@ -36,10 +36,10 @@ import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.List;
public class ReportRepositoryHelper extends EntityRepository<Report>{
public class ReportRepository extends EntityRepository<Report>{
private static final Fields REPORT_UPDATE_FIELDS = new Fields(ReportResource.FIELD_LIST, "owner,service");
public ReportRepositoryHelper(CollectionDAO repo3) {
public ReportRepository(CollectionDAO repo3) {
super(Report.class, repo3.reportDAO());
this.repo3 = repo3;
}

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java
View File

@ -71,8 +71,8 @@ import java.util.UUID;
import static org.openmetadata.catalog.jdbi3.Relationship.JOINED_WITH;
import static org.openmetadata.common.utils.CommonUtil.parseDate;
public class TableRepositoryHelper extends EntityRepository<Table> {
static final Logger LOG = LoggerFactory.getLogger(TableRepositoryHelper.class);
public class TableRepository extends EntityRepository<Table> {
static final Logger LOG = LoggerFactory.getLogger(TableRepository.class);
// Table fields that can be patched in a PATCH request
static final Fields TABLE_PATCH_FIELDS = new Fields(TableResource.FIELD_LIST,
"owner,columns,database,tags,tableConstraints");
@ -80,7 +80,7 @@ public class TableRepositoryHelper extends EntityRepository<Table> {
static final Fields TABLE_UPDATE_FIELDS = new Fields(TableResource.FIELD_LIST,
"owner,columns,database,tags,tableConstraints");
public TableRepositoryHelper(CollectionDAO repo3) {
public TableRepository(CollectionDAO repo3) {
super(Table.class, repo3.tableDAO());
this.repo3 = repo3;
}

2
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TagDAO.java
View File

@ -4,7 +4,7 @@ import org.jdbi.v3.sqlobject.config.RegisterRowMapper;
import org.jdbi.v3.sqlobject.customizer.Bind;
import org.jdbi.v3.sqlobject.statement.SqlQuery;
import org.jdbi.v3.sqlobject.statement.SqlUpdate;
import org.openmetadata.catalog.jdbi3.TagRepositoryHelper.TagLabelMapper;
import org.openmetadata.catalog.jdbi3.TagRepository.TagLabelMapper;
import org.openmetadata.catalog.type.TagLabel;
import java.util.List;

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TagRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TagRepository.java
View File

@ -37,10 +37,10 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
public class TagRepositoryHelper {
public static final Logger LOG = LoggerFactory.getLogger(TagRepositoryHelper.class);
public class TagRepository {
public static final Logger LOG = LoggerFactory.getLogger(TagRepository.class);
public TagRepositoryHelper(CollectionDAO repo3) { this.repo3 = repo3; }
public TagRepository(CollectionDAO repo3) { this.repo3 = repo3; }
private final CollectionDAO repo3;

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TaskRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TaskRepository.java
View File

@ -33,14 +33,12 @@ import org.openmetadata.catalog.util.EntityUtil.Fields;
import org.openmetadata.catalog.util.JsonUtils;
import org.openmetadata.catalog.util.RestUtil.PutResponse;
import org.openmetadata.catalog.util.ResultList;
import org.openmetadata.common.utils.CipherText;
import javax.json.JsonPatch;
import javax.ws.rs.core.Response.Status;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@ -48,7 +46,7 @@ import java.util.UUID;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class TaskRepositoryHelper extends EntityRepository<Task>{
public class TaskRepository extends EntityRepository<Task>{
private static final Fields TASK_UPDATE_FIELDS = new Fields(TaskResource.FIELD_LIST, "owner," +
"taskConfig,tags,downstreamTasks");
private static final Fields TASK_PATCH_FIELDS = new Fields(TaskResource.FIELD_LIST, "owner,service,tags");
@ -57,7 +55,7 @@ public class TaskRepositoryHelper extends EntityRepository<Task>{
return (task.getService().getName() + "." + task.getName());
}
public TaskRepositoryHelper(CollectionDAO repo3) {
public TaskRepository(CollectionDAO repo3) {
super(Task.class,repo3.taskDAO());
this.repo3 = repo3;
}
@ -291,7 +289,7 @@ public class TaskRepositoryHelper extends EntityRepository<Task>{
final Task updated;
public TaskUpdater(Task orig, Task updated, boolean patchOperation) {
super(new TaskRepositoryHelper.TaskEntityInterface(orig), new TaskRepositoryHelper.TaskEntityInterface(updated), patchOperation, repo3.relationshipDAO(),
super(new TaskRepository.TaskEntityInterface(orig), new TaskRepository.TaskEntityInterface(updated), patchOperation, repo3.relationshipDAO(),
repo3.tagDAO());
this.orig = orig;
this.updated = updated;

9
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TeamRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TeamRepository.java
View File

@ -32,7 +32,6 @@ import org.openmetadata.catalog.util.EntityUtil;
import org.openmetadata.catalog.util.EntityUtil.Fields;
import org.openmetadata.catalog.util.JsonUtils;
import org.openmetadata.catalog.util.ResultList;
import org.openmetadata.common.utils.CipherText;
import javax.json.JsonPatch;
import java.io.IOException;
@ -47,10 +46,10 @@ import java.util.UUID;
import static org.openmetadata.catalog.jdbi3.Relationship.OWNS;
public class TeamRepositoryHelper extends EntityRepository<Team> {
public class TeamRepository extends EntityRepository<Team> {
static final Fields TEAM_PATCH_FIELDS = new Fields(TeamResource.FIELD_LIST, "profile,users");
public TeamRepositoryHelper(CollectionDAO repo3) {
public TeamRepository(CollectionDAO repo3) {
super(Team.class,repo3.teamDAO());
this.repo3 = repo3;
}
@ -129,7 +128,7 @@ public class TeamRepositoryHelper extends EntityRepository<Team> {
// Patch can't make changes to following fields. Ignore the changes
updated.withName(original.getName()).withId(original.getId());
validateRelationships(updated, EntityUtil.getIDList(updated.getUsers()));
TeamRepositoryHelper.TeamUpdater teamUpdater = new TeamRepositoryHelper.TeamUpdater(original, updated, true);
TeamRepository.TeamUpdater teamUpdater = new TeamRepository.TeamUpdater(original, updated, true);
teamUpdater.updateAll();
teamUpdater.store();
}
@ -233,7 +232,7 @@ public class TeamRepositoryHelper extends EntityRepository<Team> {
final Team updated;
public TeamUpdater(Team orig, Team updated, boolean patchOperation) {
super(new TeamRepositoryHelper.TeamEntityInterface(orig), new TeamRepositoryHelper.TeamEntityInterface(updated),
super(new TeamRepository.TeamEntityInterface(orig), new TeamRepository.TeamEntityInterface(updated),
patchOperation, repo3.relationshipDAO(), null);
this.orig = orig;
this.updated = updated;

2
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ToEntityReferenceMapper3.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ToEntityReferenceMapper.java
View File

@ -23,7 +23,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.UUID;
public class ToEntityReferenceMapper3 implements RowMapper<EntityReference> {
public class ToEntityReferenceMapper implements RowMapper<EntityReference> {
@Override
public EntityReference map(ResultSet rs, org.jdbi.v3.core.statement.StatementContext ctx) throws SQLException {
return new EntityReference().withId(UUID.fromString(rs.getString("toId"))).withType(rs.getString("toEntity"));

7
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TopicRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TopicRepository.java
View File

@ -41,7 +41,6 @@ import javax.ws.rs.core.Response.Status;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;
import java.text.ParseException;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@ -49,8 +48,8 @@ import java.util.UUID;
import static org.openmetadata.catalog.exception.CatalogExceptionMessage.entityNotFound;
public class TopicRepositoryHelper extends EntityRepository<Topic> {
private static final Logger LOG = LoggerFactory.getLogger(TopicRepositoryHelper.class);
public class TopicRepository extends EntityRepository<Topic> {
private static final Logger LOG = LoggerFactory.getLogger(TopicRepository.class);
private static final Fields TOPIC_UPDATE_FIELDS = new Fields(TopicResource.FIELD_LIST, "owner,tags");
private static final Fields TOPIC_PATCH_FIELDS = new Fields(TopicResource.FIELD_LIST, "owner,service,tags");
@ -58,7 +57,7 @@ public class TopicRepositoryHelper extends EntityRepository<Topic> {
return (topic.getService().getName() + "." + topic.getName());
}
public TopicRepositoryHelper(CollectionDAO repo3) {
public TopicRepository(CollectionDAO repo3) {
super(Topic.class, repo3.topicDAO());
this.repo3 = repo3;
}

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UsageRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UsageRepository.java
View File

@ -37,10 +37,10 @@ import java.util.UUID;
import static org.openmetadata.catalog.util.EntityUtil.getEntityReference;
public class UsageRepositoryHelper {
private static final Logger LOG = LoggerFactory.getLogger(UsageRepositoryHelper.class);
public class UsageRepository {
private static final Logger LOG = LoggerFactory.getLogger(UsageRepository.class);
public UsageRepositoryHelper(CollectionDAO repo3) { this.repo3 = repo3; }
public UsageRepository(CollectionDAO repo3) { this.repo3 = repo3; }
private final CollectionDAO repo3;

10
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepositoryHelper.java → catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java
View File

@ -53,15 +53,15 @@ import static org.openmetadata.catalog.jdbi3.Relationship.CONTAINS;
import static org.openmetadata.catalog.jdbi3.Relationship.FOLLOWS;
import static org.openmetadata.catalog.jdbi3.Relationship.OWNS;
public class UserRepositoryHelper extends EntityRepository<User> {
public static final Logger LOG = LoggerFactory.getLogger(UserRepositoryHelper.class);
public class UserRepository extends EntityRepository<User> {
public static final Logger LOG = LoggerFactory.getLogger(UserRepository.class);
static final Fields USER_PATCH_FIELDS = new Fields(UserResource.FIELD_LIST, "profile,teams");
static final Fields USER_UPDATE_FIELDS = new Fields(UserResource.FIELD_LIST, "profile,teams");
private final CollectionDAO repo3;
public UserRepositoryHelper(CollectionDAO repo3) {
public UserRepository(CollectionDAO repo3) {
super(User.class,repo3.userDAO());
this.repo3 = repo3;
}
@ -155,7 +155,7 @@ public class UserRepositoryHelper extends EntityRepository<User> {
// Patch can't make changes to following fields. Ignore the changes
updated.withName(original.getName()).withId(original.getId());
validateRelationships(updated, teamIds);
UserRepositoryHelper.UserUpdater userUpdater = new UserRepositoryHelper.UserUpdater(original, updated, true);
UserRepository.UserUpdater userUpdater = new UserRepository.UserUpdater(original, updated, true);
userUpdater.updateAll();
userUpdater.store();
}
@ -325,7 +325,7 @@ public class UserRepositoryHelper extends EntityRepository<User> {
final User updated;
public UserUpdater(User orig, User updated, boolean patchOperation) {
super(new UserRepositoryHelper.UserEntityInterface(orig), new UserRepositoryHelper.UserEntityInterface(updated),
super(new UserRepository.UserEntityInterface(orig), new UserRepository.UserEntityInterface(updated),
patchOperation, repo3.relationshipDAO(), null);
this.orig = orig;
this.updated = updated;

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/bots/BotsResource.java
View File

@ -24,7 +24,7 @@ import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.entity.Bots;
import org.openmetadata.catalog.jdbi3.BotsRepositoryHelper;
import org.openmetadata.catalog.jdbi3.BotsRepository;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
@ -59,7 +59,7 @@ import java.util.UUID;
@Collection(name = "bots")
public class BotsResource {
public static final String COLLECTION_PATH = "/v1/bots/";
private final BotsRepositoryHelper dao;
private final BotsRepository dao;
private final CatalogAuthorizer authorizer;
private static List<Bots> addHref(UriInfo uriInfo, List<Bots> bots) {
@ -75,7 +75,7 @@ public class BotsResource {
@Inject
public BotsResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "CollectionDAO must not be null");
this.dao = new BotsRepositoryHelper(dao);
this.dao = new BotsRepository(dao);
this.authorizer = authorizer;
}

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/charts/ChartResource.java
View File

@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateChart;
import org.openmetadata.catalog.entity.data.Chart;
import org.openmetadata.catalog.jdbi3.ChartRepositoryHelper;
import org.openmetadata.catalog.jdbi3.ChartRepository;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
@ -82,7 +82,7 @@ import java.util.UUID;
public class ChartResource {
private static final Logger LOG = LoggerFactory.getLogger(ChartResource.class);
private static final String CHART_COLLECTION_PATH = "v1/charts/";
private final ChartRepositoryHelper dao;
private final ChartRepository dao;
private final CatalogAuthorizer authorizer;
public static void addHref(UriInfo uriInfo, EntityReference ref) {
@ -106,7 +106,7 @@ public class ChartResource {
@Inject
public ChartResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "CollectionDAO must not be null");
this.dao = new ChartRepositoryHelper(dao);
this.dao = new ChartRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/dashboards/DashboardResource.java
View File

@ -29,7 +29,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateDashboard;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.DashboardRepositoryHelper;
import org.openmetadata.catalog.jdbi3.DashboardRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -79,7 +79,7 @@ import java.util.UUID;
@Collection(name = "dashboards")
public class DashboardResource {
public static final String DASHBOARD_COLLECTION_PATH = "v1/dashboards/";
private final DashboardRepositoryHelper dao;
private final DashboardRepository dao;
private final CatalogAuthorizer authorizer;
public static void addHref(UriInfo uriInfo, EntityReference ref) {
@ -104,8 +104,8 @@ public class DashboardResource {
@Inject
public DashboardResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "DashboardRepositoryHelper must not be null");
this.dao = new DashboardRepositoryHelper(dao);
Objects.requireNonNull(dao, "DashboardRepository must not be null");
this.dao = new DashboardRepository(dao);
this.authorizer = authorizer;
}

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/DatabaseResource.java
View File

@ -29,7 +29,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateDatabase;
import org.openmetadata.catalog.entity.data.Database;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.DatabaseRepositoryHelper;
import org.openmetadata.catalog.jdbi3.DatabaseRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -82,7 +82,7 @@ import java.util.UUID;
public class DatabaseResource {
private static final Logger LOG = LoggerFactory.getLogger(DatabaseResource.class);
private static final String DATABASE_COLLECTION_PATH = "v1/databases/";
private final DatabaseRepositoryHelper dao;
private final DatabaseRepository dao;
private final CatalogAuthorizer authorizer;
public static List<Database> addHref(UriInfo uriInfo, List<Database> databases) {
@ -109,7 +109,7 @@ public class DatabaseResource {
@Inject
public DatabaseResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "CollectionDAO must not be null");
this.dao = new DatabaseRepositoryHelper(dao);
this.dao = new DatabaseRepository(dao);
this.authorizer = authorizer;
}

6
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/databases/TableResource.java
View File

@ -29,7 +29,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateTable;
import org.openmetadata.catalog.entity.data.Table;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.TableRepositoryHelper;
import org.openmetadata.catalog.jdbi3.TableRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -84,7 +84,7 @@ import java.util.UUID;
public class TableResource {
private static final Logger LOG = LoggerFactory.getLogger(TableResource.class);
private static final String TABLE_COLLECTION_PATH = "v1/tables/";
private final TableRepositoryHelper dao;
private final TableRepository dao;
private final CatalogAuthorizer authorizer;
public static void addHref(UriInfo uriInfo, EntityReference ref) {
@ -104,7 +104,7 @@ public class TableResource {
@Inject
public TableResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "CollectionDAO must not be null");
this.dao = new TableRepositoryHelper(dao);
this.dao = new TableRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java
View File

@ -26,7 +26,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.feed.CreateThread;
import org.openmetadata.catalog.entity.feed.Thread;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.FeedRepositoryHelper;
import org.openmetadata.catalog.jdbi3.FeedRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.type.Post;
@ -59,7 +59,7 @@ import java.util.UUID;
public class FeedResource {
// TODO add /v1/feed?user=userid
public static final String COLLECTION_PATH = "/v1/feed/";
private final FeedRepositoryHelper dao;
private final FeedRepository dao;
public static List<Thread> addHref(UriInfo uriInfo, List<Thread> threads) {
threads.forEach(t -> addHref(uriInfo, t));
@ -73,8 +73,8 @@ public class FeedResource {
@Inject
public FeedResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "FeedRepositoryHelper must not be null");
this.dao = new FeedRepositoryHelper(dao);
Objects.requireNonNull(dao, "FeedRepository must not be null");
this.dao = new FeedRepository(dao);
}
static class ThreadList extends ResultList<Thread> {

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/lineage/LineageResource.java
View File

@ -25,7 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.lineage.AddLineage;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.LineageRepositoryHelper;
import org.openmetadata.catalog.jdbi3.LineageRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.resources.teams.UserResource;
import org.openmetadata.catalog.security.CatalogAuthorizer;
@ -60,12 +60,12 @@ import java.util.Objects;
@Collection(name = "lineage")
public class LineageResource {
private static final Logger LOG = LoggerFactory.getLogger(UserResource.class);
private final LineageRepositoryHelper dao;
private final LineageRepository dao;
@Inject
public LineageResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "LineageRepositoryHelper must not be null");
this.dao = new LineageRepositoryHelper(dao);
Objects.requireNonNull(dao, "LineageRepository must not be null");
this.dao = new LineageRepository(dao);
}
@GET

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java
View File

@ -25,7 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.entity.data.Metrics;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.MetricsRepositoryHelper;
import org.openmetadata.catalog.jdbi3.MetricsRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.util.EntityUtil.Fields;
@ -63,7 +63,7 @@ import java.util.UUID;
@Collection(name = "metrics")
public class MetricsResource {
public static final String COLLECTION_PATH = "/v1/metrics/";
private final MetricsRepositoryHelper dao;
private final MetricsRepository dao;
private static Metrics addHref(UriInfo uriInfo, Metrics metrics) {
metrics.setHref(RestUtil.getHref(uriInfo, COLLECTION_PATH, metrics.getId()));
@ -72,8 +72,8 @@ public class MetricsResource {
@Inject
public MetricsResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "MetricsRepositoryHelper must not be null");
this.dao = new MetricsRepositoryHelper(dao);
Objects.requireNonNull(dao, "MetricsRepository must not be null");
this.dao = new MetricsRepository(dao);
}
public static class MetricsList extends ResultList<Metrics> {

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/models/ModelResource.java
View File

@ -29,7 +29,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateModel;
import org.openmetadata.catalog.entity.data.Model;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.ModelRepositoryHelper;
import org.openmetadata.catalog.jdbi3.ModelRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -79,7 +79,7 @@ import java.util.UUID;
@Collection(name = "models")
public class ModelResource {
public static final String MODEL_COLLECTION_PATH = "v1/models/";
private final ModelRepositoryHelper dao;
private final ModelRepository dao;
private final CatalogAuthorizer authorizer;
public static void addHref(UriInfo uriInfo, EntityReference ref) {
@ -101,8 +101,8 @@ public class ModelResource {
@Inject
public ModelResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "ModelRepositoryHelper must not be null");
this.dao = new ModelRepositoryHelper(dao);
Objects.requireNonNull(dao, "ModelRepository must not be null");
this.dao = new ModelRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/pipelines/PipelineResource.java
View File

@ -29,7 +29,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreatePipeline;
import org.openmetadata.catalog.entity.data.Pipeline;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.PipelineRepositoryHelper;
import org.openmetadata.catalog.jdbi3.PipelineRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -79,7 +79,7 @@ import java.util.UUID;
@Collection(name = "pipelines")
public class PipelineResource {
public static final String PIPELINE_COLLECTION_PATH = "v1/pipelines/";
private final PipelineRepositoryHelper dao;
private final PipelineRepository dao;
private final CatalogAuthorizer authorizer;
public static void addHref(UriInfo uriInfo, EntityReference ref) {
@ -104,8 +104,8 @@ public class PipelineResource {
@Inject
public PipelineResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "PipelineRepositoryHelper must not be null");
this.dao = new PipelineRepositoryHelper(dao);
Objects.requireNonNull(dao, "PipelineRepository must not be null");
this.dao = new PipelineRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java
View File

@ -25,7 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.entity.data.Report;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.ReportRepositoryHelper;
import org.openmetadata.catalog.jdbi3.ReportRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.util.EntityUtil.Fields;
@ -62,7 +62,7 @@ import java.util.UUID;
@Collection(name = "reports")
public class ReportResource {
public static final String COLLECTION_PATH = "/v1/bots/";
private final ReportRepositoryHelper dao;
private final ReportRepository dao;
private static List<Report> addHref(UriInfo uriInfo, List<Report> reports) {
reports.forEach(r -> addHref(uriInfo, r));
@ -76,8 +76,8 @@ public class ReportResource {
@Inject
public ReportResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "ReportRepositoryHelper must not be null");
this.dao = new ReportRepositoryHelper(dao);
Objects.requireNonNull(dao, "ReportRepository must not be null");
this.dao = new ReportRepository(dao);
}
public static class ReportList extends ResultList<Report> {

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/dashboard/DashboardServiceResource.java
View File

@ -28,7 +28,7 @@ import org.openmetadata.catalog.api.services.CreateDashboardService;
import org.openmetadata.catalog.api.services.UpdateDashboardService;
import org.openmetadata.catalog.entity.services.DashboardService;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.DashboardServiceRepositoryHelper;
import org.openmetadata.catalog.jdbi3.DashboardServiceRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -65,7 +65,7 @@ import java.util.UUID;
@Consumes(MediaType.APPLICATION_JSON)
@Collection(name = "dashboardServices")
public class DashboardServiceResource {
private final DashboardServiceRepositoryHelper dao;
private final DashboardServiceRepository dao;
private final CatalogAuthorizer authorizer;
public static EntityReference addHref(UriInfo uriInfo, EntityReference service) {
@ -85,8 +85,8 @@ public class DashboardServiceResource {
@Inject
public DashboardServiceResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "DashboardServiceRepositoryHelper must not be null");
this.dao = new DashboardServiceRepositoryHelper(dao);
Objects.requireNonNull(dao, "DashboardServiceRepository must not be null");
this.dao = new DashboardServiceRepository(dao);
this.authorizer = authorizer;
}

9
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java
View File

@ -28,7 +28,7 @@ import org.openmetadata.catalog.api.services.CreateDatabaseService;
import org.openmetadata.catalog.api.services.UpdateDatabaseService;
import org.openmetadata.catalog.entity.services.DatabaseService;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.DatabaseServiceRepositoryHelper;
import org.openmetadata.catalog.jdbi3.DatabaseServiceRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -45,7 +45,6 @@ import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@ -65,7 +64,7 @@ import java.util.UUID;
@Consumes(MediaType.APPLICATION_JSON)
@Collection(name = "databaseServices")
public class DatabaseServiceResource {
private final DatabaseServiceRepositoryHelper dao;
private final DatabaseServiceRepository dao;
private final CatalogAuthorizer authorizer;
public static EntityReference addHref(UriInfo uriInfo, EntityReference service) {
@ -84,8 +83,8 @@ public class DatabaseServiceResource {
@Inject
public DatabaseServiceResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "DatabaseServiceRepositoryHelper must not be null");
this.dao = new DatabaseServiceRepositoryHelper(dao);
Objects.requireNonNull(dao, "DatabaseServiceRepository must not be null");
this.dao = new DatabaseServiceRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/messaging/MessagingServiceResource.java
View File

@ -28,7 +28,7 @@ import org.openmetadata.catalog.api.services.CreateMessagingService;
import org.openmetadata.catalog.api.services.UpdateMessagingService;
import org.openmetadata.catalog.entity.services.MessagingService;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.MessagingServiceRepositoryHelper;
import org.openmetadata.catalog.jdbi3.MessagingServiceRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -65,7 +65,7 @@ import java.util.UUID;
@Consumes(MediaType.APPLICATION_JSON)
@Collection(name = "messagingServices")
public class MessagingServiceResource {
private final MessagingServiceRepositoryHelper dao;
private final MessagingServiceRepository dao;
private final CatalogAuthorizer authorizer;
public static EntityReference addHref(UriInfo uriInfo, EntityReference service) {
@ -84,8 +84,8 @@ public class MessagingServiceResource {
@Inject
public MessagingServiceResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "MessagingServiceRepositoryHelper must not be null");
this.dao = new MessagingServiceRepositoryHelper(dao);
Objects.requireNonNull(dao, "MessagingServiceRepository must not be null");
this.dao = new MessagingServiceRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/pipeline/PipelineServiceResource.java
View File

@ -28,7 +28,7 @@ import org.openmetadata.catalog.api.services.CreatePipelineService;
import org.openmetadata.catalog.api.services.UpdatePipelineService;
import org.openmetadata.catalog.entity.services.PipelineService;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.PipelineServiceRepositoryHelper;
import org.openmetadata.catalog.jdbi3.PipelineServiceRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -65,7 +65,7 @@ import java.util.UUID;
@Consumes(MediaType.APPLICATION_JSON)
@Collection(name = "pipelineServices")
public class PipelineServiceResource {
private final PipelineServiceRepositoryHelper dao;
private final PipelineServiceRepository dao;
private final CatalogAuthorizer authorizer;
public static EntityReference addHref(UriInfo uriInfo, EntityReference service) {
@ -85,8 +85,8 @@ public class PipelineServiceResource {
@Inject
public PipelineServiceResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "PipelineServiceRepositoryHelper must not be null");
this.dao = new PipelineServiceRepositoryHelper(dao);
Objects.requireNonNull(dao, "PipelineServiceRepository must not be null");
this.dao = new PipelineServiceRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tags/TagResource.java
View File

@ -26,7 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.apache.maven.shared.utils.io.IOUtil;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.TagRepositoryHelper;
import org.openmetadata.catalog.jdbi3.TagRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -72,7 +72,7 @@ import java.util.regex.Pattern;
public class TagResource {
public static final Logger LOG = LoggerFactory.getLogger(TagResource.class);
public static final String TAG_COLLECTION_PATH = "/v1/tags/";
private final TagRepositoryHelper dao;
private final TagRepository dao;
private final CatalogAuthorizer authorizer;
static class CategoryList extends ResultList<TagCategory> {
@ -87,8 +87,8 @@ public class TagResource {
@Inject
public TagResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "TagRepositoryHelper must not be null");
this.dao = new TagRepositoryHelper(dao);
Objects.requireNonNull(dao, "TagRepository must not be null");
this.dao = new TagRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/tasks/TaskResource.java
View File

@ -29,7 +29,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateTask;
import org.openmetadata.catalog.entity.data.Task;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.TaskRepositoryHelper;
import org.openmetadata.catalog.jdbi3.TaskRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -82,7 +82,7 @@ import java.util.UUID;
public class TaskResource {
private static final Logger LOG = LoggerFactory.getLogger(TaskResource.class);
private static final String TASK_COLLECTION_PATH = "v1/tasks/";
private final TaskRepositoryHelper dao;
private final TaskRepository dao;
private final CatalogAuthorizer authorizer;
public static void addHref(UriInfo uriInfo, EntityReference ref) {
@ -104,8 +104,8 @@ public class TaskResource {
@Inject
public TaskResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "TaskRepositoryHelper must not be null");
this.dao = new TaskRepositoryHelper(dao);
Objects.requireNonNull(dao, "TaskRepository must not be null");
this.dao = new TaskRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/TeamResource.java
View File

@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.teams.CreateTeam;
import org.openmetadata.catalog.entity.teams.Team;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.TeamRepositoryHelper;
import org.openmetadata.catalog.jdbi3.TeamRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -77,7 +77,7 @@ import java.util.UUID;
public class TeamResource {
private static final Logger LOG = LoggerFactory.getLogger(TeamResource.class);
public static final String TEAM_COLLECTION_PATH = "/v1/teams/";
private final TeamRepositoryHelper dao;
private final TeamRepository dao;
private final CatalogAuthorizer authorizer;
@ -94,8 +94,8 @@ public class TeamResource {
@Inject
public TeamResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "TeamRepositoryHelper must not be null");
this.dao = new TeamRepositoryHelper(dao);
Objects.requireNonNull(dao, "TeamRepository must not be null");
this.dao = new TeamRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/teams/UserResource.java
View File

@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.teams.CreateUser;
import org.openmetadata.catalog.entity.teams.User;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.UserRepositoryHelper;
import org.openmetadata.catalog.jdbi3.UserRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -81,7 +81,7 @@ import java.util.UUID;
public class UserResource {
public static final Logger LOG = LoggerFactory.getLogger(UserResource.class);
public static final String USER_COLLECTION_PATH = "v1/users/";
private final UserRepositoryHelper dao;
private final UserRepository dao;
private final CatalogAuthorizer authorizer;
public static void addHref(UriInfo uriInfo, EntityReference user) {
@ -98,8 +98,8 @@ public class UserResource {
@Inject
public UserResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "UserRepositoryHelper must not be null");
this.dao = new UserRepositoryHelper(dao);
Objects.requireNonNull(dao, "UserRepository must not be null");
this.dao = new UserRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/topics/TopicResource.java
View File

@ -29,7 +29,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateTopic;
import org.openmetadata.catalog.entity.data.Topic;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.TopicRepositoryHelper;
import org.openmetadata.catalog.jdbi3.TopicRepository;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer;
import org.openmetadata.catalog.security.SecurityUtil;
@ -39,8 +39,6 @@ import org.openmetadata.catalog.util.EntityUtil.Fields;
import org.openmetadata.catalog.util.RestUtil;
import org.openmetadata.catalog.util.RestUtil.PutResponse;
import org.openmetadata.catalog.util.ResultList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.json.JsonPatch;
import javax.validation.Valid;
@ -81,7 +79,7 @@ import java.util.UUID;
@Collection(name = "topics")
public class TopicResource {
private static final String TOPIC_COLLECTION_PATH = "v1/topics/";
private final TopicRepositoryHelper dao;
private final TopicRepository dao;
private final CatalogAuthorizer authorizer;
public static void addHref(UriInfo uriInfo, EntityReference ref) {
@ -104,7 +102,7 @@ public class TopicResource {
@Inject
public TopicResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "CollectionDAO must not be null");
this.dao = new TopicRepositoryHelper(dao);
this.dao = new TopicRepository(dao);
this.authorizer = authorizer;
}

8
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/usage/UsageResource.java
View File

@ -18,7 +18,7 @@ package org.openmetadata.catalog.resources.usage;
import com.google.inject.Inject;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.UsageRepositoryHelper;
import org.openmetadata.catalog.jdbi3.UsageRepository;
import org.openmetadata.catalog.resources.teams.UserResource;
import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.type.EntityUsage;
@ -58,12 +58,12 @@ import java.util.Objects;
@Collection(name = "usage")
public class UsageResource {
private static final Logger LOG = LoggerFactory.getLogger(UserResource.class);
private final UsageRepositoryHelper dao;
private final UsageRepository dao;
@Inject
public UsageResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
Objects.requireNonNull(dao, "UsageRepositoryHelper must not be null");
this.dao = new UsageRepositoryHelper(dao);
Objects.requireNonNull(dao, "UsageRepository must not be null");
this.dao = new UsageRepository(dao);
}
@GET

18
catalog-rest-service/src/main/java/org/openmetadata/catalog/security/DefaultCatalogAuthorizer.java
View File

@ -23,7 +23,7 @@ import org.openmetadata.catalog.entity.teams.User;
import org.openmetadata.catalog.exception.DuplicateEntityException;
import org.openmetadata.catalog.exception.EntityNotFoundException;
import org.openmetadata.catalog.jdbi3.CollectionDAO;
import org.openmetadata.catalog.jdbi3.UserRepositoryHelper;
import org.openmetadata.catalog.jdbi3.UserRepository;
import org.openmetadata.catalog.type.EntityReference;
import org.openmetadata.catalog.util.EntityUtil;
import org.slf4j.Logger;
@ -45,7 +45,7 @@ public class DefaultCatalogAuthorizer implements CatalogAuthorizer {
private Set<String> botUsers;
private String principalDomain;
private UserRepositoryHelper userRepositoryHelper;
private UserRepository userRepository;
private final String fieldsParam = "teams";
@ -57,7 +57,7 @@ public class DefaultCatalogAuthorizer implements CatalogAuthorizer {
this.principalDomain = config.getPrincipalDomain();
LOG.debug("Admin users: {}", adminUsers);
CollectionDAO repo = dbi.onDemand(CollectionDAO.class);
this.userRepositoryHelper = new UserRepositoryHelper(repo);
this.userRepository = new UserRepository(repo);
mayBeAddAdminUsers();
mayBeAddBotUsers();
}
@ -68,7 +68,7 @@ public class DefaultCatalogAuthorizer implements CatalogAuthorizer {
adminUsers.stream()
.filter(name -> {
try {
User user = userRepositoryHelper.getByName(name, fields);
User user = userRepository.getByName(name, fields);
if (user != null) {
LOG.debug("Entry for user '{}' already exists", name);
return false;
@ -87,7 +87,7 @@ public class DefaultCatalogAuthorizer implements CatalogAuthorizer {
botUsers.stream()
.filter(name -> {
try {
User user = userRepositoryHelper.getByName(name, fields);
User user = userRepository.getByName(name, fields);
if (user != null) {
LOG.debug("Entry for user '{}' already exists", name);
return false;
@ -111,7 +111,7 @@ public class DefaultCatalogAuthorizer implements CatalogAuthorizer {
String userName = SecurityUtil.getUserName(ctx);
EntityUtil.Fields fields = new EntityUtil.Fields(FIELD_LIST, fieldsParam);
try {
User user = userRepositoryHelper.getByName(userName, fields);
User user = userRepository.getByName(userName, fields);
if (owner.getType().equals(Entity.TEAM)) {
for (EntityReference team: user.getTeams()) {
if (team.getName().equals(owner.getName())) {
@ -133,7 +133,7 @@ public class DefaultCatalogAuthorizer implements CatalogAuthorizer {
String userName = SecurityUtil.getUserName(ctx);
EntityUtil.Fields fields = new EntityUtil.Fields(FIELD_LIST, fieldsParam);
try {
User user = userRepositoryHelper.getByName(userName, fields);
User user = userRepository.getByName(userName, fields);
if (user.getIsAdmin() == null) {
return false;
}
@ -149,7 +149,7 @@ public class DefaultCatalogAuthorizer implements CatalogAuthorizer {
String userName = SecurityUtil.getUserName(ctx);
EntityUtil.Fields fields = new EntityUtil.Fields(FIELD_LIST, fieldsParam);
try {
User user = userRepositoryHelper.getByName(userName, fields);
User user = userRepository.getByName(userName, fields);
if (user.getIsBot() == null) {
return false;
}
@ -174,7 +174,7 @@ public class DefaultCatalogAuthorizer implements CatalogAuthorizer {
.withUpdatedAt(new Date());
try {
User addedUser = userRepositoryHelper.create(user, null);
User addedUser = userRepository.create(user, null);
LOG.debug("Added bot user entry: {}", addedUser);
} catch (DuplicateEntityException | IOException exception) {
// In HA setup the other server may have already added the user.

3
catalog-rest-service/src/main/java/org/openmetadata/catalog/util/EntityUpdater3.java
View File

@ -3,6 +3,7 @@ package org.openmetadata.catalog.util;
import org.openmetadata.catalog.Entity;
import org.openmetadata.catalog.jdbi3.CollectionDAO.EntityRelationshipDAO;
import org.openmetadata.catalog.jdbi3.CollectionDAO.TagDAO;
import org.openmetadata.catalog.jdbi3.TableRepository;
import org.openmetadata.catalog.type.EntityReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -21,7 +22,7 @@ import java.util.List;
* of the entity.
*
* Concrete implementations need to implement update for other fields. See
* {@link org.openmetadata.catalog.jdbi3.TableRepositoryHelper.TableUpdater} for an example implementation.
* {@link TableRepository.TableUpdater} for an example implementation.
*/
public abstract class EntityUpdater3 {
private static final Logger LOG = LoggerFactory.getLogger(EntityUpdater3.class);

4
catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/teams/TeamResourceTest.java
View File

@ -25,7 +25,7 @@ import org.openmetadata.catalog.api.teams.CreateTeam;
import org.openmetadata.catalog.entity.teams.Team;
import org.openmetadata.catalog.entity.teams.User;
import org.openmetadata.catalog.exception.CatalogExceptionMessage;
import org.openmetadata.catalog.jdbi3.TeamRepositoryHelper;
import org.openmetadata.catalog.jdbi3.TeamRepository;
import org.openmetadata.catalog.resources.databases.TableResourceTest;
import org.openmetadata.catalog.resources.teams.TeamResource.TeamList;
import org.openmetadata.catalog.type.EntityReference;
@ -525,7 +525,7 @@ public class TeamResourceTest extends CatalogApplicationTest {
before.setDisplayName(displayName);
before.setDescription(description);
before.setProfile(profile);
before.setUsers(TeamRepositoryHelper.toEntityReference(users));
before.setUsers(TeamRepository.toEntityReference(users));
// Validate information returned in patch response has the updates
Team updatedTeam = patchTeam(tableJson, before, authHeaders);

4
catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/teams/UserResourceTest.java
View File

@ -26,7 +26,7 @@ import org.openmetadata.catalog.entity.data.Table;
import org.openmetadata.catalog.entity.teams.Team;
import org.openmetadata.catalog.entity.teams.User;
import org.openmetadata.catalog.exception.CatalogExceptionMessage;
import org.openmetadata.catalog.jdbi3.UserRepositoryHelper;
import org.openmetadata.catalog.jdbi3.UserRepository;
import org.openmetadata.catalog.resources.databases.TableResourceTest;
import org.openmetadata.catalog.resources.teams.UserResource.UserList;
import org.openmetadata.catalog.type.EntityReference;
@ -507,7 +507,7 @@ public class UserResourceTest extends CatalogApplicationTest {
// Update the user attributes
before.setDisplayName(displayName);
before.setTeams(UserRepositoryHelper.toEntityReference(teams));
before.setTeams(UserRepository.toEntityReference(teams));
before.setProfile(profile);
before.setTimezone(timezone);
before.setIsBot(isBot);