Skip to content

Commit

Permalink
MAT-6547: refactors and slight test coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmorasb
nmorasb committed Feb 5, 2024
1 parent 3fce6b3 commit 78e0cd7
Show file tree
Hide file tree
Showing 27 changed files with 12,415 additions and 11,526 deletions.
52 changes: 26 additions & 26 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,45 +69,45 @@
<artifactId>packaging-utility</artifactId>
<version>0.2.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>

<!-- <dependency>-->
<!-- <groupId>net.sourceforge.saxon</groupId>-->
<!-- <artifactId>saxon</artifactId>-->
<!-- <version>9.1.0.8</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>net.sf.saxon</groupId>-->
<!-- <artifactId>saxon9-dom</artifactId>-->
<!-- <version>9.1.0.8</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>net.sourceforge.saxon</groupId>-->
<!-- <artifactId>saxon</artifactId>-->
<!-- <version>9.1.0.8</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>net.sf.saxon</groupId>-->
<!-- <artifactId>saxon9-dom</artifactId>-->
<!-- <version>9.1.0.8</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
</dependency>

<!-- <dependency>-->
<!-- <groupId>net.sf.saxon</groupId>-->
<!-- <artifactId>Saxon-HE</artifactId>-->
<!-- <version>9.9.1-8</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>net.sf.saxon</groupId>-->
<!-- <artifactId>Saxon-HE</artifactId>-->
<!-- <version>9.9.1-8</version>-->
<!-- </dependency>-->

<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>12.4</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>

</dependencies>
<repositories>
Expand Down
204 changes: 87 additions & 117 deletions src/main/java/gov/cms/madie/hqmf/ConstantMessages.java
View file
Original file line number Diff line number Diff line change
@@ -1,205 +1,175 @@
package gov.cms.madie.hqmf;

