refactor: #9 Improve confluence space search algorithm to return results when no space is found by key.

vogoltsov · vogoltsov · commit 19597ed7a198 · 2019-02-01T14:15:02.000+03:00
diff --git a/plugins/confluence/src/main/java/com/github/vogoltsov/vp/plugins/confluence/client/ConfluenceSpaceRepository.java b/plugins/confluence/src/main/java/com/github/vogoltsov/vp/plugins/confluence/client/ConfluenceSpaceRepository.java
@@ -9,7 +9,10 @@
 import com.github.vogoltsov.vp.plugins.confluence.util.cql.CQL;
 import com.github.vogoltsov.vp.plugins.confluence.util.cql.CQLQuery;
 
+import java.util.Collections;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * @author Vitaly Ogoltsov &lt;vitaly.ogoltsov@me.com&gt;
@@ -25,14 +28,17 @@ public static ConfluenceSpaceRepository getInstance() {
      * Searches all spaces by title and key.
      */
     public DataPage<Space> search(String text) {
+        Space space = findByKey(text);
+        if (space != null) {
+            return DataPage.of(Collections.singletonList(space));
+        }
         CQLQuery cql = CQL.query(
                 CQL.eq("type", "space")
         );
         if (text != null && !text.isEmpty()) {
             cql.and(CQL.or(
                     CQL.like("space", text),
-                    CQL.like("space", text + "*"),
-                    CQL.eq("space.key", text)
+                    CQL.like("space", text + "*")
             ));
         }
         cql.orderBy("title");
diff --git a/plugins/confluence/src/main/java/com/github/vogoltsov/vp/plugins/confluence/dialog/ConfluenceSpaceChooserDialog.java b/plugins/confluence/src/main/java/com/github/vogoltsov/vp/plugins/confluence/dialog/ConfluenceSpaceChooserDialog.java
@@ -24,8 +24,14 @@ protected String getTitle() {
     protected HelpPanel createHelpPanel() {
         return new HelpPanel(
                 "",
-                "Confluence spaces are created on a per-project basis." +
-                        " Search by space key or name."
+                "<html><body>" +
+                        "<p>" +
+                        "Confluence spaces are created on a per-project basis." +
+                        "</p>" +
+                        "<p>" +
+                        "Searches confluence spaces by key (only exact match is returned) or by name (using fuzzy search)," +
+                        " if no space if found by key." +
+                        "</p>"
         );
     }
 
