MAT-7653 resolved conflicts

MeasureAuthoringTool · Sep 3, 2024 · 9895af2 · 9895af2
2 parents 9e75268 + 93a83fd
commit 9895af2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 		<maven.compiler.target>17</maven.compiler.target>
 		<junit-jupiter.version>5.9.3</junit-jupiter.version>
 		<slf4j.version>2.0.7</slf4j.version>
-		<hapi.fhir.r4.version>6.6.1</hapi.fhir.r4.version>
+		<hapi.fhir.r4.version>6.4.1</hapi.fhir.r4.version>
 		<slf4j.version>2.0.7</slf4j.version>
 	</properties>
 
@@ -154,40 +154,30 @@
 					<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.spotify.fmt</groupId>
-				<artifactId>fmt-maven-plugin</artifactId>
-				<version>2.21.1</version>
+				<groupId>com.theoryinpractise</groupId>
+				<artifactId>googleformatter-maven-plugin</artifactId>
+				<version>1.7.3</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,12 +7,8 @@
 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<>() {