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

Improve readability

Browse Source 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
kaizimmerm
2016-09-13 09:51:10 +02:00
parent b317823e86
commit 5ed5142429
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeMapper.java
View File

@@ -54,20 +54,14 @@ final class MgmtDistributionSetTypeMapper {
final DistributionSetType result = entityFactory.generateDistributionSetType(smsRest.getKey(), final DistributionSetType result = entityFactory.generateDistributionSetType(smsRest.getKey(),
smsRest.getName(), smsRest.getDescription()); smsRest.getName(), smsRest.getDescription());
// Add mandatory addMandatoryModules(softwareManagement, smsRest, result);
if (!CollectionUtils.isEmpty(smsRest.getMandatorymodules())) { addOptionalModules(softwareManagement, smsRest, result);
smsRest.getMandatorymodules().stream().map(mand -> {
final SoftwareModuleType smType = softwareManagement.findSoftwareModuleTypeById(mand.getId());
if (smType == null) { return result;
throw new EntityNotFoundException("SoftwareModuleType with ID " + mand.getId() + " not found"); }
}
return smType; private static void addOptionalModules(final SoftwareManagement softwareManagement,
}).forEach(result::addMandatoryModuleType); final MgmtDistributionSetTypeRequestBodyPost smsRest, final DistributionSetType result) {
}
// Add optional
if (!CollectionUtils.isEmpty(smsRest.getOptionalmodules())) { if (!CollectionUtils.isEmpty(smsRest.getOptionalmodules())) {
smsRest.getOptionalmodules().stream().map(opt -> { smsRest.getOptionalmodules().stream().map(opt -> {
final SoftwareModuleType smType = softwareManagement.findSoftwareModuleTypeById(opt.getId()); final SoftwareModuleType smType = softwareManagement.findSoftwareModuleTypeById(opt.getId());
@@ -79,8 +73,21 @@ final class MgmtDistributionSetTypeMapper {
return smType; return smType;
}).forEach(result::addOptionalModuleType); }).forEach(result::addOptionalModuleType);
} }
}
return result; private static void addMandatoryModules(final SoftwareManagement softwareManagement,
final MgmtDistributionSetTypeRequestBodyPost smsRest, final DistributionSetType result) {
if (!CollectionUtils.isEmpty(smsRest.getMandatorymodules())) {
smsRest.getMandatorymodules().stream().map(mand -> {
final SoftwareModuleType smType = softwareManagement.findSoftwareModuleTypeById(mand.getId());
if (smType == null) {
throw new EntityNotFoundException("SoftwareModuleType with ID " + mand.getId() + " not found");
}
return smType;
}).forEach(result::addMandatoryModuleType);
}
} }
static List<MgmtDistributionSetType> toTypesResponse(final List<DistributionSetType> types) { static List<MgmtDistributionSetType> toTypesResponse(final List<DistributionSetType> types) {