Refactor RabbitMQ configuration (#2519)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application.properties

@@ -38,13 +38,6 @@ hawkbit.server.ddi.security.authentication.gatewaytoken.enabled=false
 # Optional events
 hawkbit.server.repository.publish-target-poll-event=false
 
-## Configuration for DMF/RabbitMQ integration
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
-spring.rabbitmq.virtual-host=/
-spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
-
 # Enable CORS and specify the allowed origins:
 #hawkbit.server.security.cors.enabled=true
 #hawkbit.server.security.cors.allowedOrigins=http://localhost
@@ -57,11 +50,7 @@ hawkbit.lock=inMemory
 
 # Disable discovery client of spring-cloud-commons
 spring.cloud.discovery.enabled=false
-# Enable communication between services
-spring.cloud.bus.enabled=true
-spring.cloud.bus.ack.enabled=false
-spring.cloud.bus.refresh.enabled=false
-spring.cloud.bus.env.enabled=false
+# Configure communication between services
 endpoints.spring.cloud.bus.refresh.enabled=false
 endpoints.spring.cloud.bus.env.enabled=false
 spring.cloud.stream.bindings.springCloudBusInput.group=ddi-server

hawkbit-ddi/hawkbit-ddi-server/src/test/java/org/eclipse/hawkbit/app/ddi/AbstractSecurityTest.java

@@ -19,9 +19,9 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-@SpringBootTest(properties = { "hawkbit.dmf.rabbitmq.enabled=false" })
+@SpringBootTest
 @ExtendWith(SharedSqlTestDatabaseExtension.class)
-public abstract class AbstractSecurityTest {
+abstract class AbstractSecurityTest {
 
     protected MockMvc mvc;
     @Autowired

hawkbit-ddi/hawkbit-ddi-server/src/test/java/org/eclipse/hawkbit/app/ddi/AllowedHostNamesTest.java

@@ -16,14 +16,14 @@ import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.TestPropertySource;
 
-@TestPropertySource(properties = {
-        "spring.flyway.enabled=true", // if hibernate is used there could be db inconsistencies when executing tests with and without flyway
-        "hawkbit.server.security.allowedHostNames=localhost",
-        "hawkbit.server.security.httpFirewallIgnoredPaths=/index.html" })
 /**
  * Feature: Integration Test - Security<br/>
  * Story: Allowed Host Names
  */
+@TestPropertySource(properties = {
+        "spring.flyway.enabled=true", // if hibernate is used there could be db inconsistencies when executing tests with and without flyway
+        "hawkbit.server.security.allowedHostNames=localhost",
+        "hawkbit.server.security.httpFirewallIgnoredPaths=/index.html" })
 class AllowedHostNamesTest extends AbstractSecurityTest {
 
     /**