From f768c16e947a59ef2ce9dad63fa3b8c1447e0cdd Mon Sep 17 00:00:00 2001 From: Dominik Herbst Date: Wed, 12 Oct 2016 14:41:41 +0200 Subject: [PATCH] Set initial capacity for new ArrayList or replaced the usage of ArrayList. Signed-off-by: Dominik Herbst --- .../repository/TargetFilterQueryManagement.java | 2 +- .../jpa/JpaTargetFilterQueryManagement.java | 15 ++++++++------- .../repository/jpa/JpaTargetManagement.java | 3 +-- .../DistributionSetSelectTable.java | 11 ++++------- .../ui/filtermanagement/TargetFilterTable.java | 12 ++++-------- 5 files changed, 18 insertions(+), 25 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java index bd7bec4e5..27bb32b25 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java @@ -175,4 +175,4 @@ public interface TargetFilterQueryManagement { */ @PreAuthorize(SpringEvalExpressions.HAS_AUTH_UPDATE_TARGET) TargetFilterQuery updateTargetFilterQuery(@NotNull TargetFilterQuery targetFilterQuery); -} \ No newline at end of file +} diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetFilterQueryManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetFilterQueryManagement.java index 27f803a00..ab26ed60f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetFilterQueryManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetFilterQueryManagement.java @@ -9,6 +9,7 @@ package org.eclipse.hawkbit.repository.jpa; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.eclipse.hawkbit.repository.TargetFields; @@ -83,18 +84,18 @@ public class JpaTargetFilterQueryManagement implements TargetFilterQueryManageme @Override public Page findTargetFilterQueryByName(final Pageable pageable, final String name) { - final List> specList = new ArrayList<>(); + List> specList = Collections.emptyList(); if (!Strings.isNullOrEmpty(name)) { - specList.add(TargetFilterQuerySpecification.likeName(name)); + specList = Collections.singletonList(TargetFilterQuerySpecification.likeName(name)); } return convertPage(findTargetFilterQueryByCriteriaAPI(pageable, specList), pageable); } @Override public Page findTargetFilterQueryByFilter(@NotNull Pageable pageable, String rsqlFilter) { - final List> specList = new ArrayList<>(); + List> specList = Collections.emptyList(); if (!Strings.isNullOrEmpty(rsqlFilter)) { - specList.add(RSQLUtility.parse(rsqlFilter, TargetFilterQueryFields.class)); + specList = Collections.singletonList(RSQLUtility.parse(rsqlFilter, TargetFilterQueryFields.class)); } return convertPage(findTargetFilterQueryByCriteriaAPI(pageable, specList), pageable); } @@ -108,7 +109,7 @@ public class JpaTargetFilterQueryManagement implements TargetFilterQueryManageme @Override public Page findTargetFilterQueryByAutoAssignDS(@NotNull Pageable pageable, DistributionSet distributionSet, String rsqlFilter) { - final List> specList = new ArrayList<>(); + final List> specList = new ArrayList<>(2); if (distributionSet != null) { specList.add(TargetFilterQuerySpecification.byAutoAssignDS(distributionSet)); } @@ -120,8 +121,8 @@ public class JpaTargetFilterQueryManagement implements TargetFilterQueryManageme @Override public Page findTargetFilterQueryWithAutoAssignDS(@NotNull Pageable pageable) { - final List> specList = new ArrayList<>(); - specList.add(TargetFilterQuerySpecification.withAutoAssignDS()); + final List> specList = Collections + .singletonList(TargetFilterQuerySpecification.withAutoAssignDS()); return convertPage(findTargetFilterQueryByCriteriaAPI(pageable, specList), pageable); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java index 4fb68a2eb..02f4f1d5c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java @@ -579,9 +579,8 @@ public class JpaTargetManagement implements TargetManagement { @Override public Long countTargetsByTargetFilterQueryAndNonDS(Long distributionSetId, @NotNull TargetFilterQuery targetFilterQuery) { final Specification spec = RSQLUtility.parse(targetFilterQuery.getQuery(), TargetFields.class); - final List> specList = new ArrayList<>(); + final List> specList = new ArrayList<>(2); specList.add(spec); - specList.add(TargetSpecifications.hasNotDistributionSetInActions(distributionSetId)); return countByCriteriaAPI(specList); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java index 516a5449b..82d41a616 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java @@ -118,7 +118,7 @@ public class DistributionSetSelectTable extends Table { } private List getVisbleColumns() { - final List columnList = new ArrayList<>(); + final List columnList = new ArrayList<>(2); columnList.add(new TableColumn(SPUILabelDefinitions.NAME, i18n.get("header.name"), 0.6F)); columnList.add(new TableColumn(SPUILabelDefinitions.VAR_VERSION, i18n.get("header.version"), 0.4F)); return columnList; @@ -126,14 +126,11 @@ public class DistributionSetSelectTable extends Table { } private void setColumnProperties() { - final List columnList = getVisbleColumns(); - final List swColumnIds = new ArrayList<>(); - for (final TableColumn column : columnList) { + setVisibleColumns(getVisbleColumns().stream().map(column -> { setColumnHeader(column.getColumnPropertyId(), column.getColumnHeader()); setColumnExpandRatio(column.getColumnPropertyId(), column.getExpandRatio()); - swColumnIds.add(column.getColumnPropertyId()); - } - setVisibleColumns(swColumnIds.toArray()); + return column.getColumnPropertyId(); + }).toArray()); } private Map prepareQueryConfigFilters() { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java index b4833bdbe..6aefa0b75 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java @@ -10,7 +10,6 @@ package org.eclipse.hawkbit.ui.filtermanagement; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -154,7 +153,7 @@ public class TargetFilterTable extends Table { } private List getVisbleColumns() { - final List columnList = new ArrayList<>(); + final List columnList = new ArrayList<>(7); columnList.add(new TableColumn(SPUILabelDefinitions.NAME, i18n.get("header.name"), 0.2F)); columnList.add(new TableColumn(SPUILabelDefinitions.VAR_CREATED_USER, i18n.get("header.createdBy"), 0.1F)); columnList.add(new TableColumn(SPUILabelDefinitions.VAR_CREATED_DATE, i18n.get("header.createdDate"), 0.2F)); @@ -287,14 +286,11 @@ public class TargetFilterTable extends Table { } private void setColumnProperties() { - final List columnList = getVisbleColumns(); - final List swColumnIds = new ArrayList<>(); - for (final TableColumn column : columnList) { + setVisibleColumns(getVisbleColumns().stream().map(column -> { setColumnHeader(column.getColumnPropertyId(), column.getColumnHeader()); setColumnExpandRatio(column.getColumnPropertyId(), column.getExpandRatio()); - swColumnIds.add(column.getColumnPropertyId()); - } - setVisibleColumns(swColumnIds.toArray()); + return column.getColumnPropertyId(); + }).toArray()); } }