Modularization and Modernization

.editorconfig

@@ -0,0 +1,84 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+max_line_length = 100
+tab_width = 4
+ij_formatter_tags_enabled = false
+
+[*.md]
+insert_final_newline = true
+indent_size = 4
+
+[*.json]
+indent_size = 2
+tab_width = 2
+max_line_length = 80
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+
+[*.java]
+ij_java_imports_layout = $*,|,*
+ij_java_class_brace_style = end_of_line
+ij_java_method_brace_style = end_of_line
+ij_java_space_before_method_call_parentheses = false
+ij_java_space_before_method_parentheses = false
+ij_java_space_before_if_parentheses = true
+ij_java_space_before_while_parentheses = true
+ij_java_space_before_for_parentheses = true
+ij_java_space_before_switch_parentheses = true
+ij_java_space_before_catch_parentheses = true
+ij_java_space_before_synchronized_parentheses = true
+ij_java_space_around_assignment_operators = true
+ij_java_space_around_logical_operators = true
+ij_java_space_around_equality_operators = true
+ij_java_space_around_relational_operators = true
+ij_java_space_around_bitwise_operators = true
+ij_java_space_around_additive_operators = true
+ij_java_space_around_multiplicative_operators = true
+ij_java_space_around_shift_operators = true
+ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_method_call_parentheses = false
+ij_java_spaces_within_method_parentheses = false
+ij_java_spaces_within_if_parentheses = false
+ij_java_spaces_within_while_parentheses = false
+ij_java_spaces_within_for_parentheses = false
+ij_java_spaces_within_switch_parentheses = false
+ij_java_spaces_within_catch_parentheses = false
+ij_java_spaces_within_synchronized_parentheses = false
+ij_java_spaces_within_cast_parentheses = false
+ij_java_spaces_within_brackets = false
+ij_java_spaces_within_braces = false
+ij_java_spaces_within_array_initializer_braces = false
+ij_java_keep_line_breaks = true
+ij_java_keep_blank_lines_in_declarations = 1
+ij_java_keep_blank_lines_in_code = 1
+ij_java_keep_blank_lines_before_rbrace = 0
+ij_java_blank_lines_after_class_header = 0
+ij_java_blank_lines_after_package = 1
+ij_java_blank_lines_before_package = 0
+ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_after_imports = 1
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_align_param_comments = false
+ij_java_doc_align_exception_comments = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_keep_empty_parameter_tag = true
+ij_java_doc_keep_empty_return_tag = true
+ij_java_doc_keep_empty_throws_tag = true
+ij_java_binary_operation_sign_on_next_line = true
+ij_java_continuation_indent_size = 4
+ij_java_ternary_operation_signs_on_next_line = true
+ij_java_wrap_comments = true
+
+[{*.xml,*.xsl,*.xsd}]
+ij_continuation_indent_size = 2
+ij_xml_block_comment_at_first_column = true
+ij_xml_line_comment_at_first_column = true

pom.xml

@@ -12,7 +12,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
         <cql.version>3.27.0</cql.version>
         <hapi.version>8.0.0</hapi.version>
         <spring-boot.version>2.1.5.RELEASE</spring-boot.version>
@@ -28,9 +28,15 @@
     <url>https://github.com/cqframework/cqf-tooling/tree/master</url>
 
     <modules>
+        <module>tooling-core</module>
+        <module>tooling-terminology</module>
+        <module>tooling-modelinfo</module>
+        <module>tooling-cql</module>
+        <module>tooling-casereporting</module>
+        <module>tooling-acceleratorkit</module>
+        <module>tooling-ig</module>
         <module>tooling</module>
         <module>tooling-cli</module>
-        <module>tooling-ui</module>
     </modules>
 
     <licenses>
@@ -231,6 +237,18 @@
                 <version>1.2.18</version>
             </dependency>
 
+            <!-- Pin Apache POI versions to avoid transitive version conflicts -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
@@ -268,7 +286,7 @@
                     <?m2e execute onConfiguration,onIncremental?>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.6.0</version>
                     <configuration>
                         <excludeGeneratedSources>true</excludeGeneratedSources>
                         <configLocation>config/checkstyle.xml</configLocation>
@@ -306,6 +324,27 @@
                         </java>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>animal-sniffer-maven-plugin</artifactId>
+                    <version>1.23</version>
+                    <configuration>
+                        <signature>
+                            <groupId>com.toasttab.android</groupId>
+                            <artifactId>gummy-bears-api-34</artifactId>
+                            <version>0.10.0</version>
+                        </signature>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>check-android-34-compliance</id>
+                            <phase>test</phase>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
@@ -367,7 +406,7 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>3.4.0</version>
                     <configuration>
-                        <source>11</source>
+                        <source>17</source>
                         <excludePackageNames>org.opencds.cqf.tooling.vmr</excludePackageNames>
                         <quiet>true</quiet>
                         <!--TODO: tighten this to make sure comments aren't missing as well-->
@@ -461,11 +500,18 @@
             </plugins>
         </pluginManagement>
         <plugins>
