From 3039ec9b11570756aeb203f8a7f1b1fc1cc17ee5 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Wed, 16 Jul 2014 14:03:53 +0200
Subject: [PATCH] Use environment variables as values
---
.../java/de/thm/arsnova/config/ExtraConfig.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/config/ExtraConfig.java b/src/main/java/de/thm/arsnova/config/ExtraConfig.java
index ee2513d9..41de2ede 100644
--- a/src/main/java/de/thm/arsnova/config/ExtraConfig.java
+++ b/src/main/java/de/thm/arsnova/config/ExtraConfig.java
@@ -21,6 +21,11 @@ public class ExtraConfig {
@Autowired
private Environment env;
+ @Value(value = "${connector.enable}") private boolean connectorEnable;
+ @Value(value = "${connector.uri}") private String connectorUri;
+ @Value(value = "${connector.username}") private String connectorUsername;
+ @Value(value = "${connector.password}") private String connectorPassword;
+
@Value(value = "${socketio.ip}") private String socketIp;
@Value(value = "${socketio.port}") private int socketPort;
@Value(value = "${security.ssl}") private boolean socketUseSll;
@@ -41,14 +46,14 @@ public class ExtraConfig {
@Bean(name = "connectorClient")
public ConnectorClient connectorClient() {
- if (!"true".equals(env.getProperty("connector.enable"))) {
+ if (!connectorEnable) {
return null;
}
final ConnectorClientImpl connectorClient = new ConnectorClientImpl();
- connectorClient.setServiceLocation(env.getProperty("connector.uri"));
- connectorClient.setUsername(env.getProperty("connector.username"));
- connectorClient.setPassword(env.getProperty("connector.password"));
+ connectorClient.setServiceLocation(connectorUri);
+ connectorClient.setUsername(connectorUsername);
+ connectorClient.setPassword(connectorPassword);
return connectorClient;
}
--
GitLab