Renamed package for resilience parts mercedes-benz#2280

expp121 · Jun 1, 2023 · 81c5a7e · 81c5a7e
1 parent dd4f482
commit 81c5a7e
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 26 deletions.
diff --git a/...silience/ActionWhichShallBeResilient.java → ...silience/ActionWhichShallBeResilient.java b/...silience/ActionWhichShallBeResilient.java → ...silience/ActionWhichShallBeResilient.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.sharedkernel.resilience;
+package com.mercedesbenz.sechub.commons.core.resilience;
 
 public interface ActionWhichShallBeResilient<R> {
 

diff --git a/...lience/FallthroughResilienceProposal.java → ...lience/FallthroughResilienceProposal.java b/...lience/FallthroughResilienceProposal.java → ...lience/FallthroughResilienceProposal.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.sharedkernel.resilience;
+package com.mercedesbenz.sechub.commons.core.resilience;
 
 public interface FallthroughResilienceProposal extends ResilienceProposal {
     /**

diff --git a/...kernel/resilience/ResilienceCallback.java → ...s/core/resilience/ResilienceCallback.java b/...kernel/resilience/ResilienceCallback.java → ...s/core/resilience/ResilienceCallback.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.sharedkernel.resilience;
+package com.mercedesbenz.sechub.commons.core.resilience;
 
 /**
  * Represents a possibility to do some callbacks at resilience side

diff --git a/...rnel/resilience/ResilienceConsultant.java → ...core/resilience/ResilienceConsultant.java b/...rnel/resilience/ResilienceConsultant.java → ...core/resilience/ResilienceConsultant.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.sharedkernel.resilience;
+package com.mercedesbenz.sechub.commons.core.resilience;
 
 public interface ResilienceConsultant {
 

diff --git a/...dkernel/resilience/ResilienceContext.java → ...ns/core/resilience/ResilienceContext.java b/...dkernel/resilience/ResilienceContext.java → ...ns/core/resilience/ResilienceContext.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.sharedkernel.resilience;
+package com.mercedesbenz.sechub.commons.core.resilience;
 
 public interface ResilienceContext {
 

diff --git a/...kernel/resilience/ResilienceProposal.java → ...s/core/resilience/ResilienceProposal.java b/...kernel/resilience/ResilienceProposal.java → ...s/core/resilience/ResilienceProposal.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.sharedkernel.resilience;
+package com.mercedesbenz.sechub.commons.core.resilience;
 
 public interface ResilienceProposal {
 

diff --git a/...l/resilience/ResilientActionExecutor.java → ...e/resilience/ResilientActionExecutor.java b/...l/resilience/ResilientActionExecutor.java → ...e/resilience/ResilientActionExecutor.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.sharedkernel.resilience;
+package com.mercedesbenz.sechub.commons.core.resilience;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...l/resilience/RetryResilienceProposal.java → ...e/resilience/RetryResilienceProposal.java b/...l/resilience/RetryResilienceProposal.java → ...e/resilience/RetryResilienceProposal.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.sharedkernel.resilience;
+package com.mercedesbenz.sechub.commons.core.resilience;
 
 public interface RetryResilienceProposal extends ResilienceProposal {
 

diff --git a/...lience/SimpleRetryResilienceProposal.java → ...lience/SimpleRetryResilienceProposal.java b/...lience/SimpleRetryResilienceProposal.java → ...lience/SimpleRetryResilienceProposal.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.sharedkernel.resilience;
+package com.mercedesbenz.sechub.commons.core.resilience;
 
 public class SimpleRetryResilienceProposal implements RetryResilienceProposal {
 

diff --git a/...silience/ResilientActionExecutorTest.java → ...silience/ResilientActionExecutorTest.java b/...silience/ResilientActionExecutorTest.java → ...silience/ResilientActionExecutorTest.java
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-package com.mercedesbenz.sechub.sharedkernel.resilience;
+package com.mercedesbenz.sechub.commons.core.resilience;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -13,6 +13,15 @@
 import org.junit.Test;
 import org.junit.rules.Timeout;
 
+import com.mercedesbenz.sechub.commons.core.resilience.ActionWhichShallBeResilient;
+import com.mercedesbenz.sechub.commons.core.resilience.FallthroughResilienceProposal;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceCallback;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceConsultant;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceContext;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceProposal;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilientActionExecutor;
+import com.mercedesbenz.sechub.commons.core.resilience.RetryResilienceProposal;
+
 public class ResilientActionExecutorTest {
 
     private ResilientActionExecutor<TestResult> executorToTest;

diff --git a/.../java/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxProductExecutor.java b/.../java/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxProductExecutor.java
@@ -25,6 +25,7 @@
 import com.mercedesbenz.sechub.adapter.checkmarx.CheckmarxConfig;
 import com.mercedesbenz.sechub.adapter.checkmarx.CheckmarxMetaDataID;
 import com.mercedesbenz.sechub.commons.core.environment.SystemEnvironmentVariableSupport;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilientActionExecutor;
 import com.mercedesbenz.sechub.commons.model.ScanType;
 import com.mercedesbenz.sechub.domain.scan.SecHubAdapterOptionsBuilderStrategy;
 import com.mercedesbenz.sechub.domain.scan.product.AbstractProductExecutor;
@@ -34,7 +35,6 @@
 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;
 import com.mercedesbenz.sechub.storage.core.JobStorage;
 import com.mercedesbenz.sechub.storage.core.StorageService;
 

diff --git a/...va/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxResilienceCallback.java b/...va/com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxResilienceCallback.java
@@ -3,9 +3,9 @@
 
 import com.mercedesbenz.sechub.adapter.AdapterMetaData;
 import com.mercedesbenz.sechub.adapter.checkmarx.CheckmarxMetaDataID;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceCallback;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceContext;
 import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceCallback;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceContext;
 
 /**
  * A resilience callback which handles checkmarx

diff --git a/.../com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxResilienceConsultant.java b/.../com/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxResilienceConsultant.java
@@ -9,12 +9,12 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
 
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceConsultant;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceContext;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceProposal;
+import com.mercedesbenz.sechub.commons.core.resilience.SimpleRetryResilienceProposal;
 import com.mercedesbenz.sechub.commons.core.util.StacktraceUtil;
 import com.mercedesbenz.sechub.sharedkernel.MustBeDocumented;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceConsultant;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceContext;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceProposal;
-import com.mercedesbenz.sechub.sharedkernel.resilience.SimpleRetryResilienceProposal;
 
 @Component
 public class CheckmarxResilienceConsultant implements ResilienceConsultant {

diff --git a/.../mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxBadRequestConsultantTest.java b/.../mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxBadRequestConsultantTest.java
@@ -9,10 +9,10 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.web.client.HttpClientErrorException;
 
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceContext;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceProposal;
+import com.mercedesbenz.sechub.commons.core.resilience.RetryResilienceProposal;
 import com.mercedesbenz.sechub.domain.scan.SecHubExecutionException;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceContext;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceProposal;
-import com.mercedesbenz.sechub.sharedkernel.resilience.RetryResilienceProposal;
 
 public class CheckmarxBadRequestConsultantTest {
 

diff --git a/...om/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxResilienceCallbackTest.java b/...om/mercedesbenz/sechub/domain/scan/product/checkmarx/CheckmarxResilienceCallbackTest.java
@@ -11,8 +11,8 @@
 import com.mercedesbenz.sechub.adapter.AdapterMetaData;
 import com.mercedesbenz.sechub.adapter.AdapterMetaDataCallback;
 import com.mercedesbenz.sechub.adapter.checkmarx.CheckmarxMetaDataID;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceContext;
 import com.mercedesbenz.sechub.domain.scan.product.ProductExecutorContext;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceContext;
 
 public class CheckmarxResilienceCallbackTest {
 

diff --git a/...rc/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSResilienceConsultant.java b/...rc/main/java/com/mercedesbenz/sechub/domain/scan/product/pds/PDSResilienceConsultant.java
@@ -9,12 +9,12 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
 
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceConsultant;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceContext;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilienceProposal;
+import com.mercedesbenz.sechub.commons.core.resilience.SimpleRetryResilienceProposal;
 import com.mercedesbenz.sechub.commons.core.util.StacktraceUtil;
 import com.mercedesbenz.sechub.sharedkernel.MustBeDocumented;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceConsultant;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceContext;
-import com.mercedesbenz.sechub.sharedkernel.resilience.ResilienceProposal;
-import com.mercedesbenz.sechub.sharedkernel.resilience.SimpleRetryResilienceProposal;
 
 @Component
 public class PDSResilienceConsultant implements ResilienceConsultant {

diff --git a/...an/src/main/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutor.java b/...an/src/main/java/com/mercedesbenz/sechub/domain/scan/product/AbstractProductExecutor.java
@@ -12,6 +12,7 @@
 
 import com.mercedesbenz.sechub.adapter.AdapterExecutionResult;
 import com.mercedesbenz.sechub.adapter.mock.MockDataIdentifierFactory;
+import com.mercedesbenz.sechub.commons.core.resilience.ResilientActionExecutor;
 import com.mercedesbenz.sechub.commons.model.ScanType;
 import com.mercedesbenz.sechub.commons.model.SecHubConfigurationModel;
 import com.mercedesbenz.sechub.commons.model.SecHubMessagesList;
@@ -28,7 +29,6 @@
 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;
 
 /**
  * An abstract product executor implementation