Skip to content

Commit

Permalink
MAT-6547: formatting changes, merge down develop, changes to appease …
Browse files Browse the repository at this point in the history
…formatters and other plugins..also added some suppressions
  • Loading branch information
nmorasb committed Feb 21, 2024
2 parents 4bebc73 + c2afb8b commit edf7dfa
Show file tree
Hide file tree
Showing 64 changed files with 8,717 additions and 23 deletions.
2 changes: 1 addition & 1 deletion madie-checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<!-- https://checkstyle.sourceforge.io/config_sizes.html#FileLength -->
<module name="FileLength">
<property name="max" value="605" />
<property name="max" value="1000" />
</module>
<module name="SuppressionFilter">
<property name="file" value="suppressions.xml"/>
Expand Down
83 changes: 77 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,20 @@
<description>QDM Service for MADiE</description>
<properties>
<java.version>17</java.version>

<jxbmavenplugin.version>2.5.0</jxbmavenplugin.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.jakarta.xml.bind-api.version>4.0.1</maven.jakarta.xml.bind-api.version>
<maven.jaxb.xjc.version>3.0.0</maven.jaxb.xjc.version>
<maven.pmd.plugin.version>3.21.2</maven.pmd.plugin.version>
<maven.sortpom.plugin.version>3.0.1</maven.sortpom.plugin.version>
<mvn.checkstyle.file>madie-checkstyle.xml</mvn.checkstyle.file>
<mvn.checkstyle.version>3.1.2</mvn.checkstyle.version>
<mvnreports.version>3.2.2</mvnreports.version>
<mvnsite.version>3.11.0</mvnsite.version>
<okta.springboot.starter.version>3.0.5</okta.springboot.starter.version>
<org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
<puppycrawl.checkstyle.version>10.1</puppycrawl.checkstyle.version>
<spotify.fmt.version>2.21.1</spotify.fmt.version>
</properties>
Expand Down Expand Up @@ -69,7 +74,6 @@
<artifactId>packaging-utility</artifactId>
<version>0.2.2</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand All @@ -81,6 +85,18 @@
<artifactId>Saxon-HE</artifactId>
<version>12.4</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>${jxbmavenplugin.version}</version>
</dependency>

<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${org.mapstruct.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand All @@ -91,7 +107,6 @@
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>

</dependencies>
<repositories>
<repository>
Expand All @@ -111,6 +126,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${mvn.checkstyle.version}</version>
<configuration>
<excludes>**/generated/**/*, **/MeasureMapper.java, **/MeasureMapperImpl.java</excludes>
</configuration>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
Expand Down Expand Up @@ -162,7 +180,7 @@
<limit implementation="org.jacoco.report.check.Limit">
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<!-- <minimum>0.9</minimum>-->
<!-- <minimum>0.9</minimum>-->
</limit>
</limits>
</rule>
Expand Down Expand Up @@ -223,10 +241,12 @@
<configuration>
<targetJdk>${java.version}</targetJdk>
<excludes>
<exclude>**/vsac/nlm/nih/gov/*.java</exclude>
<exclude>**/generated/**/*</exclude>
<exclude>**/madie/hqmf/**/*</exclude>
</excludes>
<excludeRoots>
<excludeRoot>${project.basedir}/src/main/java/generated</excludeRoot>
<excludeRoot>${project.basedir}/src/main/java/gov/cms/madie/hqmf</excludeRoot>
</excludeRoots>
</configuration>
<executions>
Expand Down Expand Up @@ -260,12 +280,63 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<extensions>
<extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:3.2.3</extension>
</extensions>
<sourceRoot>${basedir}/src/main/java</sourceRoot>
<xsdOptions>
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/SimpleXML-QDM-5-6.xsd</xsd>
<!-- <bindingFile>${basedir}/src/main/resources/schemas/binding.xjb</bindingFile>-->
<packagename>generated.gov.cms.madie.simplexml</packagename>
</xsdOption>
</xsdOptions>
</configuration>
<executions>
<execution>
<id>xjc</id>
<goals>
<goal>xsdtojava</goal>
</goals>
<phase>generate-sources</phase>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<source>${java.version}</source>
<target>${java.version}</target>
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-mapstruct-binding</artifactId>
<version>0.2.0</version>
</dependency>
</annotationProcessorPaths>

<compilerArgs>
<compilerArg>-Amapstruct.defaultComponentModel=spring</compilerArg>
</compilerArgs>

</configuration>
</plugin>
</plugins>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
//
// This file was generated by the Eclipse Implementation of JAXB, v4.0.4
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
//

package generated.gov.cms.madie.simplexml;

import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;

/**
* Java class for allUsedCQLLibsType complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>{@code
* <complexType name="allUsedCQLLibsType">
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
* <element name="lib" type="{}libType"/>
* </sequence>
* </restriction>
* </complexContent>
* </complexType>
* }</pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(
name = "allUsedCQLLibsType",
propOrder = {"lib"})
public class AllUsedCQLLibsType {

@XmlElement(required = true)
protected LibType lib;

/**
* Gets the value of the lib property.
*
* @return possible object is {@link LibType }
*/
public LibType getLib() {
return lib;
}

/**
* Sets the value of the lib property.
*
* @param value allowed object is {@link LibType }
*/
public void setLib(LibType value) {
this.lib = value;
}
}
164 changes: 164 additions & 0 deletions src/main/java/generated/gov/cms/madie/simplexml/ArgumentType.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
//
// This file was generated by the Eclipse Implementation of JAXB, v4.0.4
// See https://eclipse-ee4j.github.io/jaxb-ri
// Any modifications to this file will be lost upon recompilation of the source schema.
//

