Move uri resolvers+wiring to uri (#1706)

These classes are specific to uri but lived in grpc-api server packages. These could also end up in their own module just for reuse in other projects that want to register, expose their own set of resolvers, but the simplest refactor was to move to :java-client-uri.

Partial #1270

grpc-api/src/main/java/io/deephaven/grpc_api/runner/DeephavenApiServer.java

@@ -10,11 +10,11 @@
 import io.deephaven.grpc_api.console.ConsoleServiceGrpcImpl;
 import io.deephaven.grpc_api.log.LogInit;
 import io.deephaven.grpc_api.session.SessionService;
-import io.deephaven.grpc_api.uri.UriResolver;
-import io.deephaven.grpc_api.uri.UriResolvers;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
-import io.deephaven.grpc_api.uri.UriResolversInstance;
+import io.deephaven.uri.resolver.UriResolver;
+import io.deephaven.uri.resolver.UriResolvers;
+import io.deephaven.uri.resolver.UriResolversInstance;
 import io.deephaven.util.annotations.VisibleForTesting;
 import io.deephaven.util.process.ProcessEnvironment;
 import io.deephaven.util.process.ShutdownManager;

grpc-api/src/main/java/io/deephaven/grpc_api/uri/ApplicationResolver.java

@@ -5,6 +5,8 @@
 import io.deephaven.grpc_api.appmode.ApplicationStates;
 import io.deephaven.uri.ApplicationUri;
 import io.deephaven.uri.DeephavenUri;
+import io.deephaven.uri.resolver.UriResolver;
+import io.deephaven.uri.resolver.UriResolversInstance;
 
 import javax.inject.Inject;
 import java.net.URI;

grpc-api/src/main/java/io/deephaven/grpc_api/uri/BarrageTableResolver.java

@@ -16,6 +16,8 @@
 import io.deephaven.uri.QueryScopeUri;
 import io.deephaven.uri.RemoteUri;
 import io.deephaven.uri.StructuredUri.Visitor;
+import io.deephaven.uri.resolver.UriResolver;
+import io.deephaven.uri.resolver.UriResolversInstance;
 import io.grpc.ManagedChannel;
 import org.apache.arrow.memory.BufferAllocator;
 

grpc-api/src/main/java/io/deephaven/grpc_api/uri/CsvTableResolver.java

@@ -2,6 +2,8 @@
 
 import io.deephaven.csv.CsvTools;
 import io.deephaven.engine.table.Table;
+import io.deephaven.uri.resolver.UriResolver;
+import io.deephaven.uri.resolver.UriResolversInstance;
 
 import javax.inject.Inject;
 import java.io.IOException;

grpc-api/src/main/java/io/deephaven/grpc_api/uri/ParquetTableResolver.java

@@ -3,6 +3,8 @@
 import io.deephaven.engine.table.Table;
 import io.deephaven.parquet.table.ParquetTools;
 import io.deephaven.uri.UriHelper;
+import io.deephaven.uri.resolver.UriResolver;
+import io.deephaven.uri.resolver.UriResolversInstance;
 
 import javax.inject.Inject;
 import java.net.URI;

grpc-api/src/main/java/io/deephaven/grpc_api/uri/QueryScopeResolver.java

@@ -3,6 +3,8 @@
 import io.deephaven.grpc_api.console.GlobalSessionProvider;
 import io.deephaven.uri.DeephavenUri;
 import io.deephaven.uri.QueryScopeUri;
+import io.deephaven.uri.resolver.UriResolver;
+import io.deephaven.uri.resolver.UriResolversInstance;
 
 import javax.inject.Inject;
 import java.net.URI;

grpc-api/src/main/java/io/deephaven/grpc_api/uri/UriModule.java

@@ -2,8 +2,14 @@
 
 import dagger.Binds;
 import dagger.Module;
+import dagger.Provides;
 import dagger.multibindings.IntoSet;
 import io.deephaven.grpc_api.barrage.BarrageClientModule;
+import io.deephaven.uri.resolver.UriResolver;
+import io.deephaven.uri.resolver.UriResolvers;
+
+import javax.inject.Singleton;
+import java.util.Set;
 
 /**
  * Installs the {@link UriResolver URI resolvers}. See each specific resolver for more information.
@@ -36,4 +42,10 @@ public interface UriModule {
     @Binds
     @IntoSet
     UriResolver bindParquetResolver(ParquetTableResolver resolver);
+
+    @Provides
+    @Singleton
+    static UriResolvers bindResolvers(Set<UriResolver> resolvers) {
+        return new UriResolvers(resolvers);
+    }
 }

grpc-api/src/main/java/io/deephaven/uri/ResolveTools.java → java-client/uri/src/main/java/io/deephaven/uri/ResolveTools.java

@@ -1,7 +1,7 @@
 package io.deephaven.uri;
 
-import io.deephaven.grpc_api.uri.UriResolver;
-import io.deephaven.grpc_api.uri.UriResolversInstance;
+import io.deephaven.uri.resolver.UriResolver;
+import io.deephaven.uri.resolver.UriResolversInstance;
 
 import java.net.URI;
 

grpc-api/src/main/java/io/deephaven/grpc_api/uri/UriResolver.java → java-client/uri/src/main/java/io/deephaven/uri/resolver/UriResolver.java

@@ -1,4 +1,4 @@
-package io.deephaven.grpc_api.uri;
+package io.deephaven.uri.resolver;
 
 import java.net.URI;
 import java.util.Set;

grpc-api/src/main/java/io/deephaven/grpc_api/uri/UriResolvers.java → java-client/uri/src/main/java/io/deephaven/uri/resolver/UriResolvers.java

@@ -1,7 +1,5 @@
-package io.deephaven.grpc_api.uri;
+package io.deephaven.uri.resolver;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
@@ -13,13 +11,11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-@Singleton
 public final class UriResolvers {
 
     private final Set<UriResolver> resolvers;
     private final Map<String, Set<UriResolver>> map;
 
-    @Inject
     public UriResolvers(Set<UriResolver> resolvers) {
         this.resolvers = Objects.requireNonNull(resolvers);
         map = new HashMap<>();

grpc-api/src/main/java/io/deephaven/grpc_api/uri/UriResolversInstance.java → java-client/uri/src/main/java/io/deephaven/uri/resolver/UriResolversInstance.java

@@ -1,4 +1,4 @@
-package io.deephaven.grpc_api.uri;
+package io.deephaven.uri.resolver;
 
 import java.util.Objects;