A bit of datatype cleanup
This commit is contained in:
parent
7c81ebce56
commit
56b0acf73f
|
@ -55,7 +55,7 @@ package org.hl7.fhir.r5.model;
|
||||||
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
import ca.uhn.fhir.model.api.annotation.DatatypeDef;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Primitive type "integer" in FHIR: A signed 32-bit integer
|
* Primitive type "integer" in FHIR: A signed 64-bit integer
|
||||||
*/
|
*/
|
||||||
@DatatypeDef(name = "integer64")
|
@DatatypeDef(name = "integer64")
|
||||||
public class Integer64Type extends PrimitiveType<Long> /* implements IBaseInteger64Datatype */ {
|
public class Integer64Type extends PrimitiveType<Long> /* implements IBaseInteger64Datatype */ {
|
||||||
|
@ -95,12 +95,8 @@ public class Integer64Type extends PrimitiveType<Long> /* implements IBaseIntege
|
||||||
* @throws IllegalArgumentException If the value is too large to fit in a signed integer
|
* @throws IllegalArgumentException If the value is too large to fit in a signed integer
|
||||||
*/
|
*/
|
||||||
public Integer64Type(Long theValue) {
|
public Integer64Type(Long theValue) {
|
||||||
if (theValue < java.lang.Long.MIN_VALUE || theValue > java.lang.Long.MAX_VALUE) {
|
|
||||||
throw new IllegalArgumentException
|
|
||||||
(theValue + " cannot be cast to int without changing its value.");
|
|
||||||
}
|
|
||||||
if(theValue!=null) {
|
if(theValue!=null) {
|
||||||
setValue((long)theValue.longValue());
|
setValue(theValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -97,12 +97,12 @@ public class IntegerType extends PrimitiveType<Integer> implements IBaseIntegerD
|
||||||
* @throws IllegalArgumentException If the value is too large to fit in a signed integer
|
* @throws IllegalArgumentException If the value is too large to fit in a signed integer
|
||||||
*/
|
*/
|
||||||
public IntegerType(Long theValue) {
|
public IntegerType(Long theValue) {
|
||||||
if (theValue < java.lang.Integer.MIN_VALUE || theValue > java.lang.Integer.MAX_VALUE) {
|
|
||||||
throw new IllegalArgumentException
|
|
||||||
(theValue + " cannot be cast to int without changing its value.");
|
|
||||||
}
|
|
||||||
if(theValue!=null) {
|
if(theValue!=null) {
|
||||||
setValue((int)theValue.longValue());
|
if (theValue < java.lang.Integer.MIN_VALUE || theValue > java.lang.Integer.MAX_VALUE) {
|
||||||
|
throw new IllegalArgumentException
|
||||||
|
(theValue + " cannot be cast to int without changing its value.");
|
||||||
|
}
|
||||||
|
setValue(theValue.intValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue