lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Sync property naming convention (#2664)

Browse Source 
Co-authored-by: vasilchev <vasil.ilchev@bosch.com>
This commit is contained in:
Vasil Ilchev
2025-09-10 14:55:51 +03:00
committed by GitHub
parent 2d45e2a76c
commit 20768a550c
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-ddi/hawkbit-ddi-resource/src/test/resources/ddi-test.properties
View File

@@ -25,4 +25,4 @@ spring.servlet.multipart.max-file-size=5MB
hawkbit.server.security.dos.maxStatusEntriesPerAction=100 hawkbit.server.security.dos.maxStatusEntriesPerAction=100
hawkbit.server.security.dos.maxAttributeEntriesPerTarget=10 hawkbit.server.security.dos.maxAttributeEntriesPerTarget=10
# Quota - END # Quota - END
hawkbit.events.remote-enabled=false hawkbit.events.remote.enabled=false

2
hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java
View File

@@ -74,7 +74,7 @@ import org.springframework.test.context.TestPropertySource;
@ActiveProfiles({ "test" }) @ActiveProfiles({ "test" })
@SpringBootTest(classes = { JpaRepositoryConfiguration.class }, webEnvironment = SpringBootTest.WebEnvironment.NONE) @SpringBootTest(classes = { JpaRepositoryConfiguration.class }, webEnvironment = SpringBootTest.WebEnvironment.NONE)
@TestPropertySource(properties = { @TestPropertySource(properties = {
"hawkbit.events.remote-enabled=false", "hawkbit.events.remote.enabled=false",
"spring.main.allow-bean-definition-overriding=true" }) "spring.main.allow-bean-definition-overriding=true" })
class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest { class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest {

2
hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java
View File

@@ -38,7 +38,7 @@ import org.springframework.test.context.TestPropertySource;
// Dirty context is necessary to create a new vhost and recreate all necessary beans after every test class. // Dirty context is necessary to create a new vhost and recreate all necessary beans after every test class.
@DirtiesContext(classMode = ClassMode.AFTER_CLASS) @DirtiesContext(classMode = ClassMode.AFTER_CLASS)
@TestPropertySource(properties = { @TestPropertySource(properties = {
"hawkbit.events.remote-enabled=false", "hawkbit.events.remote.enabled=false",
"spring.main.allow-bean-definition-overriding=true" }) "spring.main.allow-bean-definition-overriding=true" })
@SuppressWarnings("java:S6813") // constructor injects are not possible for test classes @SuppressWarnings("java:S6813") // constructor injects are not possible for test classes
public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTest { public abstract class AbstractAmqpIntegrationTest extends AbstractIntegrationTest {

2
hawkbit-mgmt/hawkbit-mgmt-resource/src/test/resources/mgmt-test.properties
View File

@@ -11,4 +11,4 @@
# Logging START - activate to see request/response details # Logging START - activate to see request/response details
#logging.level.org.eclipse.hawkbit.rest.util.MockMvcResultPrinter=DEBUG #logging.level.org.eclipse.hawkbit.rest.util.MockMvcResultPrinter=DEBUG
# Logging END # Logging END
hawkbit.events.remote-enabled=false hawkbit.events.remote.enabled=false

4
hawkbit-monolith/hawkbit-update-server/src/main/resources/application.properties
View File

@@ -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. ## Uncomment bellow to Enable communication between services (disabled by default) - no cluster support.
# To enable it, enable RabbitMQ (see above) # To enable it, enable RabbitMQ (see above)
# and set below 'hawkbit.events.remote-enabled=true' # and set below 'hawkbit.events.remote.enabled=true'
hawkbit.events.remote-enabled=false hawkbit.events.remote.enabled=false
## Disable DMF (by default) - no DMF support. To enable it, enable RabbitMQ (see above) and comment the line ## 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 ## (hawkbit.dmf.rabbitmq.enabled=false) set hawkbit.dmf.rabbitmq.enabled=true

4
hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/event/EventPublisherHolder.java
View File

@@ -44,7 +44,7 @@ import org.springframework.context.ApplicationEventPublisher;
@Slf4j @Slf4j
public final class EventPublisherHolder { public final class EventPublisherHolder {
@Value("${hawkbit.events.remote-enabled:true}") @Value("${hawkbit.events.remote.enabled:true}")
private boolean remoteEventsEnabled; private boolean remoteEventsEnabled;
@Value("${hawkbit.events.remote.destination:fanoutEventChannel}") @Value("${hawkbit.events.remote.destination:fanoutEventChannel}")
private String fanoutEventChannel; private String fanoutEventChannel;
@@ -65,7 +65,7 @@ public final class EventPublisherHolder {
@PostConstruct @PostConstruct
private void validateRemoteEventConfig() { private void validateRemoteEventConfig() {
if (remoteEventsEnabled && streamBridge == null) { 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.");
} }
} }

2
hawkbit-repository/hawkbit-repository-jpa/src/test/resources/jpa-test.properties
View File

@@ -64,4 +64,4 @@ hawkbit.repository.cluster.lock.refreshOnRemainPercent=10
## reduce scheduler tic period to speed up tests ## reduce scheduler tic period to speed up tests
hawkbit.repository.cluster.lock.ticPeriodMS=10 hawkbit.repository.cluster.lock.ticPeriodMS=10
hawkbit.events.remote-enabled=false hawkbit.events.remote.enabled=false

2
hawkbit-repository/hawkbit-repository-test/src/main/resources/hawkbit-test-defaults.properties
View File

@@ -80,4 +80,4 @@ hawkbit.server.security.dos.maxActionsPerTarget=20
# Quota - END # Quota - END
# Properties that are managed by autoconfigure module at runtime and not available during test - 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