From 03f94ab555064a3b64461b91347955a3717aca7a Mon Sep 17 00:00:00 2001
From: kaizimmerm <kai.zimmermann@bosch-si.com>
Date: Tue, 20 Sep 2016 13:55:32 +0200
Subject: [PATCH] Fixed broken optimizations

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
---
 .../model/rollout/MgmtRolloutResponseBody.java     |  3 ++-
 .../jpa/JpaDistributionSetManagement.java          | 14 +++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutResponseBody.java b/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutResponseBody.java
index ce74b4c8d..79455f501 100644
--- a/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutResponseBody.java
+++ b/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutResponseBody.java
@@ -8,6 +8,7 @@
  */
 package org.eclipse.hawkbit.mgmt.json.model.rollout;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity;
@@ -37,7 +38,7 @@ public class MgmtRolloutResponseBody extends MgmtNamedEntity {
     private Long totalTargets;
 
     @JsonProperty(required = true)
-    private Map<String, Long> totalTargetsPerStatus;
+    private final Map<String, Long> totalTargetsPerStatus = new HashMap<>();
 
     /**
      * @return the status
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java
index a4295cdae..994c880e4 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java
@@ -15,7 +15,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -67,6 +66,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
 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 List<Specification<JpaDistributionSet>> specList = new LinkedList<>();
+        final List<Specification<JpaDistributionSet>> specList = new ArrayList<>(2);
         if (deleted != null) {
             specList.add(DistributionSetSpecification.isDeleted(deleted));
         }
@@ -377,7 +377,7 @@ public class JpaDistributionSetManagement implements DistributionSetManagement {
         final Page<DistributionSet> findDistributionSetsByFilters = findDistributionSetsByFilters(pageable,
                 dsFilterWithNoTargetLinked);
 
-        final List<DistributionSet> resultSet = new LinkedList<>(findDistributionSetsByFilters.getContent());
+        final List<DistributionSet> resultSet = new ArrayList<>(findDistributionSetsByFilters.getContent());
         int orderIndex = 0;
         if (installedDS != null) {
             final boolean remove = resultSet.remove(installedDS);
@@ -414,13 +414,9 @@ public class JpaDistributionSetManagement implements DistributionSetManagement {
 
     @Override
     public Long countDistributionSetsAll() {
-
-        final List<Specification<JpaDistributionSet>> specList = new LinkedList<>();
-
         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
@@ -599,7 +595,7 @@ public class JpaDistributionSetManagement implements DistributionSetManagement {
 
     private static List<Specification<JpaDistributionSet>> buildDistributionSetSpecifications(
             final DistributionSetFilter distributionSetFilter) {
-        final List<Specification<JpaDistributionSet>> specList = new LinkedList<>();
+        final List<Specification<JpaDistributionSet>> specList = new ArrayList<>(7);
 
         Specification<JpaDistributionSet> spec;