Merge remote-tracking branch 'origin/master' into fix-packageInstallation-withPartitions-7375

Author: patrick-werner

.github/actions/build-cache/action.yml

@@ -51,7 +51,7 @@ runs:
         MAVEN_CACHE_FOLDER: ${{ inputs.cache-path }}
         MAVEN_OPTS: '-Xmx1024m -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto'
       run: |
-        mvn clean install -P CI,CHECKSTYLE \
+        mvn clean install -P CI \
           -Dmaven.test.skip=true -e -B \
           -Dmaven.javadoc.skip=true \
           -Dmaven.wagon.http.pool=false \

.github/actions/checkstyle-validation/action.yml

@@ -0,0 +1,64 @@
+name: 'Cross-Module Checkstyle Validation'
+description: 'Runs cross-module checkstyle validation to detect duplicate error codes and other violations'
+
+inputs:
+  java-version:
+    description: 'The Java version to use'
+    required: false
+    default: '17'
+  maven-cache-key:
+    description: 'The cache key for Maven dependencies'
+    required: true
+  hapi-cache-key:
+    description: 'The cache key for HAPI dependencies'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Create and List Maven Cache Directory
+      shell: bash
+      run: |
+        mkdir -p $HOME/.m2/repository
+        pwd
+        ls -al $HOME/.m2/repository
+      env:
+        MAVEN_CACHE_FOLDER: $HOME/.m2/repository
+
+    - name: Restore HAPI Cache
+      uses: ./.github/actions/caching-handler
+      with:
+        path: "$HOME/.m2/repository/ca/uhn/"
+        key: ${{ inputs.hapi-cache-key }}
+
+    - name: Set up JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: ${{ inputs.java-version }}
+        cache: 'maven'
+
+    - name: Restore Maven Cache
+      uses: ./.github/actions/caching-handler
+      with:
+        key: ${{ inputs.maven-cache-key }}
+
+    - name: Debug cache contents
+      shell: bash
+      run: |
+        echo "Checking Maven repository contents..."
+        ls -la $HOME/.m2/repository/ca/uhn/hapi/fhir/ || echo "HAPI FHIR directory not found"
+        ls -la $HOME/.m2/repository/ca/uhn/hapi/fhir/hapi-fhir-checkstyle/ || echo "hapi-fhir-checkstyle directory not found"
+        find $HOME/.m2/repository -name "*checkstyle*" -type f || echo "No checkstyle artifacts found"
+
+    - name: Run cross-module checkstyle validation
+      shell: bash
+      env:
+        MAVEN_CACHE_FOLDER: $HOME/.m2/repository
+      run: |
+        echo "Running cross-module checkstyle validation to detect duplicate error codes and other violations..."
+        echo "This step ensures that HAPI FHIR error codes (Msg.code) are unique across all modules."
+        echo "If this step fails, it means there are checkstyle violations that must be fixed before the build can proceed."
+        echo ""
+        mvn validate -P CHECKSTYLE --batch-mode --no-transfer-progress \
+          -Dmaven.repo.local=$MAVEN_CACHE_FOLDER

.github/workflows/parallel-pipeline-build.yml

@@ -26,9 +26,26 @@ jobs:
           java-version: '17'
           cache-path: $HOME/.m2/repository
 
+  checkstyle:
+    runs-on: ubuntu-latest
+    needs: build-cache
+    continue-on-error: true
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Run Checkstyle Validation
+        uses: ./.github/actions/checkstyle-validation
+        with:
+          java-version: '17'
+          maven-cache-key: ${{ github.ref_name }}-maven-${{ hashFiles('**/pom.xml') }}
+          hapi-cache-key: ${{ github.ref_name }}-hapi-${{ github.run_id }}
+
   generate-module-list:
     name: Generate List of Modules to Build
     runs-on: ubuntu-latest
