From 6f1e07d2581ad0e181886fe4c7824a6beabac2d4 Mon Sep 17 00:00:00 2001 From: venu1278 Date: Thu, 4 Feb 2016 12:56:27 +0530 Subject: [PATCH 1/3] MECS-1452_Support_additional_field_name_and_operators_in_search_query Signed-off-by: venu1278 --- .../hawkbit/repository/TargetFields.java | 2 ++ .../CustomTargetBeanQuery.java | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java index 1b4daaf66..0f38671d8 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java @@ -52,6 +52,8 @@ public enum TargetFields implements FieldNameProvider { ATTRIBUTE("targetInfo.controllerAttributes", true), ASSIGNEDDS("assignedDistributionSet", "name", "version"), + + INSTALLEDDS("targetInfo.installedDistributionSet", "name", "version"), /** * The tags field. */ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java index 6cc44ce9f..8cc0be3d7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java @@ -99,11 +99,11 @@ public class CustomTargetBeanQuery extends AbstractBeanQuery { Slice targetBeans; final List proxyTargetBeans = new ArrayList<>(); if (!Strings.isNullOrEmpty(filterQuery)) { - targetBeans = targetManagement.findTargetsAll(filterQuery, - new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort)); + targetBeans = targetManagement.findTargetsAll(filterQuery, new PageRequest(startIndex + / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort)); } else { - targetBeans = targetManagement.findTargetsAll( - new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort)); + targetBeans = targetManagement.findTargetsAll(new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, + SPUIDefinitions.PAGE_SIZE, sort)); } for (final Target targ : targetBeans) { @@ -126,17 +126,20 @@ public class CustomTargetBeanQuery extends AbstractBeanQuery { prxyTarget.setInstalledDistributionSet(installedDistributionSet); final DistributionSet assignedDistributionSet = target.getAssignedDistributionSet(); prxyTarget.setAssignedDistributionSet(assignedDistributionSet); + if (null != assignedDistributionSet) { - prxyTarget.setAssignedDistNameVersion(assignedDistributionSet.getName()); + prxyTarget.setAssignedDistNameVersion(HawkbitCommonUtil.getFormattedNameVersion( + assignedDistributionSet.getName(), assignedDistributionSet.getVersion())); } if (null != installedDistributionSet) { - prxyTarget.setInstalledDistNameVersion(installedDistributionSet.getName()); + prxyTarget.setInstalledDistNameVersion(HawkbitCommonUtil.getFormattedNameVersion( + installedDistributionSet.getName(), installedDistributionSet.getVersion())); } prxyTarget.setUpdateStatus(targ.getTargetInfo().getUpdateStatus()); prxyTarget.setLastTargetQuery(targ.getTargetInfo().getLastTargetQuery()); prxyTarget.setTargetInfo(targ.getTargetInfo()); - prxyTarget.setPollStatusToolTip( - HawkbitCommonUtil.getPollStatusToolTip(prxyTarget.getTargetInfo().getPollStatus(), getI18N())); + prxyTarget.setPollStatusToolTip(HawkbitCommonUtil.getPollStatusToolTip(prxyTarget.getTargetInfo() + .getPollStatus(), getI18N())); proxyTargetBeans.add(prxyTarget); } return proxyTargetBeans; From abf9136e7e0f67a53eadfdcc83da2284fc8765a3 Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Mon, 8 Feb 2016 08:27:54 +0100 Subject: [PATCH 2/3] format source code correctly and add javadoc to TargetFields. Signed-off-by: Michael Hirsch --- .../org/eclipse/hawkbit/repository/TargetFields.java | 6 ++++++ .../ui/filtermanagement/CustomTargetBeanQuery.java | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java index 0f38671d8..d941f214f 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java @@ -51,8 +51,14 @@ public enum TargetFields implements FieldNameProvider { */ ATTRIBUTE("targetInfo.controllerAttributes", true), + /** + * distribution sets which is assigned to the target. + */ ASSIGNEDDS("assignedDistributionSet", "name", "version"), + /** + * distribution sets which is installed on the target. + */ INSTALLEDDS("targetInfo.installedDistributionSet", "name", "version"), /** * The tags field. diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java index 8cc0be3d7..51e384946 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java @@ -99,11 +99,11 @@ public class CustomTargetBeanQuery extends AbstractBeanQuery { Slice targetBeans; final List proxyTargetBeans = new ArrayList<>(); if (!Strings.isNullOrEmpty(filterQuery)) { - targetBeans = targetManagement.findTargetsAll(filterQuery, new PageRequest(startIndex - / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort)); + targetBeans = targetManagement.findTargetsAll(filterQuery, + new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort)); } else { - targetBeans = targetManagement.findTargetsAll(new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, - SPUIDefinitions.PAGE_SIZE, sort)); + targetBeans = targetManagement.findTargetsAll( + new PageRequest(startIndex / SPUIDefinitions.PAGE_SIZE, SPUIDefinitions.PAGE_SIZE, sort)); } for (final Target targ : targetBeans) { @@ -138,8 +138,8 @@ public class CustomTargetBeanQuery extends AbstractBeanQuery { prxyTarget.setUpdateStatus(targ.getTargetInfo().getUpdateStatus()); prxyTarget.setLastTargetQuery(targ.getTargetInfo().getLastTargetQuery()); prxyTarget.setTargetInfo(targ.getTargetInfo()); - prxyTarget.setPollStatusToolTip(HawkbitCommonUtil.getPollStatusToolTip(prxyTarget.getTargetInfo() - .getPollStatus(), getI18N())); + prxyTarget.setPollStatusToolTip( + HawkbitCommonUtil.getPollStatusToolTip(prxyTarget.getTargetInfo().getPollStatus(), getI18N())); proxyTargetBeans.add(prxyTarget); } return proxyTargetBeans; From d100e255c78eb63a36f1a006d2578b5d077b9d73 Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Mon, 8 Feb 2016 08:28:21 +0100 Subject: [PATCH 3/3] format TargetFields correctly, missig empty line. Signed-off-by: Michael Hirsch --- .../main/java/org/eclipse/hawkbit/repository/TargetFields.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java index d941f214f..0a696fdb6 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java @@ -60,6 +60,7 @@ public enum TargetFields implements FieldNameProvider { * distribution sets which is installed on the target. */ INSTALLEDDS("targetInfo.installedDistributionSet", "name", "version"), + /** * The tags field. */