From 3b5f6a1de619cb16bccc599d817cdfbc89c9bcfa Mon Sep 17 00:00:00 2001 From: jenszo <6693266+jenszo@users.noreply.github.com> Date: Wed, 20 Sep 2023 11:22:17 +0200 Subject: [PATCH 1/3] Adding BomReport view and component Signed-off-by: jenszo <6693266+jenszo@users.noreply.github.com> --- .../manual/component/BomReportRequest.java | 39 +++++++++++++++++++ .../api/manual/view/BomReportContentView.java | 38 ++++++++++++++++++ .../api/manual/view/BomReportView.java | 23 +++++++++++ 3 files changed, 100 insertions(+) create mode 100644 src/main/java/com/synopsys/integration/blackduck/api/manual/component/BomReportRequest.java create mode 100644 src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportContentView.java create mode 100644 src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportView.java diff --git a/src/main/java/com/synopsys/integration/blackduck/api/manual/component/BomReportRequest.java b/src/main/java/com/synopsys/integration/blackduck/api/manual/component/BomReportRequest.java new file mode 100644 index 00000000..80866663 --- /dev/null +++ b/src/main/java/com/synopsys/integration/blackduck/api/manual/component/BomReportRequest.java @@ -0,0 +1,39 @@ +package com.synopsys.integration.blackduck.api.manual.component; + +import com.synopsys.integration.blackduck.api.core.BlackDuckComponent; + +/** + * Class for a report creation request mapped to a JSON payload by Blackduck API + * for a HTTP POST request, e.g. + * {"reportFormat":"JSON","reportType":"SBOM","sbomType":"SPDX_22"} + */ +public class BomReportRequest extends BlackDuckComponent { + private String reportFormat; + private String reportType; + private String sbomType; + + public String getReportFormat() { + return reportFormat; + } + + public void setReportFormat(String reportFormat) { + this.reportFormat = reportFormat; + } + + public String getReportType() { + return reportType; + } + + public void setReportType(String reportType) { + this.reportType = reportType; + } + + public String getSbomType() { + return sbomType; + } + + public void setSbomType(String sbomType) { + this.sbomType = sbomType; + } + +} diff --git a/src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportContentView.java b/src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportContentView.java new file mode 100644 index 00000000..23163ed3 --- /dev/null +++ b/src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportContentView.java @@ -0,0 +1,38 @@ +package com.synopsys.integration.blackduck.api.manual.view; + +import com.google.gson.JsonObject; +import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; + +/** + * Class representing an entry on the BDH reponse for a Bill of Materials report + * download request. The blackduck API uses this to map the JSON response into it. + */ +public class BomReportContentView extends BlackDuckResponse { + private String fileName; + private JsonObject fileContent; + private String fileNamePrefix; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public JsonObject getFileContent() { + return fileContent; + } + + public void setFileContent(JsonObject fileContent) { + this.fileContent = fileContent; + } + + public String getFileNamePrefix() { + return fileNamePrefix; + } + + public void setFileNamePrefix(String fileNamePrefix) { + this.fileNamePrefix = fileNamePrefix; + } +} diff --git a/src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportView.java b/src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportView.java new file mode 100644 index 00000000..3916caff --- /dev/null +++ b/src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportView.java @@ -0,0 +1,23 @@ +package com.synopsys.integration.blackduck.api.manual.view; + +import java.util.List; + +import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; + +/** + * Class representing the BDH reponse for a Bill of Materials report download request + * The blackduck API uses this to map the JSON response into it. + */ +public class BomReportView extends BlackDuckResponse{ + + private List reportContent; + + public List getReportContent() { + return reportContent; + } + + public void setReportContent(List reportContent) { + this.reportContent = reportContent; + } + +} \ No newline at end of file From 581c967383367f7122d84048322765f5579e6a73 Mon Sep 17 00:00:00 2001 From: jenszo <6693266+jenszo@users.noreply.github.com> Date: Wed, 20 Sep 2023 12:07:55 +0200 Subject: [PATCH 2/3] Adapting naming conventionS Signed-off-by: jenszo <6693266+jenszo@users.noreply.github.com> --- build.gradle | 2 +- .../{BomReportRequest.java => ReportBomRequest.java} | 2 +- ...omReportContentView.java => ReportBomContentView.java} | 2 +- .../view/{BomReportView.java => ReportBomView.java} | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/com/synopsys/integration/blackduck/api/manual/component/{BomReportRequest.java => ReportBomRequest.java} (93%) rename src/main/java/com/synopsys/integration/blackduck/api/manual/view/{BomReportContentView.java => ReportBomContentView.java} (93%) rename src/main/java/com/synopsys/integration/blackduck/api/manual/view/{BomReportView.java => ReportBomView.java} (64%) diff --git a/build.gradle b/build.gradle index 739f8e70..f6294ac6 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { project.ext.moduleName = 'com.synopsys.integration.blackduck-common-api' project.ext.javaUseAutoModuleName = 'true' -version = '2023.4.2.3-SNAPSHOT' +version = '2023.4.2.3' description = 'A library of mostly temporary request/response classes for the Black Duck REST API.' diff --git a/src/main/java/com/synopsys/integration/blackduck/api/manual/component/BomReportRequest.java b/src/main/java/com/synopsys/integration/blackduck/api/manual/component/ReportBomRequest.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/api/manual/component/BomReportRequest.java rename to src/main/java/com/synopsys/integration/blackduck/api/manual/component/ReportBomRequest.java index 80866663..8d2442c7 100644 --- a/src/main/java/com/synopsys/integration/blackduck/api/manual/component/BomReportRequest.java +++ b/src/main/java/com/synopsys/integration/blackduck/api/manual/component/ReportBomRequest.java @@ -7,7 +7,7 @@ * for a HTTP POST request, e.g. * {"reportFormat":"JSON","reportType":"SBOM","sbomType":"SPDX_22"} */ -public class BomReportRequest extends BlackDuckComponent { +public class ReportBomRequest extends BlackDuckComponent { private String reportFormat; private String reportType; private String sbomType; diff --git a/src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportContentView.java b/src/main/java/com/synopsys/integration/blackduck/api/manual/view/ReportBomContentView.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportContentView.java rename to src/main/java/com/synopsys/integration/blackduck/api/manual/view/ReportBomContentView.java index 23163ed3..80212d56 100644 --- a/src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportContentView.java +++ b/src/main/java/com/synopsys/integration/blackduck/api/manual/view/ReportBomContentView.java @@ -7,7 +7,7 @@ * Class representing an entry on the BDH reponse for a Bill of Materials report * download request. The blackduck API uses this to map the JSON response into it. */ -public class BomReportContentView extends BlackDuckResponse { +public class ReportBomContentView extends BlackDuckResponse { private String fileName; private JsonObject fileContent; private String fileNamePrefix; diff --git a/src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportView.java b/src/main/java/com/synopsys/integration/blackduck/api/manual/view/ReportBomView.java similarity index 64% rename from src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportView.java rename to src/main/java/com/synopsys/integration/blackduck/api/manual/view/ReportBomView.java index 3916caff..76a24b8c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/api/manual/view/BomReportView.java +++ b/src/main/java/com/synopsys/integration/blackduck/api/manual/view/ReportBomView.java @@ -8,15 +8,15 @@ * Class representing the BDH reponse for a Bill of Materials report download request * The blackduck API uses this to map the JSON response into it. */ -public class BomReportView extends BlackDuckResponse{ +public class ReportBomView extends BlackDuckResponse{ - private List reportContent; + private List reportContent; - public List getReportContent() { + public List getReportContent() { return reportContent; } - public void setReportContent(List reportContent) { + public void setReportContent(List reportContent) { this.reportContent = reportContent; } From d32fdd2f25120fbe3c4cddf1bba6916d218e1098 Mon Sep 17 00:00:00 2001 From: jenszo <6693266+jenszo@users.noreply.github.com> Date: Wed, 20 Sep 2023 12:39:02 +0200 Subject: [PATCH 3/3] SNAPSHOT Version Signed-off-by: jenszo <6693266+jenszo@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f6294ac6..739f8e70 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { project.ext.moduleName = 'com.synopsys.integration.blackduck-common-api' project.ext.javaUseAutoModuleName = 'true' -version = '2023.4.2.3' +version = '2023.4.2.3-SNAPSHOT' description = 'A library of mostly temporary request/response classes for the Black Duck REST API.'