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

Fixed broken optimizations

Browse Source 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
kaizimmerm
2016-09-20 13:55:32 +02:00
parent 66297d7c27
commit 03f94ab555
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutResponseBody.java
View File

@@ -8,6 +8,7 @@
*/ */
package org.eclipse.hawkbit.mgmt.json.model.rollout; package org.eclipse.hawkbit.mgmt.json.model.rollout;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity; import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity;
@@ -37,7 +38,7 @@ public class MgmtRolloutResponseBody extends MgmtNamedEntity {
private Long totalTargets; private Long totalTargets;
@JsonProperty(required = true) @JsonProperty(required = true)
private Map<String, Long> totalTargetsPerStatus; private final Map<String, Long> totalTargetsPerStatus = new HashMap<>();
/** /**
* @return the status * @return the status

14
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java
View File

@@ -15,7 +15,6 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -67,6 +66,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.eventbus.EventBus; import com.google.common.eventbus.EventBus;
/** /**
@@ -347,7 +347,7 @@ public class JpaDistributionSetManagement implements DistributionSetManagement {
final Specification<JpaDistributionSet> spec = RSQLUtility.parse(rsqlParam, DistributionSetFields.class); final Specification<JpaDistributionSet> spec = RSQLUtility.parse(rsqlParam, DistributionSetFields.class);
final List<Specification<JpaDistributionSet>> specList = new LinkedList<>(); final List<Specification<JpaDistributionSet>> specList = new ArrayList<>(2);
if (deleted != null) { if (deleted != null) {
specList.add(DistributionSetSpecification.isDeleted(deleted)); specList.add(DistributionSetSpecification.isDeleted(deleted));
} }
@@ -377,7 +377,7 @@ public class JpaDistributionSetManagement implements DistributionSetManagement {
final Page<DistributionSet> findDistributionSetsByFilters = findDistributionSetsByFilters(pageable, final Page<DistributionSet> findDistributionSetsByFilters = findDistributionSetsByFilters(pageable,
dsFilterWithNoTargetLinked); dsFilterWithNoTargetLinked);
final List<DistributionSet> resultSet = new LinkedList<>(findDistributionSetsByFilters.getContent()); final List<DistributionSet> resultSet = new ArrayList<>(findDistributionSetsByFilters.getContent());
int orderIndex = 0; int orderIndex = 0;
if (installedDS != null) { if (installedDS != null) {
final boolean remove = resultSet.remove(installedDS); final boolean remove = resultSet.remove(installedDS);
@@ -414,13 +414,9 @@ public class JpaDistributionSetManagement implements DistributionSetManagement {
@Override @Override
public Long countDistributionSetsAll() { public Long countDistributionSetsAll() {
final List<Specification<JpaDistributionSet>> specList = new LinkedList<>();
final Specification<JpaDistributionSet> spec = DistributionSetSpecification.isDeleted(Boolean.FALSE); final Specification<JpaDistributionSet> spec = DistributionSetSpecification.isDeleted(Boolean.FALSE);
specList.add(spec);
return distributionSetRepository.count(SpecificationsBuilder.combineWithAnd(specList)); return distributionSetRepository.count(SpecificationsBuilder.combineWithAnd(Lists.newArrayList(spec)));
} }
@Override @Override
@@ -599,7 +595,7 @@ public class JpaDistributionSetManagement implements DistributionSetManagement {
private static List<Specification<JpaDistributionSet>> buildDistributionSetSpecifications( private static List<Specification<JpaDistributionSet>> buildDistributionSetSpecifications(
final DistributionSetFilter distributionSetFilter) { final DistributionSetFilter distributionSetFilter) {
final List<Specification<JpaDistributionSet>> specList = new LinkedList<>(); final List<Specification<JpaDistributionSet>> specList = new ArrayList<>(7);
Specification<JpaDistributionSet> spec; Specification<JpaDistributionSet> spec;