diff --git a/slack-java-client-guice/src/main/java/com/hubspot/slack/client/guice/SlackClientModule.java b/slack-java-client-guice/src/main/java/com/hubspot/slack/client/guice/SlackClientModule.java
index bcbbaa93..efccab07 100644
--- a/slack-java-client-guice/src/main/java/com/hubspot/slack/client/guice/SlackClientModule.java
+++ b/slack-java-client-guice/src/main/java/com/hubspot/slack/client/guice/SlackClientModule.java
@@ -1,13 +1,22 @@
package com.hubspot.slack.client.guice;
import com.google.inject.AbstractModule;
+import com.hubspot.slack.client.SlackClientFactory;
+import com.hubspot.slack.client.SlackWebClient;
+import com.hubspot.slack.client.http.NioHttpClient;
+import com.hubspot.slack.client.http.NioHttpClientFactory;
import com.hubspot.slack.client.request.verifier.SlackRequestVerifierModule;
public class SlackClientModule extends AbstractModule {
@Override
protected void configure() {
- install(new com.hubspot.slack.client.SlackClientModule());
+ bind(NioHttpClientFactory.class).toInstance(NioHttpClientFactory.defaultFactory());
+ bind(NioHttpClient.Factory.class).toInstance(NioHttpClientFactory.defaultFactory());
+
+ bind(SlackClientFactory.class).toInstance(SlackClientFactory.defaultFactory());
+ bind(SlackWebClient.Factory.class).toInstance(SlackClientFactory.defaultFactory());
+
install(new SlackRequestVerifierModule());
}
diff --git a/slack-java-client-guice/src/test/java/com/hubspot/slack/client/guice/SlackClientModuleTest.java b/slack-java-client-guice/src/test/java/com/hubspot/slack/client/guice/SlackClientModuleTest.java
index e3ec1181..c265e90d 100644
--- a/slack-java-client-guice/src/test/java/com/hubspot/slack/client/guice/SlackClientModuleTest.java
+++ b/slack-java-client-guice/src/test/java/com/hubspot/slack/client/guice/SlackClientModuleTest.java
@@ -33,7 +33,6 @@ protected void configure() {
binder().requireAtInjectOnConstructors();
install(new SlackClientModule());
- install(new com.hubspot.slack.client.SlackClientModule());
}
}
);
diff --git a/slack-java-client/pom.xml b/slack-java-client/pom.xml
index fa8af36d..c95c933f 100644
--- a/slack-java-client/pom.xml
+++ b/slack-java-client/pom.xml
@@ -32,15 +32,6 @@
guava
-
-
- com.google.inject
- guice
-
-
- com.google.inject.extensions
- guice-assistedinject
-
com.hubspot
algebra
diff --git a/slack-java-client/src/main/java/com/hubspot/slack/client/SlackClientModule.java b/slack-java-client/src/main/java/com/hubspot/slack/client/SlackClientModule.java
deleted file mode 100644
index a509cf2e..00000000
--- a/slack-java-client/src/main/java/com/hubspot/slack/client/SlackClientModule.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.hubspot.slack.client;
-
-import com.google.inject.AbstractModule;
-import com.hubspot.slack.client.http.NioHttpClient;
-import com.hubspot.slack.client.http.NioHttpClientFactory;
-
-/**
- * Use slack-java-client-guice module instead
- */
-@Deprecated
-public class SlackClientModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(NioHttpClientFactory.class).toInstance(NioHttpClientFactory.defaultFactory());
- bind(NioHttpClient.Factory.class).toInstance(NioHttpClientFactory.defaultFactory());
-
- bind(SlackClientFactory.class).toInstance(SlackClientFactory.defaultFactory());
- bind(SlackWebClient.Factory.class).toInstance(SlackClientFactory.defaultFactory());
- }
-
- @Override
- public boolean equals(Object o) {
- return o != null && getClass().equals(o.getClass());
- }
-
- @Override
- public int hashCode() {
- return getClass().hashCode();
- }
-}
diff --git a/slack-java-client/src/main/java/com/hubspot/slack/client/SlackWebClient.java b/slack-java-client/src/main/java/com/hubspot/slack/client/SlackWebClient.java
index 69b85839..442aaeef 100644
--- a/slack-java-client/src/main/java/com/hubspot/slack/client/SlackWebClient.java
+++ b/slack-java-client/src/main/java/com/hubspot/slack/client/SlackWebClient.java
@@ -7,8 +7,6 @@
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multimap;
-import com.google.inject.assistedinject.Assisted;
-import com.google.inject.assistedinject.AssistedInject;
import com.hubspot.algebra.Result;
import com.hubspot.horizon.HttpConfig;
import com.hubspot.horizon.HttpRequest;
@@ -218,16 +216,15 @@ public class SlackWebClient implements SlackClient {
private final ResponseDebugger responseDebugger;
public interface Factory {
- SlackWebClient build(@Assisted SlackClientRuntimeConfig config);
+ SlackWebClient build(SlackClientRuntimeConfig config);
}
- @AssistedInject
public SlackWebClient(
DefaultHttpRequestDebugger defaultHttpRequestDebugger,
DefaultHttpResponseDebugger defaultHttpResponseDebugger,
NioHttpClient.Factory nioHttpClientFactory,
ByMethodRateLimiter defaultRateLimiter,
- @Assisted SlackClientRuntimeConfig config
+ SlackClientRuntimeConfig config
) {
this.nioHttpClient =
config
diff --git a/slack-java-client/src/main/java/com/hubspot/slack/client/http/NioHttpClient.java b/slack-java-client/src/main/java/com/hubspot/slack/client/http/NioHttpClient.java
index 677cbddb..0d0cef1f 100644
--- a/slack-java-client/src/main/java/com/hubspot/slack/client/http/NioHttpClient.java
+++ b/slack-java-client/src/main/java/com/hubspot/slack/client/http/NioHttpClient.java
@@ -1,8 +1,6 @@
package com.hubspot.slack.client.http;
import com.google.common.util.concurrent.ListenableFuture;
-import com.google.inject.Inject;
-import com.google.inject.assistedinject.Assisted;
import com.hubspot.horizon.AsyncHttpClient;
import com.hubspot.horizon.AsyncHttpClient.Callback;
import com.hubspot.horizon.HttpRequest;
@@ -27,11 +25,10 @@ public class NioHttpClient implements Closeable {
private final AsyncHttpClient delegate;
public interface Factory {
- NioHttpClient wrap(@Assisted AsyncHttpClient delegate);
+ NioHttpClient wrap(AsyncHttpClient delegate);
}
- @Inject
- public NioHttpClient(@Assisted AsyncHttpClient delegate) {
+ public NioHttpClient(AsyncHttpClient delegate) {
this.delegate = delegate;
}
diff --git a/slack-java-client/src/test/java/com/hubspot/slack/client/interceptors/http/SlackClientModuleTest.java b/slack-java-client/src/test/java/com/hubspot/slack/client/interceptors/http/SlackClientModuleTest.java
deleted file mode 100644
index c7721577..00000000
--- a/slack-java-client/src/test/java/com/hubspot/slack/client/interceptors/http/SlackClientModuleTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hubspot.slack.client.interceptors.http;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Stage;
-import com.hubspot.slack.client.SlackClientModule;
-import org.junit.Test;
-
-public class SlackClientModuleTest {
-
- @Test
- public void itGuices() {
- Guice.createInjector(Stage.TOOL, new StrictGuiceModule());
- }
-
- private static class StrictGuiceModule extends AbstractModule {
-
- @Override
- protected void configure() {
- binder().requireAtInjectOnConstructors();
-
- install(new SlackClientModule());
- }
- }
-}