From 87858a79c130b11fba9035bc4fd81f9c59e44a82 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Thu, 20 Apr 2017 19:05:21 +0200 Subject: [PATCH] compute proposals for blank strings Before we would only provide proposals for empty strings. But blank and empty is not that different. --- .../java/org/lucares/pdb/datastore/internal/Proposer.java | 3 ++- .../org/lucares/pdb/datastore/internal/ProposerTest.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/data-store/src/main/java/org/lucares/pdb/datastore/internal/Proposer.java b/data-store/src/main/java/org/lucares/pdb/datastore/internal/Proposer.java index ff99da5..8e89bf2 100644 --- a/data-store/src/main/java/org/lucares/pdb/datastore/internal/Proposer.java +++ b/data-store/src/main/java/org/lucares/pdb/datastore/internal/Proposer.java @@ -6,6 +6,7 @@ import java.util.Map.Entry; import java.util.SortedSet; import java.util.TreeSet; +import org.apache.commons.lang3.StringUtils; import org.lucares.pdb.datastore.Proposal; import org.lucares.pdb.datastore.lang.ProposerParser; import org.lucares.utils.CollectionUtils; @@ -21,7 +22,7 @@ public class Proposer { public List propose(final String query, final int caretIndex) { final SortedSet result; - if (query.isEmpty()) { + if (StringUtils.isBlank(query)) { result = proposeForAllKeys(); } else { result = ProposerParser.parse(query, dataStore, caretIndex); diff --git a/data-store/src/test/java/org/lucares/pdb/datastore/internal/ProposerTest.java b/data-store/src/test/java/org/lucares/pdb/datastore/internal/ProposerTest.java index f614c2b..e5e9902 100644 --- a/data-store/src/test/java/org/lucares/pdb/datastore/internal/ProposerTest.java +++ b/data-store/src/test/java/org/lucares/pdb/datastore/internal/ProposerTest.java @@ -67,6 +67,12 @@ public class ProposerTest { new Proposal("bird", "bird=*", 3), // new Proposal("dog", "dog=*", 2)// ); + + assertProposals(" ", 1, // + new Proposal("name", "name=*", 5), // + new Proposal("bird", "bird=*", 3), // + new Proposal("dog", "dog=*", 2)// + ); } public void testPrefixOfKey() throws Exception {