Skip to content

Commit 82f9097

Browse files
nmorasbnmorasb
authored
Merge pull request #371 from MeasureAuthoringTool/develop
Release 0.10.10
2 parents d469d49 + 1644ccf commit 82f9097

90 files changed

Lines changed: 980 additions & 50 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>gov.cms.madie</groupId>
88
<artifactId>madie-java-models</artifactId>
9-
<version>0.8.3</version>
9+
<version>0.10.10</version>
1010
<name>madie-java-models</name>
1111
<description>Java based models for MADiE microservices</description>
1212
<properties>
@@ -16,8 +16,7 @@
1616
<mvn.checkstyle.version>3.3.0</mvn.checkstyle.version>
1717
<maven.compiler.source>${java.version}</maven.compiler.source>
1818
<maven.compiler.target>${java.version}</maven.compiler.target>
19-
<fasterxml.jackson.version>2.15.3</fasterxml.jackson.version>
20-
<springboot.version>3.5.7</springboot.version>
19+
<springboot.version>4.0.7</springboot.version>
2120
</properties>
2221

2322
<distributionManagement>
@@ -28,6 +27,18 @@
2827
</repository>
2928
</distributionManagement>
3029

30+
<dependencyManagement>
31+
<dependencies>
32+
<dependency>
33+
<groupId>org.springframework.boot</groupId>
34+
<artifactId>spring-boot-dependencies</artifactId>
35+
<version>${springboot.version}</version>
36+
<type>pom</type>
37+
<scope>import</scope>
38+
</dependency>
39+
</dependencies>
40+
</dependencyManagement>
41+
3142
<dependencies>
3243
<dependency>
3344
<groupId>junit</groupId>
@@ -51,6 +62,11 @@
5162
<artifactId>spring-boot-starter-validation</artifactId>
5263
<version>${springboot.version}</version>
5364
</dependency>
65+
<dependency>
66+
<groupId>org.springframework.boot</groupId>
67+
<artifactId>spring-boot-jackson</artifactId>
68+
<version>${springboot.version}</version>
69+
</dependency>
5470
<dependency>
5571
<groupId>org.springframework.boot</groupId>
5672
<artifactId>spring-boot-starter-data-mongodb</artifactId>
@@ -65,18 +81,21 @@
6581
<dependency>
6682
<groupId>com.fasterxml.jackson.core</groupId>
6783
<artifactId>jackson-annotations</artifactId>
68-
<version>${fasterxml.jackson.version}</version>
6984
</dependency>
7085
<dependency>
71-
<groupId>com.fasterxml.jackson.core</groupId>
86+
<groupId>tools.jackson.core</groupId>
7287
<artifactId>jackson-databind</artifactId>
73-
<version>${fasterxml.jackson.version}</version>
7488
</dependency>
7589
<dependency>
7690
<groupId>org.apache.commons</groupId>
7791
<artifactId>commons-lang3</artifactId>
7892
<version>3.18.0</version>
7993
</dependency>
94+
<dependency>
95+
<groupId>org.jsoup</groupId>
96+
<artifactId>jsoup</artifactId>
97+
<version>1.15.3</version>
98+
</dependency>
8099
</dependencies>
81100

82101
<build>
@@ -98,7 +117,7 @@
98117
</plugin>
99118
<plugin>
100119
<artifactId>maven-surefire-plugin</artifactId>
101-
<version>2.22.1</version>
120+
<version>3.5.2</version>
102121
</plugin>
103122
<plugin>
104123
<artifactId>maven-jar-plugin</artifactId>

‎src/main/java/gov/cms/madie/models/common/ActionType.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,11 @@ public enum ActionType {
1818
DELETE_CMSID,
1919
OWNERSHIP_TRANSFER,
2020
EXPORTED_MEASURE,
21-
EXPORTED_TESTCASES
21+
EXPORTED_TESTCASES,
22+
ADDED_TO_COMPOSITE,
23+
REMOVED_FROM_COMPOSITE,
24+
COMPONENT_ADDED,
25+
COMPONENT_REMOVED,
26+
READY_FOR_REVIEW,
27+
NOT_READY_FOR_REVIEW
2228
}

‎src/main/java/gov/cms/madie/models/common/ModelType.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,25 @@
1010

