adding the code

hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle.xml

@@ -64,4 +64,12 @@
 			<property name="format" value="^(Base|Abstract).+$"/>
 		</module>
 	</module>
+
+	<!-- for suppression of rules; to use, surround code to exclude with comments: -->
+	<!-- CHECKSTYLE.OFF RuleToDisable   AND   CHECKSTYLE.ON RuleToDisable -->
+	<module name="SuppressWithPlainTextCommentFilter">
+		<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)" />
+		<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)" />
+	</module>
+
 </module>

hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/BaseReindexStep.java

@@ -12,7 +12,7 @@ import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
 import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId;
 import ca.uhn.fhir.rest.api.server.storage.TransactionDetails;
 
-public class BaseReindexStep {
+public abstract class BaseReindexStep {
 
 	public static final int REINDEX_MAX_RETRIES = 10;
 

hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/CheckPendingReindexWorkStep.java

@@ -9,6 +9,7 @@ import ca.uhn.fhir.batch2.api.StepExecutionDetails;
 import ca.uhn.fhir.batch2.api.VoidModel;
 import ca.uhn.fhir.batch2.jobs.reindex.models.ReindexResults;
 import ca.uhn.fhir.batch2.jobs.reindex.svcs.ReindexJobService;
+import ca.uhn.fhir.i18n.Msg;
 import jakarta.annotation.Nonnull;
 
 public class CheckPendingReindexWorkStep implements IJobStepWorker<ReindexJobParameters, ReindexResults, VoidModel> {
@@ -30,8 +31,7 @@ public class CheckPendingReindexWorkStep implements IJobStepWorker<ReindexJobPar
 
 		if (!results.getResourceToHasWorkToComplete().isEmpty()) {
 			if (myReindexJobService.anyResourceHasPendingReindexWork(results.getResourceToHasWorkToComplete())) {
-				// give time for reindex work to complete
+				throw new RetryChunkLaterException(Msg.code(2553), ReindexUtils.getRetryLaterDelay());
-				throw new RetryChunkLaterException(ReindexUtils.getRetryLaterDelay());
 			}
 		}
 

hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStepV2.java

@@ -9,6 +9,7 @@ import ca.uhn.fhir.batch2.api.StepExecutionDetails;
 import ca.uhn.fhir.batch2.jobs.chunk.ResourceIdListWorkChunkJson;
 import ca.uhn.fhir.batch2.jobs.reindex.models.ReindexResults;
 import ca.uhn.fhir.batch2.jobs.reindex.svcs.ReindexJobService;
+import ca.uhn.fhir.i18n.Msg;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirSystemDao;
 import ca.uhn.fhir.jpa.api.svc.IIdHelperService;
@@ -53,7 +54,8 @@ public class ReindexStepV2 extends BaseReindexStep
 			resourceTypesToCheckFlag.put(id.getResourceType(), true);
 		});
 		if (myReindexJobService.anyResourceHasPendingReindexWork(resourceTypesToCheckFlag)) {
-			throw new RetryChunkLaterException(ReindexUtils.getRetryLaterDelay());
+
+			throw new RetryChunkLaterException(Msg.code(2552), ReindexUtils.getRetryLaterDelay());
 		}
 
 		ReindexResults results = doReindex(

hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/RetryChunkLaterException.java

@@ -38,11 +38,18 @@ public class RetryChunkLaterException extends RuntimeException {
 	private final Duration myNextPollDuration;
 
 	public RetryChunkLaterException() {
-		this(ONE_MINUTE);
+		this("", ONE_MINUTE);
 	}
 
+	/**
+	 * For HAPI exceptions, use {@link RetryChunkLaterException#RetryChunkLaterException(String, Duration)}
+	 */
 	public RetryChunkLaterException(Duration theDuration) {
-		super();
+		this("", theDuration);
+	}
+
+	public RetryChunkLaterException(String theCode, Duration theDuration) {
+		super(theCode);
 		this.myNextPollDuration = theDuration;
 	}