QueryStringUtil.get...QueryString(String,BindingSet) methods don't replace variables at the end of the query string

[tayloj]

Current Behavior

This code:

   String prepare(final String unprepared) {
      final MapBindingSet mbs = new MapBindingSet();
      mbs.addBinding("iri", Values.iri("https://www.youtube.com/watch?v=dQw4w9WgXcQ"));
      return QueryStringUtil.getGraphQueryString(unprepared, mbs);
   }

yields these results:

      System.out.println(prepare("DESCRIBE ?iri")); // => DESCRIBE ?iri
      System.out.println(prepare("DESCRIBE ?iri ")); // => DESCRIBE <https://www.youtube.com/watch?v=dQw4w9WgXcQ> 

This appears to be because the pattern to replace is

String pattern = "[\\?\\$]" + name + "(?=\\W)";

which demands some non-word character after the variable.

Expected Behavior

      System.out.println(prepare("DESCRIBE ?iri")); // => DESCRIBE <https://www.youtube.com/watch?v=dQw4w9WgXcQ> 
      System.out.println(prepare("DESCRIBE ?iri ")); // => DESCRIBE <https://www.youtube.com/watch?v=dQw4w9WgXcQ> 

Steps To Reproduce

Self-contained test:

import org.eclipse.rdf4j.model.util.Values;
import org.eclipse.rdf4j.query.impl.MapBindingSet;
import org.eclipse.rdf4j.repository.sparql.query.QueryStringUtil;
import org.junit.Test;

public class TestQueryStrings {

   @Test
   public void testPrepare() {
      // Works when variable is followed by space
      assertEquals("DESCRIBE <https://www.youtube.com/watch?v=dQw4w9WgXcQ> ",
            prepare("DESCRIBE ?iri "));

      // Fails when variable is at end of input
      assertEquals("DESCRIBE <https://www.youtube.com/watch?v=dQw4w9WgXcQ>",
            prepare("DESCRIBE ?iri"));
   }

   String prepare(final String unprepared) {
      final MapBindingSet mbs = new MapBindingSet();
      mbs.addBinding("iri", Values.iri("https://www.youtube.com/watch?v=dQw4w9WgXcQ"));
      return QueryStringUtil.getGraphQueryString(unprepared, mbs);
   }

   private static <T> void assertEquals(final T expected, final T actual) {
      if (!expected.equals(actual)) {
         throw new AssertionError("Expected '" + expected + "' but got '" + actual + "'");
      }
   }
}

Version

4.3.6

Are you interested in contributing a solution yourself?

Perhaps?

Anything else?

No response

[frensjan]

\b would be better here indeed.