Turned Guice dependencies into singletons to improve performance

Author: gustavkarlsson

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/configuration/AppConfiguration.java

@@ -1,12 +1,14 @@
 package se.gustavkarlsson.rocketchat.jira_trigger.configuration;
 
+import com.google.inject.Singleton;
 import se.gustavkarlsson.rocketchat.jira_trigger.server.Server;
 
 import javax.inject.Inject;
 
 import static org.apache.commons.lang3.Validate.inclusiveBetween;
 import static org.apache.commons.lang3.Validate.notNull;
 
+@Singleton
 public class AppConfiguration {
 	private static final String KEY_PREFIX = "app.";
 	static final String PORT_KEY = KEY_PREFIX + "port";

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/configuration/ConfigurationModule.java

@@ -2,6 +2,7 @@
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import com.moandjiezana.toml.Toml;
 import se.gustavkarlsson.rocketchat.jira_trigger.di.qualifiers.Default;
 
@@ -30,16 +31,19 @@ protected void configure() {
 
 	@Provides
 	@Default
+	@Singleton
 	Toml provideDefaultToml() {
 		return new Toml().read(ConfigurationModule.class.getClassLoader().getResourceAsStream(DEFAULTS_FILE_NAME));
 	}
 
 	@Provides
+	@Singleton
 	Toml provideTomlFromFile() {
 		return Optional.ofNullable(configFile).map(configFile -> new Toml().read(configFile)).orElse(null);
 	}
 
 	@Provides
+	@Singleton
 	ConfigMap provideConfigMap(@Default Toml defaultToml, @Nullable Toml configFileToml) {
 		List<ConfigMap> configMaps = new ArrayList<>();
 		configMaps.add(new EnvVarConfigMap(System.getenv()));

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/configuration/JiraConfiguration.java

@@ -1,10 +1,13 @@
 package se.gustavkarlsson.rocketchat.jira_trigger.configuration;
 
+import com.google.inject.Singleton;
+
 import javax.inject.Inject;
 import java.net.URI;
 
 import static org.apache.commons.lang3.Validate.notNull;
 
+@Singleton
 public class JiraConfiguration {
 	private static final String KEY_PREFIX = "jira.";
 	static final String URI_KEY = KEY_PREFIX + "uri";

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/configuration/MessageConfiguration.java

@@ -1,5 +1,6 @@
 package se.gustavkarlsson.rocketchat.jira_trigger.configuration;
 
+import com.google.inject.Singleton;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
@@ -13,6 +14,7 @@
 import static java.util.stream.Collectors.toSet;
 import static org.apache.commons.lang3.Validate.notNull;
 
+@Singleton
 public class MessageConfiguration {
 	private static final String KEY_PREFIX = "message.";
 	static final String USERNAME_KEY = KEY_PREFIX + "username";

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/configuration/RocketChatConfiguration.java

@@ -1,5 +1,7 @@
 package se.gustavkarlsson.rocketchat.jira_trigger.configuration;
 
+import com.google.inject.Singleton;
+
 import javax.inject.Inject;
 import java.util.Collections;
 import java.util.HashSet;
@@ -8,6 +10,7 @@
 
 import static org.apache.commons.lang3.Validate.notNull;
 
+@Singleton
 public class RocketChatConfiguration {
 	private static final String KEY_PREFIX = "rocketchat.";
 	static final String TOKENS_KEY = KEY_PREFIX + "tokens";

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/jira/AuthHandlerProvider.java

@@ -5,6 +5,7 @@
 import com.atlassian.jira.rest.client.auth.BasicHttpAuthenticationHandler;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+import com.google.inject.Singleton;
 import org.slf4j.Logger;
 import se.gustavkarlsson.rocketchat.jira_trigger.configuration.JiraConfiguration;
 
@@ -13,6 +14,7 @@
 
 import static org.slf4j.LoggerFactory.getLogger;
 
+@Singleton
 class AuthHandlerProvider implements Provider<AuthenticationHandler> {
 	private static final Logger log = getLogger(AuthHandlerProvider.class);
 

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/jira/JiraModule.java

@@ -7,6 +7,7 @@
 import com.atlassian.jira.rest.client.internal.async.AsynchronousJiraRestClientFactory;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import se.gustavkarlsson.rocketchat.jira_trigger.configuration.JiraConfiguration;
 
 import java.io.Console;
@@ -18,22 +19,26 @@ protected void configure() {
 	}
 
 	@Provides
+	@Singleton
 	JiraRestClient provideJiraRestClient(JiraConfiguration jiraConfig, AuthenticationHandler authHandler) {
 		AsynchronousJiraRestClientFactory factory = new AsynchronousJiraRestClientFactory();
 		return factory.create(jiraConfig.getUri(), authHandler);
 	}
 
 	@Provides
+	@Singleton
 	MetadataRestClient provideMetadataRestClient(JiraRestClient jiraClient) {
 		return jiraClient.getMetadataClient();
 	}
 
 	@Provides
+	@Singleton
 	IssueRestClient provideIssueRestClient(JiraRestClient jiraClient) {
 		return jiraClient.getIssueClient();
 	}
 
 	@Provides
+	@Singleton
 	Console provideConsole() {
 		return System.console();
 	}

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/messages/DefaultFieldCreatorsProvider.java

@@ -2,13 +2,15 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+import com.google.inject.Singleton;
 import se.gustavkarlsson.rocketchat.jira_trigger.configuration.MessageConfiguration;
 import se.gustavkarlsson.rocketchat.jira_trigger.messages.field_creators.FieldCreator;
 
 import java.util.List;
 
 import static org.apache.commons.lang3.Validate.notNull;
 
+@Singleton
 class DefaultFieldCreatorsProvider implements Provider<List<FieldCreator>> {
 	private final FieldCreatorMapper fieldCreatorMapper;
 	private final MessageConfiguration messageConfig;

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/messages/ExtendedFieldCreatorsProvider.java

@@ -2,13 +2,15 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+import com.google.inject.Singleton;
 import se.gustavkarlsson.rocketchat.jira_trigger.configuration.MessageConfiguration;
 import se.gustavkarlsson.rocketchat.jira_trigger.messages.field_creators.FieldCreator;
 
 import java.util.List;
 
 import static org.apache.commons.lang3.Validate.notNull;
 
+@Singleton
 class ExtendedFieldCreatorsProvider implements Provider<List<FieldCreator>> {
 	private final FieldCreatorMapper fieldCreatorMapper;
 	private final MessageConfiguration messageConfig;

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/messages/MessageModule.java

@@ -2,6 +2,7 @@
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
 import se.gustavkarlsson.rocketchat.jira_trigger.configuration.JiraConfiguration;
 import se.gustavkarlsson.rocketchat.jira_trigger.configuration.MessageConfiguration;
@@ -20,16 +21,19 @@ protected void configure() {
 	}
 
 	@Provides
+	@Singleton
 	ToRocketChatMessageFactory provideToRocketChatMessageFactory(MessageConfiguration messageConfig) {
 		return new ToRocketChatMessageFactory(messageConfig.getUsername(), messageConfig.getIconUrl());
 	}
 
 	@Provides
+	@Singleton
 	FieldCreatorMapper provideFieldCreatorMapper(MessageConfiguration messageConfig) {
 		return new FieldCreatorMapper(messageConfig.isUseRealNames(), messageConfig.getDateFormatter());
 	}
 
 	@Provides
+	@Singleton
 	AttachmentCreator provideAttachmentConverter(MessageConfiguration messageConfig, JiraConfiguration jiraConfig, @Default List<FieldCreator> defaultFieldCreators, List<FieldCreator> extendedFieldCreators) {
 		return new AttachmentCreator(messageConfig.isPriorityColors(), messageConfig.getDefaultColor(), defaultFieldCreators, extendedFieldCreators, jiraConfig.getUri());
 	}