honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#604:allow MINUTE precision for datetimes

This commit is contained in:
christian ohr 2017-05-26 15:27:58 +02:00
parent ba40f44d27
commit aafde2eceb
5 changed files with 67 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java
View File

@ -285,7 +285,7 @@ public abstract class BaseDateTimeDt extends BasePrimitive<Date> {
cal.set(Calendar.DAY_OF_MONTH, parseInt(value, value.substring(8, 10), 1, actualMaximum)); cal.set(Calendar.DAY_OF_MONTH, parseInt(value, value.substring(8, 10), 1, actualMaximum));
precision = TemporalPrecisionEnum.DAY; precision = TemporalPrecisionEnum.DAY;
if (length > 10) { if (length > 10) {
validateLengthIsAtLeast(value, 17); validateLengthIsAtLeast(value, 16);
validateCharAtIndexIs(value, 10, 'T'); // yyyy-mm-ddThh:mm:ss validateCharAtIndexIs(value, 10, 'T'); // yyyy-mm-ddThh:mm:ss
int offsetIdx = getOffsetIndex(value); int offsetIdx = getOffsetIndex(value);
String time; String time;

25
hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/primitive/BaseDateTimeDtDstu2Test.java
View File

@ -569,6 +569,29 @@ public class BaseDateTimeDtDstu2Test {
dt.setValueAsString("201302"); dt.setValueAsString("201302");
} }
@Test
public void testParseMinute() throws DataFormatException {
DateTimeDt dt = new DateTimeDt();
dt.setValueAsString("2013-02-03T11:22");
assertEquals("2013-02-03 11:22", myDateInstantParser.format(dt.getValue()).substring(0, 16));
assertEquals("2013-02-03T11:22", dt.getValueAsString());
assertEquals(false, dt.isTimeZoneZulu());
assertNull(dt.getTimeZone());
assertEquals(TemporalPrecisionEnum.MINUTE, dt.getPrecision());
}
@Test
public void testParseMinuteZulu() throws DataFormatException {
DateTimeDt dt = new DateTimeDt();
dt.setValueAsString("2013-02-03T11:22Z");
assertEquals("2013-02-03T11:22Z", dt.getValueAsString());
assertEquals(true, dt.isTimeZoneZulu());
assertEquals("GMT", dt.getTimeZone().getID());
assertEquals(TemporalPrecisionEnum.MINUTE, dt.getPrecision());
}
@Test @Test
public void testParseSecond() throws DataFormatException { public void testParseSecond() throws DataFormatException {
DateTimeDt dt = new DateTimeDt(); DateTimeDt dt = new DateTimeDt();
@ -582,7 +605,7 @@ public class BaseDateTimeDtDstu2Test {
} }
@Test @Test
public void testParseSecondulu() throws DataFormatException { public void testParseSecondZulu() throws DataFormatException {
DateTimeDt dt = new DateTimeDt(); DateTimeDt dt = new DateTimeDt();
dt.setValueAsString("2013-02-03T11:22:33Z"); dt.setValueAsString("2013-02-03T11:22:33Z");

2
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/model/BaseDateTimeType.java
View File

@ -404,7 +404,7 @@ public abstract class BaseDateTimeType extends PrimitiveType<Date> {
cal.set(Calendar.DAY_OF_MONTH, parseInt(value, value.substring(8, 10), 1, actualMaximum)); cal.set(Calendar.DAY_OF_MONTH, parseInt(value, value.substring(8, 10), 1, actualMaximum));
precision = TemporalPrecisionEnum.DAY; precision = TemporalPrecisionEnum.DAY;
if (length > 10) { if (length > 10) {
validateLengthIsAtLeast(value, 17); validateLengthIsAtLeast(value, 16);
validateCharAtIndexIs(value, 10, 'T'); // yyyy-mm-ddThh:mm:ss validateCharAtIndexIs(value, 10, 'T'); // yyyy-mm-ddThh:mm:ss
int offsetIdx = getOffsetIndex(value); int offsetIdx = getOffsetIndex(value);
String time; String time;

58
hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/model/BaseDateTimeTypeDstu3Test.java
View File

@ -1,9 +1,16 @@
package org.hl7.fhir.dstu3.model; package org.hl7.fhir.dstu3.model;
import static org.hamcrest.Matchers.containsString; import ca.uhn.fhir.context.FhirContext;
import static org.hamcrest.Matchers.either; import ca.uhn.fhir.parser.DataFormatException;
import static org.hamcrest.Matchers.endsWith; import ca.uhn.fhir.util.TestUtil;
import static org.junit.Assert.*; import ca.uhn.fhir.validation.ValidationResult;
import org.apache.commons.lang3.time.FastDateFormat;
import org.hamcrest.Matchers;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -14,20 +21,8 @@ import java.util.GregorianCalendar;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;
import org.apache.commons.lang3.time.FastDateFormat; import static org.hamcrest.Matchers.*;
import org.hamcrest.Matchers; import static org.junit.Assert.*;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.parser.DataFormatException;
import ca.uhn.fhir.parser.IParser;
import ca.uhn.fhir.util.TestUtil;
import ca.uhn.fhir.validation.ValidationResult;
public class BaseDateTimeTypeDstu3Test { public class BaseDateTimeTypeDstu3Test {
private static FhirContext ourCtx = FhirContext.forDstu3(); private static FhirContext ourCtx = FhirContext.forDstu3();
@ -458,7 +453,7 @@ public class BaseDateTimeTypeDstu3Test {
dt.setValueAsString("1974-12-25+10:00"); dt.setValueAsString("1974-12-25+10:00");
fail(); fail();
} catch (ca.uhn.fhir.parser.DataFormatException e) { } catch (ca.uhn.fhir.parser.DataFormatException e) {
assertEquals("Invalid date/time format: \"1974-12-25+10:00\"", e.getMessage()); assertEquals("Invalid date/time format: \"1974-12-25+10:00\": Expected character 'T' at index 10 but found +", e.getMessage());
} }
try { try {
DateTimeType dt = new DateTimeType(); DateTimeType dt = new DateTimeType();
@ -540,6 +535,29 @@ public class BaseDateTimeTypeDstu3Test {
dt.setValueAsString("201302"); dt.setValueAsString("201302");
} }
@Test
public void testParseMinute() throws DataFormatException {
DateTimeType dt = new DateTimeType();
dt.setValueAsString("2013-02-03T11:22");
assertEquals("2013-02-03 11:22", myDateInstantParser.format(dt.getValue()).substring(0, 16));
assertEquals("2013-02-03T11:22", dt.getValueAsString());
assertEquals(false, dt.isTimeZoneZulu());
assertNull(dt.getTimeZone());
assertEquals(TemporalPrecisionEnum.MINUTE, dt.getPrecision());
}
@Test
public void testParseMinuteZulu() throws DataFormatException {
DateTimeType dt = new DateTimeType();
dt.setValueAsString("2013-02-03T11:22Z");
assertEquals("2013-02-03T11:22Z", dt.getValueAsString());
assertEquals(true, dt.isTimeZoneZulu());
assertEquals("GMT", dt.getTimeZone().getID());
assertEquals(TemporalPrecisionEnum.MINUTE, dt.getPrecision());
}
@Test @Test
public void testParseSecond() throws DataFormatException { public void testParseSecond() throws DataFormatException {
DateTimeType dt = new DateTimeType(); DateTimeType dt = new DateTimeType();
@ -553,7 +571,7 @@ public class BaseDateTimeTypeDstu3Test {
} }
@Test @Test
public void testParseSecondulu() throws DataFormatException { public void testParseSecondZulu() throws DataFormatException {
DateTimeType dt = new DateTimeType(); DateTimeType dt = new DateTimeType();
dt.setValueAsString("2013-02-03T11:22:33Z"); dt.setValueAsString("2013-02-03T11:22:33Z");

6
hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseDateTimeType.java
View File

@ -343,7 +343,7 @@ public abstract class BaseDateTimeType extends PrimitiveType<Date> {
retVal = ourYearMonthDayTimeMilliFormat.parse(theValue); retVal = ourYearMonthDayTimeMilliFormat.parse(theValue);
} }
} catch (ParseException p2) { } catch (ParseException p2) {
throw new IllegalArgumentException("Invalid data/time string (" + p2.getMessage() + "): " + theValue); throw new IllegalArgumentException("Invalid date/time string (" + p2.getMessage() + "): " + theValue);
} }
setTimeZone(theValue, hasMillis); setTimeZone(theValue, hasMillis);
setPrecision(TemporalPrecisionEnum.MILLI); setPrecision(TemporalPrecisionEnum.MILLI);
@ -357,7 +357,7 @@ public abstract class BaseDateTimeType extends PrimitiveType<Date> {
retVal = ourYearMonthDayTimeFormat.parse(theValue); retVal = ourYearMonthDayTimeFormat.parse(theValue);
} }
} catch (ParseException p2) { } catch (ParseException p2) {
throw new IllegalArgumentException("Invalid data/time string (" + p2.getMessage() + "): " + theValue); throw new IllegalArgumentException("Invalid date/time string (" + p2.getMessage() + "): " + theValue);
} }
setTimeZone(theValue, hasMillis); setTimeZone(theValue, hasMillis);
@ -372,7 +372,7 @@ public abstract class BaseDateTimeType extends PrimitiveType<Date> {
retVal = ourYearMonthDayTimeMinsFormat.parse(theValue); retVal = ourYearMonthDayTimeMinsFormat.parse(theValue);
} }
} catch (ParseException p2) { } catch (ParseException p2) {
throw new IllegalArgumentException("Invalid data/time string (" + p2.getMessage() + "): " + theValue, p2); throw new IllegalArgumentException("Invalid date/time string (" + p2.getMessage() + "): " + theValue, p2);
} }
setTimeZone(theValue, hasMillis); setTimeZone(theValue, hasMillis);