From f9383024ce459f959736d567a9bef8f9ec5537c2 Mon Sep 17 00:00:00 2001 From: Greg Gibeling Date: Sat, 31 Aug 2024 07:21:26 -0700 Subject: [PATCH 1/2] G2-1631 Suppress expected warnings --- .../com/g2forge/alexandria/service/BasicServiceLoader.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ax-service/src/main/java/com/g2forge/alexandria/service/BasicServiceLoader.java b/ax-service/src/main/java/com/g2forge/alexandria/service/BasicServiceLoader.java index 06c9d54e..75eeffab 100644 --- a/ax-service/src/main/java/com/g2forge/alexandria/service/BasicServiceLoader.java +++ b/ax-service/src/main/java/com/g2forge/alexandria/service/BasicServiceLoader.java @@ -24,6 +24,7 @@ import lombok.Getter; +@SuppressWarnings("removal") public class BasicServiceLoader implements IServiceLoader { public class ProviderIterator implements Iterator> { protected final Iterator> loaded = BasicServiceLoader.this.loaded.values().iterator(); @@ -48,6 +49,7 @@ protected class ProviderLoader implements Iterator> { protected String nextProviderName = null; + @SuppressWarnings("deprecation") @Override public boolean hasNext() { if (acc == null) return hasNextInternal(); @@ -85,6 +87,7 @@ protected void loadConfigs() throws SmartServiceConfigurationError { } @Override + @SuppressWarnings("deprecation") public Class next() { if (acc == null) return nextInternal(); else return AccessController.doPrivileged((PrivilegedAction>) this::nextInternal, acc); @@ -142,6 +145,7 @@ public BasicServiceLoader(Class key, Class type) { this(key, type, null, null); } + @SuppressWarnings("deprecation") public BasicServiceLoader(Class key, Class type, ClassLoader classLoader, ITypeFunction1 instantiator) { this.key = key == null ? type : key; this.type = Objects.requireNonNull(type, "Type cannot be null"); From acc86210c8c72b8c32af8b158b597e2dbf055a94 Mon Sep 17 00:00:00 2001 From: Greg Gibeling Date: Sat, 31 Aug 2024 07:28:01 -0700 Subject: [PATCH 2/2] G2-1631 Increase wait time for multi-threaded tests --- .../com/g2forge/alexandria/java/io/watch/TestFileWatcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ax-java/src/test/java/com/g2forge/alexandria/java/io/watch/TestFileWatcher.java b/ax-java/src/test/java/com/g2forge/alexandria/java/io/watch/TestFileWatcher.java index 26b701e9..c91e336e 100644 --- a/ax-java/src/test/java/com/g2forge/alexandria/java/io/watch/TestFileWatcher.java +++ b/ax-java/src/test/java/com/g2forge/alexandria/java/io/watch/TestFileWatcher.java @@ -80,13 +80,13 @@ protected final void test(final IConsumer2 prep, final IConsumer2