honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-01 08:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13409 from jasontedor/throwables-be-gone

Browse Source 
Remove and forbid use of com.google.common.base.Throwables
This commit is contained in:
Jason Tedor 2015-09-08 21:59:37 -04:00
commit e40409dd7f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTestCase.java
View File

@ -19,8 +19,8 @@
package org.elasticsearch.client; package org.elasticsearch.client;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.GenericAction; import org.elasticsearch.action.GenericAction;
import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteAction; import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteAction;
@ -59,7 +59,9 @@ import org.junit.Test;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; 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) { if (counter++ > 10) {
// dear god, if we got more than 10 levels down, WTF? just bail // 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; return null;
} }
result = result.getCause(); result = result.getCause();

1
dev-tools/src/main/resources/forbidden/core-signatures.txt
View File

@ -91,3 +91,4 @@ com.google.common.base.Objects
com.google.common.base.Predicate com.google.common.base.Predicate
com.google.common.base.Predicates com.google.common.base.Predicates
com.google.common.base.Strings com.google.common.base.Strings
com.google.common.base.Throwables