Use Create Reference in PUT & POST and fix wrong references (#704)

This commit is contained in:
Pere Miquel Brull 2021-10-08 04:06:53 +02:00 committed by GitHub
parent a19c5bceca
commit 3dddc084c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 54 additions and 65 deletions

View File

@ -28,7 +28,6 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateChart; import org.openmetadata.catalog.api.data.CreateChart;
import org.openmetadata.catalog.entity.data.Chart; import org.openmetadata.catalog.entity.data.Chart;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.jdbi3.ChartRepository; import org.openmetadata.catalog.jdbi3.ChartRepository;
import org.openmetadata.catalog.resources.Collection; import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.CatalogAuthorizer; import org.openmetadata.catalog.security.CatalogAuthorizer;
@ -175,7 +174,7 @@ public class ChartResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The chart", @ApiResponse(responseCode = "200", description = "The chart",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = Chart.class))),
@ApiResponse(responseCode = "404", description = "Chart for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Chart for instance {id} is not found")
}) })
public Chart get(@Context UriInfo uriInfo, @PathParam("id") String id, public Chart get(@Context UriInfo uriInfo, @PathParam("id") String id,
@ -214,7 +213,7 @@ public class ChartResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The chart", @ApiResponse(responseCode = "200", description = "The chart",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Chart.class))), schema = @Schema(implementation = CreateChart.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext, public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext,
@ -262,7 +261,7 @@ public class ChartResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The updated chart ", @ApiResponse(responseCode = "200", description = "The updated chart ",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Chart.class))) schema = @Schema(implementation = CreateChart.class)))
}) })
public Response createOrUpdate(@Context UriInfo uriInfo, public Response createOrUpdate(@Context UriInfo uriInfo,
@Context SecurityContext securityContext, @Context SecurityContext securityContext,

View File

@ -215,7 +215,7 @@ public class DashboardResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The dashboard", @ApiResponse(responseCode = "200", description = "The dashboard",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = CreateDashboard.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext, public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext,
@ -261,7 +261,7 @@ public class DashboardResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The dashboard", @ApiResponse(responseCode = "200", description = "The dashboard",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = CreateDashboard.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response createOrUpdate(@Context UriInfo uriInfo, public Response createOrUpdate(@Context UriInfo uriInfo,

View File

@ -27,7 +27,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.parameters.RequestBody; import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateDatabase; import org.openmetadata.catalog.api.data.CreateDatabase;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.entity.data.Database; import org.openmetadata.catalog.entity.data.Database;
import org.openmetadata.catalog.jdbi3.DatabaseRepository; import org.openmetadata.catalog.jdbi3.DatabaseRepository;
import org.openmetadata.catalog.resources.Collection; import org.openmetadata.catalog.resources.Collection;
@ -179,7 +178,7 @@ public class DatabaseResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The database", @ApiResponse(responseCode = "200", description = "The database",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = Database.class))),
@ApiResponse(responseCode = "404", description = "Database for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Database for instance {id} is not found")
}) })
public Response get(@Context UriInfo uriInfo, @PathParam("id") String id, public Response get(@Context UriInfo uriInfo, @PathParam("id") String id,
@ -200,7 +199,7 @@ public class DatabaseResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The database", @ApiResponse(responseCode = "200", description = "The database",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = Database.class))),
@ApiResponse(responseCode = "404", description = "Database for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Database for instance {id} is not found")
}) })
public Response getByName(@Context UriInfo uriInfo, @PathParam("fqn") String fqn, public Response getByName(@Context UriInfo uriInfo, @PathParam("fqn") String fqn,
@ -220,7 +219,7 @@ public class DatabaseResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The database", @ApiResponse(responseCode = "200", description = "The database",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Database.class))), schema = @Schema(implementation = CreateDatabase.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext, public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext,
@ -261,7 +260,7 @@ public class DatabaseResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The updated database ", @ApiResponse(responseCode = "200", description = "The updated database ",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Database.class))) schema = @Schema(implementation = CreateDatabase.class)))
}) })
public Response createOrUpdate(@Context UriInfo uriInfo, public Response createOrUpdate(@Context UriInfo uriInfo,
@Context SecurityContext securityContext, @Context SecurityContext securityContext,

View File

@ -213,7 +213,7 @@ public class TableResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "table", @ApiResponse(responseCode = "200", description = "table",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Table.class))), schema = @Schema(implementation = CreateTable.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, public Response create(@Context UriInfo uriInfo,
@ -234,7 +234,7 @@ public class TableResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The table", @ApiResponse(responseCode = "200", description = "The table",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Table.class))), schema = @Schema(implementation = CreateTable.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response createOrUpdate(@Context UriInfo uriInfo, public Response createOrUpdate(@Context UriInfo uriInfo,

View File

@ -120,7 +120,7 @@ public class FeedResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The thread", @ApiResponse(responseCode = "200", description = "The thread",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Thread.class))), schema = @Schema(implementation = CreateThread.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, @Valid CreateThread cr) throws IOException { public Response create(@Context UriInfo uriInfo, @Valid CreateThread cr) throws IOException {

View File

@ -17,7 +17,6 @@
package org.openmetadata.catalog.resources.metrics; package org.openmetadata.catalog.resources.metrics;
import com.google.inject.Inject; import com.google.inject.Inject;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.entity.data.Metrics; import org.openmetadata.catalog.entity.data.Metrics;
import org.openmetadata.catalog.jdbi3.MetricsRepository; import org.openmetadata.catalog.jdbi3.MetricsRepository;
import org.openmetadata.catalog.resources.Collection; import org.openmetadata.catalog.resources.Collection;
@ -110,7 +109,7 @@ public class MetricsResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The metrics", @ApiResponse(responseCode = "200", description = "The metrics",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = Metrics.class))),
@ApiResponse(responseCode = "404", description = "Metrics for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Metrics for instance {id} is not found")
}) })
public Metrics get(@Context UriInfo uriInfo, public Metrics get(@Context UriInfo uriInfo,

View File

@ -216,7 +216,7 @@ public class PipelineResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The pipeline", @ApiResponse(responseCode = "200", description = "The pipeline",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Pipeline.class))), schema = @Schema(implementation = CreatePipeline.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext, public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext,
@ -262,7 +262,7 @@ public class PipelineResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The pipeline", @ApiResponse(responseCode = "200", description = "The pipeline",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Pipeline.class))), schema = @Schema(implementation = CreatePipeline.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response createOrUpdate(@Context UriInfo uriInfo, public Response createOrUpdate(@Context UriInfo uriInfo,

View File

@ -17,7 +17,6 @@
package org.openmetadata.catalog.resources.reports; package org.openmetadata.catalog.resources.reports;
import com.google.inject.Inject; import com.google.inject.Inject;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.entity.data.Report; import org.openmetadata.catalog.entity.data.Report;
import org.openmetadata.catalog.jdbi3.ReportRepository; import org.openmetadata.catalog.jdbi3.ReportRepository;
import org.openmetadata.catalog.resources.Collection; import org.openmetadata.catalog.resources.Collection;
@ -110,7 +109,7 @@ public class ReportResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The report", @ApiResponse(responseCode = "200", description = "The report",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = Report.class))),
@ApiResponse(responseCode = "404", description = "Report for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Report for instance {id} is not found")
}) })
public Report get(@Context UriInfo uriInfo, @PathParam("id") String id, public Report get(@Context UriInfo uriInfo, @PathParam("id") String id,

View File

@ -26,7 +26,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.services.CreateDashboardService; import org.openmetadata.catalog.api.services.CreateDashboardService;
import org.openmetadata.catalog.api.services.UpdateDashboardService; import org.openmetadata.catalog.api.services.UpdateDashboardService;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.entity.services.DashboardService; import org.openmetadata.catalog.entity.services.DashboardService;
import org.openmetadata.catalog.jdbi3.DashboardServiceRepository; import org.openmetadata.catalog.jdbi3.DashboardServiceRepository;
import org.openmetadata.catalog.resources.Collection; import org.openmetadata.catalog.resources.Collection;
@ -112,7 +111,7 @@ public class DashboardServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Dashboard service instance", @ApiResponse(responseCode = "200", description = "Dashboard service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = DashboardService.class))),
@ApiResponse(responseCode = "404", description = "Dashboard service for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Dashboard service for instance {id} is not found")
}) })
public DashboardService get(@Context UriInfo uriInfo, public DashboardService get(@Context UriInfo uriInfo,
@ -128,7 +127,7 @@ public class DashboardServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Dashboard service instance", @ApiResponse(responseCode = "200", description = "Dashboard service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = DashboardService.class))),
@ApiResponse(responseCode = "404", description = "Dashboard service for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Dashboard service for instance {id} is not found")
}) })
public DashboardService getByName(@Context UriInfo uriInfo, public DashboardService getByName(@Context UriInfo uriInfo,
@ -143,7 +142,7 @@ public class DashboardServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Dashboard service instance", @ApiResponse(responseCode = "200", description = "Dashboard service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = DashboardService.class))), schema = @Schema(implementation = CreateDashboardService.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, public Response create(@Context UriInfo uriInfo,
@ -169,7 +168,7 @@ public class DashboardServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Dashboard service instance", @ApiResponse(responseCode = "200", description = "Dashboard service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = DashboardService.class))), schema = @Schema(implementation = CreateDashboardService.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response update(@Context UriInfo uriInfo, public Response update(@Context UriInfo uriInfo,

View File

@ -21,7 +21,6 @@ import com.google.inject.Inject;
import org.openmetadata.catalog.jdbi3.DatabaseServiceRepository; import org.openmetadata.catalog.jdbi3.DatabaseServiceRepository;
import org.openmetadata.catalog.api.services.CreateDatabaseService; import org.openmetadata.catalog.api.services.CreateDatabaseService;
import org.openmetadata.catalog.api.services.UpdateDatabaseService; import org.openmetadata.catalog.api.services.UpdateDatabaseService;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.entity.services.DatabaseService; import org.openmetadata.catalog.entity.services.DatabaseService;
import org.openmetadata.catalog.resources.Collection; import org.openmetadata.catalog.resources.Collection;
import org.openmetadata.catalog.security.SecurityUtil; import org.openmetadata.catalog.security.SecurityUtil;
@ -111,7 +110,7 @@ public class DatabaseServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Database service instance", @ApiResponse(responseCode = "200", description = "Database service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = DatabaseService.class))),
@ApiResponse(responseCode = "404", description = "Database service for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Database service for instance {id} is not found")
}) })
public DatabaseService get(@Context UriInfo uriInfo, public DatabaseService get(@Context UriInfo uriInfo,
@ -127,7 +126,7 @@ public class DatabaseServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Database service instance", @ApiResponse(responseCode = "200", description = "Database service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = DatabaseService.class))),
@ApiResponse(responseCode = "404", description = "Database service for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Database service for instance {id} is not found")
}) })
public DatabaseService getByName(@Context UriInfo uriInfo, public DatabaseService getByName(@Context UriInfo uriInfo,
@ -142,7 +141,7 @@ public class DatabaseServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Database service instance", @ApiResponse(responseCode = "200", description = "Database service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = DatabaseService.class))), schema = @Schema(implementation = CreateDatabaseService.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, public Response create(@Context UriInfo uriInfo,
@ -165,7 +164,7 @@ public class DatabaseServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Database service instance", @ApiResponse(responseCode = "200", description = "Database service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = DatabaseService.class))), schema = @Schema(implementation = CreateDatabaseService.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response update(@Context UriInfo uriInfo, public Response update(@Context UriInfo uriInfo,

View File

@ -26,7 +26,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.services.CreateMessagingService; import org.openmetadata.catalog.api.services.CreateMessagingService;
import org.openmetadata.catalog.api.services.UpdateMessagingService; import org.openmetadata.catalog.api.services.UpdateMessagingService;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.entity.services.MessagingService; import org.openmetadata.catalog.entity.services.MessagingService;
import org.openmetadata.catalog.jdbi3.MessagingServiceRepository; import org.openmetadata.catalog.jdbi3.MessagingServiceRepository;
import org.openmetadata.catalog.resources.Collection; import org.openmetadata.catalog.resources.Collection;
@ -127,7 +126,7 @@ public class MessagingServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Messaging service instance", @ApiResponse(responseCode = "200", description = "Messaging service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = MessagingService.class))),
@ApiResponse(responseCode = "404", description = "Messaging service for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Messaging service for instance {id} is not found")
}) })
public MessagingService getByName(@Context UriInfo uriInfo, public MessagingService getByName(@Context UriInfo uriInfo,
@ -142,7 +141,7 @@ public class MessagingServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Messaging service instance", @ApiResponse(responseCode = "200", description = "Messaging service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = MessagingService.class))), schema = @Schema(implementation = CreateMessagingService.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, public Response create(@Context UriInfo uriInfo,
@ -167,7 +166,7 @@ public class MessagingServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Messaging service instance", @ApiResponse(responseCode = "200", description = "Messaging service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = MessagingService.class))), schema = @Schema(implementation = CreateMessagingService.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response update(@Context UriInfo uriInfo, public Response update(@Context UriInfo uriInfo,

View File

@ -26,7 +26,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.services.CreatePipelineService; import org.openmetadata.catalog.api.services.CreatePipelineService;
import org.openmetadata.catalog.api.services.UpdatePipelineService; import org.openmetadata.catalog.api.services.UpdatePipelineService;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.entity.services.PipelineService; import org.openmetadata.catalog.entity.services.PipelineService;
import org.openmetadata.catalog.jdbi3.PipelineServiceRepository; import org.openmetadata.catalog.jdbi3.PipelineServiceRepository;
import org.openmetadata.catalog.resources.Collection; import org.openmetadata.catalog.resources.Collection;
@ -128,7 +127,7 @@ public class PipelineServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Pipeline service instance", @ApiResponse(responseCode = "200", description = "Pipeline service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = PipelineService.class))),
@ApiResponse(responseCode = "404", description = "Pipeline service for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Pipeline service for instance {id} is not found")
}) })
public PipelineService getByName(@Context UriInfo uriInfo, public PipelineService getByName(@Context UriInfo uriInfo,
@ -143,7 +142,7 @@ public class PipelineServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Pipeline service instance", @ApiResponse(responseCode = "200", description = "Pipeline service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = PipelineService.class))), schema = @Schema(implementation = CreatePipelineService.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, public Response create(@Context UriInfo uriInfo,
@ -166,7 +165,7 @@ public class PipelineServiceResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "Pipeline service instance", @ApiResponse(responseCode = "200", description = "Pipeline service instance",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = PipelineService.class))), schema = @Schema(implementation = CreatePipelineService.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response update(@Context UriInfo uriInfo, public Response update(@Context UriInfo uriInfo,

View File

@ -232,7 +232,7 @@ public class TagResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The user ", @ApiResponse(responseCode = "200", description = "The user ",
content = @Content(mediaType = "application/json", schema = @Schema(implementation = content = @Content(mediaType = "application/json", schema = @Schema(implementation =
TagCategory.class))), CreateTagCategory.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response createCategory(@Context UriInfo uriInfo, public Response createCategory(@Context UriInfo uriInfo,
@ -252,7 +252,7 @@ public class TagResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The user ", @ApiResponse(responseCode = "200", description = "The user ",
content = @Content(mediaType = "application/json", schema = @Schema(implementation = content = @Content(mediaType = "application/json", schema = @Schema(implementation =
Tag.class))), CreateTag.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response createPrimaryTag(@Context UriInfo uriInfo, public Response createPrimaryTag(@Context UriInfo uriInfo,
@ -276,7 +276,7 @@ public class TagResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The user ", @ApiResponse(responseCode = "200", description = "The user ",
content = @Content(mediaType = "application/json", schema = @Schema(implementation = content = @Content(mediaType = "application/json", schema = @Schema(implementation =
Tag.class))), CreateTag.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response createSecondaryTag(@Context UriInfo uriInfo, public Response createSecondaryTag(@Context UriInfo uriInfo,

View File

@ -27,8 +27,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.parameters.RequestBody; import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateTask; import org.openmetadata.catalog.api.data.CreateTask;
import org.openmetadata.catalog.entity.data.Chart;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.entity.data.Task; import org.openmetadata.catalog.entity.data.Task;
import org.openmetadata.catalog.jdbi3.TaskRepository; import org.openmetadata.catalog.jdbi3.TaskRepository;
import org.openmetadata.catalog.resources.Collection; import org.openmetadata.catalog.resources.Collection;
@ -131,7 +129,7 @@ public class TaskResource {
"parameter to get only necessary fields. Use cursor-based pagination to limit the number " + "parameter to get only necessary fields. Use cursor-based pagination to limit the number " +
"entries in the list using `limit` and `before` or `after` query params.", "entries in the list using `limit` and `before` or `after` query params.",
responses = { responses = {
@ApiResponse(responseCode = "200", description = "List of charts", @ApiResponse(responseCode = "200", description = "List of tasks",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = TaskList.class))) schema = @Schema(implementation = TaskList.class)))
}) })
@ -140,7 +138,7 @@ public class TaskResource {
@Parameter(description = "Fields requested in the returned resource", @Parameter(description = "Fields requested in the returned resource",
schema = @Schema(type = "string", example = FIELDS)) schema = @Schema(type = "string", example = FIELDS))
@QueryParam("fields") String fieldsParam, @QueryParam("fields") String fieldsParam,
@Parameter(description = "Filter charts by service name", @Parameter(description = "Filter tasks by service name",
schema = @Schema(type = "string", example = "superset")) schema = @Schema(type = "string", example = "superset"))
@QueryParam("service") String serviceParam, @QueryParam("service") String serviceParam,
@Parameter(description = "Limit the number tasks returned. (1 to 1000000, default = 10)") @Parameter(description = "Limit the number tasks returned. (1 to 1000000, default = 10)")
@ -148,10 +146,10 @@ public class TaskResource {
@Min(1) @Min(1)
@Max(1000000) @Max(1000000)
@QueryParam("limit") int limitParam, @QueryParam("limit") int limitParam,
@Parameter(description = "Returns list of charts before this cursor", @Parameter(description = "Returns list of tasks before this cursor",
schema = @Schema(type = "string")) schema = @Schema(type = "string"))
@QueryParam("before") String before, @QueryParam("before") String before,
@Parameter(description = "Returns list of charts after this cursor", @Parameter(description = "Returns list of tasks after this cursor",
schema = @Schema(type = "string")) schema = @Schema(type = "string"))
@QueryParam("after") String after @QueryParam("after") String after
) throws IOException, GeneralSecurityException { ) throws IOException, GeneralSecurityException {
@ -175,7 +173,7 @@ public class TaskResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The Task", @ApiResponse(responseCode = "200", description = "The Task",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = Task.class))),
@ApiResponse(responseCode = "404", description = "Task for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Task for instance {id} is not found")
}) })
public Task get(@Context UriInfo uriInfo, @PathParam("id") String id, public Task get(@Context UriInfo uriInfo, @PathParam("id") String id,
@ -189,13 +187,13 @@ public class TaskResource {
@GET @GET
@Path("/name/{fqn}") @Path("/name/{fqn}")
@Operation(summary = "Get a chart by name", tags = "charts", @Operation(summary = "Get a task by name", tags = "tasks",
description = "Get a chart by fully qualified name.", description = "Get a task by fully qualified name.",
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The chart", @ApiResponse(responseCode = "200", description = "The task",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Chart.class))), schema = @Schema(implementation = Task.class))),
@ApiResponse(responseCode = "404", description = "Chart for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Task for instance {id} is not found")
}) })
public Response getByName(@Context UriInfo uriInfo, @PathParam("fqn") String fqn, public Response getByName(@Context UriInfo uriInfo, @PathParam("fqn") String fqn,
@Context SecurityContext securityContext, @Context SecurityContext securityContext,
@ -209,12 +207,12 @@ public class TaskResource {
} }
@POST @POST
@Operation(summary = "Create a chart", tags = "charts", @Operation(summary = "Create a task", tags = "tasks",
description = "Create a chart under an existing `service`.", description = "Create a task under an existing `service`.",
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The chart", @ApiResponse(responseCode = "200", description = "The task",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Chart.class))), schema = @Schema(implementation = CreateTask.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext, public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext,
@ -266,7 +264,7 @@ public class TaskResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The updated task ", @ApiResponse(responseCode = "200", description = "The updated task ",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Task.class))) schema = @Schema(implementation = CreateTask.class)))
}) })
public Response createOrUpdate(@Context UriInfo uriInfo, public Response createOrUpdate(@Context UriInfo uriInfo,
@Context SecurityContext securityContext, @Context SecurityContext securityContext,

View File

@ -198,7 +198,7 @@ public class TeamResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The team", @ApiResponse(responseCode = "200", description = "The team",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Team.class))), schema = @Schema(implementation = CreateTeam.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, public Response create(@Context UriInfo uriInfo,

View File

@ -222,7 +222,7 @@ public class UserResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The user ", @ApiResponse(responseCode = "200", description = "The user ",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = User.class))), schema = @Schema(implementation = CreateUser.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response createUser(@Context UriInfo uriInfo, @Context SecurityContext securityContext, public Response createUser(@Context UriInfo uriInfo, @Context SecurityContext securityContext,
@ -243,7 +243,7 @@ public class UserResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The user ", @ApiResponse(responseCode = "200", description = "The user ",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = User.class))), schema = @Schema(implementation = CreateUser.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response createOrUpdateUser(@Context UriInfo uriInfo, public Response createOrUpdateUser(@Context UriInfo uriInfo,

View File

@ -27,7 +27,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.parameters.RequestBody; import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import org.openmetadata.catalog.api.data.CreateTopic; import org.openmetadata.catalog.api.data.CreateTopic;
import org.openmetadata.catalog.entity.data.Dashboard;
import org.openmetadata.catalog.entity.data.Topic; import org.openmetadata.catalog.entity.data.Topic;
import org.openmetadata.catalog.jdbi3.TopicRepository; import org.openmetadata.catalog.jdbi3.TopicRepository;
import org.openmetadata.catalog.resources.Collection; import org.openmetadata.catalog.resources.Collection;
@ -193,7 +192,7 @@ public class TopicResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The topic", @ApiResponse(responseCode = "200", description = "The topic",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Dashboard.class))), schema = @Schema(implementation = Topic.class))),
@ApiResponse(responseCode = "404", description = "Topic for instance {id} is not found") @ApiResponse(responseCode = "404", description = "Topic for instance {id} is not found")
}) })
public Response getByName(@Context UriInfo uriInfo, @PathParam("fqn") String fqn, public Response getByName(@Context UriInfo uriInfo, @PathParam("fqn") String fqn,
@ -213,7 +212,7 @@ public class TopicResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The topic", @ApiResponse(responseCode = "200", description = "The topic",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Topic.class))), schema = @Schema(implementation = CreateTopic.class))),
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext, public Response create(@Context UriInfo uriInfo, @Context SecurityContext securityContext,
@ -264,7 +263,7 @@ public class TopicResource {
responses = { responses = {
@ApiResponse(responseCode = "200", description = "The updated topic ", @ApiResponse(responseCode = "200", description = "The updated topic ",
content = @Content(mediaType = "application/json", content = @Content(mediaType = "application/json",
schema = @Schema(implementation = Topic.class))) schema = @Schema(implementation = CreateTopic.class)))
}) })
public Response createOrUpdate(@Context UriInfo uriInfo, public Response createOrUpdate(@Context UriInfo uriInfo,
@Context SecurityContext securityContext, @Context SecurityContext securityContext,