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

Merge remote-tracking branch 'origin/code_style_sonar_rule_fixes' into Sonar_Fix_Rollout

Browse Source
This commit is contained in:
SirWayne
2016-02-08 08:47:52 +01:00
parent 4574c78908 2a45fab9d7
commit 9ae2ef0bc0
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
View File

@@ -321,14 +321,10 @@ public class DistributionSetManagement {
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_CREATE_REPOSITORY) @PreAuthorize(SpringEvalExpressions.HAS_AUTH_CREATE_REPOSITORY)
public DistributionSet createDistributionSet(@NotNull final DistributionSet dSet) { public DistributionSet createDistributionSet(@NotNull final DistributionSet dSet) {
prepareDsSave(dSet); prepareDsSave(dSet);
if (dSet.getType() == null) { if (dSet.getType() == null) {
dSet.setType(systemManagement.getTenantMetadata().getDefaultDsType()); dSet.setType(systemManagement.getTenantMetadata().getDefaultDsType());
} }
return distributionSetRepository.save(dSet);
final DistributionSet result = distributionSetRepository.save(dSet);
return result;
} }
private void prepareDsSave(final DistributionSet dSet) { private void prepareDsSave(final DistributionSet dSet) {
@@ -400,7 +396,7 @@ public class DistributionSetManagement {
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_UPDATE_REPOSITORY) @PreAuthorize(SpringEvalExpressions.HAS_AUTH_UPDATE_REPOSITORY)
public DistributionSet unassignSoftwareModule(@NotNull final DistributionSet ds, public DistributionSet unassignSoftwareModule(@NotNull final DistributionSet ds,
final SoftwareModule softwareModule) { final SoftwareModule softwareModule) {
final Set<SoftwareModule> softwareModules = new HashSet<SoftwareModule>(); final Set<SoftwareModule> softwareModules = new HashSet<>();
softwareModules.add(softwareModule); softwareModules.add(softwareModule);
ds.removeModule(softwareModule); ds.removeModule(softwareModule);
checkDistributionSetSoftwareModulesIsAllowedToModify(ds, softwareModules); checkDistributionSetSoftwareModulesIsAllowedToModify(ds, softwareModules);
@@ -491,20 +487,16 @@ public class DistributionSetManagement {
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY) @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY)
private DistributionSet findDistributionSetsByFiltersAndInstalledOrAssignedTarget( private DistributionSet findDistributionSetsByFiltersAndInstalledOrAssignedTarget(
final DistributionSetFilter distributionSetFilter) { final DistributionSetFilter distributionSetFilter) {
final List<Specification<DistributionSet>> specList = buildDistributionSetSpecifications(distributionSetFilter); final List<Specification<DistributionSet>> specList = buildDistributionSetSpecifications(distributionSetFilter);
Specifications<DistributionSet> specs = null;
if (!specList.isEmpty()) { if (!specList.isEmpty()) {
specs = Specifications.where(specList.get(0)); Specifications<DistributionSet> specs = Specifications.where(specList.get(0));
}
if (specList.size() > 1) {
specList.remove(0); specList.remove(0);
for (final Specification<DistributionSet> s : specList) { for (final Specification<DistributionSet> s : specList) {
specs = specs.and(s); specs = specs.and(s);
} }
return distributionSetRepository.findOne(specs);
} }
return distributionSetRepository.findOne(specs); return null;
} }
/** /**
@@ -531,7 +523,7 @@ public class DistributionSetManagement {
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY) @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY)
public Page<DistributionSet> findDistributionSetsAll(@NotNull final Pageable pageReq, final Boolean deleted, public Page<DistributionSet> findDistributionSetsAll(@NotNull final Pageable pageReq, final Boolean deleted,
final Boolean complete) { final Boolean complete) {
final List<Specification<DistributionSet>> specList = new ArrayList<Specification<DistributionSet>>(); final List<Specification<DistributionSet>> specList = new ArrayList<>();
if (deleted != null) { if (deleted != null) {
final Specification<DistributionSet> spec = DistributionSetSpecification.isDeleted(deleted); final Specification<DistributionSet> spec = DistributionSetSpecification.isDeleted(deleted);
@@ -563,7 +555,7 @@ public class DistributionSetManagement {
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY) @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY)
public Page<DistributionSet> findDistributionSetsAll(@NotNull final Specification<DistributionSet> spec, public Page<DistributionSet> findDistributionSetsAll(@NotNull final Specification<DistributionSet> spec,
@NotNull final Pageable pageReq, final Boolean deleted) { @NotNull final Pageable pageReq, final Boolean deleted) {
final List<Specification<DistributionSet>> specList = new ArrayList<Specification<DistributionSet>>(); final List<Specification<DistributionSet>> specList = new ArrayList<>();
if (deleted != null) { if (deleted != null) {
specList.add(DistributionSetSpecification.isDeleted(deleted)); specList.add(DistributionSetSpecification.isDeleted(deleted));
} }
@@ -689,7 +681,7 @@ public class DistributionSetManagement {
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY) @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY)
public Long countDistributionSetsAll() { public Long countDistributionSetsAll() {
final List<Specification<DistributionSet>> specList = new ArrayList<Specification<DistributionSet>>(); final List<Specification<DistributionSet>> specList = new ArrayList<>();
final Specification<DistributionSet> spec = DistributionSetSpecification.isDeleted(Boolean.FALSE); final Specification<DistributionSet> spec = DistributionSetSpecification.isDeleted(Boolean.FALSE);
specList.add(spec); specList.add(spec);
@@ -873,11 +865,8 @@ public class DistributionSetManagement {
@Override @Override
public Predicate toPredicate(final Root<DistributionSetMetadata> root, final CriteriaQuery<?> query, public Predicate toPredicate(final Root<DistributionSetMetadata> root, final CriteriaQuery<?> query,
final CriteriaBuilder cb) { final CriteriaBuilder cb) {
return cb.equal(root.get(DistributionSetMetadata_.distributionSet).get(DistributionSet_.id),
final Predicate predicate = cb.equal( distributionSetId);
root.get(DistributionSetMetadata_.distributionSet).get(DistributionSet_.id), distributionSetId);
return predicate;
} }
}, pageable); }, pageable);
@@ -969,9 +958,9 @@ public class DistributionSetManagement {
private List<Specification<DistributionSet>> buildDistributionSetSpecifications( private List<Specification<DistributionSet>> buildDistributionSetSpecifications(
final DistributionSetFilter distributionSetFilter) { final DistributionSetFilter distributionSetFilter) {
final List<Specification<DistributionSet>> specList = new ArrayList<Specification<DistributionSet>>(); final List<Specification<DistributionSet>> specList = new ArrayList<>();
Specification<DistributionSet> spec = null; Specification<DistributionSet> spec;
if (null != distributionSetFilter.getIsComplete()) { if (null != distributionSetFilter.getIsComplete()) {
spec = DistributionSetSpecification.isCompleted(distributionSetFilter.getIsComplete()); spec = DistributionSetSpecification.isCompleted(distributionSetFilter.getIsComplete());