Refactoring and test fixes #1768

- move ProductIdentifier into shared kernel
- remove ProductType (redundant)
- fix tests
- fix and format pds-config-integrationtest.json

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

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

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;

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"));

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 {

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 {

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;

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;
 

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;

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;