Merge branch 'hotfix/0.1.2'

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>io.57blocks</groupId>
   <artifactId>sms-spring-boot</artifactId>
-  <version>0.1.1</version>
+  <version>0.1.2</version>
   <packaging>pom</packaging>
 
   <name>sms-spring-boot</name>

sms-spring-boot-example/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>io.57blocks</groupId>
     <artifactId>sms-spring-boot</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

sms-spring-boot-example/twilio-sms-example/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>io.57blocks</groupId>
     <artifactId>sms-spring-boot-example</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.57blocks</groupId>
       <artifactId>sms-spring-boot-starter</artifactId>
-      <version>0.1.1</version>
+      <version>0.1.2</version>
     </dependency>
     <dependency>
       <groupId>io.57blocks</groupId>

sms-spring-boot-example/twilio-sms-example/src/main/java/io/_57blocks/example/service/GreetingService.java

@@ -14,7 +14,7 @@ public GreetingService(SmsService smsService) {
   }
 
   public void sendMessage() {
-    this.smsService.send("+12056357762", "+13882201684", "greeting", Locale.ENGLISH,
+    this.smsService.send("+1234567890", "+987654321", "greeting", Locale.ENGLISH,
         new Object[]{"Mr. Smith"});
   }
 

sms-spring-boot-starter/pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.57blocks</groupId>
-  <version>0.1.1</version>
+  <version>0.1.2</version>
   <artifactId>sms-spring-boot-starter</artifactId>
   <packaging>jar</packaging>
 

sms-spring-boot-starter/src/main/java/io/_57blocks/sms/config/AbstractSmsServiceAutoConfig.java

@@ -1,40 +1,19 @@
 package io._57blocks.sms.config;
 
-import io._57blocks.sms.DummySmsService;
-import io._57blocks.sms.SmsService;
 import io._57blocks.sms.config.properties.SmsServiceProperties;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ResourceBundleMessageSource;
 
-@Configuration
-@ConditionalOnClass(SmsService.class)
-@EnableConfigurationProperties(SmsServiceProperties.class)
-public abstract class AbstractSmsServiceAutoConfig {
+abstract class AbstractSmsServiceAutoConfig {
 
   @Autowired
   private SmsServiceProperties properties;
 
-  protected ResourceBundleMessageSource smsMessageSource() {
+  ResourceBundleMessageSource smsMessageSource() {
     final ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
     messageSource.setBasename(properties.getMessageBaseName());
 
     return messageSource;
   }
 
-  @Bean
-  @ConditionalOnMissingBean
-  public SmsService smsService() {
-    if (properties.getEnabled()) {
-      return createSmsService();
-    } else {
-      return new DummySmsService();
-    }
-  }
-
-  protected abstract SmsService createSmsService();
 }

sms-spring-boot-starter/src/main/java/io/_57blocks/sms/config/DummySmsServiceAutoConfig.java

@@ -0,0 +1,21 @@
+package io._57blocks.sms.config;
+
+import io._57blocks.sms.DummySmsService;
+import io._57blocks.sms.SmsService;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnClass(SmsService.class)
+@ConditionalOnProperty(prefix = "io.57blocks.sms", value = "enabled", havingValue = "false")
+public class DummySmsServiceAutoConfig {
+
+  @Bean
+  @ConditionalOnMissingBean
+  public SmsService smsService() {
+    return new DummySmsService();
+  }
+}

sms-spring-boot-starter/src/main/java/io/_57blocks/sms/config/SmsServiceTwilioAutoConfig.java

@@ -2,15 +2,24 @@
 
 import io._57blocks.sms.SmsService;
 import io._57blocks.sms.SmsServiceTwilioImpl;
+import io._57blocks.sms.config.properties.SmsServiceProperties;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
+@Configuration
+@EnableConfigurationProperties(SmsServiceProperties.class)
+@ConditionalOnMissingBean(SmsService.class)
 @ConditionalOnBean(type = "com.twilio.http.TwilioRestClient")
-@AutoConfigureAfter(name = "io._57blocks.twilio.config.TwilioAutoConfig")
+@AutoConfigureAfter(name = "io._57blocks.twilio.config.TwilioAutoConfig", value = DummySmsServiceAutoConfig.class)
 public class SmsServiceTwilioAutoConfig extends AbstractSmsServiceAutoConfig {
 
-  @Override
-  protected SmsService createSmsService() {
+  @Bean
+  public SmsService smsService() {
     return new SmsServiceTwilioImpl(smsMessageSource());
   }
+
 }

sms-spring-boot-starter/src/main/java/io/_57blocks/sms/config/properties/SmsServiceProperties.java

@@ -9,4 +9,12 @@ public class SmsServiceProperties {
 
   private Boolean enabled = Boolean.TRUE;
   private String messageBaseName = "/sms/messages";
+
+  public String getMessageBaseName() {
+    if (messageBaseName.startsWith("/")) {
+      messageBaseName = messageBaseName.substring(1);
+    }
+
+    return messageBaseName;
+  }
 }

sms-spring-boot-starter/src/main/resources/META-INF/spring.factories

@@ -1 +1,3 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=io._57blocks.sms.config.SmsServiceTwilioAutoConfig
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+io._57blocks.sms.config.DummySmsServiceAutoConfig,\
+io._57blocks.sms.config.SmsServiceTwilioAutoConfig