Skip to content

Commit

Permalink
MAT-7060 add model for included libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
adongare committed Aug 1, 2024
1 parent 7a3a98b commit b1c64e3
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>gov.cms.madie</groupId>
<artifactId>madie-java-models</artifactId>
<version>0.6.51-SNAPSHOT</version>
<version>0.6.52-SNAPSHOT</version>
<name>madie-java-models</name>
<description>Java based models for MADiE microservices</description>
<properties>
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/gov/cms/madie/models/common/IncludedLibrary.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package gov.cms.madie.models.common;

import lombok.Builder;
import lombok.Data;

@Data
@Builder
public class IncludedLibrary {
private String name;
private String version;
}
4 changes: 4 additions & 0 deletions src/main/java/gov/cms/madie/models/library/CqlLibrary.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import gov.cms.madie.models.common.IncludedLibrary;
import gov.cms.madie.models.validators.EnumValidator;
import gov.cms.madie.models.validators.ValidLibraryName;
import gov.cms.madie.models.utils.VersionJsonSerializer;
import gov.cms.madie.models.common.ModelType;
import gov.cms.madie.models.common.Version;
import java.time.Instant;
import java.util.List;

import jakarta.validation.GroupSequence;
import jakarta.validation.constraints.*;
import jakarta.validation.groups.Default;
Expand Down Expand Up @@ -57,6 +60,7 @@ public class CqlLibrary {
@JsonDeserialize(using = VersionJsonSerializer.VersionDeserializer.class)
private Version version;

private List<IncludedLibrary> includedLibraries;
private boolean draft;
private boolean active = true;
private boolean cqlErrors;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/gov/cms/madie/models/measure/Measure.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import java.util.Date;
import java.util.List;
import java.util.Set;

import gov.cms.madie.models.common.IncludedLibrary;
import jakarta.validation.GroupSequence;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
Expand Down Expand Up @@ -108,6 +110,7 @@ public class Measure {
private String elmJson;
@Transient private String elmXml;
private List<TestCase> testCases;
private List<IncludedLibrary> includedLibraries;
private TestCaseConfiguration testCaseConfiguration;
@Valid private List<Group> groups;
private Instant createdAt;
Expand Down

0 comments on commit b1c64e3

Please sign in to comment.