Merge pull request #359 from Daimler/hotfix

Hotfix server version 0.17.2
mercedes-benz · Sep 2, 2020 · 50b3d71 · 50b3d71
2 parents 775e01d + 0967121
commit 50b3d71
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/sechub-analyzer-cli/src/test/java/com/daimler/sechub/analyzer/core/FileProcessorTest.java b/sechub-analyzer-cli/src/test/java/com/daimler/sechub/analyzer/core/FileProcessorTest.java
@@ -22,7 +22,7 @@ public class FileProcessorTest {
 
     final String path = "src/test/resources/";
     private FileProcessor analyzerToTest;
-    
+
     @Before
     public void before() throws Exception {
         analyzerToTest = new FileProcessor();
@@ -573,18 +573,9 @@ public void process_same_line() throws IOException {
     public void process_file_not_found() {
         /* prepare */
         File file = new File(path + "not_found.txt");
-        String exceptionMessage = file.getPath() + " (No such file or directory)";
-
-        try {
-            /* execute */
-            analyzerToTest.processFile(file);
-            fail("The file does not exist. An exception was expected.");
-        } catch (FileNotFoundException e) {
-            /* test */
-            assertThat(e.getMessage(), is(exceptionMessage));
-        } catch (IOException e) {
-            fail("Unexpected exception.");
-        }
+
+        /* execute */
+        assertThrows(FileNotFoundException.class, ()->analyzerToTest.processFile(file));
     }
 
     private List<MarkerPair> createMarkerPairsOf(int startLine, int startColumn, int endLine, int endColumn) {

diff --git a/...b-schedule/src/main/java/com/daimler/sechub/domain/schedule/batch/BatchConfiguration.java b/...b-schedule/src/main/java/com/daimler/sechub/domain/schedule/batch/BatchConfiguration.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 
 import com.daimler.sechub.domain.schedule.job.SecHubJobRepository;
 import com.daimler.sechub.sharedkernel.messaging.DomainMessageService;
@@ -35,6 +36,7 @@ public class BatchConfiguration {
 	public JobRepository jobRepository;
 
 	@Autowired
+	@Lazy
 	private DomainMessageService eventBusService;
 
 	@Autowired

diff --git a/sechub-server/src/main/resources/db/migration/V8__enlarge_project_config_data_field.sql b/sechub-server/src/main/resources/db/migration/V8__enlarge_project_config_data_field.sql
@@ -1,2 +1,3 @@
 -- we accept any size
-ALTER TABLE scan_project_config ALTER COLUMN data text not null;
+ALTER TABLE scan_project_config ALTER COLUMN data TYPE text;
+