You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by da...@apache.org on 2016/09/27 07:23:46 UTC
svn commit: r1762404 - in /felix/trunk/converter/converter/src:
main/java/org/apache/felix/converter/impl/ConverterImpl.java
test/java/org/apache/felix/converter/impl/ConverterServiceTest.java
Author: davidb
Date: Tue Sep 27 07:23:46 2016
New Revision: 1762404
URL: http://svn.apache.org/viewvc?rev=1762404&view=rev
Log:
Felix Converter - move Calendar and Date conversions in
Modified:
felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterServiceTest.java
Modified: felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java?rev=1762404&r1=1762403&r2=1762404&view=diff
==============================================================================
--- felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java (original)
+++ felix/trunk/converter/converter/src/main/java/org/apache/felix/converter/impl/ConverterImpl.java Tue Sep 27 07:23:46 2016
@@ -16,12 +16,15 @@
*/
package org.apache.felix.converter.impl;
+import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.OffsetTime;
import java.time.ZonedDateTime;
+import java.util.Calendar;
+import java.util.Date;
import java.util.UUID;
import java.util.regex.Pattern;
@@ -33,27 +36,35 @@ public class ConverterImpl implements In
return new ConvertingImpl(this, obj);
}
- public void addStandardRules(ConverterBuilder a) {
- a.rule(Byte.class, String.class, v -> v.toString(), Byte::parseByte); // TODO test
- a.rule(Character.class, Boolean.class, v -> v.charValue() != 0,
+ public void addStandardRules(ConverterBuilder cb) {
+ cb.rule(Byte.class, String.class, v -> v.toString(), Byte::parseByte);
+ cb.rule(Calendar.class, String.class, v -> v.getTime().toInstant().toString(),
+ v -> {
+ Calendar cc = Calendar.getInstance();
+ cc.setTime(Date.from(Instant.parse(v)));
+ return cc;
+ });
+ cb.rule(Character.class, Boolean.class, v -> v.charValue() != 0,
v -> v.booleanValue() ? (char) 1 : (char) 0);
- a.rule(Character.class, String.class, v -> v.toString(),
+ cb.rule(Character.class, String.class, v -> v.toString(),
v -> v.length() > 0 ? v.charAt(0) : 0);
- a.rule(Class.class, String.class, Class::toString,
+ cb.rule(Class.class, String.class, Class::toString,
v -> getClass().getClassLoader().loadClass(v));
- a.rule(Double.class, String.class, v -> v.toString(), Double::parseDouble); // TODO test
- a.rule(Float.class, String.class, v -> v.toString(), Float::parseFloat); // TODO test
- a.rule(Integer.class, String.class, v -> v.toString(), Integer::parseInt);
- a.rule(LocalDateTime.class, String.class, LocalDateTime::toString, LocalDateTime::parse);
- a.rule(LocalDate.class, String.class, LocalDate::toString, LocalDate::parse);
- a.rule(LocalTime.class, String.class, LocalTime::toString, LocalTime::parse);
- a.rule(Long.class, String.class, v -> v.toString(), Long::parseLong); // TODO test
- a.rule(OffsetDateTime.class, String.class, OffsetDateTime::toString, OffsetDateTime::parse);
- a.rule(OffsetTime.class, String.class, OffsetTime::toString, OffsetTime::parse);
- a.rule(Pattern.class, String.class, Pattern::toString, Pattern::compile);
- a.rule(Short.class, String.class, v -> v.toString(), Short::parseShort); // TODO test
- a.rule(UUID.class, String.class, UUID::toString, UUID::fromString);
- a.rule(ZonedDateTime.class, String.class, ZonedDateTime::toString, ZonedDateTime::parse);
+ cb.rule(Date.class, String.class, v -> v.toInstant().toString(),
+ v -> Date.from(Instant.parse(v)));
+ cb.rule(Double.class, String.class, v -> v.toString(), Double::parseDouble);
+ cb.rule(Float.class, String.class, v -> v.toString(), Float::parseFloat);
+ cb.rule(Integer.class, String.class, v -> v.toString(), Integer::parseInt);
+ cb.rule(LocalDateTime.class, String.class, LocalDateTime::toString, LocalDateTime::parse);
+ cb.rule(LocalDate.class, String.class, LocalDate::toString, LocalDate::parse);
+ cb.rule(LocalTime.class, String.class, LocalTime::toString, LocalTime::parse);
+ cb.rule(Long.class, String.class, v -> v.toString(), Long::parseLong);
+ cb.rule(OffsetDateTime.class, String.class, OffsetDateTime::toString, OffsetDateTime::parse);
+ cb.rule(OffsetTime.class, String.class, OffsetTime::toString, OffsetTime::parse);
+ cb.rule(Pattern.class, String.class, Pattern::toString, Pattern::compile);
+ cb.rule(Short.class, String.class, v -> v.toString(), Short::parseShort);
+ cb.rule(UUID.class, String.class, UUID::toString, UUID::fromString);
+ cb.rule(ZonedDateTime.class, String.class, ZonedDateTime::toString, ZonedDateTime::parse);
}
@Override
Modified: felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterServiceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterServiceTest.java?rev=1762404&r1=1762403&r2=1762404&view=diff
==============================================================================
--- felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterServiceTest.java (original)
+++ felix/trunk/converter/converter/src/test/java/org/apache/felix/converter/impl/ConverterServiceTest.java Tue Sep 27 07:23:46 2016
@@ -19,7 +19,6 @@ package org.apache.felix.converter.impl;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.URL;
-import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -399,16 +398,7 @@ public class ConverterServiceTest {
Calendar cal = new GregorianCalendar(2017, 1, 13);
Date d = cal.getTime();
- // TODO these rules need to go to the Standard Converter.
- Converter c = converter.newConverterBuilder().
- rule(Date.class, String.class, v -> v.toInstant().toString(), v -> Date.from(Instant.parse(v))).
- rule(Calendar.class, String.class, v -> v.getTime().toInstant().toString(),
- v -> {
- Calendar cc = Calendar.getInstance();
- cc.setTime(Date.from(Instant.parse(v)));
- return cc;
- }).
- build();
+ Converter c = new StandardConverter();
String s = c.convert(d).toString();
assertEquals(d, c.convert(s).to(Date.class));