#481 Add newProperty methods for temporal properties; minor test adjustments

Author: ljacqu

src/main/java/ch/jalu/configme/properties/PropertyInitializer.java

@@ -8,6 +8,9 @@
 import ch.jalu.configme.properties.types.PropertyType;
 import org.jetbrains.annotations.NotNull;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -121,6 +124,42 @@ protected PropertyInitializer() {
         return new EnumProperty<>(path, clazz, defaultValue);
     }
 
+    /**
+     * Creates a new LocalDate property.
+     *
+     * @param path the property's path
+     * @param defaultValue the default value
+     * @return the created property
+     */
+    public static @NotNull LocalDateProperty newProperty(@NotNull String path,
+                                                         @NotNull LocalDate defaultValue) {
+        return new LocalDateProperty(path, defaultValue);
+    }
+
+    /**
+     * Creates a new LocalTime property.
+     *
+     * @param path the property's path
+     * @param defaultValue the default value
+     * @return the created property
+     */
+    public static @NotNull LocalTimeProperty newProperty(@NotNull String path,
+                                                         @NotNull LocalTime defaultValue) {
+        return new LocalTimeProperty(path, defaultValue);
+    }
+
+    /**
+     * Creates a new LocalDateTime property.
+     *
+     * @param path the property's path
+     * @param defaultValue the default value
+     * @return the created property
+     */
+    public static @NotNull LocalDateTimeProperty newProperty(@NotNull String path,
+                                                             @NotNull LocalDateTime defaultValue) {
+        return new LocalDateTimeProperty(path, defaultValue);
+    }
+
     /**
      * Creates a new regex pattern property.
      *

src/main/java/ch/jalu/configme/properties/types/TemporalType.java

@@ -67,8 +67,8 @@ public TemporalType(@NotNull Class<T> clazz, @NotNull List<String> supportedForm
         return DateTimeFormatter.ofPattern(this.defaultExportFormat).format(value);
     }
 
-    private T convertToTemporalType(String temporalText) {
-        for (String format: this.supportedFormats) {
+    private @Nullable T convertToTemporalType(@NotNull String temporalText) {
+        for (String format : this.supportedFormats) {
             try {
                 T parsedValue = this.temporalParser.apply(temporalText, DateTimeFormatter.ofPattern(format));
                 this.defaultExportFormat = format;

src/test/java/ch/jalu/configme/beanmapper/leafvaluehandler/LeafValueHandlerImplTest.java

@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -169,11 +170,13 @@ void shouldNotConvertForUnsupportedTargetTypes() {
         Object object = "2020-02-13";
 
         ConvertErrorRecorder errorRecorder = mock(ConvertErrorRecorder.class);
+        MappingContext durationContext = MappingContextImpl.createRoot(of(Duration.class), errorRecorder);
         MappingContext wildcardContext = MappingContextImpl.createRoot(of(WildcardTypeImpl.newUnboundedWildcard()), errorRecorder);
 
         LeafValueHandlerImpl leafValueHandler = new LeafValueHandlerImpl(LeafValueHandlerImpl.createDefaultLeafTypes());
 
         // when / then
+        assertThat(leafValueHandler.convert(object, durationContext), nullValue());
         assertThat(leafValueHandler.convert(object, wildcardContext), nullValue());
     }
 
@@ -195,6 +198,7 @@ void shouldNotConvertUnsupportedValuesToExportValues() {
         ExportContext exportContext = ExportContextImpl.createRoot();
 
         // when / then
+        assertThat(leafValueHandler.toExportValue(Duration.ofSeconds(3), exportContext), nullValue());
         assertThat(leafValueHandler.toExportValue(new Object(), exportContext), nullValue());
     }
 

src/test/java/ch/jalu/configme/properties/PropertyInitializerTest.java

@@ -11,6 +11,9 @@
 import ch.jalu.configme.samples.TestEnum;
 import org.junit.jupiter.api.Test;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.regex.Pattern;
@@ -55,6 +58,9 @@ void shouldInstantiateProperties() {
         assertThat(newProperty("my.path", -8.4d), instanceOf(DoubleProperty.class));
         assertThat(newProperty("my.path", "default"), instanceOf(StringProperty.class));
         assertThat(newProperty(TestEnum.class, "my.path", TestEnum.FIRST), instanceOf(EnumProperty.class));
+        assertThat(newProperty("my.path", LocalDate.now()), instanceOf(LocalDateProperty.class));
+        assertThat(newProperty("my.path", LocalTime.now()), instanceOf(LocalTimeProperty.class));
+        assertThat(newProperty("my.path", LocalDateTime.now()), instanceOf(LocalDateTimeProperty.class));
         assertThat(newRegexProperty("reg.path", "abc?"), instanceOf(RegexProperty.class));
         assertThat(newRegexProperty("reg.path", Pattern.compile("w[0-9]*")), instanceOf(RegexProperty.class));
         assertThat(newListProperty("path", "default", "entries"), instanceOf(StringListProperty.class));

src/test/java/ch/jalu/configme/properties/types/TemporalTypeTest.java

@@ -14,7 +14,6 @@
 import static ch.jalu.typeresolver.TypeInfo.of;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.matchesPattern;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -23,7 +22,7 @@
  * Test for {@link TemporalType}.
  */
 @ExtendWith(MockitoExtension.class)
-public class TemporalTypeTest {
+class TemporalTypeTest {
 
     @AfterAll
     static void reset() {
@@ -35,12 +34,12 @@ static void reset() {
 
     @Test
     void shouldNotAllowToInstantiateTemporalTypeWithInvalidArguments() {
-        // when
+        // given / when
         IllegalArgumentException noSupportedFormats = assertThrows(IllegalArgumentException.class,
             () -> new TemporalType<>(LocalDate.class, Collections.emptyList(), LocalDate::parse));
 
         // then
-        assertThat(noSupportedFormats.getMessage(), matchesPattern("At least one supported format must be provided."));
+        assertThat(noSupportedFormats.getMessage(), equalTo("At least one supported format must be provided."));
     }
 
     @Test