SpringCloud/spring-functions-catalog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TimeProperties -> TimeSupplierProperties

Browse Source
This commit is contained in:
Soby Chacko
2020-05-19 17:10:40 -04:00
parent f82d589a72
commit 54e1e02f3d
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierConfiguration.java
View File

@@ -29,12 +29,12 @@ import org.springframework.context.annotation.Configuration;
* @author Soby Chacko
*/
@Configuration
@EnableConfigurationProperties(TimeProperties.class)
@EnableConfigurationProperties(TimeSupplierProperties.class)
public class TimeSupplierConfiguration {
@Bean
public Supplier<String> timeSupplier(TimeProperties timeProperties) {
FastDateFormat fastDateFormat = FastDateFormat.getInstance(timeProperties.getDateFormat());
public Supplier<String> timeSupplier(TimeSupplierProperties timeSupplierProperties) {
FastDateFormat fastDateFormat = FastDateFormat.getInstance(timeSupplierProperties.getDateFormat());
return () -> fastDateFormat.format(new Date());
}

2
supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeProperties.java → supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierProperties.java
View File

@@ -24,7 +24,7 @@ import org.springframework.validation.annotation.Validated;
*/
@ConfigurationProperties("time")
@Validated
public class TimeProperties {
public class TimeSupplierProperties {
/**
* Format for the date value.

2
supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/SimpleTimeSupplierTests.java
View File

@@ -33,7 +33,7 @@ public class SimpleTimeSupplierTests extends TimeSupplierApplicationTests {
@Test
public void testTimeSupplier() {
final String time = timeSupplier.get();
SimpleDateFormat dateFormat = new SimpleDateFormat(new TimeProperties().getDateFormat());
SimpleDateFormat dateFormat = new SimpleDateFormat(new TimeSupplierProperties().getDateFormat());
assertThatCode(() -> {
Date date = dateFormat.parse(time);
assertThat(date).isNotNull();

2
supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java
View File

@@ -33,7 +33,7 @@ public abstract class TimeSupplierApplicationTests {
Supplier<String> timeSupplier;
@Autowired
TimeProperties timeProperties;
TimeSupplierProperties timeSupplierProperties;
protected abstract void testTimeSupplier();

8
supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/VariationToSimpleTests.java
View File

@@ -37,7 +37,7 @@ public class VariationToSimpleTests extends TimeSupplierApplicationTests {
@Test
public void testTimeSupplier() {
final String time = timeSupplier.get();
SimpleDateFormat dateFormat = new SimpleDateFormat(timeProperties.getDateFormat());
SimpleDateFormat dateFormat = new SimpleDateFormat(timeSupplierProperties.getDateFormat());
assertThatCode(() -> {
Date date = dateFormat.parse(time);
assertThat(date).isNotNull();
@@ -46,9 +46,9 @@ public class VariationToSimpleTests extends TimeSupplierApplicationTests {
@Test
public void testInvalidDateFormat() {
TimeProperties timeProperties = new TimeProperties();
timeProperties.setDateFormat("AA/dd/yyyy HH:mm:ss");
assertThatIllegalArgumentException().isThrownBy(() -> new SimpleDateFormat(timeProperties.getDateFormat()));
TimeSupplierProperties timeSupplierProperties = new TimeSupplierProperties();
timeSupplierProperties.setDateFormat("AA/dd/yyyy HH:mm:ss");
assertThatIllegalArgumentException().isThrownBy(() -> new SimpleDateFormat(timeSupplierProperties.getDateFormat()));
}
}