From 1146e6a80817a28e7c382f91f5786c6ee66bd212 Mon Sep 17 00:00:00 2001
From: Kai Zimmermann <kai.zimmermann@bosch-si.com>
Date: Mon, 28 Mar 2016 10:25:07 +0200
Subject: [PATCH] Found an even better name

---
 .../org/eclipse/hawkbit/repository/SoftwareManagement.java  | 6 +++---
 .../eclipse/hawkbit/repository/SoftwareManagementTest.java  | 6 +++---
 .../hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SoftwareManagement.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SoftwareManagement.java
index ec1954b35..c6eab402a 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SoftwareManagement.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SoftwareManagement.java
@@ -508,13 +508,13 @@ public class SoftwareManagement {
      * @param orderByDistributionId
      *            the ID of distribution set to be ordered on top
      * @param searchText
-     *            to be filtered as "like" on {@link SoftwareModule#getName()}
+     *            filtered as "like" on {@link SoftwareModule#getName()}
      * @param type
-     *            to be filtered as "like" on {@link SoftwareModule#getType()}
+     *            filtered as "equal" on {@link SoftwareModule#getType()}
      * @return the page of found {@link SoftwareModule}
      */
     @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY)
-    public Slice<CustomSoftwareModule> findSoftwareModuleOrderByDistributionModuleNameAscModuleVersionAsc(
+    public Slice<CustomSoftwareModule> findSoftwareModuleOrderBySetAssignmentAndModuleNameAscModuleVersionAsc(
             @NotNull final Pageable pageable, @NotNull final Long orderByDistributionId, final String searchText,
             final SoftwareModuleType type) {
 
diff --git a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/SoftwareManagementTest.java b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/SoftwareManagementTest.java
index c295c57ce..b227568e8 100644
--- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/SoftwareManagementTest.java
+++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/SoftwareManagementTest.java
@@ -638,14 +638,14 @@ public class SoftwareManagementTest extends AbstractIntegrationTestWithMongoDB {
         softwareManagement.deleteSoftwareModule(deleted);
 
         // with filter on name, version and module type
-        assertThat(softwareManagement.findSoftwareModuleOrderByDistributionModuleNameAscModuleVersionAsc(pageReq,
+        assertThat(softwareManagement.findSoftwareModuleOrderBySetAssignmentAndModuleNameAscModuleVersionAsc(pageReq,
                 set.getId(), "found", testType).getContent())
                         .as("Found modules with given name, given module type and the assigned ones first")
                         .containsExactly(new CustomSoftwareModule(one, true), new CustomSoftwareModule(two, true),
                                 new CustomSoftwareModule(unassigned, false));
 
         // with filter on module type only
-        assertThat(softwareManagement.findSoftwareModuleOrderByDistributionModuleNameAscModuleVersionAsc(pageReq,
+        assertThat(softwareManagement.findSoftwareModuleOrderBySetAssignmentAndModuleNameAscModuleVersionAsc(pageReq,
                 set.getId(), null, testType).getContent())
                         .as("Found modules with given module type and the assigned ones first").containsExactly(
                                 new CustomSoftwareModule(differentName, true), new CustomSoftwareModule(one, true),
@@ -653,7 +653,7 @@ public class SoftwareManagementTest extends AbstractIntegrationTestWithMongoDB {
 
         // without any filter
         assertThat(softwareManagement
-                .findSoftwareModuleOrderByDistributionModuleNameAscModuleVersionAsc(pageReq, set.getId(), null, null)
+                .findSoftwareModuleOrderBySetAssignmentAndModuleNameAscModuleVersionAsc(pageReq, set.getId(), null, null)
                 .getContent()).as("Found modules with the assigned ones first").containsExactly(
                         new CustomSoftwareModule(differentName, true), new CustomSoftwareModule(one, true),
                         new CustomSoftwareModule(two, true), new CustomSoftwareModule(four, true),
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java
index 9aae5ca5c..5419cc1bf 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java
@@ -77,7 +77,7 @@ public class SwModuleBeanQuery extends AbstractBeanQuery<ProxyBaseSwModuleItem>
         final Slice<CustomSoftwareModule> swModuleBeans;
         final List<ProxyBaseSwModuleItem> proxyBeans = new ArrayList<>();
 
-        swModuleBeans = getSoftwareManagement().findSoftwareModuleOrderByDistributionModuleNameAscModuleVersionAsc(
+        swModuleBeans = getSoftwareManagement().findSoftwareModuleOrderBySetAssignmentAndModuleNameAscModuleVersionAsc(
                 new OffsetBasedPageRequest(startIndex, count), orderByDistId, searchText, type);
 
         for (final CustomSoftwareModule swModule : swModuleBeans) {