From d1bc19fbf243e37bb1dccfff1dae2e8de3a85146 Mon Sep 17 00:00:00 2001
From: IceS2 <pjt1991@gmail.com>
Date: Thu, 5 Sep 2024 11:04:50 +0200
Subject: [PATCH] Fixes some things on the APICollection (#17704)

---
 .../service/jdbi3/APICollectionRepository.java    |  4 ++--
 .../resources/apis/APICollectionResource.java     | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/APICollectionRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/APICollectionRepository.java
index 2f85db54b27..538c5b8c114 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/APICollectionRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/APICollectionRepository.java
@@ -23,7 +23,7 @@ import org.openmetadata.schema.type.EntityReference;
 import org.openmetadata.schema.type.Include;
 import org.openmetadata.schema.type.Relationship;
 import org.openmetadata.service.Entity;
-import org.openmetadata.service.resources.databases.DatabaseResource;
+import org.openmetadata.service.resources.apis.APICollectionResource;
 import org.openmetadata.service.util.EntityUtil.Fields;
 import org.openmetadata.service.util.FullyQualifiedName;
 
@@ -32,7 +32,7 @@ public class APICollectionRepository extends EntityRepository<APICollection> {
 
   public APICollectionRepository() {
     super(
-        DatabaseResource.COLLECTION_PATH,
+        APICollectionResource.COLLECTION_PATH,
         Entity.API_COLLCECTION,
         APICollection.class,
         Entity.getCollectionDAO().apiCollectionDAO(),
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/resources/apis/APICollectionResource.java b/openmetadata-service/src/main/java/org/openmetadata/service/resources/apis/APICollectionResource.java
index b45180c6df5..0f2581f1b0c 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/resources/apis/APICollectionResource.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/resources/apis/APICollectionResource.java
@@ -50,7 +50,6 @@ import org.openmetadata.schema.api.VoteRequest;
 import org.openmetadata.schema.api.data.CreateAPICollection;
 import org.openmetadata.schema.api.data.RestoreEntity;
 import org.openmetadata.schema.entity.data.APICollection;
-import org.openmetadata.schema.entity.data.Database;
 import org.openmetadata.schema.type.ChangeEvent;
 import org.openmetadata.schema.type.EntityHistory;
 import org.openmetadata.schema.type.Include;
@@ -268,7 +267,7 @@ public class APICollectionResource extends EntityResource<APICollection, APIColl
       responses = {
         @ApiResponse(
             responseCode = "200",
-            description = "database",
+            description = "APICollection",
             content =
                 @Content(
                     mediaType = "application/json",
@@ -303,7 +302,7 @@ public class APICollectionResource extends EntityResource<APICollection, APIColl
             content =
                 @Content(
                     mediaType = "application/json",
-                    schema = @Schema(implementation = Database.class))),
+                    schema = @Schema(implementation = APICollection.class))),
         @ApiResponse(responseCode = "400", description = "Bad request")
       })
   public Response create(
@@ -422,7 +421,7 @@ public class APICollectionResource extends EntityResource<APICollection, APIColl
           @QueryParam("hardDelete")
           @DefaultValue("false")
           boolean hardDelete,
-      @Parameter(description = "Id of the database", schema = @Schema(type = "UUID"))
+      @Parameter(description = "Id of the APICollection", schema = @Schema(type = "UUID"))
           @PathParam("id")
           UUID id) {
     return delete(uriInfo, securityContext, id, recursive, hardDelete);
@@ -466,7 +465,9 @@ public class APICollectionResource extends EntityResource<APICollection, APIColl
           "Delete a API Collection by `fullyQualifiedName`. API Collection can only be deleted if it has no API Endpoints.",
       responses = {
         @ApiResponse(responseCode = "200", description = "OK"),
-        @ApiResponse(responseCode = "404", description = "Database for instance {fqn} is not found")
+        @ApiResponse(
+            responseCode = "404",
+            description = "APIColletion for instance {fqn} is not found")
       })
   public Response delete(
       @Context UriInfo uriInfo,
@@ -481,7 +482,7 @@ public class APICollectionResource extends EntityResource<APICollection, APIColl
           @DefaultValue("false")
           boolean recursive,
       @Parameter(
-              description = "Fully qualified name of the database",
+              description = "Fully qualified name of the APICollection",
               schema = @Schema(type = "string"))
           @PathParam("fqn")
           String fqn) {
@@ -503,7 +504,7 @@ public class APICollectionResource extends EntityResource<APICollection, APIColl
                     mediaType = "application/json",
                     schema = @Schema(implementation = APICollection.class)))
       })
-  public Response restoreDatabase(
+  public Response restore(
       @Context UriInfo uriInfo,
       @Context SecurityContext securityContext,
       @Valid RestoreEntity restore) {