Fix problem when suggestions for wildcards ending with * did not work properly

Author: ahornace

src/org/opensolaris/opengrok/web/api/v1/suggester/query/SuggesterQueryParser.java

@@ -197,7 +197,8 @@ protected Query newPrefixQuery(final Term prefix) {
     protected Query newWildcardQuery(final Term t) {
         if (t.text().contains(identifier)) {
             String term = t.text().replace(identifier, "");
-            if (term.endsWith("*")) {
+            if (term.endsWith("*") && !containsWildcardCharacter(term.substring(0, term.length() - 1))) {
+                // the term ends with "*" but contains no other wildcard characters so faster method can be used
                 replaceIdentifier(t.field(), t.text());
                 term = term.substring(0, term.length() - 1);
                 SuggesterPrefixQuery q = new SuggesterPrefixQuery(new Term(t.field(), term));
@@ -214,6 +215,10 @@ protected Query newWildcardQuery(final Term t) {
         return super.newWildcardQuery(t);
     }
 
+    private boolean containsWildcardCharacter(final String s) {
+        return s.contains("?") || s.contains("*");
+    }
+
     @Override
     protected Query newFuzzyQuery(final Term term, final float minimumSimilarity, final int prefixLength) {
         if (term.text().contains(identifier)) {

test/org/opensolaris/opengrok/web/api/v1/controller/SuggesterControllerTest.java

@@ -602,4 +602,17 @@ public void testGetPopularityDataDifferentField() {
         assertThat(res, contains(new SimpleEntry<>("greet", 4)));
     }
 
+    @Test
+    public void testWildcardQueryEndingWithAsterisk() {
+        Result res = target(SuggesterController.PATH)
+                .queryParam(AuthorizationFilter.PROJECTS_PARAM, "c")
+                .queryParam("field", QueryBuilder.FULL)
+                .queryParam(QueryBuilder.FULL, "pr?nt*")
+                .request()
+                .get(Result.class);
+
+        assertThat(res.suggestions.stream().map(r -> r.phrase).collect(Collectors.toList()),
+                contains("printf"));
+    }
+
 }