From 0e74fe51b55080929650f0ff6adbfc4539ac10b4 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 29 Mar 2017 00:51:53 +0300 Subject: fix string quoting in Spring Value annotation --- juick-api/src/main/java/com/juick/api/ApiServer.java | 10 +++++----- .../configuration/NotificationsAppConfiguration.java | 4 ++-- .../com/juick/components/configuration/XMPPConfiguration.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/juick-api/src/main/java/com/juick/api/ApiServer.java b/juick-api/src/main/java/com/juick/api/ApiServer.java index 7f4042af..b59010b3 100644 --- a/juick-api/src/main/java/com/juick/api/ApiServer.java +++ b/juick-api/src/main/java/com/juick/api/ApiServer.java @@ -38,15 +38,15 @@ public class ApiServer implements AutoCloseable { private ExternalComponent xmpp; - @Value("${upload_tmp_dir:'/var/www/juick.com/i/tmp/'}") + @Value("${upload_tmp_dir:/var/www/juick.com/i/tmp/}") public String tmpDir; - @Value("${img_path:'/var/www/juick.com/i/'}") + @Value("${img_path:/var/www/juick.com/i/}") public String imgDir; - @Value("${xmpp_host:'localhost'}") + @Value("${xmpp_host:localhost}") private String xmppHost; - @Value("${xmpp_password:'secret'}") + @Value("${xmpp_password:secret}") private String xmppPassword; - @Value("${xmpp_jid:'api.localhost'}") + @Value("${xmpp_jid:api.localhost}") private String xmppJid; @Value("${xmpp_port:5347}") private int xmppPort; diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java index d6b4fa1e..b8730bfb 100644 --- a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java +++ b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java @@ -27,9 +27,9 @@ import java.util.List; @PropertySource("classpath:juick.conf") @ComponentScan(basePackages = {"com.juick.components.service"}) public class NotificationsAppConfiguration { - @Value("${api_user:'juick'}") + @Value("${api_user:juick}") private String apiUser; - @Value("${api_password:'secret'}") + @Value("${api_password:secret}") private String apiSecret; @Bean diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/XMPPConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/XMPPConfiguration.java index 22b3d561..4cba533d 100644 --- a/juick-notifications/src/main/java/com/juick/components/configuration/XMPPConfiguration.java +++ b/juick-notifications/src/main/java/com/juick/components/configuration/XMPPConfiguration.java @@ -14,11 +14,11 @@ import rocks.xmpp.extensions.component.accept.ExternalComponent; public class XMPPConfiguration { @Value("${push_jid}") private String pushJid; - @Value("${xmpp_host:'localhost'}") + @Value("${xmpp_host:localhost}") private String xmppHost; @Value("${xmpp_port:5347}") private int xmppPort; - @Value("${push_xmpp_password:'secret'}") + @Value("${push_xmpp_password:secret}") private String xmppPushPassword; @Bean -- cgit v1.2.3