Merge pull request #20 from MeasureAuthoringTool/feature/mat-6576-use…

…-spotify-formatter [MAT-6576] Use Spotify Formatter
MeasureAuthoringTool · May 21, 2024 · 9aee8ea · 9aee8ea
2 parents 99b92a7 + a92ab4f
commit 9aee8ea
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -154,30 +154,40 @@
 					<artifactId>maven-deploy-plugin</artifactId>
 					<version>2.8.2</version>
 				</plugin>
+				<plugin>
+					<groupId>com.spotify.fmt</groupId>
+					<artifactId>fmt-maven-plugin</artifactId>
+					<version>2.23</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>format</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<skipSortingImports>true</skipSortingImports>
+						<style>google</style>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
 			<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.21.1</version>
 				<executions>
 					<execution>
-						<id>reformat-sources</id>
-						<phase>process-sources</phase>
 						<goals>
 							<goal>format</goal>
 						</goals>
-						<configuration>
-							<includeStale>false</includeStale>
-							<style>GOOGLE</style>
-							<filterModified>false</filterModified>
-							<skip>false</skip>
-							<fixImports>false</fixImports>
-							<maxLineLength>100</maxLineLength>
-						</configuration>
 					</execution>
 				</executions>
+				<configuration>
+					<skipSortingImports>true</skipSortingImports>
+					<style>google</style>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/src/main/java/gov/cms/madie/packaging/utils/PackagingUtilityFactory.java b/src/main/java/gov/cms/madie/packaging/utils/PackagingUtilityFactory.java
@@ -7,8 +7,12 @@
 public class PackagingUtilityFactory {
 
   public static PackagingUtility getInstance(String model)
-      throws InstantiationException, IllegalAccessException, IllegalArgumentException,
-          InvocationTargetException, NoSuchMethodException, SecurityException,
+      throws InstantiationException,
+          IllegalAccessException,
+          IllegalArgumentException,
+          InvocationTargetException,
+          NoSuchMethodException,
+          SecurityException,
           ClassNotFoundException {
     Map<String, String> modelMap =
         new HashMap<>() {

diff --git a/src/test/java/gov/cms/madie/measure/utilities/qicore411/PackagingUtilityImplTest.java b/src/test/java/gov/cms/madie/measure/utilities/qicore411/PackagingUtilityImplTest.java
@@ -153,9 +153,9 @@ void testGetZipBundleForMultipleTestCases() throws IOException {
     String testCaseBundleJson1 = getStringFromTestResource("/testCaseBundle.json");
     String testCaseBundleJson2 = getStringFromTestResource("/testCaseBundle.json");
     Bundle testCaseBundle1 =
-            FhirContext.forR4().newJsonParser().parseResource(Bundle.class, testCaseBundleJson1);
+        FhirContext.forR4().newJsonParser().parseResource(Bundle.class, testCaseBundleJson1);
     Bundle testCaseBundle2 =
-            FhirContext.forR4().newJsonParser().parseResource(Bundle.class, testCaseBundleJson2);
+        FhirContext.forR4().newJsonParser().parseResource(Bundle.class, testCaseBundleJson2);
     Map<String, Bundle> multiTestCases = new HashMap<>();
     multiTestCases.put("TC1", testCaseBundle1);
     multiTestCases.put("TC2", testCaseBundle2);

diff --git a/src/test/java/gov/cms/madie/packaging/utils/ResourceUtilityFactoryTest.java b/src/test/java/gov/cms/madie/packaging/utils/ResourceUtilityFactoryTest.java
@@ -6,9 +6,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import gov.cms.madie.packaging.utils.PackagingUtility;
-import gov.cms.madie.packaging.utils.PackagingUtilityFactory;
-
 class ResourceUtilityFactoryTest {
 
   @Test

diff --git a/src/test/java/gov/cms/madie/packaging/utils/ZipUtilityTest.java b/src/test/java/gov/cms/madie/packaging/utils/ZipUtilityTest.java
@@ -3,7 +3,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
 import java.util.Map;