From 08c3a742de4970fb1f2304b40f52f5b8486e6210 Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <omaciaszeksh@vmware.com>
Date: Thu, 8 Aug 2024 12:50:09 +0200
Subject: [PATCH] Move off incompatible Base64Utils.

---
 .../contract/wiremock/restdocs/ContractResultHandler.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractResultHandler.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractResultHandler.java
index 91347e23d7..b510c25032 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractResultHandler.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/restdocs/ContractResultHandler.java
@@ -19,6 +19,7 @@ package org.springframework.cloud.contract.wiremock.restdocs;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -44,7 +45,6 @@ import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultHandler;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -211,7 +211,7 @@ public class ContractResultHandler extends WireMockVerifyHelper<MvcResult, Contr
 
 			@Override
 			public String getBodyAsBase64() {
-				return Base64Utils.encodeToString(result.getRequest().getContentAsByteArray());
+				return Base64.getEncoder().encodeToString(result.getRequest().getContentAsByteArray());
 			}
 
 			@Override