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

Merge pull request #2734 from hapifhir/2732-bump-conceptmap-group-element-display-storage-size 

Address #2732
This commit is contained in:
Josiah 2021-06-21 08:33:36 -04:00 committed by GitHub
parent 0d0a0fd6a2 164e684d7c
commit 912b44c3fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_5_0/2732-bump-conceptmap-group-element-display-size.yaml Normal file
View File

@ -0,0 +1,4 @@
---
type: change
issue: 2732
title: "The ConceptMap.group.element.display storage size limit has been increased to 500 characters."

1
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConcept.java
View File

@ -60,6 +60,7 @@ import static org.apache.commons.lang3.StringUtils.length;
public class TermConcept implements Serializable {
public static final int MAX_CODE_LENGTH = 500;
public static final int MAX_DESC_LENGTH = 400;
public static final int MAX_DISP_LENGTH = 500;
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(TermConcept.class);
private static final long serialVersionUID = 1L;

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElement.java
View File

@ -55,7 +55,7 @@ public class TermConceptMapGroupElement implements Serializable {
@Column(name = "SOURCE_CODE", nullable = false, length = TermConcept.MAX_CODE_LENGTH)
private String myCode;
@Column(name = "SOURCE_DISPLAY", length = TermConcept.MAX_DESC_LENGTH)
@Column(name = "SOURCE_DISPLAY", length = TermConcept.MAX_DISP_LENGTH)
private String myDisplay;
@OneToMany(mappedBy = "myConceptMapGroupElement")
@ -114,7 +114,7 @@ public class TermConceptMapGroupElement implements Serializable {
}
public TermConceptMapGroupElement setDisplay(String theDisplay) {
myDisplay = left(theDisplay, TermConcept.MAX_DESC_LENGTH);
myDisplay = left(theDisplay, TermConcept.MAX_DISP_LENGTH);
return this;
}

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElementTarget.java
View File

@ -55,7 +55,7 @@ public class TermConceptMapGroupElementTarget implements Serializable {
@Column(name = "TARGET_CODE", nullable = false, length = TermConcept.MAX_CODE_LENGTH)
private String myCode;
@Column(name = "TARGET_DISPLAY", nullable = true, length = TermConcept.MAX_DESC_LENGTH)
@Column(name = "TARGET_DISPLAY", nullable = true, length = TermConcept.MAX_DISP_LENGTH)
private String myDisplay;
@Enumerated(EnumType.STRING)

6
hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
View File

@ -89,6 +89,12 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks<VersionEnum> {
// Add bulk import file description
version.onTable("HFJ_BLK_IMPORT_JOBFILE")
.addColumn("20210528.1", "FILE_DESCRIPTION").nullable().type(ColumnTypeEnum.STRING, 500);
// Bump ConceptMap display lengths
version.onTable("TRM_CONCEPT_MAP_GRP_ELM_TGT")
.modifyColumn("20210617.1","TARGET_DISPLAY").nullable().withType(ColumnTypeEnum.STRING, 500);
version.onTable("TRM_CONCEPT_MAP_GRP_ELEMENT")
.modifyColumn("20210617.2", "SOURCE_DISPLAY").nullable().withType(ColumnTypeEnum.STRING, 500);
}
private void init540() {