DTSPB-4718 remove caveat expiry job from OS (#1260)

Author: FeliTam

src/functionalTest/java/uk/gov/hmcts/probate/functional/tests/CaveatControllerFunctionalTests.java

@@ -29,11 +29,8 @@
 @RequiredArgsConstructor
 public class SecurityUtils {
 
-    private static final String BASIC = "Basic ";
     private static final String BEARER = "Bearer ";
     private static final String OPENID_GRANT_TYPE = "password";
-    private static final String AUTHORIZATION_CODE = "authorization_code";
-    private static final String CODE = "code";
     private final AuthTokenGenerator authTokenGenerator;
     private final AuthTokenValidator authTokenValidator;
     private final List<String> allowedToUpdateDetails;
@@ -102,7 +99,7 @@ private String getCaseworkerToken() {
             log.info("Using cached Case Worker IDAM token.");
         }
         log.info("Getting AccessToken...");
-        return BEARER + cacheCaseworkerTokenResponse.accessToken;
+        return getBearerToken(cacheCaseworkerTokenResponse.accessToken);
     }
 
     private String getSchedulerToken() {
@@ -113,7 +110,7 @@ private String getSchedulerToken() {
             log.info("Using cached Scheduler IDAM token.");
         }
         log.info("Getting AccessToken...");
-        return BEARER + cacheSchedulerTokenResponse.accessToken;
+        return getBearerToken(cacheSchedulerTokenResponse.accessToken);
     }
 
     private TokenResponse getOpenIdTokenResponse(String username, String password) {

src/integrationTest/java/uk/gov/hmcts/probate/controller/CaveatControllerIT.java

@@ -81,7 +81,3 @@ feign:
         connectTimeout: 30000
         readTimeout: 30000
         loggerLevel: basic
-
-cron:
-  caveatExpiry:
-    schedule: "0 0 3 * * *"

src/main/java/uk/gov/hmcts/probate/controller/CaveatController.java

@@ -160,27 +160,27 @@ void shouldSecurityContextUserAsCaseworkerThrowException() {
     }
 
     @Test
-    public void givenTokenIsNull_whenGetBearToken_thenReturnNull() {
-        testGetBearToken(null, null);
+    public void givenTokenIsNull_whenGetBearerToken_thenReturnNull() {
+        testGetBearerToken(null, null);
     }
 
     @Test
-    public void givenTokenIsBlank_whenGetBearToken_thenReturnBlank() {
-        testGetBearToken(" ", " ");
+    public void givenTokenIsBlank_whenGetBearerToken_thenReturnBlank() {
+        testGetBearerToken(" ", " ");
     }
 
     @Test
     public void givenTokenDoesNotHaveBearer_whenGetBearToken_thenReturnWithBearer() {
-        testGetBearToken("TestToken", "Bearer TestToken");
+        testGetBearerToken("TestToken", "Bearer TestToken");
     }
 
     @Test
-    public void givenTokenDoesHaveBearer_whenGetBearToken_thenReturnWithBearer() {
-        testGetBearToken("Bearer TestToken", "Bearer TestToken");
+    public void givenTokenDoesHaveBearer_whenGetBearerToken_thenReturnWithBearer() {
+        testGetBearerToken("Bearer TestToken", "Bearer TestToken");
     }
 
-    private void testGetBearToken(String input, String expected) {
-        assertEquals(securityUtils.getBearerToken(input), expected);
+    private void testGetBearerToken(String input, String expected) {
+        assertEquals(expected, securityUtils.getBearerToken(input));
     }
 
     @Test