From a4cc3df0923d9af8f74d70539da4e3c5527dab9a Mon Sep 17 00:00:00 2001 From: SirWayne Date: Wed, 9 Mar 2016 15:36:59 +0100 Subject: [PATCH] Fix test properties Signed-off-by: SirWayne --- .../java/org/eclipse/hawkbit/HawkbitServerProperties.java | 2 ++ .../TenantConfigurationPollingDurationValidator.java | 3 ++- .../hawkbit/amqp/AmqpControllerAuthenticationTest.java | 6 +++++- ...ontrollerPreAuthenticatedGatewaySecurityTokenFilter.java | 3 --- .../test/java/org/eclipse/hawkbit/TestConfiguration.java | 2 +- .../ui/tenantconfiguration/polling/DurationConfigField.java | 3 --- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/HawkbitServerProperties.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/HawkbitServerProperties.java index 878965102..633e6eaf9 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/HawkbitServerProperties.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/HawkbitServerProperties.java @@ -9,11 +9,13 @@ package org.eclipse.hawkbit; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; /** * Properties for the server e.g. the server's URL which must be configured. * */ +@Component @ConfigurationProperties("hawkbit.server") public class HawkbitServerProperties { /** diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationPollingDurationValidator.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationPollingDurationValidator.java index ea8703dcf..9696ac34c 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationPollingDurationValidator.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationPollingDurationValidator.java @@ -29,6 +29,8 @@ public class TenantConfigurationPollingDurationValidator implements TenantConfig private final Duration maxDuration; /** + * Constructor. + * * @param properties * property accessor for poll configuration */ @@ -46,7 +48,6 @@ public class TenantConfigurationPollingDurationValidator implements TenantConfig final Duration tenantConfigurationValue; try { tenantConfigurationValue = durationHelper.formattedStringToDuration(tenantConfigurationString); - } catch (final DateTimeParseException ex) { throw new TenantConfigurationValidatorException( String.format("The given configuration value is expected as a string in the format %s.", diff --git a/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java b/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java index df96834aa..66527727a 100644 --- a/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java +++ b/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java @@ -27,6 +27,7 @@ import org.eclipse.hawkbit.repository.model.TenantConfigurationValue; import org.eclipse.hawkbit.security.DdiSecurityProperties; import org.eclipse.hawkbit.security.DdiSecurityProperties.Rp; import org.eclipse.hawkbit.security.SecurityContextTenantAware; +import org.eclipse.hawkbit.security.SystemSecurityContext; import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey; import org.junit.Before; import org.junit.Test; @@ -93,7 +94,10 @@ public class AmqpControllerAuthenticationTest { authenticationManager.setControllerManagement(controllerManagement); amqpMessageHandlerService.setArtifactManagement(mock(ArtifactManagement.class)); - authenticationManager.setTenantAware(new SecurityContextTenantAware()); + final SecurityContextTenantAware tenantAware = new SecurityContextTenantAware(); + authenticationManager.setTenantAware(tenantAware); + final SystemSecurityContext systemSecurityContext = new SystemSecurityContext(tenantAware); + authenticationManager.setSystemSecurityContext(systemSecurityContext); authenticationManager.postConstruct(); amqpMessageHandlerService.setAuthenticationManager(authenticationManager); } diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java index f97dde608..930c66dca 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java @@ -30,9 +30,6 @@ public class HttpControllerPreAuthenticatedGatewaySecurityTokenFilter * @param tenantConfigurationManagement * the system management service to retrieve configuration * properties - * @param systemManagement - * the system management service to retrieve configuration - * properties * @param tenantAware * the tenant aware service to get configuration for the specific * tenant diff --git a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestConfiguration.java b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestConfiguration.java index 706cb4479..e2838d866 100644 --- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestConfiguration.java +++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestConfiguration.java @@ -47,7 +47,7 @@ import com.mongodb.MongoClientOptions; */ @Configuration @EnableGlobalMethodSecurity(prePostEnabled = true, mode = AdviceMode.ASPECTJ, proxyTargetClass = true, securedEnabled = true) -@EnableConfigurationProperties({ DdiSecurityProperties.class, ControllerPollProperties.class }) +@EnableConfigurationProperties({ DdiSecurityProperties.class }) @Profile("test") public class TestConfiguration implements AsyncConfigurer { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java index 83273df0a..ee2ccec44 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java @@ -59,15 +59,12 @@ public class DurationConfigField extends GridLayout implements ValueChangeListen if (event.getProperty() != checkBox) { return; } - durationField.setEnabled(checkBox.getValue()); if (!checkBox.getValue()) { durationField.setDuration(globalDuration); } - durationField.setEnabled(false); - notifyConfigurationChanged(); }