aboutsummaryrefslogtreecommitdiff
path: root/juick-notifications/src/main/java/com
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-06-30 11:40:06 +0300
committerGravatar Vitaly Takmazov2017-06-30 11:59:09 +0300
commitea519116e9b5ff184498241298d8c9002a173c73 (patch)
tree13f2ac36378e13d49a8deeeb32f877db2c9bba3e /juick-notifications/src/main/java/com
parent71adc5f8430fbadbf7b10aa2c43c0cb8dce6ea92 (diff)
notifications: fix configuration
Diffstat (limited to 'juick-notifications/src/main/java/com')
-rw-r--r--juick-notifications/src/main/java/com/juick/components/configuration/APNSConfiguration.java4
-rw-r--r--juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java5
-rw-r--r--juick-notifications/src/main/java/com/juick/components/configuration/NotificationsInitializer.java5
3 files changed, 6 insertions, 8 deletions
diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/APNSConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/APNSConfiguration.java
index a4959497..6ac155a1 100644
--- a/juick-notifications/src/main/java/com/juick/components/configuration/APNSConfiguration.java
+++ b/juick-notifications/src/main/java/com/juick/components/configuration/APNSConfiguration.java
@@ -11,9 +11,9 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
public class APNSConfiguration {
- @Value("${ios_pkcs12_file}")
+ @Value("${ios_pkcs12_file:}")
private String pkcs12File;
- @Value("${ios_pkcs12_password}")
+ @Value("${ios_pkcs12_password:}")
private String pkcs12secret;
@Bean
public ApnsService apns() {
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 b50edfd5..5f20e43e 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
@@ -21,8 +21,9 @@ import java.util.List;
@Configuration
@EnableScheduling
@PropertySource("classpath:juick.conf")
-@ComponentScan(basePackages = {"com.juick.components.service"})
-@Import(BaseWebConfiguration.class)
+@ComponentScan(basePackages = "com.juick.components.service")
+@Import({ BaseWebConfiguration.class, APNSConfiguration.class, MPNSConfiguration.class,
+ GCMConfiguration.class, XMPPConfiguration.class })
public class NotificationsAppConfiguration extends WebMvcConfigurationSupport {
@Value("${api_user:juick}")
private String apiUser;
diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsInitializer.java b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsInitializer.java
index cc604b02..d4068d26 100644
--- a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsInitializer.java
+++ b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsInitializer.java
@@ -13,10 +13,7 @@ public class NotificationsInitializer extends AbstractAnnotationConfigDispatcher
@Override
protected Class<?>[] getRootConfigClasses() {
- return new Class<?>[]{
- APNSConfiguration.class, MPNSConfiguration.class,
- GCMConfiguration.class, XMPPConfiguration.class
- };
+ return new Class<?>[] {};
}
@Override