-            <!-- TODO: Renable checkstyle -->
-            <!-- <plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin> -->
+            </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

tooling-acceleratorkit/pom.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opencds.cqf</groupId>
+        <artifactId>tooling-parent</artifactId>
+        <version>3.11.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>tooling-acceleratorkit</artifactId>
+    <version>3.11.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>CQF Tooling Accelerator Kit</name>
+    <description>WHO accelerator kit processing — data dictionary, decision tables, and profile generation</description>
+    <url>https://github.com/cqframework/cqf-tooling/tree/master/tooling-acceleratorkit</url>
+
+    <dependencies>
+        <!-- Core infrastructure -->
+        <dependency>
+            <groupId>org.opencds.cqf</groupId>
+            <artifactId>tooling-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- Terminology (SpreadsheetHelper) -->
+        <dependency>
+            <groupId>org.opencds.cqf</groupId>
+            <artifactId>tooling-terminology</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>7.7.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/CanonicalResourceAtlas.java → tooling-acceleratorkit/src/main/java/org/opencds/cqf/tooling/acceleratorkit/CanonicalResourceAtlas.java

@@ -4,45 +4,56 @@
 
 public class CanonicalResourceAtlas {
     private CanonicalResourceProvider<StructureDefinition> structureDefinitions;
+
     public CanonicalResourceProvider<StructureDefinition> getStructureDefinitions() {
         return structureDefinitions;
     }
-    public CanonicalResourceAtlas setStructureDefinitions(CanonicalResourceProvider<StructureDefinition> structureDefinitions) {
+
+    public CanonicalResourceAtlas setStructureDefinitions(
+            CanonicalResourceProvider<StructureDefinition> structureDefinitions) {
         this.structureDefinitions = structureDefinitions;
         return this;
     }
 
     private CanonicalResourceProvider<CodeSystem> codeSystems;
+
     public CanonicalResourceProvider<CodeSystem> getCodeSystems() {
         return codeSystems;
     }
+
     public CanonicalResourceAtlas setCodeSystems(CanonicalResourceProvider<CodeSystem> codeSystems) {
         this.codeSystems = codeSystems;
         return this;
     }
 
     private CanonicalResourceProvider<ValueSet> valueSets;
+
     public CanonicalResourceProvider<ValueSet> getValueSets() {
         return valueSets;
     }
+
     public CanonicalResourceAtlas setValueSets(CanonicalResourceProvider<ValueSet> valueSets) {
         this.valueSets = valueSets;
         return this;
     }
 
     private CanonicalResourceProvider<ConceptMap> conceptMaps;
+
     public CanonicalResourceProvider<ConceptMap> getConceptMaps() {
         return conceptMaps;
     }
+
     public CanonicalResourceAtlas setConceptMaps(CanonicalResourceProvider<ConceptMap> conceptMaps) {
         this.conceptMaps = conceptMaps;
         return this;
     }
 
     private CanonicalResourceProvider<StructureDefinition> extensions;
+
     public CanonicalResourceProvider<StructureDefinition> getExtensions() {
         return extensions;
     }
+
     public CanonicalResourceAtlas setExtensions(CanonicalResourceProvider<StructureDefinition> extensions) {
         this.extensions = extensions;
         return this;

tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/CanonicalResourceProvider.java → tooling-acceleratorkit/src/main/java/org/opencds/cqf/tooling/acceleratorkit/CanonicalResourceProvider.java

@@ -2,11 +2,12 @@
 
 import org.hl7.fhir.r4.model.Resource;
 
-import java.util.List;
-
 public interface CanonicalResourceProvider<T extends Resource> {
     Iterable<T> get();
+
     Iterable<T> getByCanonicalUrl(String url);
+
     T getByCanonicalUrlWithVersion(String urlWithVersion);
+
     T getByCanonicalUrlAndVersion(String url, String version);
 }

tooling/src/main/java/org/opencds/cqf/tooling/acceleratorkit/CodeCollection.java → tooling-acceleratorkit/src/main/java/org/opencds/cqf/tooling/acceleratorkit/CodeCollection.java

@@ -1,10 +1,9 @@
 package org.opencds.cqf.tooling.acceleratorkit;
 
-import org.hl7.fhir.r4.model.Coding;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.hl7.fhir.r4.model.Coding;
 
 public class CodeCollection {
     public CodeCollection() {
@@ -16,6 +15,7 @@ public CodeCollection(List<DictionaryCode> codes) {
     }
 
     private List<DictionaryCode> codes;
+
     public List<DictionaryCode> getCodes() {
         if (this.codes == null) {
             this.codes = new ArrayList<>();
@@ -40,6 +40,7 @@ public List<DictionaryCode> getCodesForSystem(String system) {
     }
 
     private ArrayList<String> codeSystemUrls;
+
     public List<String> getCodeSystemUrls() {
         if (this.codeSystemUrls == null) {
             this.codeSystemUrls = new ArrayList<>();
@@ -68,4 +69,4 @@ public List<Coding> toCodings() {
 
         return codings;
     }
-}
+}