zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-17 01:47:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert Guava 20 features until we get the build working properly

Browse source 
*** Original change description ***

Remove deprecated methods with Guava 20 release

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=137945126
This commit is contained in:
mcilwain 2016-11-02 07:56:02 -07:00 • committed by Ben McIlwain
parent 7206f88c6c
commit 1627bd4975
14 changed files with 29 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
java/google/registry/model/SchemaVersion.java
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(subtypeOf(Enum.class), subtypeOf(ImmutableObject.class)))
.filter(or(assignableFrom(Enum.class), assignableFrom(ImmutableObject.class)))
.transform(new Function<Class<?>, String>() {
@Override
public String apply(Class<?> clazz) {

3
java/google/registry/model/server/Lock.java
View file

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