Remove and forbid use of com.google.common.base.Throwables
This commit removes and now forbids all uses of com.google.common.base.Throwables across the codebase. For uses of com.google.common.base.Throwables#getStackTraceAsString, use org.elasticsearch.ExceptionsHelper#stackTrace. Relates #13224
This commit is contained in:
parent
ea4c27a089
commit
1806c1e0c7
|
@ -19,8 +19,8 @@
|
|||
|
||||
package org.elasticsearch.client;
|
||||
|
||||
import com.google.common.base.Throwables;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import org.elasticsearch.ExceptionsHelper;
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.action.GenericAction;
|
||||
import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteAction;
|
||||
|
@ -59,7 +59,9 @@ import org.junit.Test;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.hamcrest.Matchers.*;
|
||||
import static org.hamcrest.Matchers.equalTo;
|
||||
import static org.hamcrest.Matchers.is;
|
||||
import static org.hamcrest.Matchers.notNullValue;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -228,7 +230,7 @@ public abstract class AbstractClientHeadersTestCase extends ESTestCase {
|
|||
}
|
||||
if (counter++ > 10) {
|
||||
// dear god, if we got more than 10 levels down, WTF? just bail
|
||||
fail("Exception cause unwrapping ran for 10 levels: " + Throwables.getStackTraceAsString(t));
|
||||
fail("Exception cause unwrapping ran for 10 levels: " + ExceptionsHelper.stackTrace(t));
|
||||
return null;
|
||||
}
|
||||
result = result.getCause();
|
||||
|
|
|
@ -91,3 +91,4 @@ com.google.common.base.Objects
|
|||
com.google.common.base.Predicate
|
||||
com.google.common.base.Predicates
|
||||
com.google.common.base.Strings
|
||||
com.google.common.base.Throwables
|
||||
|
|
Loading…
Reference in New Issue