renamed Configuration to BotConfiguration to avoid colliding with Spr…

…ing's Configuration type
Zomis · Jan 21, 2015 · d293f1b · d293f1b
1 parent 8e038c0
commit d293f1b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/skiwi/githubhooksechatservice/chatbot/StackExchangeChatBot.java b/src/main/java/com/skiwi/githubhooksechatservice/chatbot/StackExchangeChatBot.java
@@ -34,7 +34,7 @@
 import com.gistlabs.mechanize.document.html.form.SubmitButton;
 import com.gistlabs.mechanize.document.json.JsonDocument;
 import com.gistlabs.mechanize.impl.MechanizeAgent;
-import com.skiwi.githubhooksechatservice.mvc.configuration.Configuration;
+import com.skiwi.githubhooksechatservice.mvc.configuration.BotConfiguration;
 import com.skiwi.githubhooksechatservice.mvc.controllers.WebhookParameters;
 
 /**
@@ -53,7 +53,7 @@ public class StackExchangeChatBot implements ChatBot, DisposableBean {
     private final MechanizeAgent agent;
 
     @Autowired
-    private Configuration configuration;
+    private BotConfiguration configuration;
 
     private String chatFKey;
 

diff --git a/src/main/java/com/skiwi/githubhooksechatservice/init/RootConfig.java b/src/main/java/com/skiwi/githubhooksechatservice/init/RootConfig.java
@@ -53,8 +53,8 @@ public StartupBean startup() {
 	}
 
 	@Bean
-	public com.skiwi.githubhooksechatservice.mvc.configuration.Configuration config() {
-		com.skiwi.githubhooksechatservice.mvc.configuration.Configuration config = new com.skiwi.githubhooksechatservice.mvc.configuration.Configuration();
+	public com.skiwi.githubhooksechatservice.mvc.configuration.BotConfiguration config() {
+		com.skiwi.githubhooksechatservice.mvc.configuration.BotConfiguration config = new com.skiwi.githubhooksechatservice.mvc.configuration.BotConfiguration();
 		config.setBotEmail(env.getRequiredProperty("env.botEmail"));
 		config.setBotPassword(env.getRequiredProperty("env.botPassword"));
 		config.setChatMaxBurst(Integer.parseInt(env.getRequiredProperty("env.chatMaxBurst")));

diff --git a/src/main/java/com/skiwi/githubhooksechatservice/init/ScheduledTasks.java b/src/main/java/com/skiwi/githubhooksechatservice/init/ScheduledTasks.java
@@ -13,6 +13,7 @@
 import com.skiwi.githubhooksechatservice.chatbot.ChatBot;
 import com.skiwi.githubhooksechatservice.mvc.beans.RepositoryStats;
 import com.skiwi.githubhooksechatservice.mvc.beans.Statistics;
+import com.skiwi.githubhooksechatservice.mvc.configuration.BotConfiguration;
 import com.skiwi.githubhooksechatservice.mvc.controllers.WebhookParameters;
 
 @Configuration
@@ -24,7 +25,7 @@ public class ScheduledTasks {
     private ChatBot chatBot;
 
     @Autowired
-    private com.skiwi.githubhooksechatservice.mvc.configuration.Configuration config;
+    private BotConfiguration config;
 
     @Autowired
     private Statistics statistics;

diff --git a/...vice/mvc/configuration/Configuration.java → ...e/mvc/configuration/BotConfiguration.java b/...vice/mvc/configuration/Configuration.java → ...e/mvc/configuration/BotConfiguration.java
@@ -10,7 +10,7 @@
  *
  * @author Frank van Heeswijk
  */
-public class Configuration {
+public class BotConfiguration {
     private String rootUrl;
     private String chatUrl;
 

diff --git a/src/main/java/com/skiwi/githubhooksechatservice/mvc/controllers/TravisHookController.java b/src/main/java/com/skiwi/githubhooksechatservice/mvc/controllers/TravisHookController.java
@@ -29,7 +29,7 @@
 import com.skiwi.githubhooksechatservice.chatbot.ChatBot;
 import com.skiwi.githubhooksechatservice.events.travis.BuildEvent;
 import com.skiwi.githubhooksechatservice.mvc.beans.Statistics;
-import com.skiwi.githubhooksechatservice.mvc.configuration.Configuration;
+import com.skiwi.githubhooksechatservice.mvc.configuration.BotConfiguration;
 
 /**
  *
@@ -44,7 +44,7 @@ public class TravisHookController {
 	private ChatBot chatBot;
 
 	@Autowired
-	private Configuration configuration;
+	private BotConfiguration configuration;
 
 	@Autowired
 	private Statistics stats;