diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/LoginController.java b/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/LoginController.java
index ea4650ab02..e2629053f1 100644
--- a/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/LoginController.java
+++ b/spring-5-security-oauth/src/main/java/com/baeldung/oauth2/LoginController.java
@@ -1,10 +1,8 @@
 package com.baeldung.oauth2;
 
-import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ResolvableType;
 import org.springframework.http.HttpEntity;
@@ -73,14 +71,4 @@ public class LoginController {
 
         return "loginSuccess";
     }
-    
-    public HttpHeaders createHeaders(String username, String password){
-        return new HttpHeaders() {{
-              String auth = username + ":" + password;
-              byte[] encodedAuth = Base64.encodeBase64( 
-                 auth.getBytes(Charset.forName("US-ASCII")) );
-              String authHeader = "Basic " + new String( encodedAuth );
-              set( "Authorization", authHeader );
-           }};
-     }
 }
diff --git a/spring-security-rest-basic-auth/src/main/java/org/baeldung/web/controller/BarController.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/web/controller/BarController.java
index 2bc314baa2..5f32b9f73b 100644
--- a/spring-security-rest-basic-auth/src/main/java/org/baeldung/web/controller/BarController.java
+++ b/spring-security-rest-basic-auth/src/main/java/org/baeldung/web/controller/BarController.java
@@ -1,8 +1,12 @@
 package org.baeldung.web.controller;
 
+import java.nio.charset.Charset;
+
+import org.apache.commons.codec.binary.Base64;
 import org.baeldung.web.dto.Bar;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,4 +32,13 @@ public class BarController {
         return new Bar();
     }
 
+    public HttpHeaders createHeaders(String username, String password){
+        return new HttpHeaders() {{
+              String auth = username + ":" + password;
+              byte[] encodedAuth = Base64.encodeBase64( 
+                 auth.getBytes(Charset.forName("US-ASCII")) );
+              String authHeader = "Basic " + new String( encodedAuth );
+              set( "Authorization", authHeader );
+           }};
+     }
 }