package generated.gov.cms.madie.simplexml;

import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlValue;

/**
* Java class for argumentType complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>{@code
* <complexType name="argumentType">
* <simpleContent>
* <extension base="<http://www.w3.org/2001/XMLSchema>string">
* <attribute name="argumentName" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="qdmDataType" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="otherType" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
* </extension>
* </simpleContent>
* </complexType>
* }</pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(
name = "argumentType",
propOrder = {"value"})
public class ArgumentType {

@XmlValue protected String value;

@XmlAttribute(name = "argumentName")
protected String argumentName;

@XmlAttribute(name = "id")
protected String id;

@XmlAttribute(name = "qdmDataType")
protected String qdmDataType;

@XmlAttribute(name = "otherType")
protected String otherType;

@XmlAttribute(name = "type")
protected String type;

/**
* Gets the value of the value property.
*
* @return possible object is {@link String }
*/
public String getValue() {
return value;
}

/**
* Sets the value of the value property.
*
* @param value allowed object is {@link String }
*/
public void setValue(String value) {
this.value = value;
}

/**
* Gets the value of the argumentName property.
*
* @return possible object is {@link String }
*/
public String getArgumentName() {
return argumentName;
}

/**
* Sets the value of the argumentName property.
*
* @param value allowed object is {@link String }
*/
public void setArgumentName(String value) {
this.argumentName = value;
}

/**
* Gets the value of the id property.
*
* @return possible object is {@link String }
*/
public String getId() {
return id;
}

/**
* Sets the value of the id property.
*
* @param value allowed object is {@link String }
*/
public void setId(String value) {
this.id = value;
}

/**
* Gets the value of the qdmDataType property.
*
* @return possible object is {@link String }
*/
public String getQdmDataType() {
return qdmDataType;
}

/**
* Sets the value of the qdmDataType property.
*
* @param value allowed object is {@link String }
*/
public void setQdmDataType(String value) {
this.qdmDataType = value;
}

/**
* Gets the value of the otherType property.
*
* @return possible object is {@link String }
*/
public String getOtherType() {
return otherType;
}

/**
* Sets the value of the otherType property.
*
* @param value allowed object is {@link String }
*/
public void setOtherType(String value) {
this.otherType = value;
}

/**
* Gets the value of the type property.
*
* @return possible object is {@link String }
*/
public String getType() {
return type;
}

/**
* Sets the value of the type property.
*
* @param value allowed object is {@link String }
*/
public void setType(String value) {
this.type = value;
}
}
Loading

0 comments on commit edf7dfa

Please sign in to comment.