1111
@Getter
1212
public enum ModelType {
13+
FHIR_4_0_1(VersionConstants.FHIR_4_0_1_VERSION, "fhir4"),
1314
QI_CORE(VersionConstants.QICORE_4_1_1_VERSION, "qicore"),
1415
QI_CORE_6_0_0(VersionConstants.QICORE_6_0_0_VERSION, "qicore6"),
1516
QI_CORE_7_0_0(VersionConstants.QICORE_7_0_0_VERSION, "qicore7"),
1617
QI_CORE_7_0_2(VersionConstants.QICORE_7_0_2_VERSION, "qicore7"),
18+
US_CORE_6_1_0(VersionConstants.US_CORE_6_1_0_VERSION, "uscore6"),
19+
US_QUALITY_CORE_0_5_0(VersionConstants.USQUALITYCORE_0_5_0_Version, "usqualitycore05"),
1720
QDM_5_6(VersionConstants.QDM_5_6_VERSION, "qdm");
1821

1922
private String value;
2023
private String shortValue;
2124
private static final Map<String, ModelType> MODEL_TYPE_BY_VALUE = new HashMap<>();
25+
private static final Map<String, ModelType> MODEL_TYPE_BY_SHORT_VALUE = new HashMap<>();
2226
private static final Pattern VERSION_PATTERN = Pattern.compile("v(\\d+(\\.\\d+)*)");
2327

2428
static {
2529
for (ModelType mt : values()) {
2630
MODEL_TYPE_BY_VALUE.put(mt.getValue(), mt);
31+
MODEL_TYPE_BY_SHORT_VALUE.put(mt.getShortValue(), mt);
2732
}
2833
}
2934

@@ -52,4 +57,8 @@ public String toString() {
5257
public static ModelType valueOfName(final String name) {
5358
return MODEL_TYPE_BY_VALUE.get(name);
5459
}
60+
61+
public static ModelType byShortValue(final String shortValue) {
62+
return MODEL_TYPE_BY_SHORT_VALUE.get(shortValue);
63+
}
5564
}

‎src/main/java/gov/cms/madie/models/common/ReviewStatus.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package gov.cms.madie.models.common;
2+
3+
public enum ReviewStatus {
4+
READY_FOR_REVIEW,
5+
NOT_READY_FOR_REVIEW
6+
}

‎src/main/java/gov/cms/madie/models/cqm/datacriteria/AdverseEvent.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package gov.cms.madie.models.cqm.datacriteria;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
35
import gov.cms.madie.models.cqm.datacriteria.basetypes.DataElement;
46
import gov.cms.madie.models.cqm.datacriteria.basetypes.LocalDateTimeFormatConstant;
57
import gov.cms.madie.models.cqm.datacriteria.attributes.Entity;
@@ -46,6 +48,8 @@ public class AdverseEvent extends DataElement {
4648
private String hqmfOid = "2.16.840.1.113883.10.20.28.4.120";
4749
private String qdmCategory = "adverse_event";
4850
private String qdmVersion = "5.6";
51+
52+
@JsonProperty("_type")
4953
private String _type = "QDM::AdverseEvent";
5054

5155
public void shiftDates(int shifted) {

‎src/main/java/gov/cms/madie/models/cqm/datacriteria/AllergyIntolerance.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package gov.cms.madie.models.cqm.datacriteria;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
35
import gov.cms.madie.models.cqm.datacriteria.basetypes.DataElement;
46
import gov.cms.madie.models.cqm.datacriteria.attributes.Entity;
57
import gov.cms.madie.models.cqm.datacriteria.basetypes.Code;
@@ -41,6 +43,8 @@ public class AllergyIntolerance extends DataElement {
4143
private String qdmCategory = "allergy";
4244
private String qdmStatus = "intolerance";
4345
private String qdmVersion = "5.6";
46+
47+
@JsonProperty("_type")
4448
private String _type = "QDM::AllergyIntolerance";
4549

4650
public void shiftDates(int shifted) {

‎src/main/java/gov/cms/madie/models/cqm/datacriteria/AssessmentOrder.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package gov.cms.madie.models.cqm.datacriteria;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
35
import gov.cms.madie.models.cqm.datacriteria.basetypes.DataElement;
46
import gov.cms.madie.models.cqm.datacriteria.basetypes.LocalDateTimeFormatConstant;
57
import gov.cms.madie.models.cqm.datacriteria.attributes.Entity;
@@ -39,6 +41,8 @@ public class AssessmentOrder extends DataElement {
3941
private String qdmCategory = "assessment";
4042
private String qdmStatus = "order";
4143
private String qdmVersion = "5.6";
44+
45+
@JsonProperty("_type")
4246
private String _type = "QDM::AssessmentOrder";
4347

4448
public void shiftDates(int shifted) {

‎src/main/java/gov/cms/madie/models/cqm/datacriteria/AssessmentPerformed.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package gov.cms.madie.models.cqm.datacriteria;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
35
import gov.cms.madie.models.cqm.datacriteria.basetypes.DataElement;
46
import gov.cms.madie.models.cqm.datacriteria.attributes.Entity;
57
import gov.cms.madie.models.cqm.datacriteria.basetypes.Code;
@@ -54,6 +56,8 @@ public class AssessmentPerformed extends DataElement {
5456
private String qdmCategory = "assessment";
5557
private String qdmStatus = "performed";
5658
private String qdmVersion = "5.6";
59+
60+
@JsonProperty("_type")
5761
private String _type = "QDM::AssessmentPerformed";
5862

5963
public void shiftDates(int shifted) {

‎src/main/java/gov/cms/madie/models/cqm/datacriteria/AssessmentRecommended.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package gov.cms.madie.models.cqm.datacriteria;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
35
import gov.cms.madie.models.cqm.datacriteria.basetypes.DataElement;
46
import gov.cms.madie.models.cqm.datacriteria.basetypes.LocalDateTimeFormatConstant;
57
import gov.cms.madie.models.cqm.datacriteria.attributes.Entity;
@@ -39,6 +41,8 @@ public class AssessmentRecommended extends DataElement {
3941
private String qdmCategory = "assessment";
4042
private String qdmStatus = "recommended";
4143
private String qdmVersion = "5.6";
44+
45+
@JsonProperty("_type")
4246
private String _type = "QDM::AssessmentRecommended";
4347

4448
public void shiftDates(int shifted) {

‎src/main/java/gov/cms/madie/models/cqm/datacriteria/CareGoal.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package gov.cms.madie.models.cqm.datacriteria;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
35
import gov.cms.madie.models.cqm.datacriteria.basetypes.DataElement;
46
import gov.cms.madie.models.cqm.datacriteria.attributes.Entity;
57
import gov.cms.madie.models.cqm.datacriteria.basetypes.Interval;
@@ -37,6 +39,8 @@ public class CareGoal extends DataElement {
3739
private String hqmfOid = "2.16.840.1.113883.10.20.28.4.7";
3840
private String qdmCategory = "care_goal";
3941
private String qdmVersion = "5.6";
42+
43+
@JsonProperty("_type")
4044
private String _type = "QDM::CareGoal";
4145

4246
public void shiftDates(int shifted) {

0 commit comments

Comments
 (0)