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

Changed return type of SystemManagement.getConfigurationValue()

Browse Source 
* changed Return type to wrapper object, adding additional meta data stored in the database
* updated all calls of this method
* updated function calls in tests
* verified correct execution of correspending tests

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
This commit is contained in:
Fabian Nonnenmacher
2016-01-26 14:31:56 +01:00
committed by Nonnenmacher Fabian
parent f2e7cdb92a
commit 07fce42469
14 changed files with 277 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/SystemMapper.java
View File

@@ -3,7 +3,6 @@ package org.eclipse.hawkbit.rest.resource;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.hawkbit.repository.DistributionSetManagement;
import org.eclipse.hawkbit.repository.SystemManagement;
import org.eclipse.hawkbit.repository.model.TenantMetaData;
import org.eclipse.hawkbit.repository.model.helper.DurationHelper;
@@ -23,65 +22,25 @@ final public class SystemMapper {
private static DurationHelper dh = new DurationHelper();
public static SystemConfigurationRest toResponse(SystemManagement systemManagement) {
public static SystemConfigurationRest toResponse(final SystemManagement systemManagement) {
TenantMetaData tenantMetaData = systemManagement.getTenantMetadata();
final SystemConfigurationRest sysconf = new SystemConfigurationRest();
SystemConfigurationRest sysconf = new SystemConfigurationRest();
final Map<String, Object> authconf = new HashMap<String, Object>();
sysconf.setDefaultDistributionSetType(tenantMetaData.getDefaultDsType().getKey());
sysconf.setCreatedAt(tenantMetaData.getCreatedAt());
sysconf.setCreatedBy(tenantMetaData.getCreatedBy());
sysconf.setLastModifiedAt(tenantMetaData.getLastModifiedAt());
sysconf.setLastModifiedBy(tenantMetaData.getLastModifiedBy());
sysconf.setPollingOverdueTime(dh.durationToFormattedString(tenantMetaData.getPollingOverdueTime()));
sysconf.setPollingTime(dh.durationToFormattedString(tenantMetaData.getPollingTime()));
Map<String, Object> authconf = new HashMap<String, Object>();
for (TenantConfigurationKey key : TenantConfigurationKey.values()) {
Object value;
switch (key) {
case AUTHENTICATION_MODE_HEADER_ENABLED:
case AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED:
case AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_ENABLED:
value = systemManagement.getConfigurationValue(key, Boolean.class);
break;
case AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_NAME:
case AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY:
case AUTHENTICATION_MODE_HEADER_AUTHORITY_NAME:
value = systemManagement.getConfigurationValue(key, String.class);
break;
default:
LOG.warn("There is no data type specified for TenantConfigurationKey {}.", key.getKeyName());
value = systemManagement.getConfigurationValue(key, String.class);
}
for (final TenantConfigurationKey key : TenantConfigurationKey.values()) {
final Object value = systemManagement.getConfigurationValue(key);
authconf.put(key.getKeyName(), value);
}
sysconf.setAuthenticationConfiguration(authconf);
return sysconf;
}
public static TenantMetaData fromRequest(SystemManagement systemManagement,
SystemConfigurationRequestBodyPut systemConReq, DistributionSetManagement distributionSetManagement) {
TenantMetaData tenantMetaData = systemManagement.getTenantMetadata();
String ddstypeKey = systemConReq.getDefaultDistributionSetType();
if (distributionSetManagement.findDistributionSetTypeByKey(ddstypeKey) == null) {
throw new IllegalArgumentException(
String.format("The specified default distribution set type %s doe not exist.", ddstypeKey));
}
tenantMetaData.setPollingOverdueTime(dh.formattedStringToDuration(systemConReq.getPollingOverdueTime()));
tenantMetaData.setPollingTime(dh.formattedStringToDuration(systemConReq.getPollingTime()));
public static TenantMetaData fromRequest(final SystemManagement systemManagement,
final SystemConfigurationRequestBodyPut systemConReq) {
// TODO
return null;
}
}

2
hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/SystemResource.java
View File

@@ -39,7 +39,7 @@ public class SystemResource {
public ResponseEntity<SystemConfigurationRest> updateSoftwareModuleType(
@RequestBody final SystemConfigurationRequestBodyPut systemConReq) {
systemManagement.updateTenantConfiguration(systemConReq);
// systemManagement.updateTenantConfiguration(systemConReq);
return new ResponseEntity<>(SystemMapper.toResponse(systemManagement), HttpStatus.OK);
}