UY-1525 fix NPE when param has no value

Author: golbi

engine-api/src/main/java/pl/edu/icm/unity/engine/api/utils/URIBuilderFixer.java

@@ -28,7 +28,9 @@ public static URIBuilder newInstance(URI uri)
 	{
 		URIBuilder builder = new URIBuilder(uri);
 		List<NameValuePair> fixedParams = builder.getQueryParams().stream()
-				.map(nvp -> new BasicNameValuePair(decodePlusIntoSpace(nvp.getName()), decodePlusIntoSpace(nvp.getValue())))
+				.map(nvp -> new BasicNameValuePair(
+						decodePlusIntoSpace(nvp.getName()),
+						nvp.getValue() != null ? decodePlusIntoSpace(nvp.getValue()) : null))
 				.collect(Collectors.toList());
 		builder.clearParameters();
 		builder.addParameters(fixedParams);

engine-api/src/test/java/pl/edu/icm/unity/engine/api/utils/TestURIBuilderFixer.java

@@ -21,7 +21,7 @@ public class TestURIBuilderFixer
 	@Test
 	public void shouldParseStringWithPlusEncodedSpaceInPath() throws URISyntaxException
 	{
-		URIBuilder builder = new URIBuilder("foo://some/path:name+ooo");
+		URIBuilder builder = URIBuilderFixer.newInstance("foo://some/path:name+ooo");
 		builder.addParameter("p", "val");
 		URI uri = builder.build();
 
@@ -52,10 +52,21 @@ public void shouldParseURIWithPlusEncodedSpaceInURIParam() throws URISyntaxExcep
 	@Test
 	public void shouldParseURIWithPercentEncodedSpaceInParam() throws URISyntaxException
 	{
-		URIBuilder builder = new URIBuilder("https://some.domain.com?param1=aaa%20bbb");
+		URIBuilder builder = URIBuilderFixer.newInstance("https://some.domain.com?param1=aaa%20bbb");
 		builder.addParameter("p", "val");
 		URI uri = builder.build();
 
 		assertThat(uri.toASCIIString()).isEqualTo("https://some.domain.com?param1=aaa%20bbb&p=val");
 	}
+
+	@Test
+	public void shouldParseURIWithValuelessParam() throws URISyntaxException
+	{
+		URIBuilder builder = URIBuilderFixer.newInstance("https://some.domain.com?param1");
+		builder.addParameter("p", "val");
+		URI uri = builder.build();
+
+		assertThat(uri.toASCIIString()).isEqualTo("https://some.domain.com?param1&p=val");
+	}
+
 }