Merge remote-tracking branch 'origin/dev-4.3.x' into dev

Author: ppiernik

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

@@ -24,7 +24,7 @@ public static String encode(String name)
 			return Base64.getUrlEncoder()
 					.encodeToString(name.getBytes()) + ENCODED_NAME_SUFFIX;
 		}
-		return URLEncoder.encode(name, StandardCharsets.UTF_8);
+		return URLEncoder.encode(name, StandardCharsets.UTF_8).replaceAll("\\+", "%20");
 	}
 
 	public static String decode(String name)

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

@@ -42,12 +42,12 @@ public void shouldDecodeUnsafeName()
 	@Test
 	public void shouldEncodeSafeNameWithSpace()
 	{
-		assertThat(NameToURLEncoder.encode("name name")).isEqualTo("name+name");
+		assertThat(NameToURLEncoder.encode("name name")).isEqualTo("name%20name");
 	}
 
 	@Test
 	public void shouldDecodeSafeNameWithSpace()
 	{
-		assertThat(NameToURLEncoder.decode("name+name")).isEqualTo("name name");
+		assertThat(NameToURLEncoder.decode("name%20name")).isEqualTo("name name");
 	}
 }