Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ spring.servlet.multipart.max-file-size=5MB
hawkbit.server.security.dos.maxStatusEntriesPerAction=100
hawkbit.server.security.dos.maxAttributeEntriesPerTarget=10
# Quota - END
hawkbit.events.remote-enabled=false
hawkbit.events.remote.enabled=false
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
@ActiveProfiles({ "test" })
@SpringBootTest(classes = { JpaRepositoryConfiguration.class }, webEnvironment = SpringBootTest.WebEnvironment.NONE)
@TestPropertySource(properties = {
"hawkbit.events.remote-enabled=false",
"hawkbit.events.remote.enabled=false",
"spring.main.allow-bean-definition-overriding=true" })
class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
// Dirty context is necessary to create a new vhost and recreate all necessary beans after every test class.
@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
@TestPropertySource(properties = {
"hawkbit.events.remote-enabled=false",
"hawkbit.events.remote.enabled=false",
"spring.main.allow-bean-definition-overriding=true" })
@SuppressWarnings("java:S6813") // constructor injects are not possible for test classes
public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
# Logging START - activate to see request/response details
#logging.level.org.eclipse.hawkbit.rest.util.MockMvcResultPrinter=DEBUG
# Logging END
hawkbit.events.remote-enabled=false
hawkbit.events.remote.enabled=false
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.amqp.RabbitA

## Uncomment bellow to Enable communication between services (disabled by default) - no cluster support.
# To enable it, enable RabbitMQ (see above)
# and set below 'hawkbit.events.remote-enabled=true'
hawkbit.events.remote-enabled=false
# and set below 'hawkbit.events.remote.enabled=true'
hawkbit.events.remote.enabled=false

## Disable DMF (by default) - no DMF support. To enable it, enable RabbitMQ (see above) and comment the line
## (hawkbit.dmf.rabbitmq.enabled=false) set hawkbit.dmf.rabbitmq.enabled=true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
@Slf4j
public final class EventPublisherHolder {

@Value("${hawkbit.events.remote-enabled:true}")
@Value("${hawkbit.events.remote.enabled:true}")
private boolean remoteEventsEnabled;
@Value("${hawkbit.events.remote.destination:fanoutEventChannel}")
private String fanoutEventChannel;
Expand All @@ -65,7 +65,7 @@ public static EventPublisherHolder getInstance() {
@PostConstruct
private void validateRemoteEventConfig() {
if (remoteEventsEnabled && streamBridge == null) {
throw new IllegalStateException("'hawkbit.events.remote-enabled' is true but streamBridge is not configured. Check if 'spring-cloud-starter-stream-rabbit' dependency is included.");
throw new IllegalStateException("'hawkbit.events.remote.enabled' is true but streamBridge is not configured. Check if 'spring-cloud-starter-stream-rabbit' dependency is included.");
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ hawkbit.repository.cluster.lock.refreshOnRemainPercent=10
## reduce scheduler tic period to speed up tests
hawkbit.repository.cluster.lock.ticPeriodMS=10

hawkbit.events.remote-enabled=false
hawkbit.events.remote.enabled=false
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ hawkbit.server.security.dos.maxActionsPerTarget=20
# Quota - END

# Properties that are managed by autoconfigure module at runtime and not available during test - END
hawkbit.events.remote-enabled=false
hawkbit.events.remote.enabled=false
Loading