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

Fixed compile error and made utility final

Browse Source
This commit is contained in:
Kai Zimmermann
2016-03-15 14:05:47 +01:00
parent f5352b420d
commit d2a95b1c7c
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/DurationHelper.java
View File

@@ -20,7 +20,7 @@ import java.time.temporal.TemporalAccessor;
* {@link #DURATION_FORMAT}. * {@link #DURATION_FORMAT}.
* *
*/ */
public class DurationHelper { public final class DurationHelper {
private DurationHelper() { private DurationHelper() {
// utility class // utility class

12
hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TenantConfigurationManagementTest.java
View File

@@ -31,8 +31,6 @@ import ru.yandex.qatools.allure.annotations.Stories;
@Stories("Tenant Configuration Management") @Stories("Tenant Configuration Management")
public class TenantConfigurationManagementTest extends AbstractIntegrationTestWithMongoDB { public class TenantConfigurationManagementTest extends AbstractIntegrationTestWithMongoDB {
final DurationHelper durationHelper = new DurationHelper();
@Test @Test
@Description("Tests that tenant specific configuration can be persisted and in case the tenant does not have specific configuration the default from environment is used instead.") @Description("Tests that tenant specific configuration can be persisted and in case the tenant does not have specific configuration the default from environment is used instead.")
public void storeTenantSpecificConfigurationAsString() { public void storeTenantSpecificConfigurationAsString() {
@@ -167,8 +165,8 @@ public class TenantConfigurationManagementTest extends AbstractIntegrationTestWi
public void storesTooSmallDurationAsPollingInterval() { public void storesTooSmallDurationAsPollingInterval() {
final TenantConfigurationKey configKey = TenantConfigurationKey.POLLING_TIME_INTERVAL; final TenantConfigurationKey configKey = TenantConfigurationKey.POLLING_TIME_INTERVAL;
final String tooSmallDuration = durationHelper final String tooSmallDuration = DurationHelper
.durationToFormattedString(durationHelper.getDurationByTimeValues(0, 0, 1)); .durationToFormattedString(DurationHelper.getDurationByTimeValues(0, 0, 1));
tenantConfigurationManagement.addOrUpdateConfiguration(configKey, tooSmallDuration); tenantConfigurationManagement.addOrUpdateConfiguration(configKey, tooSmallDuration);
} }
@@ -177,15 +175,15 @@ public class TenantConfigurationManagementTest extends AbstractIntegrationTestWi
public void storesCorrectDurationAsPollingInterval() { public void storesCorrectDurationAsPollingInterval() {
final TenantConfigurationKey configKey = TenantConfigurationKey.POLLING_TIME_INTERVAL; final TenantConfigurationKey configKey = TenantConfigurationKey.POLLING_TIME_INTERVAL;
final Duration duration = durationHelper.getDurationByTimeValues(1, 2, 0); final Duration duration = DurationHelper.getDurationByTimeValues(1, 2, 0);
assertThat(duration).isEqualTo(Duration.ofHours(1).plusMinutes(2)); assertThat(duration).isEqualTo(Duration.ofHours(1).plusMinutes(2));
tenantConfigurationManagement.addOrUpdateConfiguration(configKey, tenantConfigurationManagement.addOrUpdateConfiguration(configKey,
durationHelper.durationToFormattedString(duration)); DurationHelper.durationToFormattedString(duration));
final String storedDurationString = tenantConfigurationManagement.getConfigurationValue(configKey, String.class) final String storedDurationString = tenantConfigurationManagement.getConfigurationValue(configKey, String.class)
.getValue(); .getValue();
assertThat(duration).isEqualTo(durationHelper.formattedStringToDuration(storedDurationString)); assertThat(duration).isEqualTo(DurationHelper.formattedStringToDuration(storedDurationString));
} }
@Test @Test