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

Merge pull request #114 from bsinno/fix-mixed-pollingtime

Browse Source 
ok, merging and deleting branch.
This commit is contained in:
Michael Hirsch
2016-03-31 16:56:14 +02:00
parent ddc1f7059f 9b11d92b7f
commit 515edbd417
4 changed files with 11 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/ControllerPollProperties.java
View File

@@ -31,7 +31,7 @@ public class ControllerPollProperties {
* Maximum polling time that can be configured by a tenant in HH:MM:SS * Maximum polling time that can be configured by a tenant in HH:MM:SS
* notation. * notation.
*/ */
private String maxPollingTime = "23:59:00"; private String maxPollingTime = "23:59:59";
/** /**
* Minimum polling time that can be configured by a tenant in HH:MM:SS * Minimum polling time that can be configured by a tenant in HH:MM:SS

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

@@ -36,8 +36,15 @@ public final class DurationHelper {
this.max = max; this.max = max;
} }
/**
* Checks if the requested duration is in the defined min/max range.
*
* @param duration
* to checked
* @return <code>true</code> if in time range
*/
public boolean isWithinRange(final Duration duration) { public boolean isWithinRange(final Duration duration) {
return duration.compareTo(min) > 0 && duration.compareTo(max) < 0; return duration.compareTo(min) >= 0 && duration.compareTo(max) <= 0;
} }
} }

4
hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java
View File

@@ -58,12 +58,12 @@ public enum TenantConfigurationKey {
/** /**
* string value which holds the polling time interval in the format HH:mm:ss * string value which holds the polling time interval in the format HH:mm:ss
*/ */
POLLING_TIME_INTERVAL("pollingOverdueTime", "hawkbit.controller.pollingOverdueTime", String.class, null, TenantConfigurationPollingDurationValidator.class), POLLING_TIME_INTERVAL("pollingTime", "hawkbit.controller.pollingTime", String.class, null, TenantConfigurationPollingDurationValidator.class),
/** /**
* string value which holds the polling time interval in the format HH:mm:ss * string value which holds the polling time interval in the format HH:mm:ss
*/ */
POLLING_OVERDUE_TIME_INTERVAL("pollingTime", "hawkbit.controller.pollingTime", String.class, null, TenantConfigurationPollingDurationValidator.class); POLLING_OVERDUE_TIME_INTERVAL("pollingOverdueTime", "hawkbit.controller.pollingOverdueTime", String.class, null, TenantConfigurationPollingDurationValidator.class);
private final String keyName; private final String keyName;
private final String defaultKeyName; private final String defaultKeyName;

4
hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/RootController.java
View File

@@ -64,10 +64,6 @@ import org.springframework.web.bind.annotation.RestController;
* *
* Transactional (read-write) as all queries at least update the last poll time. * Transactional (read-write) as all queries at least update the last poll time.
* *
*
*
*
*
*/ */
@RestController @RestController
@RequestMapping(ControllerConstants.BASE_V1_REQUEST_MAPPING) @RequestMapping(ControllerConstants.BASE_V1_REQUEST_MAPPING)