/**
* The Class ConstantMessages.
*/
public class ConstantMessages {
/** The Class ConstantMessages. */
public interface ConstantMessages {

public static final int DB_LOG = 1;
String CONTINUOUS_VARIABLE_SCORING = "Continuous Variable";

public static final int ID_NOT_UNIQUE = 1;
String PROPORTION_SCORING = "Proportion";

public static final int REACHED_MAXIMUM_VERSION = 2;
String RATIO_SCORING = "Ratio";

public static final int REACHED_MAXIMUM_MAJOR_VERSION = 3;
String COHORT_SCORING = "Cohort";

public static final int REACHED_MAXIMUM_MINOR_VERSION = 4;
String POPULATION_CONTEXT_ID = "initialPopulation";

public static final int INVALID_VALUE_SET_DATE = 5;
String NUMERATOR_CONTEXT_ID = "numerator";

public static final int INVALID_DATA = 6;
String NUMERATOR_EXCLUSIONS_CONTEXT_ID = "numeratorExclusions";

public static final int INVALID_CQL_DATA = 7;
String DENOMINATOR_CONTEXT_ID = "denominator";

public static final int INVALID_CQL_LIBRARIES = 8;
String DENOMINATOR_EXCLUSIONS_CONTEXT_ID = "denominatorExclusions";

public static final int DESCRIPTION_REQUIRED = 14;
String DENOMINATOR_EXCEPTIONS_CONTEXT_ID = "denominatorExceptions";

public static final int PUBLISHER_REQUIRED = 15;
String MEASURE_POPULATION_CONTEXT_ID = "measurePopulation";

public static final int MEASURE_NAME_INVALID = 16;
String MEASURE_OBSERVATION_CONTEXT_ID = "measureObservation";

public static final String INCOMPLETE_ROW_ERROR = "Import failed. One or more rows is missing a Code or a Descriptor.";
String USER_DEFINED_CONTEXT_DESC = "User-defined";

public static final String CONTINUOUS_VARIABLE_SCORING = "Continuous Variable";
String POP_TAB = "Pop";

public static final String PROPORTION_SCORING = "Proportion";
String POP_TAB_EXPANDED = "Population";

public static final String RATIO_SCORING = "Ratio";
String NUM_TAB = "Num";

public static final String COHORT_SCORING = "Cohort";
String NUM_TAB_EXPANDED = "Numerator";

public static final String POPULATION_CONTEXT_ID = "initialPopulation";
String NUM_EX_TAB = "N Excl";

public static final String NUMERATOR_CONTEXT_ID = "numerator";
String NUM_EX_TAB_EXPANDED = "Numerator Exclusions";

public static final String NUMERATOR_EXCLUSIONS_CONTEXT_ID = "numeratorExclusions";
String DEN_TAB = "Den";

public static final String DENOMINATOR_CONTEXT_ID = "denominator";
String DEN_TAB_EXPANDED = "Denominator";

public static final String DENOMINATOR_EXCLUSIONS_CONTEXT_ID = "denominatorExclusions";
String EXCL_TAB = "D Excl";

public static final String DENOMINATOR_EXCEPTIONS_CONTEXT_ID = "denominatorExceptions";
String EXCL_TAB_EXPANDED = "Denominator Exclusions";

public static final String MEASURE_POPULATION_CONTEXT_ID = "measurePopulation";
String EXCEP_TAB = "D Excep";

public static final String MEASURE_OBSERVATION_CONTEXT_ID = "measureObservation";
String EXCEP_TAB_EXPANDED = "Denominator Exceptions";

public static final String USER_DEFINED_CONTEXT_DESC = "User-defined";
String MEASURE_POP_TAB = "Meas Pop";

public static final String POP_TAB = "Pop";
String MEASURE_POP_TAB_EXPANDED = "Measure Population";

public static final String POP_TAB_EXPANDED = "Population";
String MEASURE_OBS_TAB = "Meas Obs";

public static final String NUM_TAB = "Num";
String MEASURE_OBS_TAB_EXPANDED = "Measure Observation";

public static final String NUM_TAB_EXPANDED = "Numerator";
String STRAT_TAB = "Strat";

public static final String NUM_EX_TAB = "N Excl";
String STRAT_TAB_EXPANDED = "Stratification";

public static final String NUM_EX_TAB_EXPANDED = "Numerator Exclusions";
String USER_DEFINED_TAB = "User-Defined";

public static final String DEN_TAB = "Den";
String USER_DEFINED_TAB_EXPANDED = "User-Defined";

public static final String DEN_TAB_EXPANDED = "Denominator";
String MEASURE_PHRASE_TAB = "Measure Phrase";

public static final String EXCL_TAB = "D Excl";
String MEASURE_PHRASE_TAB_EXPANDED = "Measure Phrase";

public static final String EXCL_TAB_EXPANDED = "Denominator Exclusions";
String ATTRIBUTE = "Attribute";

public static final String EXCEP_TAB = "D Excep";
String TIMING_ELEMENT = "Timing Element";

public static final String EXCEP_TAB_EXPANDED = "Denominator Exceptions";
String PATIENT_CHARACTERISTIC_RACE = "Patient Characteristic Race";

public static final String MEASURE_POP_TAB = "Meas Pop";
String PATIENT_CHARACTERISTIC_ETHNICITY = "Patient Characteristic Ethnicity";

public static final String MEASURE_POP_TAB_EXPANDED = "Measure Population";
String PATIENT_CHARACTERISTIC_PAYER = "Patient Characteristic Payer";

public static final String MEASURE_OBS_TAB = "Meas Obs";
String PATIENT_CHARACTERISTIC_GENDER = "Patient Characteristic Sex";

public static final String MEASURE_OBS_TAB_EXPANDED = "Measure Observation";
String GROUPING_CODE_SYSTEM = "Grouping";

public static final String STRAT_TAB = "Strat";
String HL7_ADMINGENDER_CODE_SYSTEM = "Administrative Sex";

public static final String STRAT_TAB_EXPANDED = "Stratification";
String CDC_CODE_SYSTEM = "CDC";

public static final String USER_DEFINED_TAB = "User-Defined";
String SOURCE_OF_PAYMENT = "Source of Payment Typology";

public static final String USER_DEFINED_TAB_EXPANDED = "User-Defined";
String MAT_MODULE = "MAT";

public static final String MEASURE_PHRASE_TAB = "Measure Phrase";
String LOGIN_MODULE = "LOGIN";

public static final String MEASURE_PHRASE_TAB_EXPANDED = "Measure Phrase";
String HARP_SUPPORT_MODULE = "HARP SUPPORT";

public static final String ATTRIBUTE = "Attribute";
String PASSWORD = "password";

public static final String TIMING_ELEMENT = "Timing Element";
String PASSWORD_EXPIRE_DATE = "passwordExpireDate";

public static final String PATIENT_CHARACTERISTIC_RACE = "Patient Characteristic Race";
String LOGINID = "loginId";

public static final String PATIENT_CHARACTERISTIC_ETHNICITY = "Patient Characteristic Ethnicity";
String HARPID = "harpId";

public static final String PATIENT_CHARACTERISTIC_PAYER = "Patient Characteristic Payer";
String USER_EMAIL = "userEmail";

public static final String PATIENT_CHARACTERISTIC_GENDER = "Patient Characteristic Sex";
String URL = "url";

public static final String GROUPING_CODE_SYSTEM = "Grouping";
String INSERT = "Insert";

public static final String HL7_ADMINGENDER_CODE_SYSTEM = "Administrative Sex";
String UPDATE = "Update";

public static final String CDC_CODE_SYSTEM = "CDC";
String DELETE = "Delete";

public static final String SOURCE_OF_PAYMENT = "Source of Payment Typology";
String USER_NOT_FOUND = "User Not Found";

public static final String MAT_MODULE = "MAT";
String EMAIL_NOT_FOUND = "Email Not Found";

public static final String LOGIN_MODULE = "LOGIN";
String TOOLTIP_FOR_OCCURRENCE =
"Select Specific Occurrence if you need to reference a specific occurrence of your element.";

public static final String HARP_SUPPORT_MODULE = "HARP SUPPORT";
String DEFAULT_SELECT = "--Select--";

public static final String PASSWORD = "password";
String CREATE_NEW_MEASURE = "New Measure";

public static final String PASSWORD_EXPIRE_DATE = "passwordExpireDate";
String CREATE_NEW_CQL = "New Library";

public static final String LOGINID = "loginId";
String MAXIMUM_ALLOWED_VERSION = "999.999";

public static final String HARPID = "harpId";
String MAXIMUM_ALLOWED_MAJOR_VERSION = "999";

public static final String USER_EMAIL = "userEmail";
String MAXIMUM_ALLOWED_MINOR_VERSION = "999";

public static final String URL = "url";
String GENDER_OID = "2.16.840.1.113762.1.4.1";

public static final String INSERT = "Insert";
String RACE_OID = "2.16.840.1.114222.4.11.836";

public static final String UPDATE = "Update";
String ETHNICITY_OID = "2.16.840.1.114222.4.11.837";

public static final String DELETE = "Delete";
String PAYER_OID = "2.16.840.1.114222.4.11.3591";

public static final String USER_NOT_FOUND = "User Not Found";
String MAIN_TAB_LAYOUT_ID = "mainTab";

public static final String EMAIL_NOT_FOUND = "Email Not Found";
String MEASURE_COMPOSER_TAB = "measureTab";

public static final String TOOLTIP_FOR_OCCURRENCE = "Select Specific Occurrence if you need to reference a specific occurrence of your element.";
String CQL_COMPOSER_TAB = "cqlTab";

public static final String DEFAULT_SELECT = "--Select--";
String USER_DEFINED_QDM_OID = "1.1.1.1";

public static final String CREATE_NEW_MEASURE = "New Measure";
String USER_DEFINED_QDM_NAME = "User Defined QDM";

public static final String CREATE_NEW_CQL = "New Library";
String PATIENT_CHARACTERISTIC_BIRTHDATE = "Patient Characteristic Birthdate";

public static final String MAXIMUM_ALLOWED_VERSION = "999.999";
String PATIENT_CHARACTERISTIC_EXPIRED = "Patient Characteristic Expired";

public static final String MAXIMUM_ALLOWED_MAJOR_VERSION = "999";
String DEAD = "Dead";

public static final String MAXIMUM_ALLOWED_MINOR_VERSION = "999";
String BIRTHDATE = "Birthdate";

public static final String GENDER_OID = "2.16.840.1.113762.1.4.1";
String DEAD_OID = "419099009";

public static final String RACE_OID = "2.16.840.1.114222.4.11.836";
String BIRTHDATE_OID = "21112-8";

public static final String ETHNICITY_OID = "2.16.840.1.114222.4.11.837";
String BIRTHDATE_CODE_SYSTEM_OID = "2.16.840.1.113883.6.1";

public static final String PAYER_OID = "2.16.840.1.114222.4.11.3591";
String DEAD_CODE_SYSTEM_OID = "2.16.840.1.113883.6.96";

public static final String MAIN_TAB_LAYOUT_ID = "mainTab";
String SUPPORT_EMAIL = "supportEmailAddress";

public static final String MEASURE_COMPOSER_TAB = "measureTab";

public static final String CQL_COMPOSER_TAB = "cqlTab";

public static final String USER_DEFINED_QDM_OID = "1.1.1.1";

public static final String USER_DEFINED_QDM_NAME = "User Defined QDM";

public static final String PATIENT_CHARACTERISTIC_BIRTHDATE = "Patient Characteristic Birthdate";

public static final String PATIENT_CHARACTERISTIC_EXPIRED = "Patient Characteristic Expired";

public static final String DEAD = "Dead";

public static final String BIRTHDATE = "Birthdate";

public static final String DEAD_OID = "419099009";

public static final String BIRTHDATE_OID = "21112-8";

public static final String BIRTHDATE_CODE_SYSTEM_OID = "2.16.840.1.113883.6.1";

public static final String DEAD_CODE_SYSTEM_OID = "2.16.840.1.113883.6.96";

public static final String SUPPORT_EMAIL = "supportEmailAddress";

private ConstantMessages() {
// Utility class
}
}
Loading

0 comments on commit 78e0cd7

Please sign in to comment.