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

fix classcast ex on TargetBeanQuery (#440)

Browse Source 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
This commit is contained in:
Michael Hirsch
2017-02-21 16:49:30 +01:00
committed by GitHub
parent 5628d625e8
commit cbf5bed232
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java
View File

@@ -24,7 +24,6 @@ import org.eclipse.hawkbit.repository.FilterParams;
import org.eclipse.hawkbit.repository.OffsetBasedPageRequest; import org.eclipse.hawkbit.repository.OffsetBasedPageRequest;
import org.eclipse.hawkbit.repository.TargetManagement; import org.eclipse.hawkbit.repository.TargetManagement;
import org.eclipse.hawkbit.repository.model.Target; import org.eclipse.hawkbit.repository.model.Target;
import org.eclipse.hawkbit.repository.model.TargetFilterQuery;
import org.eclipse.hawkbit.repository.model.TargetUpdateStatus; import org.eclipse.hawkbit.repository.model.TargetUpdateStatus;
import org.eclipse.hawkbit.ui.common.UserDetailsFormatter; import org.eclipse.hawkbit.ui.common.UserDetailsFormatter;
import org.eclipse.hawkbit.ui.components.ProxyTarget; import org.eclipse.hawkbit.ui.components.ProxyTarget;
@@ -61,7 +60,7 @@ public class TargetBeanQuery extends AbstractBeanQuery<ProxyTarget> {
private transient TargetManagement targetManagement; private transient TargetManagement targetManagement;
private transient I18N i18N; private transient I18N i18N;
private Long pinnedDistId; private Long pinnedDistId;
private TargetFilterQuery targetFilterQuery; private Long targetFilterQueryId;
private ManagementUIState managementUIState; private ManagementUIState managementUIState;
/** /**
@@ -88,7 +87,7 @@ public class TargetBeanQuery extends AbstractBeanQuery<ProxyTarget> {
noTagClicked = (Boolean) queryConfig.get(SPUIDefinitions.FILTER_BY_NO_TAG); noTagClicked = (Boolean) queryConfig.get(SPUIDefinitions.FILTER_BY_NO_TAG);
distributionId = (Long) queryConfig.get(SPUIDefinitions.FILTER_BY_DISTRIBUTION); distributionId = (Long) queryConfig.get(SPUIDefinitions.FILTER_BY_DISTRIBUTION);
searchText = (String) queryConfig.get(SPUIDefinitions.FILTER_BY_TEXT); searchText = (String) queryConfig.get(SPUIDefinitions.FILTER_BY_TEXT);
targetFilterQuery = (TargetFilterQuery) queryConfig.get(SPUIDefinitions.FILTER_BY_TARGET_FILTER_QUERY); targetFilterQueryId = (Long) queryConfig.get(SPUIDefinitions.FILTER_BY_TARGET_FILTER_QUERY);
if (!Strings.isNullOrEmpty(searchText)) { if (!Strings.isNullOrEmpty(searchText)) {
searchText = String.format("%%%s%%", searchText); searchText = String.format("%%%s%%", searchText);
} }
@@ -118,8 +117,8 @@ public class TargetBeanQuery extends AbstractBeanQuery<ProxyTarget> {
targetBeans = getTargetManagement().findTargetsAllOrderByLinkedDistributionSet( targetBeans = getTargetManagement().findTargetsAllOrderByLinkedDistributionSet(
new OffsetBasedPageRequest(startIndex, SPUIDefinitions.PAGE_SIZE, sort), pinnedDistId, new OffsetBasedPageRequest(startIndex, SPUIDefinitions.PAGE_SIZE, sort), pinnedDistId,
new FilterParams(distributionId, status, overdueState, searchText, noTagClicked, targetTags)); new FilterParams(distributionId, status, overdueState, searchText, noTagClicked, targetTags));
} else if (null != targetFilterQuery) { } else if (null != targetFilterQueryId) {
targetBeans = getTargetManagement().findTargetsByTargetFilterQuery(targetFilterQuery.getId(), targetBeans = getTargetManagement().findTargetsByTargetFilterQuery(targetFilterQueryId,
new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort)); new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort));
} else if (!isAnyFilterSelected()) { } else if (!isAnyFilterSelected()) {
targetBeans = getTargetManagement().findTargetsAll( targetBeans = getTargetManagement().findTargetsAll(
@@ -186,8 +185,8 @@ public class TargetBeanQuery extends AbstractBeanQuery<ProxyTarget> {
public int size() { public int size() {
final long totSize = getTargetManagement().countTargetsAll(); final long totSize = getTargetManagement().countTargetsAll();
long size; long size;
if (null != targetFilterQuery) { if (null != targetFilterQueryId) {
size = getTargetManagement().countTargetByTargetFilterQuery(targetFilterQuery.getId()); size = getTargetManagement().countTargetByTargetFilterQuery(targetFilterQueryId);
} else if (!isAnyFilterSelected()) { } else if (!isAnyFilterSelected()) {
size = totSize; size = totSize;
} else { } else {