From 1888a2f7e8948cd760132ce55b8e24b48406d016 Mon Sep 17 00:00:00 2001 From: DOHA Date: Sun, 7 Jul 2019 13:46:24 +0300 Subject: [PATCH] change package to com.baeldung --- .../baeldung/properties/conversion}/Employee.java | 2 +- .../properties/conversion}/EmployeeConverter.java | 2 +- .../PropertiesConversionApplication.java | 14 ++++++++++++++ .../properties/conversion}/PropertyConversion.java | 2 +- .../ConfigPropertiesDemoApplication.java | 4 +--- .../PropertiesConversionIntegrationTest.java | 7 +++++-- 6 files changed, 23 insertions(+), 8 deletions(-) rename spring-boot/src/main/java/{org/baeldung/properties => com/baeldung/properties/conversion}/Employee.java (91%) rename spring-boot/src/main/java/{org/baeldung/properties => com/baeldung/properties/conversion}/EmployeeConverter.java (91%) create mode 100644 spring-boot/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java rename spring-boot/src/main/java/{org/baeldung/properties => com/baeldung/properties/conversion}/PropertyConversion.java (98%) rename spring-boot/src/test/java/{org/baeldung/properties => com/baeldung/properties/conversion}/PropertiesConversionIntegrationTest.java (86%) diff --git a/spring-boot/src/main/java/org/baeldung/properties/Employee.java b/spring-boot/src/main/java/com/baeldung/properties/conversion/Employee.java similarity index 91% rename from spring-boot/src/main/java/org/baeldung/properties/Employee.java rename to spring-boot/src/main/java/com/baeldung/properties/conversion/Employee.java index 33715d38a5..52c7881dfc 100644 --- a/spring-boot/src/main/java/org/baeldung/properties/Employee.java +++ b/spring-boot/src/main/java/com/baeldung/properties/conversion/Employee.java @@ -1,4 +1,4 @@ -package org.baeldung.properties; +package com.baeldung.properties.conversion; public class Employee { diff --git a/spring-boot/src/main/java/org/baeldung/properties/EmployeeConverter.java b/spring-boot/src/main/java/com/baeldung/properties/conversion/EmployeeConverter.java similarity index 91% rename from spring-boot/src/main/java/org/baeldung/properties/EmployeeConverter.java rename to spring-boot/src/main/java/com/baeldung/properties/conversion/EmployeeConverter.java index 57b8128d2b..6ec19cae72 100644 --- a/spring-boot/src/main/java/org/baeldung/properties/EmployeeConverter.java +++ b/spring-boot/src/main/java/com/baeldung/properties/conversion/EmployeeConverter.java @@ -1,4 +1,4 @@ -package org.baeldung.properties; +package com.baeldung.properties.conversion; import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; import org.springframework.core.convert.converter.Converter; diff --git a/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java b/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java new file mode 100644 index 0000000000..f00a26e9c4 --- /dev/null +++ b/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertiesConversionApplication.java @@ -0,0 +1,14 @@ +package com.baeldung.properties.conversion; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@ComponentScan(basePackageClasses = { PropertyConversion.class, EmployeeConverter.class }) +public class PropertiesConversionApplication { + public static void main(String[] args) { + SpringApplication.run(PropertiesConversionApplication.class, args); + } + +} diff --git a/spring-boot/src/main/java/org/baeldung/properties/PropertyConversion.java b/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertyConversion.java similarity index 98% rename from spring-boot/src/main/java/org/baeldung/properties/PropertyConversion.java rename to spring-boot/src/main/java/com/baeldung/properties/conversion/PropertyConversion.java index 6b70e16e76..b9c890306f 100644 --- a/spring-boot/src/main/java/org/baeldung/properties/PropertyConversion.java +++ b/spring-boot/src/main/java/com/baeldung/properties/conversion/PropertyConversion.java @@ -1,4 +1,4 @@ -package org.baeldung.properties; +package com.baeldung.properties.conversion; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/spring-boot/src/main/java/org/baeldung/properties/ConfigPropertiesDemoApplication.java b/spring-boot/src/main/java/org/baeldung/properties/ConfigPropertiesDemoApplication.java index cad4188926..7b8f2c3411 100644 --- a/spring-boot/src/main/java/org/baeldung/properties/ConfigPropertiesDemoApplication.java +++ b/spring-boot/src/main/java/org/baeldung/properties/ConfigPropertiesDemoApplication.java @@ -8,9 +8,7 @@ import org.springframework.context.annotation.ComponentScan; @ComponentScan(basePackageClasses = {ConfigProperties.class, JsonProperties.class, CustomJsonProperties.class, - AdditionalConfiguration.class, - PropertyConversion.class, - EmployeeConverter.class}) + AdditionalConfiguration.class}) public class ConfigPropertiesDemoApplication { public static void main(String[] args) { new SpringApplicationBuilder(ConfigPropertiesDemoApplication.class).initializers(new JsonPropertyContextInitializer()) diff --git a/spring-boot/src/test/java/org/baeldung/properties/PropertiesConversionIntegrationTest.java b/spring-boot/src/test/java/com/baeldung/properties/conversion/PropertiesConversionIntegrationTest.java similarity index 86% rename from spring-boot/src/test/java/org/baeldung/properties/PropertiesConversionIntegrationTest.java rename to spring-boot/src/test/java/com/baeldung/properties/conversion/PropertiesConversionIntegrationTest.java index 2baae80570..53bad329ea 100644 --- a/spring-boot/src/test/java/org/baeldung/properties/PropertiesConversionIntegrationTest.java +++ b/spring-boot/src/test/java/com/baeldung/properties/conversion/PropertiesConversionIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.properties; +package com.baeldung.properties.conversion; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,8 +12,11 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.unit.DataSize; +import com.baeldung.properties.conversion.PropertiesConversionApplication; +import com.baeldung.properties.conversion.PropertyConversion; + @RunWith(SpringRunner.class) -@SpringBootTest(classes = ConfigPropertiesDemoApplication.class) +@SpringBootTest(classes = PropertiesConversionApplication.class) @TestPropertySource("classpath:conversion.properties") public class PropertiesConversionIntegrationTest {