Merge pull request #208 from MeasureAuthoringTool/feature/mat-6576-us…

…e-spotify-formatter

[MAT-6576] Use Spotify Formatter

pom.xml

@@ -243,28 +243,20 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>com.theoryinpractise</groupId>
-				<artifactId>googleformatter-maven-plugin</artifactId>
-				<version>1.7.3</version>
+				<groupId>com.spotify.fmt</groupId>
+				<artifactId>fmt-maven-plugin</artifactId>
+				<version>2.23</version>
 				<executions>
 					<execution>
-						<id>reformat-sources</id>
-						<phase>process-sources</phase>
 						<goals>
 							<goal>format</goal>
 						</goals>
-						<configuration>
-							<includeStale>false</includeStale>
-							<style>GOOGLE</style>
-							<formatMain>true</formatMain>
-							<formatTest>true</formatTest>
-							<filterModified>false</filterModified>
-							<skip>false</skip>
-							<fixImports>false</fixImports>
-							<maxLineLength>100</maxLineLength>
-						</configuration>
 					</execution>
 				</executions>
+				<configuration>
+					<skipSortingImports>true</skipSortingImports>
+					<style>google</style>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

src/main/java/gov/cms/madie/madiefhirservice/cql/LibraryCqlVisitor.java

@@ -17,7 +17,6 @@
 import org.hl7.fhir.r4.model.RelatedArtifact;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -188,7 +187,9 @@ public String visitRetrieve(cqlParser.RetrieveContext ctx) {
     return null;
   }
 
-  /** @return Has to be something so always null. */
+  /**
+   * @return Has to be something so always null.
+   */
   @Override
   protected String defaultResult() {
     return null;

src/main/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorService.java

@@ -14,7 +14,6 @@
 import gov.cms.madie.models.measure.Population;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.hl7.fhir.Uri;
 import org.hl7.fhir.r4.model.Identifier.IdentifierUse;
 import org.hl7.fhir.instance.model.api.IBaseDatatype;
 import org.hl7.fhir.r4.model.CanonicalType;

src/test/java/gov/cms/madie/madiefhirservice/resources/MeasureBundleControllerMvcTest.java

@@ -27,7 +27,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

src/test/java/gov/cms/madie/madiefhirservice/resources/TestCaseBundleControllerMvcTest.java

@@ -8,7 +8,6 @@
 import gov.cms.madie.models.common.BundleType;
 import gov.cms.madie.models.dto.ExportDTO;
 import gov.cms.madie.models.measure.Measure;
-import gov.cms.madie.models.measure.TestCase;
 import org.hl7.fhir.r4.model.Bundle;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

src/test/java/gov/cms/madie/madiefhirservice/services/HumanReadableServiceTest.java

@@ -13,7 +13,6 @@
 import gov.cms.madie.models.measure.MeasureScoring;
 import gov.cms.madie.models.measure.Population;
 import gov.cms.madie.models.measure.PopulationType;
-import org.hl7.fhir.MeasureGroup;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.r4.model.Attachment;
 import org.hl7.fhir.r4.model.Bundle;
@@ -87,10 +86,7 @@ void setUp() {
             .measurementPeriodEnd(new Date())
             .measureMetaData(
                 new MeasureMetaData()
-                    .toBuilder()
-                    .copyright("test_copyright")
-                    .disclaimer("test_disclaimer")
-                    .build())
+                    .toBuilder().copyright("test_copyright").disclaimer("test_disclaimer").build())
             .groups(List.of(measureGroup1))
             .build();
 

src/test/java/gov/cms/madie/madiefhirservice/services/LibraryServiceTest.java

@@ -29,7 +29,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.when;
 

src/test/java/gov/cms/madie/madiefhirservice/services/MeasureTranslatorServiceTest.java

@@ -33,7 +33,6 @@
 import gov.cms.madie.models.measure.PopulationType;
 import gov.cms.madie.models.measure.Stratification;
 import java.sql.Date;
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

src/test/java/gov/cms/madie/madiefhirservice/services/ResourceValidationServiceTest.java

@@ -12,22 +12,19 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
-import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.List;
-import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 class ResourceValidationServiceTest {