Remove deprecated methods with Guava 20 release

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=137849843
This commit is contained in:
jianglai 2016-11-01 11:39:34 -07:00 committed by Ben McIlwain
parent 73e88b2391
commit 82b0bff9b5
14 changed files with 34 additions and 29 deletions

View file

@ -14,8 +14,8 @@
package google.registry.model;
import static com.google.common.base.Predicates.assignableFrom;
import static com.google.common.base.Predicates.or;
import static com.google.common.base.Predicates.subtypeOf;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
@ -61,7 +61,7 @@ public final class SchemaVersion {
*/
public static String getSchema() {
return FluentIterable.from(getAllPersistedTypes())
.filter(or(assignableFrom(Enum.class), assignableFrom(ImmutableObject.class)))
.filter(or(subtypeOf(Enum.class), subtypeOf(ImmutableObject.class)))
.transform(new Function<Class<?>, String>() {
@Override
public String apply(Class<?> clazz) {

View file

@ -193,7 +193,8 @@ public class Lock extends ImmutableObject {
TimeUnit.MILLISECONDS,
true);
} catch (Exception e) {
throw Throwables.propagate(e);
Throwables.throwIfUnchecked(e);
throw new RuntimeException(e);
}
}