From d2386ac83a95a84b549a949a73899740b1518a78 Mon Sep 17 00:00:00 2001 From: Jonathan Christison Date: Fri, 7 Jul 2023 01:02:04 +0100 Subject: [PATCH] Set scanRequests on scan, dont put pnc build in json --- src/main/java/com/redhat/pctsec/model/PNCBuild.java | 4 +++- .../java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/redhat/pctsec/model/PNCBuild.java b/src/main/java/com/redhat/pctsec/model/PNCBuild.java index a6f2f88..9cd91af 100644 --- a/src/main/java/com/redhat/pctsec/model/PNCBuild.java +++ b/src/main/java/com/redhat/pctsec/model/PNCBuild.java @@ -1,5 +1,6 @@ package com.redhat.pctsec.model; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.redhat.pctsec.model.api.service.AltPncService; //import com.redhat.pctsec.model.api.service.PncService; import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder; @@ -30,7 +31,8 @@ public class PNCBuild extends BuildType{ */ @Transient - Build build; + @JsonIgnore + private Build build; private URI SCMURL; private String revision; diff --git a/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java b/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java index f37b15c..ce2a300 100644 --- a/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java +++ b/src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java @@ -81,6 +81,7 @@ public class ScanResource { //Now set the actual payload requestor s.setRequestor(scanRequest.requestor); s.setProductName(scanRequest.productName); + s.setScanRequests(scanRequests); sr.persist(s); return s; }