Skip to content

[#2173] Add LocalDateTime binder #1236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asolntsev merged 1 commit into from
Jun 4, 2018
Merged

[#2173] Add LocalDateTime binder #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 10 additions & 38 deletions framework/src/play/data/binding/Binder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,23 @@
package play.data.binding;

import java.io.File;
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Comparator;
import java.util.Date;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;

import org.apache.commons.lang.StringUtils;
import org.joda.time.DateTime;

import play.Logger;
import play.Play;
import play.data.Upload;
import play.data.binding.types.BinaryBinder;
import play.data.binding.types.ByteArrayArrayBinder;
import play.data.binding.types.ByteArrayBinder;
import play.data.binding.types.CalendarBinder;
import play.data.binding.types.DateBinder;
import play.data.binding.types.DateTimeBinder;
import play.data.binding.types.FileArrayBinder;
import play.data.binding.types.FileBinder;
import play.data.binding.types.LocaleBinder;
import play.data.binding.types.UploadArrayBinder;
import play.data.binding.types.UploadBinder;
import play.data.binding.types.*;
import play.data.validation.Validation;
import play.db.Model;
import play.exceptions.UnexpectedException;

import java.io.File;
import java.lang.annotation.Annotation;
import java.lang.reflect.*;
import java.math.BigDecimal;
import java.text.ParseException;
import java.time.LocalDateTime;
import java.util.*;

/**
* The binder try to convert String values to Java objects.
*/
Expand All @@ -63,6 +34,7 @@ public abstract class Binder {
supportedTypes.put(DateTime.class, new DateTimeBinder());
supportedTypes.put(File.class, new FileBinder());
supportedTypes.put(File[].class, new FileArrayBinder());
supportedTypes.put(LocalDateTime.class, new LocalDateTimeBinder());
supportedTypes.put(Model.BinaryField.class, new BinaryBinder());
supportedTypes.put(Upload.class, new UploadBinder());
supportedTypes.put(Upload[].class, new UploadArrayBinder());
Expand Down
15 changes: 15 additions & 0 deletions framework/src/play/data/binding/types/LocalDateTimeBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package play.data.binding.types;

import play.data.binding.TypeBinder;

import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.time.LocalDateTime;

public class LocalDateTimeBinder implements TypeBinder<LocalDateTime> {

@Override
public LocalDateTime bind(String name, Annotation[] annotations, String value, Class actualClass, Type genericType) {
return value != null && !value.trim().isEmpty() ? LocalDateTime.parse(value) : null;
}
}
43 changes: 43 additions & 0 deletions framework/test-src/play/data/binding/types/LocalDateTimeBinderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package play.data.binding.types;

import org.junit.Before;
import org.junit.Test;
import play.PlayBuilder;

import java.time.LocalDateTime;
import java.time.format.DateTimeParseException;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;

public class LocalDateTimeBinderTest {

private LocalDateTimeBinder binder = new LocalDateTimeBinder();

@Before
public void setup() {
new PlayBuilder().build();
}

@Test
public void nullLocalDateTime() {
assertNull(binder.bind("event.start", null, null, LocalDateTime.class, null));
}

@Test
public void emptyLocalDateTime() {
assertNull(binder.bind("event.start", null, "", LocalDateTime.class, null));
}

@Test
public void validLocalDateTime() {
LocalDateTime expected = LocalDateTime.parse("2007-12-03T10:15:30");
LocalDateTime actual = binder.bind("event.start", null, "2007-12-03T10:15:30", LocalDateTime.class, null);
assertEquals(expected, actual);
}

@Test(expected = DateTimeParseException.class)
public void invalidLocalDateTime() throws Exception {
binder.bind("event.start", null, "2007-13-03T10:15:30", LocalDateTime.class, null);
}
}