Skip to content

Commit da86b6c

Browse files
committed
[master] Updates for newer version of Guava.
1 parent 9d2099a commit da86b6c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/main/java/net/apnic/rdap/conformance/Context.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.google.common.util.concurrent.JdkFutureAdapters;
1919
import com.google.common.util.concurrent.Futures;
2020
import com.google.common.util.concurrent.FutureCallback;
21+
import com.google.common.util.concurrent.MoreExecutors;
2122

2223
/**
2324
* <p>Context class.</p>
@@ -272,7 +273,8 @@ public void onFailure(final Throwable t) {
272273
}
273274
testsRunning.getAndDecrement();
274275
}
275-
}
276+
},
277+
MoreExecutors.directExecutor()
276278
);
277279
} catch (Exception e) {
278280
System.err.println("Error during test submission: " +

src/main/java/net/apnic/rdap/conformance/attributetest/DomainNames.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public boolean run(final Context context, final Result proto,
124124
Status.Failure,
125125
data);
126126
boolean isAscii =
127-
CharMatcher.ASCII.matchesAllOf(unicodeName);
127+
CharMatcher.ascii().matchesAllOf(unicodeName);
128128
Result hu = new Result(nr);
129129
hu.addNode("unicodeName");
130130
/* There are at least a couple of implementations that return

0 commit comments

Comments
 (0)