+    needs: checkstyle
+    if: always()
     outputs:
       modules_list: ${{ steps.format-modules.outputs.modules_list }}
     steps:
@@ -94,7 +111,7 @@ jobs:
   final-result:
     if: ${{ always() }}
     runs-on: ubuntu-latest
-    needs: [ assemble-test-reports ]
+    needs: [ assemble-test-reports, checkstyle ]
     steps:
       - run: exit 1
         if: >-

.gitignore

@@ -170,6 +170,6 @@ Snap.*
 /database*/
 /activemq-data/
 /.run/
-/CLAUDE.md
+**/CLAUDE.md
 
 **/.claude/settings.local.json

hapi-deployable-pom/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		 <groupId>ca.uhn.hapi.fhir</groupId>
 		 <artifactId>hapi-fhir</artifactId>
-		 <version>8.4.0</version>
+		 <version>8.7.0-SNAPSHOT</version>
 
 		 <relativePath>../pom.xml</relativePath>
 	 </parent>

hapi-fhir-android/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.4.0</version>
+		<version>8.7.0-SNAPSHOT</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

hapi-fhir-base/pom.xml

@@ -5,15 +5,15 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>8.4.0</version>
+		<version>8.7.0-SNAPSHOT</version>
 
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
 
 	<artifactId>hapi-fhir-base</artifactId>
 	<packaging>bundle</packaging>
 
-	<url>http://jamesagnew.github.io/hapi-fhir/</url>
+	<url>https://hapifhir.io/</url>
 
 	<name>HAPI FHIR - Core Library</name>
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java

@@ -330,7 +330,7 @@ public AddProfileTagEnum getAddProfileTagWhenEncoding() {
 	 * avoiding the need to manually add profile declarations for these custom types.
 	 * </p>
 	 * <p>
-	 * See <a href="http://jamesagnew.gihhub.io/hapi-fhir/doc_extensions.html">Profiling and Extensions</a>
+	 * See <a href="https://hapifhir.io/hapi-fhir/docs/model/profiles_and_extensions.html">Profiles and Extensions</a>
 	 * for more information on using custom types.
 	 * </p>
 	 * <p>

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java

@@ -426,7 +426,7 @@ private void scanResourceForSearchParams(
 					components = new ArrayList<>();
 					for (String name : searchParam.compositeOf()) {
 						String ref = toCanonicalSearchParameterUri(theResourceDef, name);
-						components.add(new RuntimeSearchParam.Component(null, ref));
+						components.add(new RuntimeSearchParam.Component(null, ref, null));
 					}
 				}
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java

@@ -346,7 +346,7 @@ public List<String> getPathsSplitForResourceType(@Nullable String theResourceNam
 		return retVal;
 	}
 
-	public void addUpliftRefchain(@Nonnull String theCode, @Nonnull String theElementName) {
+	public void addUpliftRefchain(@Nonnull String theCode, @Nullable String theElementName) {
 		myUpliftRefchains.put(theCode, theElementName);
 	}
 
@@ -435,20 +435,23 @@ public enum RuntimeSearchParamStatusEnum {
 	public static class Component {
 		private final String myExpression;
 		private final String myReference;
+		private final String myComboUpliftChain;
 
 		/**
 		 * Constructor
 		 */
-		public Component(String theExpression, String theReference) {
+		public Component(String theExpression, String theReference, String theComboUpliftChain) {
 			myExpression = theExpression;
 			myReference = theReference;
+			myComboUpliftChain = theComboUpliftChain;
 		}
 
 		@Override
 		public String toString() {
 			return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
 					.append("expression", myExpression)
 					.append("reference", myReference)
+					.append("chain", myComboUpliftChain)
 					.toString();
 		}
 
@@ -459,5 +462,9 @@ public String getExpression() {
 		public String getReference() {
 			return myReference;
 		}
+
+		public String getComboUpliftChain() {
+			return myComboUpliftChain;
+		}
 	}
 }