fix: remove unused path parameter (#25825)

* fix: remove unused path parameter

* fix: remove extra path parameter from feed resource

* fix: remove extra path parameter in team resource

* fix: remove duplicate resource

* fix: remove duplicate resource

* fix: test-container errror

* fix: testContainer version

* fix: remove unsued body

(cherry picked from commit dfa632d)

Author: TeddyCr

openmetadata-integration-tests/pom.xml

@@ -41,25 +41,25 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.20.4</version>
+      <version>1.21.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
-      <version>1.20.4</version>
+      <version>1.21.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>mysql</artifactId>
-      <version>1.20.4</version>
+      <version>1.21.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>elasticsearch</artifactId>
-      <version>1.20.4</version>
+      <version>1.21.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -71,13 +71,13 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>k3s</artifactId>
-      <version>1.20.4</version>
+      <version>1.21.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>1.20.4</version>
+      <version>1.21.4</version>
       <scope>test</scope>
     </dependency>
     <!-- Kubernetes client for K8s integration tests -->

openmetadata-mcp/pom.xml

@@ -19,7 +19,7 @@
         <assertj-core.version>3.27.7</assertj-core.version>
         <okhttp.version>4.12.0</okhttp.version>
         <awaitility.version>4.2.2</awaitility.version>
-        <testcontainers.version>1.20.4</testcontainers.version>
+        <testcontainers.version>1.21.4</testcontainers.version>
         <jetty.version>12.1.1</jetty.version>
     </properties>
 

openmetadata-sdk/pom.xml

@@ -22,7 +22,7 @@
         <mockito.version>5.5.0</mockito.version>
         <slf4j.version>2.0.9</slf4j.version>
         <lombok.version>1.18.30</lombok.version>
-        <testcontainers.version>1.19.3</testcontainers.version>
+        <testcontainers.version>1.21.4</testcontainers.version>
         <jwt.version>4.4.0</jwt.version>
         <flyway.version>9.22.3</flyway.version>
         <json.version>20240303</json.version>

openmetadata-service/pom.xml

@@ -16,8 +16,8 @@
     <sonar.junit.reportPaths>${project.basedir}/target/surefire-reports</sonar.junit.reportPaths>
     <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
     <sonar.tests>${project.basedir}/src/test/java</sonar.tests>
-    <org.testcontainers.version>1.20.4</org.testcontainers.version>
-    <awssdk.version>2.31.7</awssdk.version>
+    <org.testcontainers.version>1.21.4</org.testcontainers.version>
+    <awssdk.version>2.30.19</awssdk.version>
     <azure-identity.version>1.14.0</azure-identity.version>
     <azure-kv.version>4.10.0</azure-kv.version>
     <azure-identity-extensions.version>1.0.0</azure-identity-extensions.version>

openmetadata-service/src/main/java/org/openmetadata/service/resources/drives/DirectoryResource.java

@@ -475,8 +475,10 @@ public Response delete(
   public Response restoreDirectory(
       @Context UriInfo uriInfo,
       @Context SecurityContext securityContext,
-      @Valid RestoreEntity restore) {
-    return restoreEntity(uriInfo, securityContext, restore.getId());
+      @Parameter(description = "Id of the directory", schema = @Schema(type = "UUID"))
+          @PathParam("id")
+          UUID id) {
+    return restoreEntity(uriInfo, securityContext, id);
   }
 
   @PUT

openmetadata-service/src/main/java/org/openmetadata/service/resources/drives/FileResource.java

@@ -470,7 +470,7 @@ public Response deleteByIdAsync(
   }
 
   @PUT
-  @Path("/{id}/restore")
+  @Path("{id}/restore")
   @Operation(
       operationId = "restoreFile",
       summary = "Restore a soft deleted file",
@@ -487,8 +487,9 @@ public Response deleteByIdAsync(
   public Response restoreFile(
       @Context UriInfo uriInfo,
       @Context SecurityContext securityContext,
-      @Valid RestoreEntity restore) {
-    return restoreEntity(uriInfo, securityContext, restore.getId());
+      @Parameter(description = "Id of the file", schema = @Schema(type = "UUID")) @PathParam("id")
+          UUID id) {
+    return restoreEntity(uriInfo, securityContext, id);
   }
 
   @PUT

openmetadata-service/src/main/java/org/openmetadata/service/resources/feeds/FeedResource.java

@@ -251,10 +251,7 @@ public Thread get(
       @Context UriInfo uriInfo,
       @Parameter(description = "Id of the Thread", schema = @Schema(type = "string"))
           @PathParam("id")
-          UUID id,
-      @Parameter(description = "Type of the Entity", schema = @Schema(type = "string"))
-          @PathParam("entityType")
-          String entityType) {
+          UUID id) {
     return addHref(uriInfo, dao.get(id));
   }
 

openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/TeamResource.java

@@ -705,8 +705,7 @@ public Response restoreTeam(
   @Operation(
       operationId = "getCsvDocumentation",
       summary = "Get CSV documentation for team import/export")
-  public String getCsvDocumentation(
-      @Context SecurityContext securityContext, @PathParam("name") String name) {
+  public String getCsvDocumentation(@Context SecurityContext securityContext) {
     return JsonUtils.pojoToJson(TeamCsv.DOCUMENTATION);
   }