[master] Updates for newer version of Guava.

APNIC-net · Feb 20, 2024 · da86b6c · da86b6c
1 parent 9d2099a
commit da86b6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/net/apnic/rdap/conformance/Context.java b/src/main/java/net/apnic/rdap/conformance/Context.java
@@ -18,6 +18,7 @@
 import com.google.common.util.concurrent.JdkFutureAdapters;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.MoreExecutors;
 
 /**
  * <p>Context class.</p>
@@ -272,7 +273,8 @@ public void onFailure(final Throwable t) {
                                     }
                                     testsRunning.getAndDecrement();
                                 }
-                            }
+                            },
+                            MoreExecutors.directExecutor()
                         );
                     } catch (Exception e) {
                         System.err.println("Error during test submission: " +

diff --git a/src/main/java/net/apnic/rdap/conformance/attributetest/DomainNames.java b/src/main/java/net/apnic/rdap/conformance/attributetest/DomainNames.java
@@ -124,7 +124,7 @@ public boolean run(final Context context, final Result proto,
                                                        Status.Failure,
                                                        data);
         boolean isAscii =
-            CharMatcher.ASCII.matchesAllOf(unicodeName);
+            CharMatcher.ascii().matchesAllOf(unicodeName);
         Result hu = new Result(nr);
         hu.addNode("unicodeName");
         /* There are at least a couple of implementations that return