fix warnings

Author: fil512

hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/retry/Retrier.java

@@ -29,7 +29,6 @@
 import org.springframework.retry.RetryContext;
 import org.springframework.retry.RetryListener;
 import org.springframework.retry.backoff.ExponentialBackOffPolicy;
-import org.springframework.retry.listener.RetryListenerSupport;
 import org.springframework.retry.policy.SimpleRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 
@@ -69,11 +68,10 @@ public boolean canRetry(RetryContext context) {
 		retryPolicy.setMaxAttempts(theMaxRetries);
 		myRetryTemplate.setRetryPolicy(retryPolicy);
 
-		RetryListener listener = new RetryListenerSupport() {
+		RetryListener listener = new RetryListener() {
 			@Override
-			public <T, E extends Throwable> void onError(
-					RetryContext context, RetryCallback<T, E> callback, Throwable throwable) {
-				super.onError(context, callback, throwable);
+			public <TT, E extends Throwable> void onError(
+					RetryContext context, RetryCallback<TT, E> callback, Throwable throwable) {
 				if (throwable instanceof NullPointerException
 						|| throwable instanceof UnsupportedOperationException
 						|| HapiSystemProperties.isUnitTestModeEnabled()) {

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/messaging/json/BaseJsonMessage.java

@@ -21,17 +21,17 @@
 
 import ca.uhn.fhir.model.api.IModelJson;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
+import java.util.Objects;
+
 import static java.util.Objects.isNull;
-import static org.apache.commons.lang3.StringUtils.defaultString;
 
 public abstract class BaseJsonMessage<T> implements Message<T>, IModelJson {
 
-	private static final long serialVersionUID = 1L;
-
 	@JsonProperty("headers")
 	private HapiMessageHeaders myHeaders;
 
@@ -49,6 +49,7 @@ protected void setDefaultRetryHeaders() {
 	}
 
 	@Override
+	@Nonnull
 	public MessageHeaders getHeaders() {
 		return myHeaders.toMessageHeaders();
 	}
@@ -82,7 +83,7 @@ public String getMessageKey() {
 	 */
 	@Nullable
 	public String getMessageKeyOrDefault() {
-		return defaultString(getMessageKey(), getMessageKeyDefaultValue());
+		return Objects.toString(getMessageKey(), getMessageKeyDefaultValue());
 	}
 
 	/**

hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/subscription/channel/impl/RetryingMessageHandlerWrapper.java

@@ -32,7 +32,6 @@
 import org.springframework.retry.RetryContext;
 import org.springframework.retry.RetryListener;
 import org.springframework.retry.backoff.ExponentialBackOffPolicy;
-import org.springframework.retry.listener.RetryListenerSupport;
 import org.springframework.retry.policy.TimeoutRetryPolicy;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.transaction.CannotCreateTransactionException;
@@ -59,7 +58,7 @@ public void handleMessage(@Nonnull Message<?> theMessage) throws MessagingExcept
 		retryPolicy.setTimeout(DateUtils.MILLIS_PER_MINUTE);
 		retryTemplate.setRetryPolicy(retryPolicy);
 		retryTemplate.setThrowLastExceptionOnExhausted(true);
-		RetryListener retryListener = new RetryListenerSupport() {
+		RetryListener retryListener = new RetryListener() {
 			@Override
 			public <T, E extends Throwable> void onError(
 					RetryContext theContext, RetryCallback<T, E> theCallback, Throwable theThrowable) {