From 008c20cfd3da265cb76afa34a97f5a02dc30294a Mon Sep 17 00:00:00 2001 From: jeeppler Date: Fri, 17 Feb 2023 21:54:26 +0100 Subject: [PATCH] Refactoring and test fixes #1768 - move ProductIdentifier into shared kernel - remove ProductType (redundant) - fix tests - fix and format pds-config-integrationtest.json --- .../product/nessus/NessusProductExecutor.java | 2 +- .../netsparker/NetsparkerProductExecutor.java | 2 +- .../admin/DeveloperAdministration.java | 2 +- .../developertools/admin/ui/CommandUI.java | 2 +- ...tExecutorTemplatesDialogActionFactory.java | 2 +- .../ProductExecutorTemplatesDialogUI.java | 2 +- ...wProductExecutorTemplatesDialogAction.java | 2 +- .../action/config/ExecutorConfigDialogUI.java | 2 +- ...utionProfileRestControllerRestDocTest.java | 2 +- ...ecutorConfigRestControllerRestDocTest.java | 2 +- .../resources/pds-config-integrationtest.json | 423 ++++++++---------- ...equestedUserNotificationServiceHelper.java | 1 + ...stedUserNotificationServiceHelperTest.java | 1 + .../checkmarx/CheckmarxProductExecutor.java | 2 +- .../CheckmarxProductExecutorMockTest.java | 2 +- .../pds/AbstractPDSProductExecutor.java | 2 +- .../product/pds/PDSAnalyticsExecutor.java | 2 +- .../pds/PDSCodeScanProductExecutor.java | 2 +- .../pds/PDSInfraScanProductExecutor.java | 2 +- .../pds/PDSLicenseScanProductExecutor.java | 2 +- .../pds/PDSSecretScanProductExecutor.java | 2 +- .../pds/PDSWebScanProductExecutor.java | 2 +- ...ctExecutorMinimumConfigValidationTest.java | 2 +- .../SerecoProductResultSpdxJsonResolver.java | 2 +- .../SerecoProductResultTransformer.java | 2 +- .../sereco/SerecoReportProductExecutor.java | 2 +- .../SerecoProductResultTransformerTest.java | 2 +- .../IntegrationTestScanRestController.java | 2 +- ...SecHubReportProductTransformerService.java | 2 +- .../AbstractProductExecutionService.java | 1 + .../scan/product/AbstractProductExecutor.java | 1 + .../scan/product/ProductIdentifiable.java | 2 + .../domain/scan/product/ProductResult.java | 1 + .../ProductResultRepositoryCustom.java | 1 + .../product/ProductResultRepositoryImpl.java | 1 + .../domain/scan/product/ProductType.java | 19 - .../DefaultProductExecutorConfigInfo.java | 2 +- .../DeleteProductExecutorConfigService.java | 2 +- .../product/config/ProductExecutorConfig.java | 2 +- .../config/ProductExecutorConfigInfo.java | 2 +- .../ProductExecutorConfigRepository.java | 2 +- .../WithoutProductExecutorConfigInfo.java | 2 +- .../report/DownloadSpdxScanReportService.java | 2 +- .../ReportProductResultTransformer.java | 2 +- ...ubReportProductTransformerServiceTest.java | 2 +- .../AbstractProductExecutionServiceTest.java | 1 + .../product/AbstractProductExecutorTest.java | 1 + .../ProductResultRepositoryDBTest.java | 3 +- ...ConfigAndProfileQueryRepositoryDBTest.java | 2 +- ...ProductExecutorConfigRepositoryDBTest.java | 2 +- ...oductExecutorConfigValidationImplTest.java | 2 +- .../DownloadSpdxScanReportServiceTest.java | 2 +- .../sechub/sereco/ImportParameter.java | 19 +- .../sharedkernel}/ProductIdentifier.java | 41 +- .../sharedkernel/ProductIdentifierTest.java | 54 +++ .../sechub/test/report/ReportTestHelper.java | 2 +- .../report/Sarif2Sereco2SecHubReportTest.java | 2 +- .../report/ThymeLeafHTMLReportingTest.java | 2 +- .../sechub/webui/CredentialService.java | 1 + .../resources/application-localserver.yml | 1 + .../src/main/resources/application-test.yml | 1 + 61 files changed, 324 insertions(+), 333 deletions(-) delete mode 100644 sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductType.java rename {sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product => sechub-shared-kernel/src/main/java/com/mercedesbenz/sechub/sharedkernel}/ProductIdentifier.java (58%) create mode 100644 sechub-shared-kernel/src/test/java/com/mercedesbenz/sechub/sharedkernel/ProductIdentifierTest.java diff --git a/deprecated-sechub-scan-product-nessus/src/main/java/com/mercedesbenz/sechub/domain/scan/product/nessus/NessusProductExecutor.java b/deprecated-sechub-scan-product-nessus/src/main/java/com/mercedesbenz/sechub/domain/scan/product/nessus/NessusProductExecutor.java index 84eb4716b1..b001928171 100644 --- a/deprecated-sechub-scan-product-nessus/src/main/java/com/mercedesbenz/sechub/domain/scan/product/nessus/NessusProductExecutor.java +++ b/deprecated-sechub-scan-product-nessus/src/main/java/com/mercedesbenz/sechub/domain/scan/product/nessus/NessusProductExecutor.java @@ -24,9 +24,9 @@ import com.mercedesbenz.sechub.domain.scan.product.AbstractProductExecutor; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorData; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.sharedkernel.MustBeDocumented; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.configuration.SecHubConfiguration; @Deprecated // will be removed in future diff --git a/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerProductExecutor.java b/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerProductExecutor.java index e758b7e5da..d524f73dc5 100644 --- a/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerProductExecutor.java +++ b/deprecated-sechub-scan-product-netsparker/src/main/java/com/mercedesbenz/sechub/domain/scan/product/netsparker/NetsparkerProductExecutor.java @@ -27,8 +27,8 @@ import com.mercedesbenz.sechub.domain.scan.product.AbstractProductExecutor; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorData; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.configuration.SecHubConfiguration; @Deprecated // will be removed in future diff --git a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/DeveloperAdministration.java b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/DeveloperAdministration.java index 3b5edf8f0b..4338d26366 100644 --- a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/DeveloperAdministration.java +++ b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/DeveloperAdministration.java @@ -25,7 +25,6 @@ import com.mercedesbenz.sechub.commons.pds.PDSDefaultParameterKeyConstants; import com.mercedesbenz.sechub.developertools.admin.ui.ConfigurationSetup; import com.mercedesbenz.sechub.developertools.admin.ui.UIContext; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.pds.PDSProductExecutorKeyConstants; import com.mercedesbenz.sechub.domain.scan.product.pds.SecHubProductExecutionPDSKeyProvider; import com.mercedesbenz.sechub.integrationtest.api.AsPDSUser; @@ -44,6 +43,7 @@ import com.mercedesbenz.sechub.integrationtest.internal.TestJSONHelper; import com.mercedesbenz.sechub.integrationtest.internal.TestRestHelper; import com.mercedesbenz.sechub.integrationtest.internal.TestRestHelper.RestHelperTarget; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.project.ProjectAccessLevel; import com.mercedesbenz.sechub.test.PDSTestURLBuilder; import com.mercedesbenz.sechub.test.SecHubTestURLBuilder; diff --git a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/CommandUI.java b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/CommandUI.java index d6ae78e9ff..1446c34ba6 100644 --- a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/CommandUI.java +++ b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/CommandUI.java @@ -106,7 +106,7 @@ import com.mercedesbenz.sechub.developertools.admin.ui.action.user.UpdateUserEmailAction; import com.mercedesbenz.sechub.developertools.admin.ui.action.user.privileges.GrantAdminRightsToUserAction; import com.mercedesbenz.sechub.developertools.admin.ui.action.user.privileges.RevokeAdminRightsFromAdminAction; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; public class CommandUI { private static final ImageIcon EDIT_ROAD_BLACK_ICON = new ImageIcon(CommandUI.class.getResource("/icons/material-io/twotone_edit_road_black_18dp.png")); diff --git a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/ShowProductExecutorTemplatesDialogActionFactory.java b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/ShowProductExecutorTemplatesDialogActionFactory.java index 1a710344cd..13ac0bfcbb 100644 --- a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/ShowProductExecutorTemplatesDialogActionFactory.java +++ b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/ShowProductExecutorTemplatesDialogActionFactory.java @@ -8,8 +8,8 @@ import com.mercedesbenz.sechub.developertools.admin.ui.action.adapter.TemplatesDialogData; import com.mercedesbenz.sechub.developertools.admin.ui.action.adapter.TemplatesDialogData.Necessarity; import com.mercedesbenz.sechub.developertools.admin.ui.action.adapter.TemplatesDialogData.Type; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.pds.SecHubProductExecutionPDSKeyProvider; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.mapping.MappingIdentifier; public class ShowProductExecutorTemplatesDialogActionFactory { diff --git a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/adapter/ProductExecutorTemplatesDialogUI.java b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/adapter/ProductExecutorTemplatesDialogUI.java index 92f71684ae..6c32dbe81a 100644 --- a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/adapter/ProductExecutorTemplatesDialogUI.java +++ b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/adapter/ProductExecutorTemplatesDialogUI.java @@ -36,7 +36,7 @@ import com.mercedesbenz.sechub.developertools.admin.ui.action.adapter.TemplatesDialogData.Type; import com.mercedesbenz.sechub.developertools.admin.ui.util.SortedMapToTextConverter; import com.mercedesbenz.sechub.developertools.admin.ui.util.TextToSortedMapConverter; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.wrapper.checkmarx.cli.CheckmarxWrapperKeys; public class ProductExecutorTemplatesDialogUI { diff --git a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/adapter/ShowProductExecutorTemplatesDialogAction.java b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/adapter/ShowProductExecutorTemplatesDialogAction.java index c950ecf37c..0e058b91b7 100644 --- a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/adapter/ShowProductExecutorTemplatesDialogAction.java +++ b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/adapter/ShowProductExecutorTemplatesDialogAction.java @@ -8,7 +8,7 @@ import com.mercedesbenz.sechub.developertools.admin.ui.UIContext; import com.mercedesbenz.sechub.developertools.admin.ui.action.adapter.ProductExecutorTemplatesDialogUI.TemplatesDialogConfig; import com.mercedesbenz.sechub.developertools.admin.ui.action.adapter.ProductExecutorTemplatesDialogUI.TemplatesDialogResult; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; public class ShowProductExecutorTemplatesDialogAction extends AbstractAction { private static final long serialVersionUID = 1L; diff --git a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/config/ExecutorConfigDialogUI.java b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/config/ExecutorConfigDialogUI.java index a76d2cb4a5..fde5802054 100644 --- a/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/config/ExecutorConfigDialogUI.java +++ b/sechub-developertools/src/main/java/com/mercedesbenz/sechub/developertools/admin/ui/action/config/ExecutorConfigDialogUI.java @@ -42,7 +42,7 @@ import com.mercedesbenz.sechub.developertools.admin.ui.action.adapter.ShowProductExecutorTemplatesDialogAction; import com.mercedesbenz.sechub.developertools.admin.ui.util.SortedMapToTextConverter; import com.mercedesbenz.sechub.developertools.admin.ui.util.TextToSortedMapConverter; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.test.executorconfig.TestExecutorConfig; import com.mercedesbenz.sechub.test.executorconfig.TestExecutorSetupJobParam; diff --git a/sechub-doc/src/test/java/com/mercedesbenz/sechub/restdoc/ProductExecutionProfileRestControllerRestDocTest.java b/sechub-doc/src/test/java/com/mercedesbenz/sechub/restdoc/ProductExecutionProfileRestControllerRestDocTest.java index ca966d1386..e953f16fc7 100644 --- a/sechub-doc/src/test/java/com/mercedesbenz/sechub/restdoc/ProductExecutionProfileRestControllerRestDocTest.java +++ b/sechub-doc/src/test/java/com/mercedesbenz/sechub/restdoc/ProductExecutionProfileRestControllerRestDocTest.java @@ -34,7 +34,6 @@ import com.mercedesbenz.sechub.commons.model.JSONConverter; import com.mercedesbenz.sechub.docgen.util.RestDocFactory; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.config.CreateProductExecutionProfileService; import com.mercedesbenz.sechub.domain.scan.product.config.DeleteProductExecutionProfileService; import com.mercedesbenz.sechub.domain.scan.product.config.FetchProductExecutionProfileListService; @@ -49,6 +48,7 @@ import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigSetupJobParameter; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigValidation; import com.mercedesbenz.sechub.domain.scan.product.config.UpdateProductExecutionProfileService; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.Profiles; import com.mercedesbenz.sechub.sharedkernel.RoleConstants; import com.mercedesbenz.sechub.sharedkernel.configuration.AbstractAllowSecHubAPISecurityConfiguration; diff --git a/sechub-doc/src/test/java/com/mercedesbenz/sechub/restdoc/ProductExecutorConfigRestControllerRestDocTest.java b/sechub-doc/src/test/java/com/mercedesbenz/sechub/restdoc/ProductExecutorConfigRestControllerRestDocTest.java index 2af3acd530..733c8e70bc 100644 --- a/sechub-doc/src/test/java/com/mercedesbenz/sechub/restdoc/ProductExecutorConfigRestControllerRestDocTest.java +++ b/sechub-doc/src/test/java/com/mercedesbenz/sechub/restdoc/ProductExecutorConfigRestControllerRestDocTest.java @@ -35,7 +35,6 @@ import com.mercedesbenz.sechub.commons.model.JSONConverter; import com.mercedesbenz.sechub.docgen.util.RestDocFactory; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.config.CreateProductExecutorConfigService; import com.mercedesbenz.sechub.domain.scan.product.config.DeleteProductExecutorConfigService; import com.mercedesbenz.sechub.domain.scan.product.config.FetchProductExecutorConfigListService; @@ -50,6 +49,7 @@ import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigSetupJobParameter; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigValidation; import com.mercedesbenz.sechub.domain.scan.product.config.UpdateProductExecutorConfigService; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.Profiles; import com.mercedesbenz.sechub.sharedkernel.RoleConstants; import com.mercedesbenz.sechub.sharedkernel.configuration.AbstractAllowSecHubAPISecurityConfiguration; diff --git a/sechub-integrationtest/src/main/resources/pds-config-integrationtest.json b/sechub-integrationtest/src/main/resources/pds-config-integrationtest.json index 16fdddab19..f15fb19027 100644 --- a/sechub-integrationtest/src/main/resources/pds-config-integrationtest.json +++ b/sechub-integrationtest/src/main/resources/pds-config-integrationtest.json @@ -1,247 +1,188 @@ { -==== BASE ==== - "apiVersion": "1.0", - - "serverId" : "integration_test_singlenode1", - - "products": [ - { - "id": "PDS_INTTEST_PRODUCT_CODESCAN", - "path": "./../sechub-integrationtest/pds/product-scripts/integrationtest-codescan.sh", - "scanType": "codeScan", - "description": "This is only a fake code scan - used by integration tests. The code scan will just return data from uploaded zip file", - "parameters": { - "mandatory": [ - { - "key": "product1.qualititycheck.enabled", - "description": "when 'true' quality scan results are added as well" - }, - { - "key": "product1.level", - "description": "numeric, 1-gets all, 2-only critical,fatal and medium, 3- only critical and fatal" - } - ], - "optional": [ - { - "key": "product1.add.tipoftheday", - "description": "add tip of the day as info" - }, - { - "key": "pds.test.key.variantname", - "description": "a parameter from configuration - will be different in each integration test config from sechub integration test server" - }, - { - "key": "test.mapping1.replace.project1", - "description": "mapping1 for testing - only in variant j, will have mapping from sechub" - }, - { - "key": "test.mapping2.not.existing.in.sechub", - "description": "mapping 2 for testing - only in variant j, will have fallback data (empty)" - } - - ] - } - }, - { - "id": "PDS_INTTEST_PRODUCT_CS_SARIF", - "path": "./../sechub-integrationtest/pds/product-scripts/integrationtest-codescan-sarif.sh", - "scanType": "codeScan", - "description": "This is only a fake code scan - used by integration tests. The code scan will just return data from uploaded zip file", - "parameters": { - "mandatory": [ - { - "key": "product1.qualititycheck.enabled", - "description": "when 'true' quality scan results are added as well" - }, - { - "key": "product1.level", - "description": "numeric, 1-gets all, 2-only critical,fatal and medium, 3- only critical and fatal" - } - ], - "optional": [ - { - "key": "product1.add.tipoftheday", - "description": "add tip of the day as info" - }, - { - "key": "pds.test.key.variantname", - "description": "a parameter from configuration - will be different in each integration test config from sechub integration test server" - }, - { - "key": "pds.config.supported.datatypes", - "description": "Supported data types. Should not be changed at runtime", - "default": "source" - } - ] - } - }, - { - "id": "PDS_INTTEST_PRODUCT_WEBSCAN", - "path": "./../sechub-integrationtest/pds/product-scripts/integrationtest-webscan.sh", - "scanType": "webScan", - "description": "This is only a fake web scan - used by integration tests.", - "parameters": { - "mandatory": [ - { - "key": "product2.level", - "description": "numeric, 1-gets all, 2-only critical,fatal and medium, 3- only critical and fatal" - }, - { - "key": "pds.config.supported.datatypes", - "description": "We accept only sources (open api files) or none (simple webscan) here!", - "default": "none, source" - } - ], - "optional": [ - { - "key": "pds.test.key.variantname", - "description": "a parameter from configuration - will be different in each integration test config from sechub integration test server" - } - ] - } - }, - { - "id": "PDS_INTTEST_PRODUCT_INFRASCAN", - "path": "./../sechub-integrationtest/pds/product-scripts/integrationtest-infrascan.sh", - "scanType": "infraScan", - "description": "This is only a fake infra scan - used by integration tests.", - "parameters": { - "mandatory": [ - { - "key": "pds.config.supported.datatypes", - "description": "We do not need any sources or binaries here", - "default": "none" - } - ] - } - }, - { - "id": "PDS_INTTEST_PRODUCT_WS_SARIF", - "path": "./../sechub-integrationtest/pds/product-scripts/integrationtest-webscan-sarif.sh", - "scanType": "webScan", - "description": "This webscan will return SARIF json test file data based on the parameter 'pds.test.key.variantname'", - "parameters": { - "optional": [ - { - "key": "product1.qualititycheck.enabled", - "description": "when 'true' quality scan results are added as well" - }, - { - "key": "product1.level", - "description": "numeric, 1-gets all, 2-only critical,fatal and medium, 3- only critical and fatal" - }, - { - "key": "product1.add.tipoftheday", - "description": "add tip of the day as info" - }, - { - "key": "pds.test.key.variantname", - "description": "a parameter from configuration - currently we provide :'owasp-file-1'" - } , - { - "key": "pds.config.supported.datatypes", - "description": "We accept only sources (open api files) or none (simple webscan) here!", - "default": "none, source" - } - ] - } - }, - { - "id": "PDS_CHECKMARX_INTEGRATIONTEST", - "path": "./../sechub-integrationtest/pds/product-scripts/integrationtest-checkmarx.sh", - "scanType": "codeScan", - "description": "Runs Checkmarx. This config should be (except the script path and the id) always same as pds-solution variant!", - "parameters": { - "mandatory": [ - { - "key": "pds.checkmarx.baseurl", - "description": "The base URL of the checkmarx server." - }, - { - "key": "checkmarx.newproject.teamid.mapping", - "description": "The team id mapping" - }, - { - "key": "pds.checkmarx.user", - "description": "The user (or an environment entry) of the checkmarx user." - }, - { - "key": "pds.checkmarx.password", - "description": "The password (or an environment entry) of the checkmarx user." - }, - { - "key": "pds.config.supported.datatypes", - "description": "We accept only sources here!", - "default": "source" - } - ], - "optional": [ - { - "key": "pds.checkmarx.engine.configuration.name", - "description": "The name of the engine to use. If not set, a default engine will be used." - }, - { - "key": "checkmarx.newproject.presetid.mapping", - "description": "When not set, the default preset will be used" - }, - { - "key": "pds.checkmarx.mocking.enabled", - "description": "When true, a mocked adapter will be used." - }, - { - "key": "pds.checkmarx.result.check.period.minutes", - "description": "The period time in minutes when checkmarx adapter tries to fetch the result from checkmarx server again." - }, - { - "key": "pds.checkmarx.result.check.timeout.minutes", - "description": "The timout in minutes when checkmarx adapter will stop communictaion with checkmarx server and return an error instead." - }, - { - "key": "pds.checkmarx.client.secret", - "description": "This is a standard value and has not to be set. It is NOT a really secret value. But we made this value optional to be safe in future, if the static default value must be changed." - }, - { - "key": "pds.checkmarx.always.fullscan.enabled", - "description": "When true, full scan is always active." - } - ] - } - }, - { - "id": "PDS_TEST_PRODUCT_LICENSESCAN", - "path": "./../sechub-integrationtest/pds/product-scripts/integrationtest-licensescan.sh", - "scanType": "licenseScan", - "description": "This is only a fake license scan - used by integration tests." - }, - { - "id": "PDS_TEST_PMD", - "path": "./../sechub-integrationtest/pds/product-scripts/integrationtest-pmd.sh", - "scanType": "codeScan", - "description": "This is a fake PMD scan - used by integration tests." - }, - { - "id": "PDS_INTTEST_PRODUCT_ANALYZE", - "path": "./../sechub-integrationtest/pds/product-scripts/integrationtest-analytics.sh", - "scanType": "analytics", - "description": "This is a fake analytics scan - used by integration tests.", - "parameters": { - "optional": [ - { - "key": "pds.test.key.variantname", - "description": "a parameter from configuration, can be used to handle differerent variants in same script" - }, - { - "key": "pds.config.supported.datatypes", - "description": "Supported data types. In our test we only accept 'source'. And we check this also inside the script. When the script is executed, it MUST have sources!", - "default": "source" - } - ] - } - }, -{ + "apiVersion" : "1.0", + "serverId" : "integration_test_singlenode1", + "products" : [ { + "id" : "PDS_INTTEST_PRODUCT_CODESCAN", + "path" : "./../sechub-integrationtest/pds/product-scripts/integrationtest-codescan.sh", + "scanType" : "codeScan", + "description" : "This is only a fake code scan - used by integration tests. The code scan will just return data from uploaded zip file", + "parameters" : { + "mandatory" : [ { + "key" : "product1.qualititycheck.enabled", + "description" : "when 'true' quality scan results are added as well" + }, { + "key" : "product1.level", + "description" : "numeric, 1-gets all, 2-only critical,fatal and medium, 3- only critical and fatal" + } ], + "optional" : [ { + "key" : "product1.add.tipoftheday", + "description" : "add tip of the day as info" + }, { + "key" : "pds.test.key.variantname", + "description" : "a parameter from configuration - will be different in each integration test config from sechub integration test server" + }, { + "key" : "test.mapping1.replace.project1", + "description" : "mapping1 for testing - only in variant j, will have mapping from sechub" + }, { + "key" : "test.mapping2.not.existing.in.sechub", + "description" : "mapping 2 for testing - only in variant j, will have fallback data (empty)" + } ] + } + }, { + "id" : "PDS_INTTEST_PRODUCT_CS_SARIF", + "path" : "./../sechub-integrationtest/pds/product-scripts/integrationtest-codescan-sarif.sh", + "scanType" : "codeScan", + "description" : "This is only a fake code scan - used by integration tests. The code scan will just return data from uploaded zip file", + "parameters" : { + "mandatory" : [ { + "key" : "product1.qualititycheck.enabled", + "description" : "when 'true' quality scan results are added as well" + }, { + "key" : "product1.level", + "description" : "numeric, 1-gets all, 2-only critical,fatal and medium, 3- only critical and fatal" + } ], + "optional" : [ { + "key" : "product1.add.tipoftheday", + "description" : "add tip of the day as info" + }, { + "key" : "pds.test.key.variantname", + "description" : "a parameter from configuration - will be different in each integration test config from sechub integration test server" + }, { + "key" : "pds.config.supported.datatypes", + "description" : "Supported data types. Should not be changed at runtime", + "default" : "source" + } ] + } + }, { + "id" : "PDS_INTTEST_PRODUCT_WEBSCAN", + "path" : "./../sechub-integrationtest/pds/product-scripts/integrationtest-webscan.sh", + "scanType" : "webScan", + "description" : "This is only a fake web scan - used by integration tests.", + "parameters" : { + "mandatory" : [ { + "key" : "product2.level", + "description" : "numeric, 1-gets all, 2-only critical,fatal and medium, 3- only critical and fatal" + }, { + "key" : "pds.config.supported.datatypes", + "description" : "We accept only sources (open api files) or none (simple webscan) here!", + "default" : "none, source" + } ], + "optional" : [ { + "key" : "pds.test.key.variantname", + "description" : "a parameter from configuration - will be different in each integration test config from sechub integration test server" + } ] + } + }, { + "id" : "PDS_INTTEST_PRODUCT_INFRASCAN", + "path" : "./../sechub-integrationtest/pds/product-scripts/integrationtest-infrascan.sh", + "scanType" : "infraScan", + "description" : "This is only a fake infra scan - used by integration tests.", + "parameters" : { + "mandatory" : [ { + "key" : "pds.config.supported.datatypes", + "description" : "We do not need any sources or binaries here", + "default" : "none" + } ] + } + }, { + "id" : "PDS_INTTEST_PRODUCT_WS_SARIF", + "path" : "./../sechub-integrationtest/pds/product-scripts/integrationtest-webscan-sarif.sh", + "scanType" : "webScan", + "description" : "This webscan will return SARIF json test file data based on the parameter 'pds.test.key.variantname'", + "parameters" : { + "optional" : [ { + "key" : "product1.qualititycheck.enabled", + "description" : "when 'true' quality scan results are added as well" + }, { + "key" : "product1.level", + "description" : "numeric, 1-gets all, 2-only critical,fatal and medium, 3- only critical and fatal" + }, { + "key" : "product1.add.tipoftheday", + "description" : "add tip of the day as info" + }, { + "key" : "pds.test.key.variantname", + "description" : "a parameter from configuration - currently we provide :'owasp-file-1'" + }, { + "key" : "pds.config.supported.datatypes", + "description" : "We accept only sources (open api files) or none (simple webscan) here!", + "default" : "none, source" + } ] + } + }, { + "id" : "PDS_CHECKMARX_INTEGRATIONTEST", + "path" : "./../sechub-integrationtest/pds/product-scripts/integrationtest-checkmarx.sh", + "scanType" : "codeScan", + "description" : "Runs Checkmarx. This config should be (except the script path and the id) always same as pds-solution variant!", + "parameters" : { + "mandatory" : [ { + "key" : "pds.checkmarx.baseurl", + "description" : "The base URL of the checkmarx server." + }, { + "key" : "checkmarx.newproject.teamid.mapping", + "description" : "The team id mapping" + }, { + "key" : "pds.checkmarx.user", + "description" : "The user (or an environment entry) of the checkmarx user." + }, { + "key" : "pds.checkmarx.password", + "description" : "The password (or an environment entry) of the checkmarx user." + }, { + "key" : "pds.config.supported.datatypes", + "description" : "We accept only sources here!", + "default" : "source" + } ], + "optional" : [ { + "key" : "pds.checkmarx.engine.configuration.name", + "description" : "The name of the engine to use. If not set, a default engine will be used." + }, { + "key" : "checkmarx.newproject.presetid.mapping", + "description" : "When not set, the default preset will be used" + }, { + "key" : "pds.checkmarx.mocking.enabled", + "description" : "When true, a mocked adapter will be used." + }, { + "key" : "pds.checkmarx.result.check.period.minutes", + "description" : "The period time in minutes when checkmarx adapter tries to fetch the result from checkmarx server again." + }, { + "key" : "pds.checkmarx.result.check.timeout.minutes", + "description" : "The timout in minutes when checkmarx adapter will stop communictaion with checkmarx server and return an error instead." + }, { + "key" : "pds.checkmarx.client.secret", + "description" : "This is a standard value and has not to be set. It is NOT a really secret value. But we made this value optional to be safe in future, if the static default value must be changed." + }, { + "key" : "pds.checkmarx.always.fullscan.enabled", + "description" : "When true, full scan is always active." + } ] + } + }, { + "id" : "PDS_TEST_PRODUCT_LICENSESCAN", + "path" : "./../sechub-integrationtest/pds/product-scripts/integrationtest-licensescan.sh", + "scanType" : "licenseScan", + "description" : "This is only a fake license scan - used by integration tests." + }, { + "id" : "PDS_TEST_PMD", + "path" : "./../sechub-integrationtest/pds/product-scripts/integrationtest-pmd.sh", + "scanType" : "codeScan", + "description" : "This is a fake PMD scan - used by integration tests." + }, { + "id" : "PDS_INTTEST_PRODUCT_ANALYZE", + "path" : "./../sechub-integrationtest/pds/product-scripts/integrationtest-analytics.sh", + "scanType" : "analytics", + "description" : "This is a fake analytics scan - used by integration tests.", + "parameters" : { + "optional" : [ { + "key" : "pds.test.key.variantname", + "description" : "a parameter from configuration, can be used to handle differerent variants in same script" + }, { + "key" : "pds.config.supported.datatypes", + "description" : "Supported data types. In our test we only accept 'source'. And we check this also inside the script. When the script is executed, it MUST have sources!", + "default" : "source" + } ] + } + }, { "id" : "PDS_TEST_PRODUCT_SECRETSCAN", "path" : "./../sechub-integrationtest/pds/product-scripts/integrationtest-secretscan.sh", "scanType" : "secretScan", "description" : "This is only a fake secret scan - used by integration tests." } ] -} +} \ No newline at end of file diff --git a/sechub-notification/src/main/java/com/mercedesbenz/sechub/domain/notification/user/NewApiTokenRequestedUserNotificationServiceHelper.java b/sechub-notification/src/main/java/com/mercedesbenz/sechub/domain/notification/user/NewApiTokenRequestedUserNotificationServiceHelper.java index 09d9fc9a92..f6d5b43d58 100644 --- a/sechub-notification/src/main/java/com/mercedesbenz/sechub/domain/notification/user/NewApiTokenRequestedUserNotificationServiceHelper.java +++ b/sechub-notification/src/main/java/com/mercedesbenz/sechub/domain/notification/user/NewApiTokenRequestedUserNotificationServiceHelper.java @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT package com.mercedesbenz.sechub.domain.notification.user; import java.time.Clock; diff --git a/sechub-notification/src/test/java/com/mercedesbenz/sechub/domain/notification/user/NewApiTokenRequestedUserNotificationServiceHelperTest.java b/sechub-notification/src/test/java/com/mercedesbenz/sechub/domain/notification/user/NewApiTokenRequestedUserNotificationServiceHelperTest.java index 0058d3c51a..007bbd0c55 100644 --- a/sechub-notification/src/test/java/com/mercedesbenz/sechub/domain/notification/user/NewApiTokenRequestedUserNotificationServiceHelperTest.java +++ b/sechub-notification/src/test/java/com/mercedesbenz/sechub/domain/notification/user/NewApiTokenRequestedUserNotificationServiceHelperTest.java @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT package com.mercedesbenz.sechub.domain.notification.user; import static org.junit.Assert.assertEquals; diff --git a/sechub-scan-product-checkmarx/src/main/java/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxProductExecutor.java b/sechub-scan-product-checkmarx/src/main/java/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxProductExecutor.java index 24faa1e893..d81479ee38 100644 --- a/sechub-scan-product-checkmarx/src/main/java/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxProductExecutor.java +++ b/sechub-scan-product-checkmarx/src/main/java/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxProductExecutor.java @@ -29,9 +29,9 @@ import com.mercedesbenz.sechub.domain.scan.SecHubAdapterOptionsBuilderStrategy; import com.mercedesbenz.sechub.domain.scan.product.AbstractProductExecutor; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorData; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.sharedkernel.MustBeDocumented; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.metadata.MetaDataInspection; import com.mercedesbenz.sechub.sharedkernel.metadata.MetaDataInspector; import com.mercedesbenz.sechub.sharedkernel.resilience.ResilientActionExecutor; diff --git a/sechub-scan-product-checkmarx/src/test/java/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxProductExecutorMockTest.java b/sechub-scan-product-checkmarx/src/test/java/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxProductExecutorMockTest.java index 61902ed3e5..a969694b52 100644 --- a/sechub-scan-product-checkmarx/src/test/java/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxProductExecutorMockTest.java +++ b/sechub-scan-product-checkmarx/src/test/java/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxProductExecutorMockTest.java @@ -37,13 +37,13 @@ import com.mercedesbenz.sechub.domain.scan.SecHubExecutionException; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorCallback; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfig; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigSetup; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigSetupCredentials; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigSetupJobParameter; import com.mercedesbenz.sechub.domain.scan.resolve.NetworkTargetResolver; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.Profiles; import com.mercedesbenz.sechub.sharedkernel.configuration.AbstractAllowSecHubAPISecurityConfiguration; import com.mercedesbenz.sechub.sharedkernel.configuration.SecHubConfiguration; diff --git a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/AbstractPDSProductExecutor.java b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/AbstractPDSProductExecutor.java index fe9e228b89..fe2189637b 100644 --- a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/AbstractPDSProductExecutor.java +++ b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/AbstractPDSProductExecutor.java @@ -16,7 +16,7 @@ import com.mercedesbenz.sechub.domain.scan.product.CanceableProductExecutor; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorData; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.metadata.MetaDataInspector; public abstract class AbstractPDSProductExecutor extends AbstractProductExecutor implements CanceableProductExecutor { diff --git a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSAnalyticsExecutor.java b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSAnalyticsExecutor.java index b702be0a80..53ad51e2f4 100644 --- a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSAnalyticsExecutor.java +++ b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSAnalyticsExecutor.java @@ -16,8 +16,8 @@ import com.mercedesbenz.sechub.domain.scan.SecHubExecutionContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorData; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.metadata.MetaDataInspection; @Service diff --git a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSCodeScanProductExecutor.java b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSCodeScanProductExecutor.java index 05bd6454ea..9594218771 100644 --- a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSCodeScanProductExecutor.java +++ b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSCodeScanProductExecutor.java @@ -16,8 +16,8 @@ import com.mercedesbenz.sechub.domain.scan.SecHubExecutionContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorData; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.metadata.MetaDataInspection; @Service diff --git a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSInfraScanProductExecutor.java b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSInfraScanProductExecutor.java index 3f87564ec8..764e2408ba 100644 --- a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSInfraScanProductExecutor.java +++ b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSInfraScanProductExecutor.java @@ -23,8 +23,8 @@ import com.mercedesbenz.sechub.domain.scan.SecHubExecutionContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorData; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.configuration.SecHubConfiguration; @Service diff --git a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSLicenseScanProductExecutor.java b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSLicenseScanProductExecutor.java index ee59131c23..395dee6494 100644 --- a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSLicenseScanProductExecutor.java +++ b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSLicenseScanProductExecutor.java @@ -16,8 +16,8 @@ import com.mercedesbenz.sechub.domain.scan.SecHubExecutionContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorData; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.metadata.MetaDataInspection; @Service diff --git a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSSecretScanProductExecutor.java b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSSecretScanProductExecutor.java index 57a618460c..f72f1fe57d 100644 --- a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSSecretScanProductExecutor.java +++ b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSSecretScanProductExecutor.java @@ -16,8 +16,8 @@ import com.mercedesbenz.sechub.domain.scan.SecHubExecutionContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorData; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.metadata.MetaDataInspection; @Service diff --git a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSWebScanProductExecutor.java b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSWebScanProductExecutor.java index 36779f3da0..da3e19fbbe 100644 --- a/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSWebScanProductExecutor.java +++ b/sechub-scan-product-pds/src/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSWebScanProductExecutor.java @@ -24,8 +24,8 @@ import com.mercedesbenz.sechub.domain.scan.WebScanNetworkLocationProvider; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorData; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.configuration.SecHubConfiguration; @Service diff --git a/sechub-scan-product-pds/src/test/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSProductExecutorMinimumConfigValidationTest.java b/sechub-scan-product-pds/src/test/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSProductExecutorMinimumConfigValidationTest.java index e9264ac498..f0906f43ba 100644 --- a/sechub-scan-product-pds/src/test/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSProductExecutorMinimumConfigValidationTest.java +++ b/sechub-scan-product-pds/src/test/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSProductExecutorMinimumConfigValidationTest.java @@ -10,10 +10,10 @@ import com.mercedesbenz.sechub.commons.pds.ExecutionPDSKey; import com.mercedesbenz.sechub.commons.pds.PDSConfigDataKeyProvider; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfig; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigSetup; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigSetupJobParameter; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.validation.ValidationResult; public class PDSProductExecutorMinimumConfigValidationTest { diff --git a/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultSpdxJsonResolver.java b/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultSpdxJsonResolver.java index 657ec66cbb..298504e91c 100644 --- a/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultSpdxJsonResolver.java +++ b/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultSpdxJsonResolver.java @@ -8,12 +8,12 @@ import org.springframework.stereotype.Component; import com.mercedesbenz.sechub.commons.model.JSONConverter; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.domain.scan.resolve.ProductResultSpdxJsonResolver; import com.mercedesbenz.sechub.sereco.metadata.SerecoLicenseDocument; import com.mercedesbenz.sechub.sereco.metadata.SerecoLicenseSpdx; import com.mercedesbenz.sechub.sereco.metadata.SerecoMetaData; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; @Component public class SerecoProductResultSpdxJsonResolver implements ProductResultSpdxJsonResolver { diff --git a/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultTransformer.java b/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultTransformer.java index 0e788bcef6..1dced2477c 100644 --- a/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultTransformer.java +++ b/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultTransformer.java @@ -29,7 +29,6 @@ import com.mercedesbenz.sechub.commons.model.web.SecHubReportWebResponse; import com.mercedesbenz.sechub.domain.scan.ReportTransformationResult; import com.mercedesbenz.sechub.domain.scan.SecHubExecutionException; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.domain.scan.report.ReportProductResultTransformer; import com.mercedesbenz.sechub.sereco.metadata.SerecoAnnotation; @@ -45,6 +44,7 @@ import com.mercedesbenz.sechub.sereco.metadata.SerecoWebRequest; import com.mercedesbenz.sechub.sereco.metadata.SerecoWebResponse; import com.mercedesbenz.sechub.sharedkernel.MustBeDocumented; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; @Component public class SerecoProductResultTransformer implements ReportProductResultTransformer { diff --git a/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoReportProductExecutor.java b/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoReportProductExecutor.java index 5857417c7f..437b8360c1 100644 --- a/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoReportProductExecutor.java +++ b/sechub-scan-product-sereco/src/main/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoReportProductExecutor.java @@ -22,11 +22,11 @@ import com.mercedesbenz.sechub.domain.scan.SecHubExecutionException; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutor; import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.domain.scan.product.ProductResultRepository; import com.mercedesbenz.sechub.sereco.Sereco; import com.mercedesbenz.sechub.sereco.Workspace; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.UUIDTraceLogID; @Component diff --git a/sechub-scan-product-sereco/src/test/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultTransformerTest.java b/sechub-scan-product-sereco/src/test/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultTransformerTest.java index c4f71f7ede..f51377402f 100644 --- a/sechub-scan-product-sereco/src/test/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultTransformerTest.java +++ b/sechub-scan-product-sereco/src/test/java/com/mercedesbenz/sechub/domain/scan/product/sereco/SerecoProductResultTransformerTest.java @@ -19,7 +19,6 @@ import com.mercedesbenz.sechub.commons.model.Severity; import com.mercedesbenz.sechub.domain.scan.AssertSecHubResult; import com.mercedesbenz.sechub.domain.scan.ReportTransformationResult; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.domain.scan.product.config.WithoutProductExecutorConfigInfo; import com.mercedesbenz.sechub.sereco.metadata.SerecoClassification; @@ -27,6 +26,7 @@ import com.mercedesbenz.sechub.sereco.metadata.SerecoMetaData; import com.mercedesbenz.sechub.sereco.metadata.SerecoSeverity; import com.mercedesbenz.sechub.sereco.metadata.SerecoVulnerability; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; public class SerecoProductResultTransformerTest { diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/IntegrationTestScanRestController.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/IntegrationTestScanRestController.java index 06071ba086..edce427422 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/IntegrationTestScanRestController.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/IntegrationTestScanRestController.java @@ -29,7 +29,6 @@ import com.mercedesbenz.sechub.domain.scan.config.ScanMappingConfigurationService; import com.mercedesbenz.sechub.domain.scan.config.ScanMappingRepository; import com.mercedesbenz.sechub.domain.scan.config.UpdateScanMappingConfigurationService; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.domain.scan.product.ProductResultCountService; import com.mercedesbenz.sechub.domain.scan.product.ProductResultRepository; @@ -40,6 +39,7 @@ import com.mercedesbenz.sechub.domain.scan.product.config.WithoutProductExecutorConfigInfo; import com.mercedesbenz.sechub.domain.scan.report.ScanReportCountService; import com.mercedesbenz.sechub.sharedkernel.APIConstants; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.Profiles; /** diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/SecHubReportProductTransformerService.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/SecHubReportProductTransformerService.java index 9fc1c77c3e..9f92d34a36 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/SecHubReportProductTransformerService.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/SecHubReportProductTransformerService.java @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT package com.mercedesbenz.sechub.domain.scan; -import static com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier.*; +import static com.mercedesbenz.sechub.sharedkernel.ProductIdentifier.*; import static com.mercedesbenz.sechub.sharedkernel.util.Assert.*; import java.util.List; diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutionService.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutionService.java index 2b84099730..14805e2f0f 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutionService.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutionService.java @@ -21,6 +21,7 @@ import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfig; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigRepository; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigSetup; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.UUIDTraceLogID; import com.mercedesbenz.sechub.sharedkernel.configuration.SecHubConfiguration; diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutor.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutor.java index 51f7bb5aea..1b93ec5b04 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutor.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutor.java @@ -25,6 +25,7 @@ import com.mercedesbenz.sechub.domain.scan.SecHubExecutionException; import com.mercedesbenz.sechub.domain.scan.SecHubExecutionHistoryElement; import com.mercedesbenz.sechub.domain.scan.resolve.NetworkTargetResolver; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.UUIDTraceLogID; import com.mercedesbenz.sechub.sharedkernel.configuration.SecHubConfiguration; import com.mercedesbenz.sechub.sharedkernel.resilience.ResilientActionExecutor; diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductIdentifiable.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductIdentifiable.java index f0df0e5aa3..a5f0bd3fe5 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductIdentifiable.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductIdentifiable.java @@ -1,6 +1,8 @@ // SPDX-License-Identifier: MIT package com.mercedesbenz.sechub.domain.scan.product; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; + public interface ProductIdentifiable { /** diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResult.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResult.java index c53e21d6ae..62653cb8f9 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResult.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResult.java @@ -18,6 +18,7 @@ import org.hibernate.annotations.Type; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigInfo; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; /** * Represents a product result for a SecHub job UUID diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryCustom.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryCustom.java index ecdc1c6658..9695ece992 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryCustom.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryCustom.java @@ -5,6 +5,7 @@ import java.util.UUID; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigInfo; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; public interface ProductResultRepositoryCustom { diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryImpl.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryImpl.java index 8382c15ada..4d2d2b55dd 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryImpl.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryImpl.java @@ -13,6 +13,7 @@ import javax.persistence.Query; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigInfo; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; public class ProductResultRepositoryImpl implements ProductResultRepositoryCustom { /* @formatter:off */ diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductType.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductType.java deleted file mode 100644 index 9423cf0327..0000000000 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductType.java +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: MIT -package com.mercedesbenz.sechub.domain.scan.product; - -public enum ProductType { - - CODESCAN, - - WEBSCAN, - - INFRASCAN, - - LICENSESCAN, - - ANALYTICS, - - REPORT_COLLECTOR, - - SECRETSCAN, -} diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/DefaultProductExecutorConfigInfo.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/DefaultProductExecutorConfigInfo.java index f3b491d100..4c0eda5c88 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/DefaultProductExecutorConfigInfo.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/DefaultProductExecutorConfigInfo.java @@ -3,7 +3,7 @@ import java.util.UUID; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; /** * A default product executor configuration info diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/DeleteProductExecutorConfigService.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/DeleteProductExecutorConfigService.java index 5914fd1e1e..1cd5d02767 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/DeleteProductExecutorConfigService.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/DeleteProductExecutorConfigService.java @@ -12,7 +12,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.Profiles; import com.mercedesbenz.sechub.sharedkernel.RoleConstants; import com.mercedesbenz.sechub.sharedkernel.Step; diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfig.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfig.java index bb4332d1e2..2190e675b5 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfig.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfig.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; /** * Represents a product executor configuration diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigInfo.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigInfo.java index 55bf901cec..54c43cf9cb 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigInfo.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigInfo.java @@ -3,7 +3,7 @@ import java.util.UUID; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; public interface ProductExecutorConfigInfo { /** diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigRepository.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigRepository.java index c64530eaee..e44a4a1096 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigRepository.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigRepository.java @@ -10,7 +10,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; public interface ProductExecutorConfigRepository extends JpaRepository { /** diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/WithoutProductExecutorConfigInfo.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/WithoutProductExecutorConfigInfo.java index 08546df3a3..096d35cd9a 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/WithoutProductExecutorConfigInfo.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/config/WithoutProductExecutorConfigInfo.java @@ -3,7 +3,7 @@ import java.util.UUID; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; /** * A special product executor configuration info - will always return null for diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/report/DownloadSpdxScanReportService.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/report/DownloadSpdxScanReportService.java index f13704ed87..31e8b48c4c 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/report/DownloadSpdxScanReportService.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/report/DownloadSpdxScanReportService.java @@ -9,10 +9,10 @@ import com.mercedesbenz.sechub.commons.model.SecHubRuntimeException; import com.mercedesbenz.sechub.domain.scan.ScanAssertService; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.domain.scan.product.ProductResultRepository; import com.mercedesbenz.sechub.domain.scan.resolve.ProductResultSpdxJsonResolver; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.error.NotFoundException; import com.mercedesbenz.sechub.sharedkernel.logging.AuditLogService; import com.mercedesbenz.sechub.sharedkernel.validation.UserInputAssertion; diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/report/ReportProductResultTransformer.java b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/report/ReportProductResultTransformer.java index cb890113be..cd11a58003 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/report/ReportProductResultTransformer.java +++ b/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/report/ReportProductResultTransformer.java @@ -3,8 +3,8 @@ import com.mercedesbenz.sechub.domain.scan.ReportTransformationResult; import com.mercedesbenz.sechub.domain.scan.SecHubExecutionException; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; /** * Implementations of this interface transforms a report product result (e.g. diff --git a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/SecHubReportProductTransformerServiceTest.java b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/SecHubReportProductTransformerServiceTest.java index 1e6122efcb..8833e50b7f 100644 --- a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/SecHubReportProductTransformerServiceTest.java +++ b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/SecHubReportProductTransformerServiceTest.java @@ -15,11 +15,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.domain.scan.product.ProductResultRepository; import com.mercedesbenz.sechub.domain.scan.product.config.WithoutProductExecutorConfigInfo; import com.mercedesbenz.sechub.domain.scan.report.ReportProductResultTransformer; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.test.junit4.ExpectedExceptionFactory; public class SecHubReportProductTransformerServiceTest { diff --git a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutionServiceTest.java b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutionServiceTest.java index 372fd1f3fd..b82e004c79 100644 --- a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutionServiceTest.java +++ b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutionServiceTest.java @@ -24,6 +24,7 @@ import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfig; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigRepository; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigSetup; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.UUIDTraceLogID; import com.mercedesbenz.sechub.sharedkernel.configuration.SecHubConfiguration; import com.mercedesbenz.sechub.test.junit4.ExpectedExceptionFactory; diff --git a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutorTest.java b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutorTest.java index f63d4385b7..2e5be80538 100644 --- a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutorTest.java +++ b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutorTest.java @@ -14,6 +14,7 @@ import com.mercedesbenz.sechub.commons.model.SecHubMessage; import com.mercedesbenz.sechub.commons.model.SecHubMessageType; import com.mercedesbenz.sechub.commons.model.SecHubMessagesList; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; class AbstractProductExecutorTest { diff --git a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryDBTest.java b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryDBTest.java index 3929d2ede8..94c3da7447 100644 --- a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryDBTest.java +++ b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/ProductResultRepositoryDBTest.java @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT package com.mercedesbenz.sechub.domain.scan.product; -import static com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier.*; +import static com.mercedesbenz.sechub.sharedkernel.ProductIdentifier.*; import static org.junit.Assert.*; import static org.mockito.Mockito.*; @@ -24,6 +24,7 @@ import com.mercedesbenz.sechub.domain.scan.product.config.DefaultProductExecutorConfigInfo; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigInfo; import com.mercedesbenz.sechub.domain.scan.product.config.WithoutProductExecutorConfigInfo; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; @RunWith(SpringRunner.class) @DataJpaTest diff --git a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigAndProfileQueryRepositoryDBTest.java b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigAndProfileQueryRepositoryDBTest.java index fc0f0600bf..4299aaf38b 100644 --- a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigAndProfileQueryRepositoryDBTest.java +++ b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigAndProfileQueryRepositoryDBTest.java @@ -19,7 +19,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.Profiles; @ActiveProfiles(Profiles.TEST) diff --git a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigRepositoryDBTest.java b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigRepositoryDBTest.java index 682700a852..0df6dec121 100644 --- a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigRepositoryDBTest.java +++ b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigRepositoryDBTest.java @@ -19,7 +19,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.Profiles; @ActiveProfiles(Profiles.TEST) diff --git a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigValidationImplTest.java b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigValidationImplTest.java index 6b30e9ecaa..2c824008c7 100644 --- a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigValidationImplTest.java +++ b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/product/config/ProductExecutorConfigValidationImplTest.java @@ -10,7 +10,7 @@ import org.junit.Before; import org.junit.Test; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.validation.ValidationResult; public class ProductExecutorConfigValidationImplTest { diff --git a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/report/DownloadSpdxScanReportServiceTest.java b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/report/DownloadSpdxScanReportServiceTest.java index e6d6e99d41..c0037a6775 100644 --- a/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/report/DownloadSpdxScanReportServiceTest.java +++ b/sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/report/DownloadSpdxScanReportServiceTest.java @@ -18,10 +18,10 @@ import org.mockito.ArgumentCaptor; import com.mercedesbenz.sechub.domain.scan.ScanAssertService; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.domain.scan.product.ProductResultRepository; import com.mercedesbenz.sechub.domain.scan.resolve.ProductResultSpdxJsonResolver; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.sharedkernel.error.NotFoundException; import com.mercedesbenz.sechub.sharedkernel.logging.AuditLogService; import com.mercedesbenz.sechub.sharedkernel.validation.UserInputAssertion; diff --git a/sechub-sereco/src/main/java/com/mercedesbenz/sechub/sereco/ImportParameter.java b/sechub-sereco/src/main/java/com/mercedesbenz/sechub/sereco/ImportParameter.java index 23632fb21d..42838a23c6 100644 --- a/sechub-sereco/src/main/java/com/mercedesbenz/sechub/sereco/ImportParameter.java +++ b/sechub-sereco/src/main/java/com/mercedesbenz/sechub/sereco/ImportParameter.java @@ -5,6 +5,7 @@ import com.mercedesbenz.sechub.commons.model.ScanType; import com.mercedesbenz.sechub.commons.model.SecHubMessage; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; public class ImportParameter { private String productId; @@ -33,23 +34,9 @@ public List getProductMessages() { } public ScanType getScanType() { - ScanType scanType = ScanType.UNKNOWN; - - if (productId == "NESSUS" || productId == "PDS_INFRASCAN") { - scanType = ScanType.INFRA_SCAN; - } else if (productId == "CHECKMARX" || productId == "PDS_CODESCAN") { - scanType = ScanType.CODE_SCAN; - } else if (productId == "NETSPARKER" || productId == "PDS_WEBSCAN") { - scanType = ScanType.WEB_SCAN; - } else if (productId == "PDS_LICENSESCAN") { - scanType = ScanType.LICENSE_SCAN; - } else if (productId == "PDS_SECRETSCAN") { - scanType = ScanType.SECRET_SCAN; - } else if (productId == "PDS_ANALYTICS") { - scanType = ScanType.ANALYTICS; - } + ProductIdentifier productIdentifier = ProductIdentifier.fromString(productId); - return scanType; + return productIdentifier.getType(); } /** diff --git a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductIdentifier.java b/sechub-shared-kernel/src/main/java/com/mercedesbenz/sechub/sharedkernel/ProductIdentifier.java similarity index 58% rename from sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductIdentifier.java rename to sechub-shared-kernel/src/main/java/com/mercedesbenz/sechub/sharedkernel/ProductIdentifier.java index ed47079119..e84ea522f5 100644 --- a/sechub-scan/src/main/java/com/mercedesbenz/sechub/domain/scan/product/ProductIdentifier.java +++ b/sechub-shared-kernel/src/main/java/com/mercedesbenz/sechub/sharedkernel/ProductIdentifier.java @@ -1,7 +1,8 @@ // SPDX-License-Identifier: MIT -package com.mercedesbenz.sechub.domain.scan.product; +package com.mercedesbenz.sechub.sharedkernel; import com.mercedesbenz.sechub.commons.core.MustBeKeptStable; +import com.mercedesbenz.sechub.commons.model.ScanType; /** * An enumeration with all currently known product identifiers. If one of the @@ -22,52 +23,64 @@ public enum ProductIdentifier { * Webscanner */ @Deprecated - NETSPARKER(ProductType.WEBSCAN), + NETSPARKER(ScanType.WEB_SCAN), /** * Infrastructure scanner */ @Deprecated - NESSUS(ProductType.INFRASCAN), + NESSUS(ScanType.INFRA_SCAN), /** * SERECO = Security report collector */ - SERECO(ProductType.REPORT_COLLECTOR), + SERECO(ScanType.REPORT), /** * Static code analysis */ - CHECKMARX(ProductType.CODESCAN), + CHECKMARX(ScanType.CODE_SCAN), /** Product delegation server - code scan */ - PDS_CODESCAN(ProductType.CODESCAN), + PDS_CODESCAN(ScanType.CODE_SCAN), /** Product delegation server - web scan */ - PDS_WEBSCAN(ProductType.WEBSCAN), + PDS_WEBSCAN(ScanType.WEB_SCAN), /** Product delegation server - infrastructure scan execution */ - PDS_INFRASCAN(ProductType.INFRASCAN), + PDS_INFRASCAN(ScanType.INFRA_SCAN), /** Product delegation server - license scan */ - PDS_LICENSESCAN(ProductType.LICENSESCAN), + PDS_LICENSESCAN(ScanType.LICENSE_SCAN), /** Product delegation server - secret scan */ - PDS_SECRETSCAN(ProductType.SECRETSCAN), + PDS_SECRETSCAN(ScanType.SECRET_SCAN), /** Product delegation server - analytics */ - PDS_ANALYTICS(ProductType.ANALYTICS); + PDS_ANALYTICS(ScanType.ANALYTICS), + + UNKNOWN(ScanType.UNKNOWN); ; - private ProductType type; + private ScanType type; - private ProductIdentifier(ProductType type) { + private ProductIdentifier(ScanType type) { this.type = type; } - public ProductType getType() { + public ScanType getType() { return type; } + public static ProductIdentifier fromString(String productIdentifier) { + for (ProductIdentifier productId : ProductIdentifier.values()) { + if (productId.name().equalsIgnoreCase(productIdentifier)) { + return productId; + } + + } + + return UNKNOWN; + } } diff --git a/sechub-shared-kernel/src/test/java/com/mercedesbenz/sechub/sharedkernel/ProductIdentifierTest.java b/sechub-shared-kernel/src/test/java/com/mercedesbenz/sechub/sharedkernel/ProductIdentifierTest.java new file mode 100644 index 0000000000..a8b0b75ddc --- /dev/null +++ b/sechub-shared-kernel/src/test/java/com/mercedesbenz/sechub/sharedkernel/ProductIdentifierTest.java @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: MIT +package com.mercedesbenz.sechub.sharedkernel; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; +import org.junit.jupiter.params.provider.NullSource; + +class ProductIdentifierTest { + + @ParameterizedTest() + @EnumSource(ProductIdentifier.class) + @NullSource + void fromString__enum_value(ProductIdentifier productIdentifier) { + /* prepare */ + ProductIdentifier expected = productIdentifier == null ? ProductIdentifier.UNKNOWN : productIdentifier; + String productIdName = productIdentifier == null ? null : productIdentifier.name(); + + /* execute */ + ProductIdentifier result = ProductIdentifier.fromString(productIdName); + + /* test */ + assertEquals(expected, result); + } + + @ParameterizedTest() + @EnumSource(ProductIdentifier.class) + void fromString__lower_case(ProductIdentifier productIdentifier) { + /* prepare */ + ProductIdentifier expected = productIdentifier; + String productIdName = productIdentifier.name().toLowerCase(); + + /* execute */ + ProductIdentifier result = ProductIdentifier.fromString(productIdName); + + /* test */ + assertEquals(expected, result); + } + + @Test + void fromString__fantasy_type() { + /* prepare */ + ProductIdentifier expected = ProductIdentifier.UNKNOWN; + String productIdName = "fantasyProduct"; + + /* execute */ + ProductIdentifier result = ProductIdentifier.fromString(productIdName); + + /* test */ + assertEquals(expected, result); + } +} diff --git a/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/ReportTestHelper.java b/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/ReportTestHelper.java index 7dab793bd5..48a55ba802 100644 --- a/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/ReportTestHelper.java +++ b/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/ReportTestHelper.java @@ -11,7 +11,6 @@ import com.mercedesbenz.sechub.commons.model.ScanType; import com.mercedesbenz.sechub.domain.scan.ReportTransformationResult; import com.mercedesbenz.sechub.domain.scan.SecHubExecutionException; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.product.ProductResult; import com.mercedesbenz.sechub.domain.scan.product.config.ProductExecutorConfigInfo; import com.mercedesbenz.sechub.domain.scan.product.sereco.SerecoProductResultTransformer; @@ -21,6 +20,7 @@ import com.mercedesbenz.sechub.sereco.importer.ProductResultImporter; import com.mercedesbenz.sechub.sereco.importer.SarifV1JSONImporter; import com.mercedesbenz.sechub.sereco.metadata.SerecoMetaData; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.test.TestFileReader; public class ReportTestHelper { diff --git a/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/Sarif2Sereco2SecHubReportTest.java b/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/Sarif2Sereco2SecHubReportTest.java index 0bf2e3737b..e2083dd1f0 100644 --- a/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/Sarif2Sereco2SecHubReportTest.java +++ b/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/Sarif2Sereco2SecHubReportTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; /** * A special reporting test: Will test if existing SARIF reports are transformed diff --git a/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/ThymeLeafHTMLReportingTest.java b/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/ThymeLeafHTMLReportingTest.java index 8ada92d21e..99b670231d 100644 --- a/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/ThymeLeafHTMLReportingTest.java +++ b/sechub-test/src/test/java/com/mercedesbenz/sechub/test/report/ThymeLeafHTMLReportingTest.java @@ -23,10 +23,10 @@ import com.mercedesbenz.sechub.docgen.util.TextFileWriter; import com.mercedesbenz.sechub.domain.scan.SecHubExecutionException; import com.mercedesbenz.sechub.domain.scan.TestHTMLScanResultReportModelBuilder; -import com.mercedesbenz.sechub.domain.scan.product.ProductIdentifier; import com.mercedesbenz.sechub.domain.scan.report.ScanReport; import com.mercedesbenz.sechub.domain.scan.report.ScanReportResultType; import com.mercedesbenz.sechub.domain.scan.report.ScanSecHubReport; +import com.mercedesbenz.sechub.sharedkernel.ProductIdentifier; import com.mercedesbenz.sechub.test.TestUtil; /** diff --git a/sechub-webui/src/main/java/com/mercedesbenz/sechub/webui/CredentialService.java b/sechub-webui/src/main/java/com/mercedesbenz/sechub/webui/CredentialService.java index 8838e7c816..bd7c69158e 100644 --- a/sechub-webui/src/main/java/com/mercedesbenz/sechub/webui/CredentialService.java +++ b/sechub-webui/src/main/java/com/mercedesbenz/sechub/webui/CredentialService.java @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT package com.mercedesbenz.sechub.webui; import javax.annotation.PostConstruct; diff --git a/sechub-webui/src/main/resources/application-localserver.yml b/sechub-webui/src/main/resources/application-localserver.yml index 84e9eb23d3..773e34f9c8 100644 --- a/sechub-webui/src/main/resources/application-localserver.yml +++ b/sechub-webui/src/main/resources/application-localserver.yml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MIT server: ssl: key-store-type: diff --git a/sechub-webui/src/main/resources/application-test.yml b/sechub-webui/src/main/resources/application-test.yml index 1600baad96..05d1a2afbe 100644 --- a/sechub-webui/src/main/resources/application-test.yml +++ b/sechub-webui/src/main/resources/application-test.yml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MIT server: ssl: enabled: false \ No newline at end of file