chore(deps): upgrade to Spring Framework 7 generation (PR-MAJOR) (#24475)

* chore(deps): upgrade to Spring Framework 7 generation (PR-MAJOR)

Atomic generation bump after Phase 0 prep PRs A-G:

- Spring Framework 6.2.18 -> 7.0.8
- Spring Security 6.5.10 -> 7.0.6
- Spring Authorization Server 1.5.2 -> 7.0.6
- Spring Data Redis 2.7.18 -> 4.1.0
- Spring Session Data Redis 2.7.4 -> 4.1.0 (aligned with session-core 4.1.0)
- JUnit 5.12.2 -> 6.0.3
- surefire: spring.test.extension.context.scope=test_class

Spring-7-only API migrations:
- HttpHeaders no longer implements Map (AuthScheme, RouteService, advice, tests)
- OAuth2 RestClientAuthorizationCodeTokenResponseClient (private_key_jwt kept)
- Authorization Server package moves + OAuth2AuthorizationServerConfigurer ctor
- ObjectPostProcessor package move; AbstractAuthenticationToken(null) cast
- Hibernate SpringSessionContext FQCN -> org.springframework.orm.jpa.hibernate
- RedisTemplate<String,Object> for session
- setPatternParser(null) keep AntPathMatcher until PathPattern migration
- Temporary requireProofKey(false) bridge (SAS 7 PKCE-by-default); PR-H to adopt PKCE

Validated: clean reactor test-compile + unit-test profile green.

Based on spike PR #24087; Phase 0 prep already on master.

* fix: declare spring-web on dhis-api for HttpHeaders AuthScheme API

AuthScheme.apply now takes org.springframework.http.HttpHeaders (Spring 7
no longer implements Map). dependency:analyze requires an explicit
spring-web compile dependency on dhis-api.

* fix: use Spring Data Redis 4.0.6 + Lettuce 6.8.2 (not SDR 4.1)

SDR 4.1.0 requires Lettuce 7.5+ (DriverInfo). That blew up app boot in
api-test with ClassNotFoundException: io.lettuce.core.DriverInfo.

Stay on the 4.0.x line for MAJOR (aligned with spike PR #24087):
- spring-data-redis 4.0.6
- spring-session-core / spring-session-data-redis 4.0.4
- lettuce 6.8.2.RELEASE

Lettuce 7 remains PR-L after deliberate SDR 4.1+ adoption.

* fix: SAS 7 PKCE/DCR/auth_time + data-exchange dependency analyze

- dhis-service-data-exchange: drop unused spring-core (analyze fail)
- Force requireProofKey(false) on client create/toEntity/DCR converter
  (SAS 7 PKCE-by-default temporary bridge; PR-H removes this)
- DCR tests: omit scope (SAS 7 rejects scope on registration)
- Federated OIDC test: clientSettings.requireProofKey(false) + Factor auth
- TwoFactorAuthenticationProvider + OAuth2Authorization load path: ensure
  FactorGrantedAuthority so JwtGenerator can set OIDC auth_time when
  SessionRegistry is present (fixes OAuth2Test 500 authenticationTime)

* fix: DCR default scopes; stop forcing requireProofKey on RegisteredClient save

- DCR without scope (SAS 7) gets openid/profile/username/email defaults so
  client_credentials token requests still work
- Do not rewrite requireProofKey in toEntity (round-trip fidelity for
  Dhis2OAuth2ClientServiceIntegrationTest); keep false only for CRUD
  applyCreateDefaults when clientSettings is null + DCR converter
- Authorization integration test: allow FACTOR_* authorities after load

* style: clear Sonar new-code smells on Spring 7 PR

- avoid null credentials in UsernamePasswordAuthenticationToken.authenticated
- SessionFixationConfigurer method reference; drop unused throws Exception
- wrap AS filter-chain config Exception as IllegalStateException
- TestBase clearSecurityContext; package-private test methods

* style: clear remaining Sonar smells on Spring 7 PR

Wrap filterChain Exception; requireNonNull principals; package-private
RouteControllerTest beforeEach.

* style: null-check principal before AuthenticationToken.authenticated (S4449)

* fix: cast OAuth2User when rebuilding OAuth2AuthenticationToken

* style: spotless import order for OAuth2User

* chore: remove local plan and changelog docs from PR-MAJOR

These markdown planning/changelog files must not ship in product PRs.

* refactor: keep spring-web out of dhis-api

Reverts the AuthScheme signature change back to the JDK-typed
Map<String, List<String>> from master, removing the spring-web
dependency that was added to dhis-api.

Spring 7 HttpHeaders no longer implements MultiValueMap, so the two
call sites (RouteService, WebhookHandler) now collect auth headers in
a plain map and merge them into HttpHeaders afterwards, keeping the
web type in the web-aware modules where spring-web is available.

Keeps the Spring Security 7 constructor disambiguation cast in
OAuth2ClientCredentialsAuthScheme.

Author: netroms

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/auth/OAuth2ClientCredentialsAuthScheme.java

@@ -30,6 +30,7 @@
 package org.hisp.dhis.common.auth;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.function.UnaryOperator;
@@ -44,6 +45,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.client.OAuth2AuthorizationContext;
 import org.springframework.security.oauth2.client.OAuth2AuthorizeRequest;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
@@ -64,7 +66,7 @@ public class OAuth2ClientCredentialsAuthScheme implements AuthScheme {
   public static final String OAUTH2_CLIENT_CREDENTIALS_TYPE = "oauth2-client-credentials";
 
   public static final Authentication ANONYMOUS_AUTHENTICATION =
-      new AbstractAuthenticationToken(null) {
+      new AbstractAuthenticationToken((Collection<? extends GrantedAuthority>) null) {
         @Override
         public Object getCredentials() {
           return "";

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/route/RouteService.java

@@ -47,6 +47,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -480,7 +481,7 @@ protected WebClient.RequestHeadersSpec<?> buildRequestSpec(
       requestHeadersSpec = buildUpstreamRequestHeaderSpec(request, requestBodySpec);
     }
 
-    for (Map.Entry<String, List<String>> header : headers.entrySet()) {
+    for (Map.Entry<String, List<String>> header : headers.headerSet()) {
       requestHeadersSpec =
           requestHeadersSpec.header(header.getKey(), header.getValue().toArray(new String[0]));
     }
@@ -586,14 +587,16 @@ protected ResponseBodyEmitter emitResponseBody(
   }
 
   protected void applyAuthScheme(
-      Route route, Map<String, List<String>> headers, Map<String, List<String>> queryParameters)
+      Route route, HttpHeaders headers, Map<String, List<String>> queryParameters)
       throws BadGatewayException {
     if (route.getAuth() != null) {
       try {
+        Map<String, List<String>> authHeaders = new LinkedHashMap<>();
         route
             .getAuth()
             .decrypt(encryptor::decrypt)
-            .apply(applicationContext, headers, queryParameters);
+            .apply(applicationContext, authHeaders, queryParameters);
+        authHeaders.forEach((name, values) -> values.forEach(value -> headers.add(name, value)));
       } catch (Exception e) {
         log.error(e.getMessage(), e);
         throw new BadGatewayException("An error occurred during authentication");
@@ -646,7 +649,8 @@ private HttpHeaders filterRequestHeaders(HttpServletRequest request) {
    * @return an {@link HttpHeaders}.
    */
   private HttpHeaders filterResponseHeaders(HttpHeaders responseHeaders) {
-    return filterHeaders(responseHeaders.keySet(), ALLOWED_RESPONSE_HEADERS, responseHeaders::get);
+    return filterHeaders(
+        responseHeaders.headerNames(), ALLOWED_RESPONSE_HEADERS, responseHeaders::get);
   }
 
   /**

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oauth2/authorization/Dhis2OAuth2AuthorizationServiceImpl.java

@@ -52,7 +52,10 @@
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.FactorGrantedAuthority;
 import org.springframework.security.jackson2.SecurityJackson2Modules;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.oauth2.core.OAuth2AccessToken;
 import org.springframework.security.oauth2.core.OAuth2DeviceCode;
 import org.springframework.security.oauth2.core.OAuth2RefreshToken;
@@ -61,6 +64,7 @@
 import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
 import org.springframework.security.oauth2.core.oidc.endpoint.OidcParameterNames;
+import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.security.oauth2.server.authorization.OAuth2Authorization;
 import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationCode;
@@ -255,7 +259,11 @@ private OAuth2Authorization toObject(Dhis2OAuth2Authorization entity) {
             .principalName(entity.getPrincipalName())
             .authorizationGrantType(OAuth2GrantTypes.resolve(entity.getAuthorizationGrantType()))
             .authorizedScopes(StringUtils.commaDelimitedListToSet(entity.getAuthorizedScopes()))
-            .attributes(attributes -> attributes.putAll(parseMap(entity.getAttributes())));
+            .attributes(
+                attributes -> {
+                  attributes.putAll(parseMap(entity.getAttributes()));
+                  ensureFactorGrantedAuthority(attributes);
+                });
 
     if (entity.getState() != null) {
       builder.attribute(OAuth2ParameterNames.STATE, entity.getState());
@@ -474,6 +482,45 @@ private <T extends OAuth2Token> void setTokenValues(
    * @param data The JSON string
    * @return The parsed Map
    */
+
+  /**
+   * SAS 7 JwtGenerator requires a {@link FactorGrantedAuthority} to derive OIDC {@code auth_time}
+   * when a SessionRegistry is present. Older persisted principals (and some login paths) may lack
+   * one after JSON round-trip; re-attach a synthetic password factor so token exchange does not
+   * fail with "authenticationTime cannot be null".
+   */
+  private static void ensureFactorGrantedAuthority(Map<String, Object> attributes) {
+    Object principal = attributes.get(java.security.Principal.class.getName());
+    if (!(principal instanceof Authentication authentication)) {
+      return;
+    }
+    if (authentication.getAuthorities().stream()
+        .anyMatch(FactorGrantedAuthority.class::isInstance)) {
+      return;
+    }
+    java.util.List<GrantedAuthority> authorities =
+        new java.util.ArrayList<>(authentication.getAuthorities());
+    authorities.add(
+        FactorGrantedAuthority.fromAuthority(FactorGrantedAuthority.PASSWORD_AUTHORITY));
+    Object principalObj = authentication.getPrincipal();
+    if (principalObj == null) {
+      return;
+    }
+    Authentication enriched;
+    if (authentication instanceof OAuth2AuthenticationToken oauth
+        && principalObj instanceof OAuth2User oauth2User) {
+      enriched =
+          new OAuth2AuthenticationToken(
+              oauth2User, authorities, oauth.getAuthorizedClientRegistrationId());
+    } else {
+      Object credentials = authentication.getCredentials();
+      enriched =
+          UsernamePasswordAuthenticationToken.authenticated(
+              principalObj, credentials != null ? credentials : "", authorities);
+    }
+    attributes.put(java.security.Principal.class.getName(), enriched);
+  }
+
   private Map<String, Object> parseMap(String data) {
     if (data == null || data.isBlank()) {
       return Map.of();

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oauth2/client/Dhis2OAuth2ClientServiceImpl.java

@@ -388,8 +388,11 @@ public void applyCreateDefaults(Dhis2OAuth2Client entity) {
     if (entity.getRawName() == null || entity.getRawName().isEmpty()) {
       entity.setName(truncateName(entity.getClientId()));
     }
+    // SAS 7 flips requireProofKey default false->true. Temporary bridge for existing non-PKCE
+    // clients/e2e (CRUD/API create without clientSettings) until PR-H adopts PKCE-by-default.
     if (entity.getClientSettings() == null) {
-      ClientSettings defaults = ClientSettings.builder().requireAuthorizationConsent(true).build();
+      ClientSettings defaults =
+          ClientSettings.builder().requireAuthorizationConsent(true).requireProofKey(false).build();
       entity.setClientSettings(writeMap(defaults.getSettings()));
     }
     if (entity.getTokenSettings() == null) {

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oidc/DhisAuthorizationCodeTokenResponseClient.java

@@ -31,71 +31,49 @@
 
 import com.nimbusds.jose.jwk.JWK;
 import jakarta.annotation.PostConstruct;
-import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import javax.annotation.Nonnull;
 import lombok.RequiredArgsConstructor;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.http.RequestEntity;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.converter.FormHttpMessageConverter;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.security.oauth2.client.endpoint.NimbusJwtClientAuthenticationParametersConverter;
 import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient;
 import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest;
-import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequestEntityConverter;
-import org.springframework.security.oauth2.client.http.OAuth2ErrorResponseErrorHandler;
+import org.springframework.security.oauth2.client.endpoint.RestClientAuthorizationCodeTokenResponseClient;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
-import org.springframework.security.oauth2.core.OAuth2AuthorizationException;
-import org.springframework.security.oauth2.core.OAuth2Error;
 import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse;
-import org.springframework.security.oauth2.core.http.converter.OAuth2AccessTokenResponseHttpMessageConverter;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.ResponseErrorHandler;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestOperations;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * Spring {@link OAuth2AccessTokenResponseClient} used by the DHIS2 Relying Party during the
  * authorization-code token exchange against an external OIDC Identity Provider.
  *
  * <p>This client supports both client authentication modes: standard {@code client_secret_*}
  * (basic, post, JWT) and {@code private_key_jwt}. When the matched {@link ClientRegistration}
- * declares {@link ClientAuthenticationMethod#PRIVATE_KEY_JWT}, the client builds a JWT client
- * assertion signed with the per-provider key loaded from {@link DhisOidcClientRegistration} ({@code
- * jwk}, {@code jwkSetUrl}), using Spring's {@link
- * NimbusJwtClientAuthenticationParametersConverter}; for all other methods it falls back to the
- * standard {@link OAuth2AuthorizationCodeGrantRequestEntityConverter}.
+ * declares {@link ClientAuthenticationMethod#PRIVATE_KEY_JWT}, the {@link
+ * NimbusJwtClientAuthenticationParametersConverter} adds a JWT client assertion signed with the
+ * per-provider key loaded from {@link DhisOidcClientRegistration} ({@code jwk}, {@code jwkSetUrl});
+ * for all other methods the converter contributes nothing and the delegate falls back to the
+ * standard client-credentials parameters.
  *
- * <p>HTTP exchange is performed with a {@link RestTemplate} configured with {@link
- * FormHttpMessageConverter} and {@link OAuth2AccessTokenResponseHttpMessageConverter}, and {@link
- * OAuth2ErrorResponseErrorHandler} mapping upstream HTTP errors to {@link
- * OAuth2AuthorizationException} with the {@code invalid_token_response} error code.
+ * <p>Since Spring Security 7.0 removed the {@code RequestEntity}-converter /{@code RestOperations}
+ * token-client infrastructure, the HTTP exchange is delegated to {@link
+ * RestClientAuthorizationCodeTokenResponseClient}, which provides the default {@code RestClient},
+ * message converters and OAuth2 error handling.
  *
  * @author Morten Svanæs <msvanaes@dhis2.org>
  */
 @Service
 @RequiredArgsConstructor
 public class DhisAuthorizationCodeTokenResponseClient
     implements OAuth2AccessTokenResponseClient<OAuth2AuthorizationCodeGrantRequest> {
-  private static final String INVALID_TOKEN_RESPONSE_ERROR_CODE = "invalid_token_response";
-
   private final DhisOidcProviderRepository clientRegistrations;
 
-  private Converter<OAuth2AuthorizationCodeGrantRequest, RequestEntity<?>> requestEntityConverter =
-      new OAuth2AuthorizationCodeGrantRequestEntityConverter();
-
-  private Converter<OAuth2AuthorizationCodeGrantRequest, RequestEntity<?>>
-      jwtRequestEntityConverter;
-
-  private RestOperations restOperations;
+  private RestClientAuthorizationCodeTokenResponseClient delegate;
 
   /**
-   * Builds the two request-entity converters (standard and {@code private_key_jwt}) and the {@link
-   * RestTemplate} used to call the IdP's token endpoint.
+   * Builds the delegate token-response client and registers the {@code private_key_jwt} parameters
+   * converter (which self-gates on the client registration's authentication method).
    */
   @PostConstruct
   public void init() {
@@ -129,86 +107,22 @@ public void init() {
         parametersConverter = new NimbusJwtClientAuthenticationParametersConverter<>(jwkResolver);
     parametersConverter.setJwtClientAssertionCustomizer(jwtClientAssertionCustomizer);
 
-    OAuth2AuthorizationCodeGrantRequestEntityConverter jwtReqConverter =
-        new OAuth2AuthorizationCodeGrantRequestEntityConverter();
-    jwtReqConverter.addParametersConverter(parametersConverter);
-    this.jwtRequestEntityConverter = jwtReqConverter;
-
-    RestTemplate restTemplate =
-        new RestTemplate(
-            List.of(
-                new FormHttpMessageConverter(),
-                new OAuth2AccessTokenResponseHttpMessageConverter()));
-    restTemplate.setErrorHandler(new OAuth2ErrorResponseErrorHandler());
-    this.restOperations = restTemplate;
+    RestClientAuthorizationCodeTokenResponseClient tokenResponseClient =
+        new RestClientAuthorizationCodeTokenResponseClient();
+    tokenResponseClient.addParametersConverter(parametersConverter);
+    this.delegate = tokenResponseClient;
   }
 
   /**
    * Exchanges an authorization code for an access token (and an ID token) at the IdP's token
-   * endpoint. Picks the {@code private_key_jwt} converter when the client registration declares
-   * that authentication method, otherwise uses the standard converter.
+   * endpoint.
    *
    * @param authorizationCodeGrantRequest the authorization-code grant request
    * @return the parsed token response from the IdP
-   * @throws OAuth2AuthorizationException if the HTTP exchange fails or the response cannot be
-   *     parsed
    */
   @Override
   public OAuth2AccessTokenResponse getTokenResponse(
       @Nonnull OAuth2AuthorizationCodeGrantRequest authorizationCodeGrantRequest) {
-    Converter<OAuth2AuthorizationCodeGrantRequest, RequestEntity<?>> converter =
-        ClientAuthenticationMethod.PRIVATE_KEY_JWT.equals(
-                authorizationCodeGrantRequest
-                    .getClientRegistration()
-                    .getClientAuthenticationMethod())
-            ? this.jwtRequestEntityConverter
-            : this.requestEntityConverter;
-
-    return getResponse(converter.convert(authorizationCodeGrantRequest)).getBody();
-  }
-
-  private ResponseEntity<OAuth2AccessTokenResponse> getResponse(RequestEntity<?> request) {
-    try {
-      return this.restOperations.exchange(request, OAuth2AccessTokenResponse.class);
-    } catch (RestClientException ex) {
-      OAuth2Error oauth2Error =
-          new OAuth2Error(
-              INVALID_TOKEN_RESPONSE_ERROR_CODE,
-              "An error occurred while attempting to retrieve the OAuth 2.0 Access Token Response: "
-                  + ex.getMessage(),
-              null);
-      throw new OAuth2AuthorizationException(oauth2Error, ex);
-    }
-  }
-
-  /**
-   * Sets the {@link Converter} used for converting the {@link OAuth2AuthorizationCodeGrantRequest}
-   * to a {@link RequestEntity} representation of the OAuth 2.0 Access Token Request.
-   *
-   * @param requestEntityConverter the {@link Converter} used for converting to a {@link
-   *     RequestEntity} representation of the Access Token Request
-   */
-  public void setRequestEntityConverter(
-      @Nonnull
-          Converter<OAuth2AuthorizationCodeGrantRequest, RequestEntity<?>> requestEntityConverter) {
-    this.requestEntityConverter = requestEntityConverter;
-  }
-
-  /**
-   * Sets the {@link RestOperations} used when requesting the OAuth 2.0 Access Token Response.
-   *
-   * <p><b>NOTE:</b> At a minimum, the supplied {@code restOperations} must be configured with the
-   * following:
-   *
-   * <ol>
-   *   <li>{@link HttpMessageConverter}'s - {@link FormHttpMessageConverter} and {@link
-   *       OAuth2AccessTokenResponseHttpMessageConverter}
-   *   <li>{@link ResponseErrorHandler} - {@link OAuth2ErrorResponseErrorHandler}
-   * </ol>
-   *
-   * @param restOperations the {@link RestOperations} used when requesting the Access Token Response
-   */
-  public void setRestOperations(@Nonnull RestOperations restOperations) {
-    this.restOperations = restOperations;
+    return delegate.getTokenResponse(authorizationCodeGrantRequest);
   }
 }

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring2fa/TwoFactorAuthenticationProvider.java

@@ -55,6 +55,8 @@
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.FactorGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedCredentialsNotFoundException;
@@ -113,8 +115,16 @@ public Authentication authenticate(Authentication auth) throws AuthenticationExc
     checkTwoFactorAuthentication(auth, userDetails);
 
     // Return a new authentication token with the user details.
+    // Spring Security 7 JwtGenerator requires FactorGrantedAuthority for OIDC auth_time when a
+    // SessionRegistry is active (Authorization Server always installs one).
+    java.util.List<GrantedAuthority> authorities =
+        new java.util.ArrayList<>(result.getAuthorities());
+    if (authorities.stream().noneMatch(FactorGrantedAuthority.class::isInstance)) {
+      authorities.add(
+          FactorGrantedAuthority.fromAuthority(FactorGrantedAuthority.PASSWORD_AUTHORITY));
+    }
     return new UsernamePasswordAuthenticationToken(
-        userDetails, result.getCredentials(), result.getAuthorities());
+        userDetails, result.getCredentials(), authorities);
   }
 
   private void checkLockout(String username, String ip) {

dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/sms/GenericSmsGatewayTest.java

@@ -116,7 +116,7 @@ class GenericSmsGatewayTest {
   private Map<String, String> valueStore = new HashMap<>();
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     subject.setRestTemplate(restTemplate);
 
     gatewayConfig = new GenericHttpGatewayConfig();
@@ -188,8 +188,8 @@ void testSendSms_Json() {
         .filter(p -> p.isEncode() && p.isConfidential() && p.isHeader())
         .forEach(
             p -> {
-              assertTrue(httpHeaders.containsKey(p.getKey()));
-              assertEquals(" Basic ZGVjcnlwdGVkVGV4dA==", httpHeaders.get(p.getKey()).get(0));
+              assertTrue(httpHeaders.containsHeader(p.getKey()));
+              assertEquals(" Basic ZGVjcnlwdGVkVGV4dA==", httpHeaders.getFirst(p.getKey()));
             });
   }
 

dhis-2/dhis-services/dhis-service-data-exchange/pom.xml

@@ -49,10 +49,6 @@
     </dependency>
 
     <!-- Application -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>