From 405a0aa12575ddf655188f061bfd2dab22a256be Mon Sep 17 00:00:00 2001 From: Dominik Herbst Date: Tue, 27 Sep 2016 11:10:52 +0200 Subject: [PATCH] Fixed visibility and sonar issues Signed-off-by: Dominik Herbst --- .../hawkbit/repository/FilterParams.java | 18 ++++++++++++------ .../repository/jpa/rsql/RSQLUtility.java | 19 +++++++++---------- .../management/targettable/TargetTable.java | 11 +++++++++-- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/FilterParams.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/FilterParams.java index eef479831..33bafaa3c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/FilterParams.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/FilterParams.java @@ -21,12 +21,12 @@ import org.eclipse.hawkbit.repository.model.TargetUpdateStatus; */ public class FilterParams { - Collection filterByStatus; - Boolean overdueState; - String filterBySearchText; - Boolean selectTargetWithNoTag; - String[] filterByTagNames; - Long filterByDistributionId; + private Collection filterByStatus; + private Boolean overdueState; + private String filterBySearchText; + private Boolean selectTargetWithNoTag; + private String[] filterByTagNames; + private Long filterByDistributionId; /** * Constructor. @@ -72,6 +72,7 @@ public class FilterParams { * Sets {@link DistributionSet#getId()} to filter the result. * * @param filterByDistributionId + * the distribution set id */ public void setFilterByDistributionId(Long filterByDistributionId) { this.filterByDistributionId = filterByDistributionId; @@ -91,6 +92,7 @@ public class FilterParams { * Sets the collection of target states to filter for. * * @param filterByStatus + * collection of target update status */ public void setFilterByStatus(Collection filterByStatus) { this.filterByStatus = filterByStatus; @@ -113,6 +115,7 @@ public class FilterParams { * overdue filter is activated. * * @param overdueState + * if the overdue filter should be activates */ public void setOverdueState(Boolean overdueState) { this.overdueState = overdueState; @@ -133,6 +136,7 @@ public class FilterParams { * Sets the search text to filter for. * * @param filterBySearchText + * search text */ public void setFilterBySearchText(String filterBySearchText) { this.filterBySearchText = filterBySearchText; @@ -152,6 +156,7 @@ public class FilterParams { * Sets the flag indicating if tagging filter is used. * * @param selectTargetWithNoTag + * should the tagging filter be used? */ public void setSelectTargetWithNoTag(Boolean selectTargetWithNoTag) { this.selectTargetWithNoTag = selectTargetWithNoTag; @@ -171,6 +176,7 @@ public class FilterParams { * Sets the tags that are used to filter for. * * @param filterByTagNames + * array of tag names */ public void setFilterByTagNames(String[] filterByTagNames) { this.filterByTagNames = filterByTagNames; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java index 10bc24e8a..bfb7e5cf1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java @@ -187,7 +187,6 @@ public final class RSQLUtility { private final Root root; private final CriteriaBuilder cb; private final Class enumType; - private final VirtualPropertyLookup virtualPropertyLookup; private final StrSubstitutor substitutor; private final SimpleTypeConverter simpleTypeConverter; @@ -197,10 +196,10 @@ public final class RSQLUtility { this.root = root; this.cb = cb; this.enumType = enumType; - this.virtualPropertyLookup = virtualPropertyLookup; - this.substitutor = new StrSubstitutor(new StrLookupAdapter(virtualPropertyLookup), - StrSubstitutor.DEFAULT_PREFIX, - StrSubstitutor.DEFAULT_SUFFIX, StrSubstitutor.DEFAULT_ESCAPE); + this.substitutor = (virtualPropertyLookup != null) + ? new StrSubstitutor(new StrLookupAdapter(virtualPropertyLookup), StrSubstitutor.DEFAULT_PREFIX, + StrSubstitutor.DEFAULT_SUFFIX, StrSubstitutor.DEFAULT_ESCAPE) + : null; simpleTypeConverter = new SimpleTypeConverter(); } @@ -222,7 +221,7 @@ public final class RSQLUtility { return toSingleList(cb.conjunction()); } - private List toSingleList(final Predicate predicate) { + private static List toSingleList(final Predicate predicate) { return Collections.singletonList(predicate); } @@ -419,7 +418,7 @@ public final class RSQLUtility { // Exception squid:S2095 - see // https://jira.sonarsource.com/browse/SONARJAVA-1478 @SuppressWarnings({ "rawtypes", "unchecked", "squid:S2095" }) - private Object transformEnumValue(final ComparisonNode node, final String value, + private static Object transformEnumValue(final ComparisonNode node, final String value, final Class javaType) { final Class tmpEnumType = (Class) javaType; try { @@ -447,7 +446,7 @@ public final class RSQLUtility { final String value; // if lookup is available, replace macros ... - if (virtualPropertyLookup != null) { + if (substitutor != null) { value = substitutor.replace(values.get(0)); } else { value = values.get(0); @@ -568,12 +567,12 @@ public final class RSQLUtility { return cb.notEqual(fieldPath, transformedValue); } - private String escapeValueToSQL(final String transformedValue) { + private static String escapeValueToSQL(final String transformedValue) { return transformedValue.replace("%", "\\%").replace(LIKE_WILDCARD, '%'); } @SuppressWarnings("unchecked") - private Path pathOfString(final Path path) { + private static Path pathOfString(final Path path) { return (Path) path; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java index 5d1e6a46e..ed8f389df 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java @@ -8,7 +8,14 @@ */ package org.eclipse.hawkbit.ui.management.targettable; -import static org.eclipse.hawkbit.ui.management.event.TargetFilterEvent.*; +import static org.eclipse.hawkbit.ui.management.event.TargetFilterEvent.FILTER_BY_DISTRIBUTION; +import static org.eclipse.hawkbit.ui.management.event.TargetFilterEvent.FILTER_BY_TAG; +import static org.eclipse.hawkbit.ui.management.event.TargetFilterEvent.FILTER_BY_TARGET_FILTER_QUERY; +import static org.eclipse.hawkbit.ui.management.event.TargetFilterEvent.FILTER_BY_TEXT; +import static org.eclipse.hawkbit.ui.management.event.TargetFilterEvent.REMOVE_FILTER_BY_DISTRIBUTION; +import static org.eclipse.hawkbit.ui.management.event.TargetFilterEvent.REMOVE_FILTER_BY_TAG; +import static org.eclipse.hawkbit.ui.management.event.TargetFilterEvent.REMOVE_FILTER_BY_TARGET_FILTER_QUERY; +import static org.eclipse.hawkbit.ui.management.event.TargetFilterEvent.REMOVE_FILTER_BY_TEXT; import java.util.ArrayList; import java.util.Collection; @@ -416,7 +423,7 @@ public class TargetTable extends AbstractTable { /** * Add listener to pin. * - * @param pinBtn + * @param event * as event */ private void addPinClickListener(final ClickEvent event) {