Merge branch 'v2025.10.31.01' of github.com:CMSgov/qpp-conversion-tool into develop-clone

Author: john-manack

README.md

@@ -199,7 +199,7 @@ can be found in the [sample-files](sample-files/README.md) folder.
 
 ## Swagger Info
 
-Swagger will be enabled under `/swagger-ui/index.html#/` path.
+Swagger documentation logic for the CT is handled in the Submissions API codebase.
 
 ## Javadoc
 

rest-api/pom.xml

@@ -32,7 +32,7 @@
         <requiredCodeCoverage>0.90</requiredCodeCoverage>
 
         <!-- For documentation only; actual coordination is done by the BOMs below -->
-        <spring-framework.version>6.2.11</spring-framework.version>
+        <spring-framework.version>6.2.12</spring-framework.version>
         <tomcat.version>10.1.45</tomcat.version>
 
         <!-- Test stack kept explicit so CI is deterministic across JDK updates -->
@@ -195,7 +195,29 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.4.8</version>
+                <version>3.4.11</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- These two lines are redundant when importing spring-framework-bom but kept for clarity.
+                 You can safely remove them later if desired. -->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-webmvc</artifactId>
+                <version>6.2.12</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>6.2.12</version>
+            </dependency>
+
+            <!-- Framework BOM import: lifts ALL spring-* modules to 6.2.12 (security fix) -->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>6.2.12</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -254,11 +276,6 @@
                 <artifactId>snakeyaml</artifactId>
                 <version>2.3</version>
             </dependency>
-            <dependency>
-                <groupId>io.swagger.core.v3</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>2.2.9</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

rest-api/src/main/java/gov/cms/qpp/conversion/api/config/OpenAPIConfig.java

@@ -3,12 +3,6 @@
 import gov.cms.qpp.conversion.api.model.HealthCheck;
 import gov.cms.qpp.conversion.api.services.VersionService;
 
-import io.swagger.v3.oas.annotations.Operation;
-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 io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +13,6 @@
 /**
  * Controller to simply respond with status 200 with a GET /health call.
  */
-@Tag(name = "Health Check")
 @RestController
 @RequestMapping("/health")
 public class HealthCheckController {
@@ -40,11 +33,6 @@ public HealthCheckController(VersionService version) {
 	 *
 	 * @return health check of version, environment variables, and system properties
 	 */
-	@Operation(summary = "Gets the current state of the API.", description = "Returns the environment variables, system properties and implementation version of the conversion tool.")
-	@ApiResponses({
-			@ApiResponse(responseCode = "200", content = { @Content(schema = @Schema(implementation = HealthCheck.class), mediaType = "application/json") }),
-			@ApiResponse(responseCode = "404", content = { @Content(schema = @Schema()) }),
-			@ApiResponse(responseCode = "500", content = { @Content(schema = @Schema()) }) })
 	@GetMapping
 	@ResponseStatus(HttpStatus.OK)
 	public @ResponseBody HealthCheck health() {

rest-api/src/main/java/gov/cms/qpp/conversion/api/controllers/HealthCheckController.java

@@ -6,17 +6,13 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -32,7 +28,6 @@
 /**
  * Controller to handle uploading files for QRDA-III Conversion
  */
-@Tag(name="Conversion")
 @RestController
 @CrossOrigin
 public abstract class SkeletalQrdaController<T> {
@@ -66,8 +61,6 @@ public SkeletalQrdaController(QrdaService qrdaService, ValidationService validat
 	 * @param purpose the purpose for the conversion
 	 * @return Valid json or error json content
 	 */
-	@Operation(summary = "Converts QRDA3 XML to QPP JSON", description = "Converts QRDA3 XML to QPP JSON. Provide a QRDA3 XML file as a multipart file. The response body will contain the QPP JSON upon success or error JSON on failure.")
-	@Parameter(name = "Purpose", hidden = true)
 	@PostMapping(consumes = {"multipart/form-data"})
 	public ResponseEntity<T> uploadQrdaFile(
 		@RequestParam(name = "file") MultipartFile file,

rest-api/src/main/java/gov/cms/qpp/conversion/api/controllers/SkeletalQrdaController.java

@@ -9,7 +9,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import io.swagger.v3.oas.annotations.Hidden;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
@@ -25,7 +24,6 @@
 import gov.cms.qpp.conversion.api.services.QrdaService;
 import gov.cms.qpp.conversion.api.services.ValidationService;
 
-@Hidden
 @RestController
 @RequestMapping(path = "/", headers = {"Accept=application/zip"})
 public class ZipController extends SkeletalQrdaController<List<ConvertResponse>> {