Fixed merge issues

J12934 · J12934 · commit 170434a335ed · 2019-01-23T10:54:26.000+01:00
diff --git a/scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoPersistenceProvider.java b/scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoPersistenceProvider.java
@@ -86,9 +86,9 @@ public void persist(SecurityTest securityTest) throws PersistenceException {
             }
     }
 
-    static final String GIT_SERVER_NAME = "GitServer";
-    static final String BUILD_SERVER_NAME = "BuildServer";
-    static final String SECURITY_TEST_SERVER_NAME = "SecurityTestOrchestrationEngine";
+    static final String GIT_SERVER_NAME = "Git Server";
+    static final String BUILD_SERVER_NAME = "Build Server";
+    static final String SECURITY_TEST_SERVER_NAME = "Security TestOrchestration Engine";
 
     private void checkToolTypes() {
         DefectDojoResponse<ToolType> toolTypeGitResponse = defectDojoService.getToolTypeByName(GIT_SERVER_NAME);

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,9 @@ public void persist(SecurityTest securityTest) throws PersistenceException {`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`		`- static final String GIT_SERVER_NAME = "GitServer";`
`90`		`- static final String BUILD_SERVER_NAME = "BuildServer";`
`91`		`- static final String SECURITY_TEST_SERVER_NAME = "SecurityTestOrchestrationEngine";`
	`89`	`+ static final String GIT_SERVER_NAME = "Git Server";`
	`90`	`+ static final String BUILD_SERVER_NAME = "Build Server";`
	`91`	`+ static final String SECURITY_TEST_SERVER_NAME = "Security TestOrchestration Engine";`
`92`	`92`
`93`	`93`	`private void checkToolTypes() {`
`94`	`94`	`DefectDojoResponse<ToolType> toolTypeGitResponse = defectDojoService.getToolTypeByName(GIT_SERVER_NAME);`