From 54e1e02f3dccee3777e6b54aef3eb0c1ce3c85f3 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Tue, 19 May 2020 17:10:40 -0400 Subject: [PATCH] TimeProperties -> TimeSupplierProperties --- .../cloud/fn/supplier/time/TimeSupplierConfiguration.java | 6 +++--- .../{TimeProperties.java => TimeSupplierProperties.java} | 2 +- .../cloud/fn/supplier/time/SimpleTimeSupplierTests.java | 2 +- .../fn/supplier/time/TimeSupplierApplicationTests.java | 2 +- .../cloud/fn/supplier/time/VariationToSimpleTests.java | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) rename supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/{TimeProperties.java => TimeSupplierProperties.java} (96%) diff --git a/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierConfiguration.java b/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierConfiguration.java index c0cb9e56..b58b8f1b 100644 --- a/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierConfiguration.java +++ b/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierConfiguration.java @@ -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 timeSupplier(TimeProperties timeProperties) { - FastDateFormat fastDateFormat = FastDateFormat.getInstance(timeProperties.getDateFormat()); + public Supplier timeSupplier(TimeSupplierProperties timeSupplierProperties) { + FastDateFormat fastDateFormat = FastDateFormat.getInstance(timeSupplierProperties.getDateFormat()); return () -> fastDateFormat.format(new Date()); } diff --git a/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeProperties.java b/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierProperties.java similarity index 96% rename from supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeProperties.java rename to supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierProperties.java index 0bb70167..5c6df97c 100644 --- a/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeProperties.java +++ b/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierProperties.java @@ -24,7 +24,7 @@ import org.springframework.validation.annotation.Validated; */ @ConfigurationProperties("time") @Validated -public class TimeProperties { +public class TimeSupplierProperties { /** * Format for the date value. diff --git a/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/SimpleTimeSupplierTests.java b/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/SimpleTimeSupplierTests.java index 1a0a4a2f..6777c8ad 100644 --- a/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/SimpleTimeSupplierTests.java +++ b/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/SimpleTimeSupplierTests.java @@ -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(); diff --git a/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java b/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java index 41fcacd4..a2e383d5 100644 --- a/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java +++ b/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java @@ -33,7 +33,7 @@ public abstract class TimeSupplierApplicationTests { Supplier timeSupplier; @Autowired - TimeProperties timeProperties; + TimeSupplierProperties timeSupplierProperties; protected abstract void testTimeSupplier(); diff --git a/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/VariationToSimpleTests.java b/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/VariationToSimpleTests.java index 125c76e4..c33edb35 100644 --- a/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/VariationToSimpleTests.java +++ b/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/VariationToSimpleTests.java @@ -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())); } }