Document id is no longer encoded while creating documents to match Je…

…st behavior to ES. (See release notes). Test case added for testing new non-encoded id behavior.
xialinbing · Aug 7, 2018 · 56edc60 · 56edc60
1 parent e6e49b1
commit 56edc60
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java b/jest-common/src/main/java/io/searchbox/action/AbstractDocumentTargetedAction.java
@@ -4,9 +4,6 @@
 import io.searchbox.client.config.ElasticsearchVersion;
 import io.searchbox.strings.StringUtils;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
 /**
  * @author cihat keser
  */
@@ -41,11 +38,7 @@ protected String buildURI(ElasticsearchVersion elasticsearchVersion) {
         StringBuilder sb = new StringBuilder(super.buildURI(elasticsearchVersion));
 
         if (StringUtils.isNotBlank(id)) {
-            try {
-                sb.append("/").append(URLEncoder.encode(id, CHARSET));
-            } catch (UnsupportedEncodingException e) {
-                log.error("Error occurred while adding document id to uri.", e);
-            }
+            sb.append("/").append(id);
         }
         return sb.toString();
     }

diff --git a/jest/src/test/java/io/searchbox/core/SearchIntegrationTest.java b/jest/src/test/java/io/searchbox/core/SearchIntegrationTest.java
@@ -285,6 +285,26 @@ public void searchIndexWithTypeWithNullJestId() throws Exception {
         assertNotNull(articleResult.get(0).getId());
     }
 
+    @Test
+    public void testWithEncodedURI() throws IOException {
+        assertAcked(prepareCreate(INDEX).addMapping(TYPE, "{\"properties\":{\"user\":{\"type\":\"keyword\"}}}", XContentType.JSON));
+
+        Index index = new Index.Builder("{\"user\":\"kimchy1\"}").index(INDEX).type(TYPE).id("test%2f1").refresh(true).build();
+        client.execute(index);
+
+        String query = "{\n" +
+                "  \"query\": {\n" +
+                "    \"terms\": {\n" +
+                "      \"_id\": [\"test/1\"]\n" +
+                "    }\n" +
+                "  }\n" +
+                "}";
+
+        SearchResult result = client.execute(new Search.Builder(query).build());
+        assertTrue(result.getErrorMessage(), result.isSucceeded());
+        assertEquals(Long.valueOf(1), result.getTotal());
+    }
+
     @Test
     public void searchWithPercolator() throws IOException {
         String index = "twitter";