to be more consistent, log the Exception and move on

johnulist · Jun 29, 2015 · e4bb419 · e4bb419
1 parent 0569d0a
commit e4bb419
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/jest-common/src/main/java/io/searchbox/indices/script/CreateIndexedScript.java b/jest-common/src/main/java/io/searchbox/indices/script/CreateIndexedScript.java
@@ -7,10 +7,10 @@
 import io.searchbox.action.GenericResultAbstractAction;
 
 import java.io.*;
-import java.net.URLEncoder;
 import java.nio.charset.Charset;
 
 import static io.searchbox.indices.script.ScriptLanguage.GROOVY;
+import static java.net.URLEncoder.encode;
 
 public class CreateIndexedScript extends GenericResultAbstractAction {
 
@@ -26,11 +26,15 @@ protected CreateIndexedScript(Builder builder) {
   }
 
   protected String buildURI() {
+    String finalUri = super.buildURI() + "/_scripts/" + scriptLanguage.pathParameterName + "/";
     try {
-      return super.buildURI() + "/_scripts/" + scriptLanguage.pathParameterName + "/" + URLEncoder.encode(scriptName, CHARSET);
+      finalUri += encode(scriptName, CHARSET);
     } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
+      // unless CHARSET is overridden with a wrong value in a subclass,
+      // this exception won't be thrown.
+      log.error("Error occurred while adding parameters to uri.", e);
     }
+    return finalUri;
   }
 
   @Override

diff --git a/jest-common/src/main/java/io/searchbox/indices/script/DeleteIndexedScript.java b/jest-common/src/main/java/io/searchbox/indices/script/DeleteIndexedScript.java
@@ -4,9 +4,9 @@
 import io.searchbox.action.GenericResultAbstractAction;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 
 import static io.searchbox.indices.script.ScriptLanguage.GROOVY;
+import static java.net.URLEncoder.encode;
 
 public class DeleteIndexedScript extends GenericResultAbstractAction {
 
@@ -21,11 +21,15 @@ protected DeleteIndexedScript(Builder builder) {
   }
 
   protected String buildURI() {
+    String finalUri = super.buildURI() + "/_scripts/" + scriptLanguage.pathParameterName + "/";
     try {
-      return super.buildURI() + "/_scripts/" + scriptLanguage.pathParameterName + "/" + URLEncoder.encode(scriptName, CHARSET);
+      finalUri += encode(scriptName, CHARSET);
     } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException(e);
+      // unless CHARSET is overridden with a wrong value in a subclass,
+      // this exception won't be thrown.
+      log.error("Error occurred while adding parameters to uri.", e);
     }
+    return finalUri;
   }
 
   @Override