Synchronized with latest master

Author: madduci

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IEntityResult.java

@@ -19,7 +19,7 @@
  */
 package ca.uhn.fhir.rest.gclient;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jspecify.annotations.NonNull;
 
 import java.io.InputStream;
 import java.util.List;

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java

@@ -139,7 +139,6 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBinary;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
@@ -151,9 +150,11 @@
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
+import org.jspecify.annotations.NonNull;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1424,8 +1425,7 @@ private void addParam(String theName, IBase theValue) {
 		}
 
 		private void addParam(String theName, IQueryParameterType theValue) {
-			IPrimitiveType<?> stringType =
-					ParametersUtil.createString(myContext, theValue.getValueAsQueryToken(myContext));
+			IPrimitiveType<?> stringType = ParametersUtil.createString(myContext, theValue.getValueAsQueryToken());
 			addParam(theName, stringType);
 		}
 
@@ -2206,11 +2206,11 @@ public OUTPUT execute() {
 			Map<String, List<String>> params = getParamMap();
 
 			for (TokenParam next : myTags) {
-				addParam(params, Constants.PARAM_TAG, next.getValueAsQueryToken(myContext));
+				addParam(params, Constants.PARAM_TAG, next.getValueAsQueryToken());
 			}
 
 			for (TokenParam next : mySecurity) {
-				addParam(params, Constants.PARAM_SECURITY, next.getValueAsQueryToken(myContext));
+				addParam(params, Constants.PARAM_SECURITY, next.getValueAsQueryToken());
 			}
 
 			for (Collection<String> profileUris : myProfiles) {
@@ -2281,7 +2281,7 @@ public OUTPUT execute() {
 
 			if (myLastUpdated != null) {
 				for (DateParam next : myLastUpdated.getValuesAsQueryTokens()) {
-					addParam(params, Constants.PARAM_LASTUPDATED, next.getValueAsQueryToken(myContext));
+					addParam(params, Constants.PARAM_LASTUPDATED, next.getValueAsQueryToken());
 				}
 			}
 
@@ -2504,7 +2504,7 @@ public StringOutcome invokeClient(
 				Map<String, List<String>> theHeaders)
 				throws IOException, BaseServerResponseException {
 
-			String payload = IOUtils.toString(theResponseInputStream, Charsets.UTF_8);
+			String payload = IOUtils.toString(theResponseInputStream, StandardCharsets.UTF_8);
 			return new StringOutcome(theResponseStatusCode, payload, theHeaders);
 		}
 	}