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

hawkBit repository uses Optional on single entity find/get requests (#435)

Browse Source 
* Repo returns optionals.
* Improved exception handling for collection usage in repo queries.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2017-02-16 10:09:14 +01:00
committed by GitHub
parent d21af83804
commit 804522f966
232 changed files with 2104 additions and 2377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
View File

@@ -254,7 +254,7 @@ public abstract class AbstractIntegrationTest implements EnvironmentAware {
}
protected Long getOsModule(final DistributionSet ds) {
return ds.findFirstModuleByType(osType).getId();
return ds.findFirstModuleByType(osType).get().getId();
}
protected Action prepareFinishedUpdate() {
@@ -291,7 +291,7 @@ public abstract class AbstractIntegrationTest implements EnvironmentAware {
// Run here, because Scheduler is disabled during tests
rolloutManagement.fillRolloutGroupsWithTargets(rollout.getId());
return rolloutManagement.findRolloutById(rollout.getId());
return rolloutManagement.findRolloutById(rollout.getId()).get();
}
@Before

41
hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/TestdataFactory.java
View File

@@ -314,7 +314,7 @@ public class TestdataFactory {
tags.forEach(tag -> distributionSetManagement.toggleTagAssignment(Arrays.asList(set.getId()), tag.getName()));
return distributionSetManagement.findDistributionSetById(set.getId());
return distributionSetManagement.findDistributionSetById(set.getId()).get();
}
@@ -529,7 +529,7 @@ public class TestdataFactory {
entityFactory.softwareModule().update(module.getId()).description("Updated " + DEFAULT_DESCRIPTION)));
// load also lazy stuff
return distributionSetManagement.findDistributionSetByIdWithDetails(set.getId());
return distributionSetManagement.findDistributionSetByIdWithDetails(set.getId()).get();
}
/**
@@ -560,15 +560,9 @@ public class TestdataFactory {
* @return persisted {@link DistributionSetType}
*/
public DistributionSetType findOrCreateDistributionSetType(final String dsTypeKey, final String dsTypeName) {
final DistributionSetType findDistributionSetTypeByname = distributionSetManagement
.findDistributionSetTypeByKey(dsTypeKey);
if (findDistributionSetTypeByname != null) {
return findDistributionSetTypeByname;
}
return distributionSetManagement.createDistributionSetType(entityFactory.distributionSetType().create()
.key(dsTypeKey).name(dsTypeName).description(LOREM.words(10)).colour("black"));
return distributionSetManagement.findDistributionSetTypeByKey(dsTypeKey)
.orElseGet(() -> distributionSetManagement.createDistributionSetType(entityFactory.distributionSetType()
.create().key(dsTypeKey).name(dsTypeName).description(LOREM.words(10)).colour("black")));
}
/**
@@ -588,17 +582,11 @@ public class TestdataFactory {
*/
public DistributionSetType findOrCreateDistributionSetType(final String dsTypeKey, final String dsTypeName,
final Collection<SoftwareModuleType> mandatory, final Collection<SoftwareModuleType> optional) {
final DistributionSetType findDistributionSetTypeByname = distributionSetManagement
.findDistributionSetTypeByKey(dsTypeKey);
if (findDistributionSetTypeByname != null) {
return findDistributionSetTypeByname;
}
return distributionSetManagement.createDistributionSetType(entityFactory.distributionSetType().create()
.key(dsTypeKey).name(dsTypeName).description(LOREM.words(10)).colour("black")
.optional(optional.stream().map(SoftwareModuleType::getId).collect(Collectors.toList()))
.mandatory(mandatory.stream().map(SoftwareModuleType::getId).collect(Collectors.toList())));
return distributionSetManagement.findDistributionSetTypeByKey(dsTypeKey)
.orElseGet(() -> distributionSetManagement.createDistributionSetType(entityFactory.distributionSetType()
.create().key(dsTypeKey).name(dsTypeName).description(LOREM.words(10)).colour("black")
.optional(optional.stream().map(SoftwareModuleType::getId).collect(Collectors.toList()))
.mandatory(mandatory.stream().map(SoftwareModuleType::getId).collect(Collectors.toList()))));
}
/**
@@ -627,12 +615,9 @@ public class TestdataFactory {
* @return persisted {@link SoftwareModuleType}
*/
public SoftwareModuleType findOrCreateSoftwareModuleType(final String key, final int maxAssignments) {
final SoftwareModuleType findSoftwareModuleTypeByKey = softwareManagement.findSoftwareModuleTypeByKey(key);
if (findSoftwareModuleTypeByKey != null) {
return findSoftwareModuleTypeByKey;
}
return softwareManagement.createSoftwareModuleType(entityFactory.softwareModuleType().create().key(key)
.name(key).description(LOREM.words(10)).maxAssignments(maxAssignments));
return softwareManagement.findSoftwareModuleTypeByKey(key)
.orElseGet(() -> softwareManagement.createSoftwareModuleType(entityFactory.softwareModuleType().create()
.key(key).name(key).description(LOREM.words(10)).maxAssignments(maxAssignments)));
}
/**