Convert Endpoint

api/src/main/java/org/svip/api/controller/SBOMController.java

@@ -7,21 +7,12 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.svip.api.entities.SBOM;
-import org.svip.api.entities.SBOMFile;
 import org.svip.api.requests.UploadSBOMFileInput;
 import org.svip.api.services.SBOMFileService;
-import org.svip.api.utils.Converter;
-import org.svip.api.utils.Utils;
-import org.svip.merge.MergerController;
-import org.svip.merge.MergerException;
-import org.svip.sbom.builder.objects.SVIPSBOMBuilder;
+import org.svip.sbom.builder.SBOMBuilderException;
 import org.svip.serializers.SerializerFactory;
-import org.svip.serializers.deserializer.Deserializer;
-import org.svip.serializers.serializer.Serializer;
-
-import java.util.ArrayList;
-import java.util.Optional;
-import java.util.Random;
+import org.svip.serializers.exceptions.DeserializerException;
+import org.svip.serializers.exceptions.SerializerException;
 
 /**
  * REST API Controller for managing SBOM and SBOM operations
@@ -44,7 +35,7 @@ public class SBOMController {
      *
      * @param sbomService Service for handling SBOM queries
      */
-    public SBOMController(SBOMFileService sbomService){
+    public SBOMController(SBOMFileService sbomService) {
         this.sbomService = sbomService;
     }
 
@@ -55,7 +46,7 @@ public SBOMController(SBOMFileService sbomService){
 
     /**
      * USAGE. Send POST request to /sboms with one SBOM Input data.
-     *
+     * <p>
      * The API will respond with an HTTP 200 and the ID used to identify the SBOM file.
      *
      * @param uploadSBOMInput Input required to create a new SBOM instance from a request
@@ -79,7 +70,7 @@ public ResponseEntity<Long> upload(@RequestBody UploadSBOMFileInput uploadSBOMIn
             // Problem with parsing
             LOGGER.error("POST /svip/sboms - " + e.getMessage());
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        } catch (Exception e){
+        } catch (Exception e) {
             // Problem with uploading
             LOGGER.error("POST /svip/sboms - " + e.getMessage());
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
@@ -99,7 +90,7 @@ public ResponseEntity<Long> merge(@RequestBody Long[] ids) {
 
         Long mergeID = this.sbomService.merge(ids);
         // todo convert should probably throw errors instead of returning null if error occurs
-        if(mergeID == null)
+        if (mergeID == null)
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
 
         // Return final merged ID
@@ -122,14 +113,15 @@ public ResponseEntity<Long> merge(@RequestBody Long[] ids) {
      * @return ID of converted SBOM
      */
     @PutMapping("/sboms")
-    public ResponseEntity<Long> convert(@RequestParam("id") Long id, @RequestParam("schema") SerializerFactory.Schema schema,
-                                        @RequestParam("format") SerializerFactory.Format format,
-                                        @RequestParam("overwrite") Boolean overwrite) {
-
-        Long convertID = this.sbomService.convert(id, schema, format, overwrite);
-        // todo convert should probably throw errors instead of returning null if error occurs
-        if(convertID == null)
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+    public ResponseEntity<?> convert(@RequestParam("id") Long id, @RequestParam("schema") SerializerFactory.Schema schema,
+                                     @RequestParam("format") SerializerFactory.Format format,
+                                     @RequestParam("overwrite") Boolean overwrite) {
+        Long convertID;
+        try {
+            convertID = this.sbomService.convert(id, schema, format, overwrite);
+        } catch (DeserializerException | SBOMBuilderException | SerializerException | JsonProcessingException e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
 
         // Return converted ID
         return new ResponseEntity<>(convertID, HttpStatus.OK);
@@ -142,26 +134,26 @@ public ResponseEntity<Long> convert(@RequestParam("id") Long id, @RequestParam("
 
     /**
      * USAGE. Send GET request to /sboms with a URL parameter id to get the deserialized SBOM.
-     *
+     * <p>
      * The API will respond with an HTTP 200 and the SBOM object json
      *
      * @param id The id of the SBOM contents to retrieve.
      * @return A deserialized SBOM Object in JSON form
      */
     @GetMapping("/sbom")
-    public ResponseEntity<String> getSBOMObjectAsJSON(@RequestParam("id") Long id){
+    public ResponseEntity<String> getSBOMObjectAsJSON(@RequestParam("id") Long id) {
 
-        try{
+        try {
             String sbom = this.sbomService.getSBOMObjectAsJSON(id);
 
             // No SBOM was found
-            if(sbom == null)
+            if (sbom == null)
                 return new ResponseEntity<>(HttpStatus.NO_CONTENT);
 
             // Else return the object
             return new ResponseEntity<>(sbom, HttpStatus.OK);
 
-        } catch (JsonProcessingException e ){
+        } catch (JsonProcessingException e) {
             // error with Deserialization
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
@@ -170,7 +162,7 @@ public ResponseEntity<String> getSBOMObjectAsJSON(@RequestParam("id") Long id){
 
     /**
      * USAGE. Send GET request to /sboms/content with a URL parameter id to get the contents of the SBOM with the specified ID.
-     *
+     * <p>
      * The API will respond with an HTTP 200 and the contents of the SBOM file.
      *
      * @param id The id of the SBOM contents to retrieve.
@@ -202,7 +194,7 @@ public ResponseEntity<SBOM> getContent(@RequestParam("id") Long id) {
      * @return A JSON array of IDs of all currently uploaded SBOM files.
      */
     @GetMapping("/sboms")
-    public ResponseEntity<Long[]> getAllIds(){
+    public ResponseEntity<Long[]> getAllIds() {
 
         // Get all ids
         Long[] ids = this.sbomService.getAllIDs();
@@ -211,7 +203,7 @@ public ResponseEntity<Long[]> getAllIds(){
         LOGGER.info("GET /svip/sboms - Found " + ids.length + " sbom" + (ids.length == 0 ? "." : "s."));
 
         // report nothing if no SBOMs in the database
-        if(ids.length == 0)
+        if (ids.length == 0)
             return new ResponseEntity<>(HttpStatus.NO_CONTENT);
 
         // Else return the array of stored IDs
@@ -226,7 +218,7 @@ public ResponseEntity<Long[]> getAllIds(){
     /**
      * USAGE. Send DELETE request to /delete with a URL parameter id to get the contents of the SBOM with the specified
      * ID.
-     *
+     * <p>
      * The API will respond with an HTTP 200 and the ID of the deleted SBOM file (if found).
      *
      * @param id The id of the SBOM contents to retrieve.
@@ -236,7 +228,7 @@ public ResponseEntity<Long[]> getAllIds(){
     public ResponseEntity<Long> delete(@RequestParam("id") Long id) {
 
         // Attempt to delete id
-        if(this.sbomService.deleteSBOMFile(id) == null){
+        if (this.sbomService.deleteSBOMFile(id) == null) {
             LOGGER.warn("DELETE /svip/sboms?id=" + id + " - FILE NOT FOUND");
             return new ResponseEntity<>(HttpStatus.NO_CONTENT);
         }

api/src/main/java/org/svip/api/controller/SVIPApiController.java

@@ -13,8 +13,10 @@
 import org.springframework.web.multipart.MultipartFile;
 import org.svip.api.entities.SBOMFile;
 import org.svip.api.repository.SBOMFileRepository;
-import org.svip.api.utils.Converter;
+import org.svip.api.services.SBOMFileService;
 import org.svip.api.utils.Utils;
+import org.svip.conversion.Conversion;
+import org.svip.sbom.builder.SBOMBuilderException;
 import org.svip.sbom.builder.objects.SVIPSBOMBuilder;
 import org.svip.sbom.model.interfaces.generics.Component;
 import org.svip.sbom.model.interfaces.generics.SBOM;
@@ -251,8 +253,7 @@ public ResponseEntity<?> generateParsers(@RequestParam("zipFile") MultipartFile
 
         SBOMFile result = new SBOMFile(projectName + ((format == SerializerFactory.Format.JSON)
                 ? ".json" : ".spdx"), contents);
-        Random rand = new Random();
-        result.setId(Utils.generateNewId(rand.nextLong(), rand, sbomFileRepository));
+        result.setId(SBOMFileService.generateSBOMFileId());
         sbomFileRepository.save(result);
 
         return Utils.encodeResponse(result.getId());
@@ -263,7 +264,7 @@ public ResponseEntity<?> generateParsers(@RequestParam("zipFile") MultipartFile
     public ResponseEntity<?> generateOSI(@RequestParam("zipFile") MultipartFile zipFile,
                                          @RequestParam("projectName") String projectName,
                                          @RequestParam("schema") SerializerFactory.Schema schema,
-                                         @RequestParam("format") SerializerFactory.Format format) {
+                                         @RequestParam("format") SerializerFactory.Format format) throws SBOMBuilderException {
         if (osiContainer == null)
             return new ResponseEntity<>("OSI has been disabled for this instance.", HttpStatus.NOT_FOUND);
 
@@ -357,7 +358,8 @@ public ResponseEntity<?> generateOSI(@RequestParam("zipFile") MultipartFile zipF
                         HttpStatus.NOT_FOUND);
             }
         }
-        Converter.buildSBOM(builder, osiMerged, schema, oldSchema);
+
+        Conversion.buildSBOM(osiMerged, schema, oldSchema);
         builder.setName(projectName); // Set SBOM name to specified project name TODO should this be done in OSI class?
 
         // Serialize SVIPSBOM to given schema and format

api/src/main/java/org/svip/api/entities/SBOM.java

@@ -169,4 +169,5 @@ public Schema getSchema(){
     public FileType getFileType() {
         return this.fileType;
     }
+
 }

api/src/main/java/org/svip/api/entities/SBOMFile.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import org.hibernate.annotations.GenericGenerator;
-import org.svip.api.repository.SBOMFileIdentifierGenerator;
 
 /**
  * Dataclass containing JSON-friendly SBOM objects. Contains {@code fileName} & {@code contents} fields that are capable
@@ -22,9 +21,9 @@ public class SBOMFile {
      * Autogenerated primary key.
      */
     @Id
-    @GeneratedValue(generator = SBOMFileIdentifierGenerator.generatorName)
-    @GenericGenerator(name = SBOMFileIdentifierGenerator.generatorName,
-            strategy = "org.svip.api.repository.SBOMFileIdentifierGenerator")
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(nullable = false)
+    @JsonProperty
     private long id;
 
     /**

api/src/main/java/org/svip/api/requests/UploadSBOMFileInput.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.svip.api.entities.SBOM;
+import org.svip.api.services.SBOMFileService;
 import org.svip.serializers.SerializerFactory;
 import org.svip.serializers.deserializer.Deserializer;