From 4e0b28f9c7d9bce6e762daeb9042d2b367c05e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Mon, 22 Dec 2025 08:07:27 +0100
Subject: [PATCH 1/7] feature/Add webui_obp_portal_url

---
 obp-api/src/main/resources/props/sample.props.template | 8 ++++++++
 obp-api/src/main/scala/code/snippet/WebUI.scala        | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/obp-api/src/main/resources/props/sample.props.template b/obp-api/src/main/resources/props/sample.props.template
index f9416680e8..dc558759a3 100644
--- a/obp-api/src/main/resources/props/sample.props.template
+++ b/obp-api/src/main/resources/props/sample.props.template
@@ -624,6 +624,14 @@ webui_agree_terms_url =
 #webui_post_consumer_registration_more_info_text = Please tell us more your Application and / or Startup using this link.
 #webui_post_consumer_registration_submit_button_value=Register consumer
 
+# OBP Portal URL - base URL for the OBP Portal service
+webui_obp_portal_url = http://localhost:5174
+
+# External Consumer Registration URL - used to redirect "Get API Key" links to an external service
+# If not set, defaults to webui_obp_portal_url + "/consumer-registration"
+# Set this to redirect to a custom URL for consumer registration
+webui_external_consumer_registration_url = http://localhost:5174/consumer-registration
+
 
 ## Display For Banks section
 webui_display_for_banks_section = true
diff --git a/obp-api/src/main/scala/code/snippet/WebUI.scala b/obp-api/src/main/scala/code/snippet/WebUI.scala
index 63214fa925..d732bbec24 100644
--- a/obp-api/src/main/scala/code/snippet/WebUI.scala
+++ b/obp-api/src/main/scala/code/snippet/WebUI.scala
@@ -312,11 +312,11 @@ class WebUI extends MdcLoggable{
   // External Consumer Registration Link
   // This replaces the internal Lift-based consumer registration functionality
   // with a link to an external consumer registration service.
-  // Uses webui_api_explorer_url + /consumers/register as default.
+  // Uses OBP-Portal (webui_obp_portal_url) for consumer registration by default.
   // Configure webui_external_consumer_registration_url to override with a custom URL.
   def externalConsumerRegistrationLink: CssSel = {
-    val apiExplorerUrl = getWebUiPropsValue("webui_api_explorer_url", "http://localhost:5174")
-    val defaultConsumerRegisterUrl = s"$apiExplorerUrl/consumers/register"
+    val portalUrl = getWebUiPropsValue("webui_obp_portal_url", "http://localhost:5174")
+    val defaultConsumerRegisterUrl = s"$portalUrl/consumer-registration"
     val externalUrl = getWebUiPropsValue("webui_external_consumer_registration_url", defaultConsumerRegisterUrl)
     ".get-api-key-link a [href]" #> scala.xml.Unparsed(externalUrl) &
     ".get-api-key-link a [target]" #> "_blank" &

From 12fab148208b3af5952f6efeadd66095ef869d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Mon, 22 Dec 2025 08:45:36 +0100
Subject: [PATCH 2/7] feature/Reduce warning in tests

---
 obp-api/src/main/scala/code/api/util/AfterApiAuth.scala | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/obp-api/src/main/scala/code/api/util/AfterApiAuth.scala b/obp-api/src/main/scala/code/api/util/AfterApiAuth.scala
index 13eae4fc40..00ef0fa503 100644
--- a/obp-api/src/main/scala/code/api/util/AfterApiAuth.scala
+++ b/obp-api/src/main/scala/code/api/util/AfterApiAuth.scala
@@ -32,11 +32,12 @@ object AfterApiAuth extends MdcLoggable{
    */
   def innerLoginUserInitAction(authUser: Box[AuthUser]) = {
     authUser.map { u => // Init actions
-      logger.info("AfterApiAuth.innerLoginUserInitAction started successfully")
+      logger.debug("AfterApiAuth.innerLoginUserInitAction started successfully")
       sofitInitAction(u)
     } match {
-        case Full(_) => logger.warn("AfterApiAuth.innerLoginUserInitAction completed successfully")
-        case userInitActionFailure => logger.warn("AfterApiAuth.innerLoginUserInitAction: " + userInitActionFailure)
+        case Full(_) => logger.debug("AfterApiAuth.innerLoginUserInitAction completed successfully")
+        case Empty => // Init actions are not started at all
+        case userInitActionFailure => logger.error("AfterApiAuth.innerLoginUserInitAction: " + userInitActionFailure)
     }
   }
   /**

From 233af77b753ededc3668f395a62c2446c589bb76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Mon, 22 Dec 2025 14:46:09 +0100
Subject: [PATCH 3/7] feature/Remove Sign Up flow from legacy portal

---
 .../resources/props/sample.props.template     |  26 ++-
 .../main/scala/code/api/util/Glossary.scala   |   6 +-
 .../code/model/dataAccess/AuthUser.scala      | 193 +-----------------
 .../src/main/scala/code/snippet/Login.scala   |   7 +-
 .../code/snippet/OAuthAuthorisation.scala     |   9 +-
 .../src/main/scala/code/snippet/WebUI.scala   |  17 +-
 obp-api/src/main/webapp/index-en.html         |   2 +-
 obp-api/src/main/webapp/index.html            |   2 +-
 obp-api/src/main/webapp/oauth/authorize.html  |   2 +-
 .../main/webapp/templates-hidden/_login.html  |   2 +-
 .../webapp/templates-hidden/default-en.html   |   6 +-
 .../templates-hidden/default-footer.html      |   6 +-
 .../templates-hidden/default-header.html      |   6 +-
 .../main/webapp/templates-hidden/default.html |   6 +-
 .../test/scala/code/util/OAuthClient.scala    |   2 +-
 15 files changed, 73 insertions(+), 219 deletions(-)

diff --git a/obp-api/src/main/resources/props/sample.props.template b/obp-api/src/main/resources/props/sample.props.template
index dc558759a3..8bc5aa02c1 100644
--- a/obp-api/src/main/resources/props/sample.props.template
+++ b/obp-api/src/main/resources/props/sample.props.template
@@ -569,15 +569,16 @@ webui_oauth_1_documentation_url =
 # Link to OAuth 2.0 glossary on api explorer
 webui_oauth_2_documentation_url =
 
-# Link to Privacy Policy on signup page
-#webui_signup_form_submit_button_value=
-#webui_signup_form_title_text=Sign Up
-#webui_signup_body_password_repeat_text=Repeat
-#allow_pre_filled_password=true
-#webui_agree_terms_html=<div id="signup-agree-terms" class="checkbox"><label><input type="checkbox" />I hereby agree to the <a href="$url" title="T &amp; C">Terms and Conditions</a></label></div>
-webui_agree_privacy_policy_url = https://openbankproject.com/privacy-policy
-webui_agree_privacy_policy_html_text =<div id="signup-agree-privacy-policy"><label>By submitting this information you consent to processing your data by TESOBE GmbH according to our <a href="$url" title="Privacy Policy">Privacy Policy</a>. TESOBE shall use this information to send you emails and provide customer support.</label></div>
-#webui_legal_notice_html_text=<div id="signup-legal_notice">Tesobe will use your information as set out in our privacy notice</div>
+# Sign up functionality removed - users are directed to OBP Portal for registration
+# The following signup-related properties are no longer used:
+# - webui_signup_form_submit_button_value (signup form submit button text)
+# - webui_signup_form_title_text (signup form title)  
+# - webui_signup_body_password_repeat_text (password repeat field text)
+# - allow_pre_filled_password (pre-filled password functionality)
+# - webui_agree_terms_html (terms agreement checkbox HTML)
+# - webui_agree_privacy_policy_url (privacy policy URL for signup)
+# - webui_agree_privacy_policy_html_text (privacy policy agreement text)
+# - webui_legal_notice_html_text (legal notice for signup forms)
 
 ## For partner logos and links
 webui_main_partners=[\
@@ -596,8 +597,8 @@ webui_main_style_sheet = /media/css/website.css
 # Override certain elements (with important styles)
 webui_override_style_sheet =
 
-## Link to agree to Terms & Conditions, shown on signup page
-webui_agree_terms_url =
+## Link to agree to Terms & Conditions (no longer used - signup removed)
+# webui_agree_terms_url =
 
 ## The Support Email, shown in the bottom page
 #webui_support_email=contact@openbankproject.com
@@ -625,6 +626,9 @@ webui_agree_terms_url =
 #webui_post_consumer_registration_submit_button_value=Register consumer
 
 # OBP Portal URL - base URL for the OBP Portal service
+# Used for:
+# - User registration: {webui_obp_portal_url}/register (all "Register" links redirect here)
+# - Consumer registration: {webui_obp_portal_url}/consumer-registration (default)
 webui_obp_portal_url = http://localhost:5174
 
 # External Consumer Registration URL - used to redirect "Get API Key" links to an external service
diff --git a/obp-api/src/main/scala/code/api/util/Glossary.scala b/obp-api/src/main/scala/code/api/util/Glossary.scala
index 79d3ff77c9..b0c0dc2ca8 100644
--- a/obp-api/src/main/scala/code/api/util/Glossary.scala
+++ b/obp-api/src/main/scala/code/api/util/Glossary.scala
@@ -1095,7 +1095,7 @@ object Glossary extends MdcLoggable  {
 			|
 			|### 1) Get your App key
 			|
-			|[Sign up]($getServerUrl/user_mgt/sign_up) or [login]($getServerUrl/user_mgt/login) as a developer.
+			|[Sign up](${APIUtil.getPropsValue("webui_obp_portal_url", "http://localhost:5174")}/register) or [login]($getServerUrl/user_mgt/login) as a developer.
 			|
 			|Register your App key [HERE](${getConsumerRegistrationUrl()})
 			|
@@ -2151,7 +2151,7 @@ object Glossary extends MdcLoggable  {
         |
         |### Step 1: Get your App key
         |
-        |[Sign up]($getServerUrl/user_mgt/sign_up) or [login]($getServerUrl/user_mgt/login) as a developer
+        |[Sign up](${APIUtil.getPropsValue("webui_obp_portal_url", "http://localhost:5174")}/register) or [login]($getServerUrl/user_mgt/login) as a developer
         |
         |Register your App key [HERE](${getConsumerRegistrationUrl()})
         |
@@ -2800,7 +2800,7 @@ object Glossary extends MdcLoggable  {
 |
 |## In order to get an App / Consumer key
 |
-|[Sign up]($getServerUrl/user_mgt/sign_up) or [login]($getServerUrl/user_mgt/login) as a developer.
+|[Sign up](${APIUtil.getPropsValue("webui_obp_portal_url", "http://localhost:5174")}/register) or [login]($getServerUrl/user_mgt/login) as a developer.
 |
 |Register your App / Consumer [HERE](${getConsumerRegistrationUrl()})
 |
diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
index 0d8a462f9d..ee6d171a3d 100644
--- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
+++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
@@ -229,7 +229,7 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga
 
   override lazy val password = new MyPasswordNew
   
-  lazy val signupPasswordRepeatText = getWebUiPropsValue("webui_signup_body_password_repeat_text", S.?("repeat"))
+  // Removed signup password repeat text - not needed with OBP Portal redirect
  
   class MyPasswordNew extends MappedPassword(this) {
     lazy val preFilledPassword = if (APIUtil.getPropsAsBoolValue("allow_pre_filled_password", true)) {get.toString} else ""
@@ -238,14 +238,9 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga
         Full(
           <span>
             {appendFieldId(<input id="textPassword" aria-labelledby="Password" aria-describedby={uniqueFieldId.getOrElse("")} type={formInputType} name={funcName} value={preFilledPassword}/> ) }
-            <div id="signup-error" class="alert alert-danger hide">
+            <div id="password-error" class="alert alert-danger hide">
               <span data-lift={s"Msg?id=${uniqueFieldId.getOrElse("")}&errorClass=error"}/>
             </div>
-            <div id ="repeat-password">{signupPasswordRepeatText}</div>
-            <input id="textPasswordRepeat" aria-labelledby="Password Repeat" aria-describedby={uniqueFieldId.getOrElse("")}  type={formInputType} name={funcName} value={preFilledPassword}/>
-            <div id="signup-error" class="alert alert-danger hide">
-              <span data-lift={s"Msg?id=${uniqueFieldId.getOrElse("")}_repeat&errorClass=error"}/>
-            </div>
         </span>)
       }
     }
@@ -429,7 +424,6 @@ import net.liftweb.util.Helpers._
   override def screenWrap = Full(<lift:surround with="default" at="content"><lift:bind /></lift:surround>)
   // define the order fields will appear in forms and output
   override def fieldOrder = List(id, firstName, lastName, email, username, password, provider)
-  override def signupFields = List(firstName, lastName, email, username, password)
 
   // To force validation of email addresses set this to false (default as of 29 June 2021)
   override def skipEmailValidation = APIUtil.getPropsAsBoolValue("authUser.skipEmailValidation", false)
@@ -698,28 +692,7 @@ import net.liftweb.util.Helpers._
     case _ => S.error(S.?("invalid.validation.link")); S.redirectTo(homePage)
   }
 
-  override def actionsAfterSignup(theUser: TheUserType, func: () => Nothing): Nothing = {
-    theUser.setValidated(skipEmailValidation).resetUniqueId()
-    theUser.save
-    val privacyPolicyValue: String = getWebUiPropsValue("webui_privacy_policy", "")
-    val termsAndConditionsValue: String = getWebUiPropsValue("webui_terms_and_conditions", "")
-    // User Agreement table
-    UserAgreementProvider.userAgreementProvider.vend.createUserAgreement(
-      theUser.user.foreign.map(_.userId).getOrElse(""), "privacy_conditions", privacyPolicyValue)
-    UserAgreementProvider.userAgreementProvider.vend.createUserAgreement(
-      theUser.user.foreign.map(_.userId).getOrElse(""), "terms_and_conditions", termsAndConditionsValue)
-    if (!skipEmailValidation) {
-      sendValidationEmail(theUser)
-      S.notice(S.?("sign.up.message"))
-      func()
-    } else {
-      grantDefaultEntitlementsToAuthUser(theUser)
-      logUserIn(theUser, () => {
-        S.notice(S.?("welcome"))
-        func()
-      })
-    }
-  }
+
   /**
    * Set this to redirect to a certain page after a failed login
    */
@@ -728,87 +701,9 @@ import net.liftweb.util.Helpers._
   }
 
 
-  def agreeTermsDiv = {
-    val webUi = new WebUI
-    val webUiPropsValue = getWebUiPropsValue("webui_terms_and_conditions", "")
-    val termsAndConditionsCheckboxTitle = Helper.i18n("terms_and_conditions_checkbox_text", Some("I agree to the above Terms and Conditions"))
-    val termsAndConditionsCheckboxLabel = Helper.i18n("terms_and_conditions_checkbox_label", Some("Terms and Conditions"))
-    val agreeTermsHtml = s"""<hr>
-                |                        <div class="form-group" id="terms-and-conditions-div" onclick="enableDisableButton()">
-                |                            <details open style="cursor:s-resize;">
-                |                                <summary style="display:list-item;"><a class="api_group_name">$termsAndConditionsCheckboxLabel</a></summary>
-                |                                <div id="terms-and-conditions-page">${webUi.makeHtml(webUiPropsValue)}</div>
-                |                            </details>
-                |                            <input type="checkbox" class="form-check-input" id="terms_checkbox" >
-                |                            <label id="terms_checkbox_value" class="form-check-label" for="terms_checkbox">$termsAndConditionsCheckboxTitle</label>
-                |                        </div>
-                |                        """.stripMargin
-
-    scala.xml.Unparsed(agreeTermsHtml)
-  }
-
-  def legalNoticeDiv = {
-    val agreeTermsHtml = getWebUiPropsValue("webui_legal_notice_html_text", "")
-    if(agreeTermsHtml.isEmpty){
-      s""
-    } else{
-      scala.xml.Unparsed(s"""$agreeTermsHtml""")
-    }
-  }
-
-  def agreePrivacyPolicy = {
-    val webUi = new WebUI
-    val privacyPolicyCheckboxText = Helper.i18n("privacy_policy_checkbox_text", Some("I agree to the above Privacy Policy"))
-    val privacyPolicyCheckboxLabel = Helper.i18n("privacy_policy_checkbox_label", Some("Privacy Policy"))
-    val webUiPropsValue = getWebUiPropsValue("webui_privacy_policy", "")
-    val agreePrivacyPolicy = s"""<hr>
-                           |                        <div class="form-group" id="privacy-conditions-div" onclick="enableDisableButton()">
-                           |                            <details open style="cursor:s-resize;">
-                           |                                <summary style="display:list-item;"><a class="api_group_name">$privacyPolicyCheckboxLabel</a></summary>
-                           |                                <div id="privacy-policy-page">${webUi.makeHtml(webUiPropsValue)}</div>
-                           |                            </details>
-                           |                            <input id="privacy_checkbox" type="checkbox" class="form-check-input">
-                           |                            <label class="form-check-label" for="privacy_checkbox">$privacyPolicyCheckboxText</label>
-                           |                        </div>
-                           |                        <hr>""".stripMargin
-
-    scala.xml.Unparsed(agreePrivacyPolicy)
-  }
-  def enableDisableSignUpButton = {
-    val javaScriptCode = """<script>
-                               |                function enableDisableButton() {
-                               |                  var checkBox = document.getElementById("terms-and-conditions-div").querySelector("input[type=checkbox]");
-                               |                  var checkBox2 = document.getElementById("privacy-conditions-div").querySelector("input[type=checkbox]");
-                               |                  var button = document.getElementById("submit-button");
-                               |                  if (checkBox.checked == true && checkBox2.checked == true){
-                               |                    button.disabled = false;
-                               |                  } else {
-                               |                     button.disabled = true;
-                               |                  }
-                               |                }
-                               |                </script>""".stripMargin
-
-    scala.xml.Unparsed(javaScriptCode)
-  }
-
-  def signupFormTitle = getWebUiPropsValue("webui_signup_form_title_text", S.?("sign.up"))
-
-  override def signupXhtml (user:AuthUser) =  {
-    <div id="signup" tabindex="-1">
-      <form method="post" action={ObpS.uriAndQueryString.getOrElse(ObpS.uri)}>
-          <h1>{signupFormTitle}</h1>
-          {legalNoticeDiv}
-          <div id="signup-general-error" class="alert alert-danger hide"><span data-lift="Msg?id=error"/></div>
-          {localForm(user, false, signupFields)}
-          {agreeTermsDiv}
-          {agreePrivacyPolicy}
-          <div id="signup-submit">
-            <input onmouseover="enableDisableButton()" onfocus="enableDisableButton()" disabled="true" id="submit-button" type="submit" class="btn btn-danger"/>
-          </div>
-          {enableDisableSignUpButton}
-      </form>
-    </div>
-  }
+  // Removed signup-related methods: agreeTermsDiv, legalNoticeDiv, agreePrivacyPolicy
+  // These were only used in signup forms which now redirect to OBP Portal
+  // Signup functionality removed - users are directed to OBP Portal for registration
 
 
   override def localForm(user: TheUserType, ignorePassword: Boolean, fields: List[FieldPointerType]): NodeSeq = {
@@ -818,18 +713,11 @@ import net.liftweb.util.Helpers._
       if field.show_? && (!ignorePassword || !pointer.isPasswordField_?)
       form <- field.toForm.toList
     } yield {
-      if(field.uniqueFieldId.getOrElse("") == "authuser_password") {
-        <div class="form-group">
-          <label>{field.displayName}</label>
-          {form}
-        </div>
-      } else {
-        <div class="form-group">
-          <label>{field.displayName}</label>
-          {form}
-          <div id="signup-error" class="alert alert-danger hide"><span data-lift={s"Msg?id=${field.uniqueFieldId.getOrElse("")}&errorClass=error"}/></div>
-        </div>
-      }
+      <div class="form-group">
+        <label>{field.displayName}</label>
+        {form}
+        <div id="form-error" class="alert alert-danger hide"><span data-lift={s"Msg?id=${field.uniqueFieldId.getOrElse("")}&errorClass=error"}/></div>
+      </div>
     }
 
   }
@@ -1610,67 +1498,8 @@ def restoreSomeSessions(): Unit = {
     val usernames: List[String] = this.getResourceUsersByEmail(email).map(_.user.name)
     findAll(ByList(this.username, usernames))
   }
-  def signupSubmitButtonValue() = getWebUiPropsValue("webui_signup_form_submit_button_value", S.?("sign.up"))
-
-  //overridden to allow redirect to loginRedirect after signup. This is mostly to allow
-  // loginFirst menu items to work if the user doesn't have an account. Without this,
-  // if a user tries to access a logged-in only page, and then signs up, they don't get redirected
-  // back to the proper page.
-  override def signup = {
-    val theUser: TheUserType = mutateUserOnSignup(createNewUserInstance())
-    val theName = signUpPath.mkString("")
-
-    //Check the internal redirect, in case for open redirect issue.
-    // variable redir is from loginRedirect, it is set-up in OAuthAuthorisation.scala as following code:
-    // val currentUrl = ObpS.uriAndQueryString.getOrElse("/")
-    // AuthUser.loginRedirect.set(Full(Helpers.appendParams(currentUrl, List((LogUserOutParam, "false")))))
-    val loginRedirectSave = loginRedirect.is
-
-    def testSignup() {
-      validateSignup(theUser) match {
-        case Nil =>
-          //here we check loginRedirectSave (different from implementation in super class)
-          val redir = loginRedirectSave match {
-            case Full(url) =>
-              loginRedirect(Empty)
-              url
-            case _ =>
-              //if the register page url (user_mgt/sign_up?after-signup=link-to-customer) contains the parameter 
-              //after-signup=link-to-customer,then it will redirect to the on boarding customer page.
-              ObpS.param("after-signup") match { 
-                case url if (url.equals("link-to-customer")) =>
-                  "/add-user-auth-context-update-request"
-                case _ =>
-                  homePage
-            }
-          }
-          if (Helper.isValidInternalRedirectUrl(redir.toString)) {
-            actionsAfterSignup(theUser, () => {
-              S.redirectTo(redir)
-            })
-          } else {
-            S.error(S.?(ErrorMessages.InvalidInternalRedirectUrl))
-            logger.info(ErrorMessages.InvalidInternalRedirectUrl + loginRedirect.get)
-          }
 
-        case xs =>
-          xs.foreach{
-            e => S.error(e.field.uniqueFieldId.openOrThrowException("There is no uniqueFieldId."), e.msg)
-          }
-          signupFunc(Full(innerSignup _))
-      }
-    }
 
-    def innerSignup = {
-      val bind = "type=submit" #> signupSubmitButton(signupSubmitButtonValue(), testSignup _)
-      bind(signupXhtml(theUser))
-    }
-    
-    if(APIUtil.getPropsAsBoolValue("user_invitation.mandatory", false)) 
-      S.redirectTo("/user-invitation-info") 
-    else 
-      innerSignup
-  }
 
   def scrambleAuthUser(userPrimaryKey: UserPrimaryKey): Box[Boolean] = tryo {
     AuthUser.find(By(AuthUser.user, userPrimaryKey.value)) match {
diff --git a/obp-api/src/main/scala/code/snippet/Login.scala b/obp-api/src/main/scala/code/snippet/Login.scala
index a7c6a36c34..1ae8ce83b3 100644
--- a/obp-api/src/main/scala/code/snippet/Login.scala
+++ b/obp-api/src/main/scala/code/snippet/Login.scala
@@ -70,8 +70,11 @@ class Login {
         href getOrElse "#"
       } & {
         ".signup [href]" #> {
-         AuthUser.signUpPath.foldLeft("")(_ + "/" + _)
-        }
+         val portalUrl = getWebUiPropsValue("webui_obp_portal_url", "http://localhost:5174")
+         s"$portalUrl/register"
+        } &
+        ".signup [target]" #> "_blank" &
+        ".signup [rel]" #> "noopener"
       }
     }
   }
diff --git a/obp-api/src/main/scala/code/snippet/OAuthAuthorisation.scala b/obp-api/src/main/scala/code/snippet/OAuthAuthorisation.scala
index 66a5986277..be038b035a 100644
--- a/obp-api/src/main/scala/code/snippet/OAuthAuthorisation.scala
+++ b/obp-api/src/main/scala/code/snippet/OAuthAuthorisation.scala
@@ -46,6 +46,7 @@ import net.liftweb.http.S
 import net.liftweb.util.Helpers._
 import net.liftweb.util.{CssSel, Helpers, Props}
 import code.api.oauth1a.OauthParams._
+import code.webuiprops.MappedWebUiPropsProvider.getWebUiPropsValue
 
 import scala.xml.NodeSeq
 
@@ -150,8 +151,12 @@ object OAuthAuthorisation {
 
                   href getOrElse "#"
                 } &
-                ".signup [href]" #>
-                  AuthUser.signUpPath.foldLeft("")(_ + "/" + _)
+                ".signup [href]" #> {
+                  val portalUrl = getWebUiPropsValue("webui_obp_portal_url", "http://localhost:5174")
+                  s"$portalUrl/register"
+                } &
+                ".signup [target]" #> "_blank" &
+                ".signup [rel]" #> "noopener"
             }
           }
           case _ => error("Application not found")
diff --git a/obp-api/src/main/scala/code/snippet/WebUI.scala b/obp-api/src/main/scala/code/snippet/WebUI.scala
index d732bbec24..c741558c58 100644
--- a/obp-api/src/main/scala/code/snippet/WebUI.scala
+++ b/obp-api/src/main/scala/code/snippet/WebUI.scala
@@ -550,8 +550,21 @@ class WebUI extends MdcLoggable{
   def userIsLoggedIn: CssSel = {
     if(AuthUser.loggedIn_?)
       "#register-link [href]" #> scala.xml.Unparsed(s"/already-logged-in")
-    else
-      "#register-link [href]" #> scala.xml.Unparsed(s"/user_mgt/sign_up")
+    else {
+      val portalUrl = getWebUiPropsValue("webui_obp_portal_url", "http://localhost:5174")
+      val registerUrl = s"$portalUrl/register"
+      "#register-link [href]" #> scala.xml.Unparsed(registerUrl) &
+      "#register-link [target]" #> "_blank" &
+      "#register-link [rel]" #> "noopener"
+    }
+  }
+
+  def portalRegisterLink: CssSel = {
+    val portalUrl = getWebUiPropsValue("webui_obp_portal_url", "http://localhost:5174")
+    val registerUrl = s"$portalUrl/register"
+    "a [href]" #> scala.xml.Unparsed(registerUrl) &
+    "a [target]" #> "_blank" &
+    "a [rel]" #> "noopener"
   }
 
   def alreadyLoggedIn: CssSel = {
diff --git a/obp-api/src/main/webapp/index-en.html b/obp-api/src/main/webapp/index-en.html
index a0dd0210ca..32075b8b4a 100644
--- a/obp-api/src/main/webapp/index-en.html
+++ b/obp-api/src/main/webapp/index-en.html
@@ -59,7 +59,7 @@ <h2 id="get-started-part"><span class="get_started_title">Get started</span></h2
             </div>
             <div class="col-xs-12 col-md-5 main-get-started-text">
                 <h3><span class="get_started_create_account_title">Create an account</span></h3>
-                <p><span class="get_started_create_account">First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage. </span><a href="/user_mgt/sign_up"><span class="register_for_an_account">Register for an account</span>
+                <p><span class="get_started_create_account">First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage. </span><a href="#" data-lift="WebUI.portalRegisterLink"><span class="register_for_an_account">Register for an account</span>
                         </a>.</p>
                 <p data-lift="WebUI.subscriptionsInvitationText" class ="subscriptions_invitation_text"> </span>
                         </p>
diff --git a/obp-api/src/main/webapp/index.html b/obp-api/src/main/webapp/index.html
index 54b4d75a3f..92fabd6ba3 100644
--- a/obp-api/src/main/webapp/index.html
+++ b/obp-api/src/main/webapp/index.html
@@ -59,7 +59,7 @@ <h2 id="get-started-part"><lift:loc locid="get_started_title">Get started</lift:
             </div>
             <div class="col-xs-12 col-md-5 main-get-started-text">
                 <h3><lift:loc locid="get_started_create_account_title">Create an account</lift:loc></h3>
-                <p><lift:loc locid="get_started_create_account">First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage. </lift:loc><a href="/user_mgt/sign_up"><lift:loc locid="register_for_an_account">Register for an account</lift:loc>
+                <p><lift:loc locid="get_started_create_account">First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage. </lift:loc><a href="#" data-lift="WebUI.portalRegisterLink"><lift:loc locid="register_for_an_account">Register for an account</lift:loc>
                         </a>.</p>
                 <p data-lift="WebUI.subscriptionsInvitationText" class ="subscriptions_invitation_text"> </lift:loc>
                         </p>
diff --git a/obp-api/src/main/webapp/oauth/authorize.html b/obp-api/src/main/webapp/oauth/authorize.html
index b4d7678a03..a71babac72 100644
--- a/obp-api/src/main/webapp/oauth/authorize.html
+++ b/obp-api/src/main/webapp/oauth/authorize.html
@@ -40,7 +40,7 @@ <h1>The application <span id="applicationName">app</span> is asking for access t
 					<hr>
 					<div class="row">
 						<span id="login-Register-text">Don't have an account? </span>
-						<a href="/user_mgt/sign_up" id="authorise-signup" class="btn btn-default pull-right authorise-button" tabindex="0">Register</a>
+						<a href="#" data-lift="WebUI.portalRegisterLink" id="authorise-signup" class="btn btn-default pull-right authorise-button" tabindex="0">Register</a>
 					</div>
 
 					<div data-lift="OpenIDConnectSnippet.showText" class ="login-or"> or Login with OpenID : </div>
diff --git a/obp-api/src/main/webapp/templates-hidden/_login.html b/obp-api/src/main/webapp/templates-hidden/_login.html
index c96de62e20..0b91a507c6 100644
--- a/obp-api/src/main/webapp/templates-hidden/_login.html
+++ b/obp-api/src/main/webapp/templates-hidden/_login.html
@@ -42,7 +42,7 @@ <h1  id="login-instruction-title"><lift:loc locid="logontext">Log on to the Open
 			<hr>
 			<div class="row">
 				<span id="login-Register-text"><lift:loc locid="don't_have_account">Don't have an account?</lift:loc> </span>
-				<a href="/user_mgt/sign_up" id="authorise-signup" class="btn btn-default pull-right authorise-button" tabindex="0"><lift:loc locid="register">Register</lift:loc></a>
+				<a href="#" data-lift="WebUI.portalRegisterLink" id="authorise-signup" class="btn btn-default pull-right authorise-button" tabindex="0"><lift:loc locid="register">Register</lift:loc></a>
 			</div>
 
 			<div data-lift="OpenIDConnectSnippet.showText" class ="login-or"><lift:loc locid="or_login_with_openid"> or Login with OpenID :</lift:loc></div>
diff --git a/obp-api/src/main/webapp/templates-hidden/default-en.html b/obp-api/src/main/webapp/templates-hidden/default-en.html
index 2b2e4f8313..9da6dba6d4 100644
--- a/obp-api/src/main/webapp/templates-hidden/default-en.html
+++ b/obp-api/src/main/webapp/templates-hidden/default-en.html
@@ -143,7 +143,7 @@
 						<li data-lift="Nav.item?name=Login" class="navitem">
 							<!-- LOGGED OUT -->
 							<p data-lift="WebUI.userIsLoggedIn">
-								<a href="/user_mgt/sign_up" class="navbar-btn" id ="register-link"><span class="register">Register</span></a><a data-lift="Login.loggedOut" href="#" class="btn btn-danger login"><span class="logon">Log on</span></a>
+								<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link"><span class="register">Register</span></a><a data-lift="Login.loggedOut" href="#" class="btn btn-danger login"><span class="logon">Log on</span></a>
 							</p>
 						</li>
 
@@ -198,7 +198,7 @@
 				</li>
 				<li>
 					<div class="navitem" id="register-link-nav">
-						<a data-lift="WebUI.userIsLoggedIn" href="/user_mgt/sign_up" class="navbar-btn" id ="register-link">Register</a>
+						<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link">Register</a>
 						<a data-lift="Login.loggedIn" href="#" class="logout">Log off</a></p>
 					</div>
 				</li>
@@ -235,7 +235,7 @@
 						<a class="sofi-link" data-lift="WebUI.sofiLink" href="">Sofit</a>
 					</li>
 					<li>
-						<a href="/user_mgt/sign_up?after-signup=link-to-customer" class="navbar-btn" id ="register-link">
+						<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link">
 							<span class="register">On Board</span></a>
 					</li>
 					<li>
diff --git a/obp-api/src/main/webapp/templates-hidden/default-footer.html b/obp-api/src/main/webapp/templates-hidden/default-footer.html
index 74a60838bb..819ba810cc 100644
--- a/obp-api/src/main/webapp/templates-hidden/default-footer.html
+++ b/obp-api/src/main/webapp/templates-hidden/default-footer.html
@@ -148,7 +148,7 @@
 						<li data-lift="Nav.item?name=Login" class="navitem">
 							
 							<p data-lift="WebUI.userIsLoggedIn">
-								<a href="/user_mgt/sign_up" class="navbar-btn" id ="register-link"><lift:loc locid="register">Register</lift:loc></a><a data-lift="Login.loggedOut" href="#" class="btn btn-danger login"><lift:loc locid="logon">Log on</lift:loc></a>
+								<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link"><lift:loc locid="register">Register</lift:loc></a><a data-lift="Login.loggedOut" href="#" class="btn btn-danger login"><lift:loc locid="logon">Log on</lift:loc></a>
 							</p>
 						</li>
 
@@ -208,7 +208,7 @@
 				</li>
 				<li>
 					<div class="navitem" id="register-link-nav">
-						<a data-lift="WebUI.userIsLoggedIn" href="/user_mgt/sign_up" class="navbar-btn" id ="register-link">Register</a>
+						<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link">Register</a>
 						<a data-lift="Login.loggedIn" href="#" class="logout">Log off</a></p>
 					</div>
 				</li>
@@ -248,7 +248,7 @@
 						<a class="sofi-link" data-lift="WebUI.sofiLink" href="">Sofit</a>
 					</li>
 					<li>
-						<a href="/user_mgt/sign_up?after-signup=link-to-customer" class="navbar-btn" id ="register-link">
+						<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link">
 							<lift:loc locid="register">On Board</lift:loc></a>
 					</li>
 					<li>
diff --git a/obp-api/src/main/webapp/templates-hidden/default-header.html b/obp-api/src/main/webapp/templates-hidden/default-header.html
index fba6bbb16d..c5079d3d9c 100644
--- a/obp-api/src/main/webapp/templates-hidden/default-header.html
+++ b/obp-api/src/main/webapp/templates-hidden/default-header.html
@@ -143,7 +143,7 @@
 						<li data-lift="Nav.item?name=Login" class="navitem">
 							<!-- LOGGED OUT -->
 							<p data-lift="WebUI.userIsLoggedIn">
-								<a href="/user_mgt/sign_up" class="navbar-btn" id ="register-link"><lift:loc locid="register">Register</lift:loc></a><a data-lift="Login.loggedOut" href="#" class="btn btn-danger login"><lift:loc locid="logon">Log on</lift:loc></a>
+								<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link"><lift:loc locid="register">Register</lift:loc></a><a data-lift="Login.loggedOut" href="#" class="btn btn-danger login"><lift:loc locid="logon">Log on</lift:loc></a>
 							</p>
 						</li>
 
@@ -198,7 +198,7 @@
 				</li>
 				<li>
 					<div class="navitem" id="register-link-nav">
-						<a data-lift="WebUI.userIsLoggedIn" href="/user_mgt/sign_up" class="navbar-btn" id ="register-link">Register</a>
+						<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link">Register</a>
 						<a data-lift="Login.loggedIn" href="#" class="logout">Log off</a></p>
 					</div>
 				</li>
@@ -236,7 +236,7 @@
 						<a class="sofi-link" data-lift="WebUI.sofiLink" href="">Sofit</a>
 					</li>
 					<li>
-						<a href="/user_mgt/sign_up?after-signup=link-to-customer" class="navbar-btn" id ="register-link">
+						<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link">
 							<lift:loc locid="register">On Board</lift:loc></a>
 					</li>
 					<li>
diff --git a/obp-api/src/main/webapp/templates-hidden/default.html b/obp-api/src/main/webapp/templates-hidden/default.html
index 4eb5915caa..c2ec26e45e 100644
--- a/obp-api/src/main/webapp/templates-hidden/default.html
+++ b/obp-api/src/main/webapp/templates-hidden/default.html
@@ -143,7 +143,7 @@
 						<li data-lift="Nav.item?name=Login" class="navitem">
 							<!-- LOGGED OUT -->
 							<p data-lift="WebUI.userIsLoggedIn">
-								<a href="/user_mgt/sign_up" class="navbar-btn" id ="register-link"><lift:loc locid="register">Register</lift:loc></a><a data-lift="Login.loggedOut" href="#" class="btn btn-danger login"><lift:loc locid="logon">Log on</lift:loc></a>
+								<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link"><lift:loc locid="register">Register</lift:loc></a><a data-lift="Login.loggedOut" href="#" class="btn btn-danger login"><lift:loc locid="logon">Log on</lift:loc></a>
 							</p>
 						</li>
 
@@ -198,7 +198,7 @@
 				</li>
 				<li>
 					<div class="navitem" id="register-link-nav">
-						<a data-lift="WebUI.userIsLoggedIn" href="/user_mgt/sign_up" class="navbar-btn" id ="register-link">Register</a>
+						<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link">Register</a>
 						<a data-lift="Login.loggedIn" href="#" class="logout">Log off</a></p>
 					</div>
 				</li>
@@ -235,7 +235,7 @@
 						<a class="sofi-link" data-lift="WebUI.sofiLink" href="">Sofit</a>
 					</li>
 					<li>
-						<a href="/user_mgt/sign_up?after-signup=link-to-customer" class="navbar-btn" id ="register-link">
+						<a href="#" data-lift="WebUI.portalRegisterLink" class="navbar-btn" id ="register-link">
 							<lift:loc locid="register">On Board</lift:loc></a>
 					</li>
 					<li>
diff --git a/obp-api/src/test/scala/code/util/OAuthClient.scala b/obp-api/src/test/scala/code/util/OAuthClient.scala
index d930f85ee1..4f81b1ad48 100644
--- a/obp-api/src/test/scala/code/util/OAuthClient.scala
+++ b/obp-api/src/test/scala/code/util/OAuthClient.scala
@@ -67,7 +67,7 @@ trait DefaultProvider extends Provider {
   val requestTokenUrl = baseUrl + "/oauth/initiate"
   val accessTokenUrl = baseUrl + "/oauth/token"
   val authorizeUrl = baseUrl + "/oauth/authorize"
-  val signupUrl = Some(baseUrl + "/user_mgt/sign_up")
+  val signupUrl = Some(APIUtil.getPropsValue("webui_obp_portal_url", "http://localhost:5174") + "/register")
 
   lazy val oAuthProvider : OAuthProvider = new DefaultOAuthProvider(requestTokenUrl, accessTokenUrl, authorizeUrl)
 

From 0fcf0b9d457d820c475915d028a6d6cd07021103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Tue, 23 Dec 2025 10:34:17 +0100
Subject: [PATCH 4/7] feature/Reduce test warnings

---
 obp-api/src/test/scala/RunMTLSWebApp.scala    |  2 +-
 obp-api/src/test/scala/RunTLSWebApp.scala     |  2 +-
 obp-api/src/test/scala/code/AppTest.scala     | 22 +++++++--------
 .../test/scala/code/api/DirectLoginTest.scala |  1 +
 .../scala/code/api/OBPRestHelperTest.scala    |  1 -
 .../ResourceDocs1_4_0/ResourceDocsTest.scala  |  1 +
 .../ResourceDocs1_4_0/SwaggerDocsTest.scala   |  1 +
 .../code/api/util/JavaWebSignatureTest.scala  |  1 +
 .../scala/code/api/v1_4_0/BranchesTest.scala  |  2 ++
 .../v2_1_0/CreateTransactionTypeTest.scala    |  1 +
 .../code/api/v2_1_0/EntitlementTests.scala    |  1 +
 .../scala/code/api/v2_2_0/API2_2_0Test.scala  | 14 ++++++++++
 .../code/api/v2_2_0/ExchangeRateTest.scala    | 10 +++++++
 .../scala/code/api/v3_0_0/AccountTest.scala   |  9 +++++++
 .../scala/code/api/v3_0_0/BranchesTest.scala  |  4 +++
 .../code/api/v3_0_0/CounterpartyTest.scala    |  5 ++++
 .../api/v3_0_0/EntitlementRequestsTest.scala  | 10 +++++++
 .../scala/code/api/v3_0_0/FirehoseTest.scala  | 11 ++++++++
 .../code/api/v3_0_0/GetAdapterInfoTest.scala  | 10 +++++++
 .../code/api/v3_0_0/TransactionsTest.scala    |  8 ++++++
 .../test/scala/code/api/v3_0_0/UserTest.scala | 15 +++++++++++
 .../scala/code/api/v3_0_0/ViewsTests.scala    | 15 +++++++++++
 .../scala/code/api/v3_0_0/WarehouseTest.scala | 10 +++++++
 .../code/api/v3_0_0/WarehouseTestAsync.scala  | 11 ++++++++
 .../scala/code/api/v3_1_0/AccountTest.scala   | 25 +++++++++++++++++
 .../scala/code/api/v3_1_0/ConsentTest.scala   | 16 +++++++++++
 .../code/api/v3_1_0/TransactionTest.scala     |  8 +++---
 .../scala/code/api/v4_0_0/AccountTest.scala   |  2 +-
 .../AuthenticationTypeValidationTest.scala    | 15 +++++++++++
 .../code/api/v4_0_0/ConnectorMethodTest.scala |  2 +-
 .../api/v4_0_0/ForceErrorValidationTest.scala | 16 +++++++++++
 .../api/v4_0_0/JsonSchemaValidationTest.scala | 15 +++++++++++
 .../api/v4_0_0/TransactionRequestsTest.scala  |  4 +--
 .../scala/code/api/v5_0_0/AccountTest.scala   | 24 +++++++++++++++++
 .../scala/code/api/v5_0_0/ViewsTests.scala    | 10 +++++++
 .../code/api/v5_1_0/ConsentObpTest.scala      | 16 +++++++++++
 .../api/v5_1_0/VRPConsentRequestTest.scala    | 27 +++++++++++++++++++
 .../scala/code/api/v6_0_0/CustomerTest.scala  |  2 +-
 .../code/api/v6_0_0/PasswordResetTest.scala   |  2 +-
 .../scala/code/connector/ConnectorTest.scala  |  9 +++++++
 .../connector/InternalConnectorTest.scala     |  1 +
 .../scala/code/connector/MessageDocTest.scala |  1 +
 .../RestConnector_vMar2019_FrozenTest.scala   |  1 +
 .../scala/code/util/FrozenClassUtil.scala     |  1 +
 44 files changed, 338 insertions(+), 26 deletions(-)

diff --git a/obp-api/src/test/scala/RunMTLSWebApp.scala b/obp-api/src/test/scala/RunMTLSWebApp.scala
index 06381729b1..6169fd19b2 100644
--- a/obp-api/src/test/scala/RunMTLSWebApp.scala
+++ b/obp-api/src/test/scala/RunMTLSWebApp.scala
@@ -89,7 +89,7 @@ object RunMTLSWebApp extends App with PropsProgrammatically {
     // RESET HEADER
     https.addCustomizer(customizer)
 
-    val sslContextFactory = new SslContextFactory()
+    val sslContextFactory = new SslContextFactory.Server()
     sslContextFactory.setKeyStorePath(this.getClass.getResource("/cert/server.jks").toExternalForm)
     sslContextFactory.setKeyStorePassword("123456")
 
diff --git a/obp-api/src/test/scala/RunTLSWebApp.scala b/obp-api/src/test/scala/RunTLSWebApp.scala
index dc4f7affff..718734b5ac 100644
--- a/obp-api/src/test/scala/RunTLSWebApp.scala
+++ b/obp-api/src/test/scala/RunTLSWebApp.scala
@@ -89,7 +89,7 @@ object RunTLSWebApp extends App with PropsProgrammatically {
     // RESET HEADER
     https.addCustomizer(customizer)
 
-    val sslContextFactory = new SslContextFactory()
+    val sslContextFactory = new SslContextFactory.Server()
     sslContextFactory.setKeyStorePath(this.getClass.getResource("/cert/server.jks").toExternalForm)
     sslContextFactory.setKeyStorePassword("123456")
 
diff --git a/obp-api/src/test/scala/code/AppTest.scala b/obp-api/src/test/scala/code/AppTest.scala
index 2e8dedba95..20c50420c0 100644
--- a/obp-api/src/test/scala/code/AppTest.scala
+++ b/obp-api/src/test/scala/code/AppTest.scala
@@ -27,33 +27,29 @@ TESOBE (http://www.tesobe.com/)
 package code
 
 import java.io.File
-import junit.framework._
-import Assert._
 import scala.xml.XML
 import net.liftweb.util._
 import net.liftweb.common._
+import org.scalatest.{FlatSpec, Matchers}
 
 object AppTest {
-  def suite: Test = {
-    val suite = new TestSuite(classOf[AppTest])
-    suite
-  }
-
   def main(args : Array[String]) {
-    junit.textui.TestRunner.run(suite)
+    // Use ScalaTest runner instead
+    println("Use 'sbt test' or 'mvn test' to run tests")
   }
 }
 
 /**
  * Unit test for simple App.
  */
-class AppTest extends TestCase("app") {
+class AppTest extends FlatSpec with Matchers {
 
   /**
-   * Rigourous Tests :-)
+   * Basic functionality test
    */
-  def testOK() = assertTrue(true)
-  // def testKO() = assertTrue(false);
+  "App" should "pass basic test" in {
+    true should be(true)
+  }
 
   /**
    * Tests to make sure the project's XML files are well-formed.
@@ -61,7 +57,7 @@ class AppTest extends TestCase("app") {
    * Finds every *.html and *.xml file in src/main/webapp (and its
    * subdirectories) and tests to make sure they are well-formed.
    */
-  def testXml() = {
+  it should "have well-formed XML files" in {
     var failed: List[File] = Nil
 
     def handledXml(file: String) =
diff --git a/obp-api/src/test/scala/code/api/DirectLoginTest.scala b/obp-api/src/test/scala/code/api/DirectLoginTest.scala
index 2cb1c92c3b..9cca2d5e4f 100644
--- a/obp-api/src/test/scala/code/api/DirectLoginTest.scala
+++ b/obp-api/src/test/scala/code/api/DirectLoginTest.scala
@@ -13,6 +13,7 @@ import code.setup.{APIResponse, ServerSetup, TestPasswordConfig}
 import code.userlocks.UserLocksProvider
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
 import net.liftweb.json.JsonAST.{JArray, JField, JObject, JString}
 import net.liftweb.mapper.By
diff --git a/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala b/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala
index a8bfc06c15..ddc90c77bf 100644
--- a/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala
+++ b/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala
@@ -1,7 +1,6 @@
 package code.api
 
 import code.api.util.APIUtil.{ResourceDoc, EmptyBody}
-import code.api.OBPRestHelper
 import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion}
 import org.scalatest.{FlatSpec, Matchers, Tag}
 
diff --git a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala
index a830976850..e758d413e1 100644
--- a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala
+++ b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala
@@ -9,6 +9,7 @@ import code.api.v1_4_0.JSONFactory1_4_0.ResourceDocsJson
 import code.setup.{DefaultUsers, PropsReset}
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.{ApiVersion, Functions}
+import scala.language.reflectiveCalls
 import net.liftweb.json
 import net.liftweb.json.JsonAST._
 import net.liftweb.json.{Formats, JString, Serializer, TypeInfo}
diff --git a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala
index b96a1acf37..2fe764ed5f 100644
--- a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala
+++ b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala
@@ -5,6 +5,7 @@ import code.api.util.{ApiRole, CustomJsonFormats}
 import code.setup.{DefaultUsers, PropsReset}
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.{ApiVersion, Functions}
+import scala.language.reflectiveCalls
 import io.swagger.parser.OpenAPIParser
 import net.liftweb.json
 import net.liftweb.json.JsonAST._
diff --git a/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala b/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala
index f629673469..8375426159 100644
--- a/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala
+++ b/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala
@@ -11,6 +11,7 @@ import com.github.dwickern.macros.NameOf.nameOf
 import net.liftweb.common.Full
 import net.liftweb.util.Helpers._
 import org.scalatest.Tag
+import scala.language.postfixOps
 
 class JavaWebSignatureTest extends V400ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala b/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala
index e9d6239ca1..5eefca75ed 100644
--- a/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala
+++ b/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala
@@ -1,4 +1,6 @@
 package code.api.v1_4_0
+// Note: This test intentionally uses deprecated model classes (LobbyStringT, DriveUpStringT)
+// to maintain backwards compatibility testing. These warnings are expected.
 
 import code.api.util.APIUtil.OAuth._
 import code.api.util.OBPQueryParam
diff --git a/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala b/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
index 8a0bedf9b4..f2d1c0d06f 100644
--- a/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
+++ b/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
@@ -10,6 +10,7 @@ import code.setup.DefaultUsers
 import code.transaction_types.MappedTransactionType
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.model.{AmountOfMoneyJsonV121, ErrorMessage, TransactionTypeId}
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
 import net.liftweb.json.Serialization._
 import org.scalatest.Tag
diff --git a/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala b/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
index 0267f559e3..ecec7ea293 100644
--- a/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
+++ b/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
@@ -10,6 +10,7 @@ import code.entitlement.Entitlement
 import code.setup.DefaultUsers
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
 
 
diff --git a/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala b/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
index 34e50d2b33..c7b1deebc0 100644
--- a/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
+++ b/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
@@ -27,20 +27,34 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v2_2_0
 
 import code.api.Constant._
+import scala.language.reflectiveCalls
 import _root_.net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.createViewJsonV300
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.v1_2._
+import scala.language.reflectiveCalls
 import code.api.v1_2_1.UpdateViewJsonV121
+import scala.language.reflectiveCalls
 import code.setup.{APIResponse, DefaultUsers}
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.CreateViewJson
+import scala.language.reflectiveCalls
 import net.liftweb.util.Helpers._
+import scala.language.reflectiveCalls
 import org.scalatest._
+import scala.language.reflectiveCalls
 import code.api.v2_2_0.OBPAPI2_2_0.Implementations2_2_0
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 
 import scala.util.Random._
+import scala.language.reflectiveCalls
 
 
 class API2_2_0Test extends V220ServerSetup with DefaultUsers {
diff --git a/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala b/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala
index 2b98968678..aaf37c2a18 100644
--- a/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala
+++ b/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala
@@ -1,15 +1,25 @@
 package code.api.v2_2_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.InvalidISOCurrencyCode
+import scala.language.reflectiveCalls
 import code.consumer.Consumers
+import scala.language.reflectiveCalls
 import code.scope.Scope
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class ExchangeRateTest extends V220ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala
index d7d7594062..849bdd74a9 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala
@@ -1,14 +1,23 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanUseAccountFirehoseAtAnyBank
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{AccountFirehoseNotAllowedOnThisInstance, UserHasMissingRoles}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.setup.APIResponse
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class AccountTest extends V300ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala
index 579b8e4d8d..ce4253ca37 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala
@@ -1,4 +1,6 @@
 package code.api.v3_0_0
+// Note: This test intentionally uses deprecated model classes (LobbyStringT, DriveUpStringT)
+// to maintain backwards compatibility testing. These warnings are expected.
 
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole.CanDeleteBranchAtAnyBank
@@ -13,6 +15,8 @@ import code.setup.DefaultUsers
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.model._
 import org.scalatest.Tag
+import scala.language.postfixOps
+import scala.language.reflectiveCalls
 
 import scala.concurrent.duration._
 import scala.concurrent.Await
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala
index 1dc35fe80b..ece6cb43aa 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala
@@ -1,10 +1,15 @@
 package code.api.v3_0_0
 
 import code.api.Constant._
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class CounterpartyTest extends V300ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala
index 47417995db..f763fcf75e 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala
@@ -1,15 +1,25 @@
 package code.api.v3_0_0
 
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.{CanGetEntitlementRequestsAtAnyBank}
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.util.{ApiRole}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 /*
 Note This does not test retrieval from a backend.
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala
index 45e6b1b361..1d50e0bbe3 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala
@@ -1,16 +1,27 @@
 package code.api.v3_0_0
 
 import code.api.Constant
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.{CanUseAccountFirehose, CanUseAccountFirehoseAtAnyBank}
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.AccountFirehoseNotAllowedOnThisInstance
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.PropsReset
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class FirehoseTest extends V300ServerSetup with PropsReset{
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala
index c3c7a1e0f2..a363ee2613 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala
@@ -26,15 +26,25 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_0_0
 
 import code.api.util.ApiRole.canGetAdapterInfoAtOneBank
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{UserHasMissingRoles, UserNotLoggedIn}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class GetAdapterInfoTest extends V300ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala
index 487c22e051..66e250d6b2 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala
@@ -1,13 +1,21 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanUseAccountFirehoseAtAnyBank
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{AccountFirehoseNotAllowedOnThisInstance, UserHasMissingRoles}
+import scala.language.reflectiveCalls
 import code.api.util.{APIUtil, ErrorMessages}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class TransactionsTest extends V300ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala
index bc0ade4969..4eccea066a 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala
@@ -1,20 +1,35 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.{ApiRole, ErrorMessages}
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanGetAnyUser
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.UserHasMissingRoles
+import scala.language.reflectiveCalls
 import code.api.v2_0_0.JSONFactory200.UsersJsonV200
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.JsonAST._
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import net.liftweb.util.Helpers.randomString
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 
 class UserTest extends V300ServerSetup with DefaultUsers {
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala b/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala
index 1d6df40d91..b567b3aa6b 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala
@@ -27,21 +27,36 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_0_0
 
 import code.api.Constant._
+import scala.language.reflectiveCalls
 import _root_.net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import code.api.v1_2_1.{APIInfoJSON, PermissionJSON, PermissionsJSON}
+import scala.language.reflectiveCalls
 import code.api.v2_2_0.{ViewJSONV220, ViewsJSONV220}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.setup.APIResponse
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{CreateViewJson, UpdateViewJSON}
+import scala.language.reflectiveCalls
 import net.liftweb.util.Helpers._
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import scala.util.Random.nextInt
+import scala.language.reflectiveCalls
 
 class ViewsTests extends V300ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala
index 3a88f90f26..00a3649948 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala
@@ -3,15 +3,25 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanSearchWarehouse
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.UserHasMissingRoles
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.setup.{APIResponse, DefaultUsers}
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 
 class WarehouseTest extends V300ServerSetup with DefaultUsers {
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala
index 6d0ee31883..9dfa99f9b2 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala
@@ -3,17 +3,28 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanSearchWarehouse
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.UserHasMissingRoles
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.setup.{APIResponse, DefaultUsers}
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import scala.concurrent.Future
+import scala.language.reflectiveCalls
 
 class WarehouseTestAsync extends V300ServerSetupAsync with DefaultUsers {
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala
index 68c6e00469..94db2bbb53 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala
@@ -1,31 +1,56 @@
 package code.api.v3_1_0
 
 import code.api.Constant
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{AccountRouting, AccountRoutingJsonV121, AmountOfMoneyJsonV121, ErrorMessage, enums}
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.updateAccountRequestJsonV310
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.extractErrorMessageCode
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{UserHasMissingRoles, UserNotLoggedIn}
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.v2_0_0.BasicAccountJSON
+import scala.language.reflectiveCalls
 import code.api.v2_2_0.CreateAccountJSONV220
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.{CoreAccountsJsonV300, ModeratedCoreAccountJsonV300}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
+import scala.language.reflectiveCalls
 import code.api.v2_0_0.OBPAPI2_0_0.Implementations2_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.model.dataAccess.BankAccountRouting
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.enums.AccountRoutingScheme
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import java.util.UUID
+import scala.language.reflectiveCalls
 import java.util.concurrent.TimeUnit
+import scala.language.reflectiveCalls
 import scala.util.Random
+import scala.language.reflectiveCalls
 
 class AccountTest extends V310ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala b/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala
index 894c29dbbf..1b9db56e1a 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala
@@ -26,22 +26,38 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_1_0
 
 import code.api.Constant
+import scala.language.reflectiveCalls
 import code.api.RequestHeader
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
+import scala.language.reflectiveCalls
 import code.api.util.{APIUtil, Consent}
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.{APIMethods300, UserJsonV300}
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import java.util.Date
+import scala.language.reflectiveCalls
 
 class ConsentTest extends V310ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala b/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala
index f67ddc6246..8a5b254a4b 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala
@@ -26,7 +26,6 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_1_0
 
 import code.api.Constant._
-import com.openbankproject.commons.model.ErrorMessage
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole.CanCreateHistoricalTransaction
@@ -42,10 +41,11 @@ import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations2_2_0
 import code.entitlement.Entitlement
 import com.github.dwickern.macros.NameOf.nameOf
-import com.openbankproject.commons.model.AmountOfMoneyJsonV121
+import com.openbankproject.commons.model.{AmountOfMoneyJsonV121, ErrorMessage}
 import com.openbankproject.commons.util.ApiVersion
-import org.scalatest.Tag
 import net.liftweb.json.Serialization.write
+import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class TransactionTest extends V310ServerSetup {
 
@@ -448,7 +448,7 @@ class TransactionTest extends V310ServerSetup {
 
       val responseError1 = makePostRequest(request310, write(postJsonCounterparty1))
       Then("We should get a 400")
-      
+
       responseError1.code should equal(400)
       responseError1.body.toString contains("from object should only contain bank_id and account_id or counterparty_id in the post json body.") should be (true)
 
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala
index 3158ed64f3..9fa32b6528 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala
@@ -329,7 +329,7 @@ class AccountTest extends V400ServerSetup {
       When("We make a request v4.0.0")
       val request400 = (v4_0_0_Request / "management" / "accounts" / "account-routing-regex-query").POST
       val postBody = getAccountByRoutingJson.copy(account_routing = AccountRoutingJsonV121("AccountNumber", "123456789-[A-Z]{3}"))
-      val response400 = makePostRequest(request400, write())
+      val response400 = makePostRequest(request400, write(postBody))
       Then("We should get a 401")
       response400.code should equal(401)
       And("error should be " + UserNotLoggedIn)
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala
index 8852f2f6bf..2088c9d495 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala
@@ -1,20 +1,35 @@
 package code.api.v4_0_0
 
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations2_2_0
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.APIResponse
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json
+import scala.language.reflectiveCalls
 import net.liftweb.json.JsonAST.JBool
+import scala.language.reflectiveCalls
 import net.liftweb.json.{JArray, JString}
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class AuthenticationTypeValidationTest extends V400ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
index 488b11fb3a..e2120abcf5 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
@@ -281,7 +281,7 @@ class ConnectorMethodTest extends V400ServerSetup {
       val future = connectorMethod.getBank(BankId("Hello_bank_id"), None)
       val result = Await.result(future, Duration.apply(10, TimeUnit.SECONDS))
 
-      result shouldBe a[Full[(Bank, Option[CallContext])]]
+      result shouldBe a[net.liftweb.common.Box[_]]
       val Full((bank, _)) = result
 
       bank.bankId.value shouldBe "Hello_bank_id"
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala
index b524417ee0..6dae1a3f3a 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala
@@ -1,21 +1,37 @@
 package code.api.v4_0_0
 
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations2_2_0
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
+import scala.language.reflectiveCalls
 import code.api.dynamic.endpoint.APIMethodsDynamicEndpoint.ImplementationsDynamicEndpoint
+import scala.language.reflectiveCalls
 import code.api.dynamic.entity.APIMethodsDynamicEntity.ImplementationsDynamicEntity
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.{APIResponse, PropsReset}
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.{JInt, JString, prettyRender}
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class ForceErrorValidationTest extends V400ServerSetup with PropsReset {
 
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala
index 8ae253ae46..cde7f4bc61 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala
@@ -1,20 +1,35 @@
 package code.api.v4_0_0
 
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations2_2_0
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.APIResponse
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json
+import scala.language.reflectiveCalls
 import net.liftweb.json.JsonAST.JBool
+import scala.language.reflectiveCalls
 import net.liftweb.json.{JArray, JString}
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class JsonSchemaValidationTest extends V400ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala
index 2988f76c8a..645b0ee95f 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala
@@ -179,8 +179,8 @@ class TransactionRequestsTest extends V400ServerSetup with DefaultUsers {
           cvv = cardJsonV500.cvv,
           card_number = cardJsonV500.card_number,
           name_on_card = cardJsonV500.name_on_card,
-          expiry_year = (cardJsonV500.expires_date.getYear+1900).toString,
-          expiry_month = (cardJsonV500.expires_date.getMonth+1).toString
+          expiry_year = (cardJsonV500.expires_date.toInstant.atZone(java.time.ZoneId.systemDefault()).getYear + 1900).toString,
+          expiry_month = (cardJsonV500.expires_date.toInstant.atZone(java.time.ZoneId.systemDefault()).getMonthValue).toString
         ),
         CounterpartyIdJson(counterpartyCounterparty.counterpartyId), 
         bodyValue, 
diff --git a/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala
index c6aae646c2..0bb35ed9f8 100644
--- a/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala
@@ -1,30 +1,54 @@
 package code.api.v5_0_0
 
 import code.api.Constant
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.extractErrorMessageCode
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{UserHasMissingRoles, UserNotLoggedIn}
+import scala.language.reflectiveCalls
 import code.api.v2_0_0.BasicAccountJSON
+import scala.language.reflectiveCalls
 import code.api.v2_0_0.OBPAPI2_0_0.Implementations2_0_0
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.CoreAccountsJsonV300
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.CreateAccountResponseJsonV310
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.{AccountsBalancesJsonV400, ModeratedCoreAccountJsonV400}
+import scala.language.reflectiveCalls
 import code.api.v5_0_0.OBPAPI5_0_0.Implementations5_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.enums.AccountRoutingScheme
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{AccountRoutingJsonV121, AmountOfMoneyJsonV121, ErrorMessage}
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import java.util.UUID
+import scala.language.reflectiveCalls
 import java.util.concurrent.TimeUnit
+import scala.language.reflectiveCalls
 import scala.util.Random
+import scala.language.reflectiveCalls
 
 class AccountTest extends V500ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala b/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala
index c2adc72c6f..c99176de7e 100644
--- a/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala
+++ b/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala
@@ -27,16 +27,26 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v5_0_0
 
 import code.api.Constant._
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.v1_2_1.{PermissionJSON, PermissionsJSON}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.setup.APIResponse
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import scala.util.Random.nextInt
+import scala.language.reflectiveCalls
 
 class ViewsTests extends V500ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala b/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala
index 6ce76e53bf..dd934c7971 100644
--- a/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala
@@ -26,21 +26,37 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v5_1_0
 
 import code.api.{Constant, RequestHeader}
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.util.{APIUtil, Consent}
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.{APIMethods300, UserJsonV300}
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.{ConsentJsonV310, PostConsentChallengeJsonV310, PostConsentEntitlementJsonV310, PostConsentViewJsonV310}
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
+import scala.language.reflectiveCalls
 import code.api.v5_1_0.OBPAPI5_1_0.Implementations5_1_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class ConsentObpTest extends V510ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala b/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala
index 68789e3d5d..3441b5a1e2 100644
--- a/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala
@@ -26,33 +26,60 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v5_1_0
 
 import code.api.RequestHeader
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.{accountRoutingJsonV121, bankRoutingJsonV121, branchRoutingJsonV141, postCounterpartyLimitV510}
+import scala.language.reflectiveCalls
 import code.api.v5_0_0.ConsentJsonV500
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.Consent
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.util.ExampleValue.counterpartyNameExample
+import scala.language.reflectiveCalls
 import code.api.v2_1_0.{CounterpartyIdJson, TransactionRequestBodyCounterpartyJSON}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.CoreAccountsJsonV300
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.PostConsentChallengeJsonV310
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.{TransactionRequestWithChargeJSON400, UsersJsonV400}
+import scala.language.reflectiveCalls
 import code.api.v5_0_0.ConsentRequestResponseJson
+import scala.language.reflectiveCalls
 import code.api.v5_0_0.OBPAPI5_0_0.Implementations5_0_0
+import scala.language.reflectiveCalls
 import code.api.v5_1_0.OBPAPI5_1_0.Implementations5_1_0
+import scala.language.reflectiveCalls
 import code.consent.ConsentStatus
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.PropsReset
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{AmountOfMoneyJsonV121, ErrorMessage}
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import scala.language.postfixOps
+import scala.language.reflectiveCalls
 
 class VRPConsentRequestTest extends V510ServerSetup with PropsReset{
 
diff --git a/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala b/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala
index 7c24dc652f..9b14b44c75 100644
--- a/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala
+++ b/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala
@@ -31,7 +31,7 @@ import code.api.util.ApiRole.{CanCreateCustomer, CanGetCustomersAtOneBank}
 import code.api.util.ErrorMessages._
 import code.api.v3_1_0.PostCustomerNumberJsonV310
 import code.api.v6_0_0.OBPAPI6_0_0.Implementations6_0_0
-import code.api.v6_0_0.{CustomerJsonV600, CustomerJSONsV600, CustomerWithAttributesJsonV600, PostCustomerJsonV600}
+// Removed imports that shadow local object definitions: CustomerJsonV600, CustomerJSONsV600, CustomerWithAttributesJsonV600, PostCustomerJsonV600
 import code.customer.CustomerX
 import code.entitlement.Entitlement
 import code.usercustomerlinks.UserCustomerLink
diff --git a/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala b/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
index 90aaeca7e9..7fb54f5047 100644
--- a/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
+++ b/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
@@ -31,7 +31,7 @@ import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole._
 import com.openbankproject.commons.util.ApiVersion
 import code.api.util.ErrorMessages._
-import code.api.v6_0_0.APIMethods600
+// Removed import that shadows local object definition: APIMethods600
 
 import code.entitlement.Entitlement
 import code.model.dataAccess.{AuthUser, ResourceUser}
diff --git a/obp-api/src/test/scala/code/connector/ConnectorTest.scala b/obp-api/src/test/scala/code/connector/ConnectorTest.scala
index 8765540a72..13e12200ef 100644
--- a/obp-api/src/test/scala/code/connector/ConnectorTest.scala
+++ b/obp-api/src/test/scala/code/connector/ConnectorTest.scala
@@ -1,15 +1,24 @@
 package code.connector
 
 import code.api.util.{CallContext, OBPQueryParam}
+import scala.language.postfixOps
 import code.api.v5_1_0.V510ServerSetup
+import scala.language.postfixOps
 import code.bankconnectors.Connector
+import scala.language.postfixOps
 import com.github.dwickern.macros.NameOf
+import scala.language.postfixOps
 import com.openbankproject.commons.model.OutboundAdapterCallContext
+import scala.language.postfixOps
 import com.openbankproject.commons.util.ReflectUtils
+import scala.language.postfixOps
 import org.scalatest.{FlatSpec, Matchers, Tag}
+import scala.language.postfixOps
 
 import scala.collection.immutable.List
+import scala.language.postfixOps
 import scala.reflect.runtime.universe
+import scala.language.postfixOps
 
 class ConnectorTest extends V510ServerSetup {
   object ConnectorTestTag extends Tag(NameOf.nameOfType[ConnectorTest])
diff --git a/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala b/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala
index a663cf7079..792aea78e6 100644
--- a/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala
+++ b/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala
@@ -8,6 +8,7 @@ import org.scalatest.{FlatSpec, Matchers}
 
 import scala.concurrent.duration._
 import scala.concurrent.Future
+import scala.language.postfixOps
 
 class InternalConnectorTest extends FlatSpec with Matchers {
 
diff --git a/obp-api/src/test/scala/code/connector/MessageDocTest.scala b/obp-api/src/test/scala/code/connector/MessageDocTest.scala
index ab322bd4b6..260bf29903 100644
--- a/obp-api/src/test/scala/code/connector/MessageDocTest.scala
+++ b/obp-api/src/test/scala/code/connector/MessageDocTest.scala
@@ -7,6 +7,7 @@ import code.bankconnectors.LocalMappedConnector
 import code.setup.DefaultUsers
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json
 import net.liftweb.json.JValue
 import org.scalatest.Tag
diff --git a/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala b/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala
index e52490a458..352ac126c0 100644
--- a/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala
+++ b/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala
@@ -12,6 +12,7 @@ import org.scalatest.matchers.{MatchResult, Matcher}
 import org.scalatest.{BeforeAndAfter, FlatSpec, Matchers, Tag}
 
 import scala.reflect.runtime.universe._
+import scala.language.postfixOps
 
 
 /**
diff --git a/obp-api/src/test/scala/code/util/FrozenClassUtil.scala b/obp-api/src/test/scala/code/util/FrozenClassUtil.scala
index af669f57d6..b5a34c6567 100644
--- a/obp-api/src/test/scala/code/util/FrozenClassUtil.scala
+++ b/obp-api/src/test/scala/code/util/FrozenClassUtil.scala
@@ -11,6 +11,7 @@ import net.liftweb.common.Loggable
 import org.apache.commons.io.IOUtils
 
 import scala.reflect.runtime.universe._
+import scala.language.postfixOps
 
 /**
   * this util is for persist metadata of frozen type, those frozen type is versionStatus = "STABLE" related example classes,

From c5937d855043085858bc8da83fbeb374146add8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Tue, 23 Dec 2025 11:11:26 +0100
Subject: [PATCH 5/7] Revert "feature/Reduce test warnings"

This reverts commit 0fcf0b9d457d820c475915d028a6d6cd07021103.
---
 obp-api/src/test/scala/RunMTLSWebApp.scala    |  2 +-
 obp-api/src/test/scala/RunTLSWebApp.scala     |  2 +-
 obp-api/src/test/scala/code/AppTest.scala     | 22 ++++++++-------
 .../test/scala/code/api/DirectLoginTest.scala |  1 -
 .../scala/code/api/OBPRestHelperTest.scala    |  1 +
 .../ResourceDocs1_4_0/ResourceDocsTest.scala  |  1 -
 .../ResourceDocs1_4_0/SwaggerDocsTest.scala   |  1 -
 .../code/api/util/JavaWebSignatureTest.scala  |  1 -
 .../scala/code/api/v1_4_0/BranchesTest.scala  |  2 --
 .../v2_1_0/CreateTransactionTypeTest.scala    |  1 -
 .../code/api/v2_1_0/EntitlementTests.scala    |  1 -
 .../scala/code/api/v2_2_0/API2_2_0Test.scala  | 14 ----------
 .../code/api/v2_2_0/ExchangeRateTest.scala    | 10 -------
 .../scala/code/api/v3_0_0/AccountTest.scala   |  9 -------
 .../scala/code/api/v3_0_0/BranchesTest.scala  |  4 ---
 .../code/api/v3_0_0/CounterpartyTest.scala    |  5 ----
 .../api/v3_0_0/EntitlementRequestsTest.scala  | 10 -------
 .../scala/code/api/v3_0_0/FirehoseTest.scala  | 11 --------
 .../code/api/v3_0_0/GetAdapterInfoTest.scala  | 10 -------
 .../code/api/v3_0_0/TransactionsTest.scala    |  8 ------
 .../test/scala/code/api/v3_0_0/UserTest.scala | 15 -----------
 .../scala/code/api/v3_0_0/ViewsTests.scala    | 15 -----------
 .../scala/code/api/v3_0_0/WarehouseTest.scala | 10 -------
 .../code/api/v3_0_0/WarehouseTestAsync.scala  | 11 --------
 .../scala/code/api/v3_1_0/AccountTest.scala   | 25 -----------------
 .../scala/code/api/v3_1_0/ConsentTest.scala   | 16 -----------
 .../code/api/v3_1_0/TransactionTest.scala     |  8 +++---
 .../scala/code/api/v4_0_0/AccountTest.scala   |  2 +-
 .../AuthenticationTypeValidationTest.scala    | 15 -----------
 .../code/api/v4_0_0/ConnectorMethodTest.scala |  2 +-
 .../api/v4_0_0/ForceErrorValidationTest.scala | 16 -----------
 .../api/v4_0_0/JsonSchemaValidationTest.scala | 15 -----------
 .../api/v4_0_0/TransactionRequestsTest.scala  |  4 +--
 .../scala/code/api/v5_0_0/AccountTest.scala   | 24 -----------------
 .../scala/code/api/v5_0_0/ViewsTests.scala    | 10 -------
 .../code/api/v5_1_0/ConsentObpTest.scala      | 16 -----------
 .../api/v5_1_0/VRPConsentRequestTest.scala    | 27 -------------------
 .../scala/code/api/v6_0_0/CustomerTest.scala  |  2 +-
 .../code/api/v6_0_0/PasswordResetTest.scala   |  2 +-
 .../scala/code/connector/ConnectorTest.scala  |  9 -------
 .../connector/InternalConnectorTest.scala     |  1 -
 .../scala/code/connector/MessageDocTest.scala |  1 -
 .../RestConnector_vMar2019_FrozenTest.scala   |  1 -
 .../scala/code/util/FrozenClassUtil.scala     |  1 -
 44 files changed, 26 insertions(+), 338 deletions(-)

diff --git a/obp-api/src/test/scala/RunMTLSWebApp.scala b/obp-api/src/test/scala/RunMTLSWebApp.scala
index 6169fd19b2..06381729b1 100644
--- a/obp-api/src/test/scala/RunMTLSWebApp.scala
+++ b/obp-api/src/test/scala/RunMTLSWebApp.scala
@@ -89,7 +89,7 @@ object RunMTLSWebApp extends App with PropsProgrammatically {
     // RESET HEADER
     https.addCustomizer(customizer)
 
-    val sslContextFactory = new SslContextFactory.Server()
+    val sslContextFactory = new SslContextFactory()
     sslContextFactory.setKeyStorePath(this.getClass.getResource("/cert/server.jks").toExternalForm)
     sslContextFactory.setKeyStorePassword("123456")
 
diff --git a/obp-api/src/test/scala/RunTLSWebApp.scala b/obp-api/src/test/scala/RunTLSWebApp.scala
index 718734b5ac..dc4f7affff 100644
--- a/obp-api/src/test/scala/RunTLSWebApp.scala
+++ b/obp-api/src/test/scala/RunTLSWebApp.scala
@@ -89,7 +89,7 @@ object RunTLSWebApp extends App with PropsProgrammatically {
     // RESET HEADER
     https.addCustomizer(customizer)
 
-    val sslContextFactory = new SslContextFactory.Server()
+    val sslContextFactory = new SslContextFactory()
     sslContextFactory.setKeyStorePath(this.getClass.getResource("/cert/server.jks").toExternalForm)
     sslContextFactory.setKeyStorePassword("123456")
 
diff --git a/obp-api/src/test/scala/code/AppTest.scala b/obp-api/src/test/scala/code/AppTest.scala
index 20c50420c0..2e8dedba95 100644
--- a/obp-api/src/test/scala/code/AppTest.scala
+++ b/obp-api/src/test/scala/code/AppTest.scala
@@ -27,29 +27,33 @@ TESOBE (http://www.tesobe.com/)
 package code
 
 import java.io.File
+import junit.framework._
+import Assert._
 import scala.xml.XML
 import net.liftweb.util._
 import net.liftweb.common._
-import org.scalatest.{FlatSpec, Matchers}
 
 object AppTest {
+  def suite: Test = {
+    val suite = new TestSuite(classOf[AppTest])
+    suite
+  }
+
   def main(args : Array[String]) {
-    // Use ScalaTest runner instead
-    println("Use 'sbt test' or 'mvn test' to run tests")
+    junit.textui.TestRunner.run(suite)
   }
 }
 
 /**
  * Unit test for simple App.
  */
-class AppTest extends FlatSpec with Matchers {
+class AppTest extends TestCase("app") {
 
   /**
-   * Basic functionality test
+   * Rigourous Tests :-)
    */
-  "App" should "pass basic test" in {
-    true should be(true)
-  }
+  def testOK() = assertTrue(true)
+  // def testKO() = assertTrue(false);
 
   /**
    * Tests to make sure the project's XML files are well-formed.
@@ -57,7 +61,7 @@ class AppTest extends FlatSpec with Matchers {
    * Finds every *.html and *.xml file in src/main/webapp (and its
    * subdirectories) and tests to make sure they are well-formed.
    */
-  it should "have well-formed XML files" in {
+  def testXml() = {
     var failed: List[File] = Nil
 
     def handledXml(file: String) =
diff --git a/obp-api/src/test/scala/code/api/DirectLoginTest.scala b/obp-api/src/test/scala/code/api/DirectLoginTest.scala
index 9cca2d5e4f..2cb1c92c3b 100644
--- a/obp-api/src/test/scala/code/api/DirectLoginTest.scala
+++ b/obp-api/src/test/scala/code/api/DirectLoginTest.scala
@@ -13,7 +13,6 @@ import code.setup.{APIResponse, ServerSetup, TestPasswordConfig}
 import code.userlocks.UserLocksProvider
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
 import net.liftweb.json.JsonAST.{JArray, JField, JObject, JString}
 import net.liftweb.mapper.By
diff --git a/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala b/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala
index ddc90c77bf..a8bfc06c15 100644
--- a/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala
+++ b/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala
@@ -1,6 +1,7 @@
 package code.api
 
 import code.api.util.APIUtil.{ResourceDoc, EmptyBody}
+import code.api.OBPRestHelper
 import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion}
 import org.scalatest.{FlatSpec, Matchers, Tag}
 
diff --git a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala
index e758d413e1..a830976850 100644
--- a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala
+++ b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala
@@ -9,7 +9,6 @@ import code.api.v1_4_0.JSONFactory1_4_0.ResourceDocsJson
 import code.setup.{DefaultUsers, PropsReset}
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.{ApiVersion, Functions}
-import scala.language.reflectiveCalls
 import net.liftweb.json
 import net.liftweb.json.JsonAST._
 import net.liftweb.json.{Formats, JString, Serializer, TypeInfo}
diff --git a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala
index 2fe764ed5f..b96a1acf37 100644
--- a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala
+++ b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala
@@ -5,7 +5,6 @@ import code.api.util.{ApiRole, CustomJsonFormats}
 import code.setup.{DefaultUsers, PropsReset}
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.{ApiVersion, Functions}
-import scala.language.reflectiveCalls
 import io.swagger.parser.OpenAPIParser
 import net.liftweb.json
 import net.liftweb.json.JsonAST._
diff --git a/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala b/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala
index 8375426159..f629673469 100644
--- a/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala
+++ b/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala
@@ -11,7 +11,6 @@ import com.github.dwickern.macros.NameOf.nameOf
 import net.liftweb.common.Full
 import net.liftweb.util.Helpers._
 import org.scalatest.Tag
-import scala.language.postfixOps
 
 class JavaWebSignatureTest extends V400ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala b/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala
index 5eefca75ed..e9d6239ca1 100644
--- a/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala
+++ b/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala
@@ -1,6 +1,4 @@
 package code.api.v1_4_0
-// Note: This test intentionally uses deprecated model classes (LobbyStringT, DriveUpStringT)
-// to maintain backwards compatibility testing. These warnings are expected.
 
 import code.api.util.APIUtil.OAuth._
 import code.api.util.OBPQueryParam
diff --git a/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala b/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
index f2d1c0d06f..8a0bedf9b4 100644
--- a/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
+++ b/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
@@ -10,7 +10,6 @@ import code.setup.DefaultUsers
 import code.transaction_types.MappedTransactionType
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.model.{AmountOfMoneyJsonV121, ErrorMessage, TransactionTypeId}
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
 import net.liftweb.json.Serialization._
 import org.scalatest.Tag
diff --git a/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala b/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
index ecec7ea293..0267f559e3 100644
--- a/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
+++ b/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
@@ -10,7 +10,6 @@ import code.entitlement.Entitlement
 import code.setup.DefaultUsers
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
 
 
diff --git a/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala b/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
index c7b1deebc0..34e50d2b33 100644
--- a/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
+++ b/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
@@ -27,34 +27,20 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v2_2_0
 
 import code.api.Constant._
-import scala.language.reflectiveCalls
 import _root_.net.liftweb.json.Serialization.write
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.createViewJsonV300
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.v1_2._
-import scala.language.reflectiveCalls
 import code.api.v1_2_1.UpdateViewJsonV121
-import scala.language.reflectiveCalls
 import code.setup.{APIResponse, DefaultUsers}
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.CreateViewJson
-import scala.language.reflectiveCalls
 import net.liftweb.util.Helpers._
-import scala.language.reflectiveCalls
 import org.scalatest._
-import scala.language.reflectiveCalls
 import code.api.v2_2_0.OBPAPI2_2_0.Implementations2_2_0
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 
 import scala.util.Random._
-import scala.language.reflectiveCalls
 
 
 class API2_2_0Test extends V220ServerSetup with DefaultUsers {
diff --git a/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala b/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala
index aaf37c2a18..2b98968678 100644
--- a/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala
+++ b/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala
@@ -1,25 +1,15 @@
 package code.api.v2_2_0
 
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.InvalidISOCurrencyCode
-import scala.language.reflectiveCalls
 import code.consumer.Consumers
-import scala.language.reflectiveCalls
 import code.scope.Scope
-import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 class ExchangeRateTest extends V220ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala
index 849bdd74a9..d7d7594062 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala
@@ -1,23 +1,14 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanUseAccountFirehoseAtAnyBank
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{AccountFirehoseNotAllowedOnThisInstance, UserHasMissingRoles}
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.setup.APIResponse
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 class AccountTest extends V300ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala
index ce4253ca37..579b8e4d8d 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala
@@ -1,6 +1,4 @@
 package code.api.v3_0_0
-// Note: This test intentionally uses deprecated model classes (LobbyStringT, DriveUpStringT)
-// to maintain backwards compatibility testing. These warnings are expected.
 
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole.CanDeleteBranchAtAnyBank
@@ -15,8 +13,6 @@ import code.setup.DefaultUsers
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.model._
 import org.scalatest.Tag
-import scala.language.postfixOps
-import scala.language.reflectiveCalls
 
 import scala.concurrent.duration._
 import scala.concurrent.Await
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala
index ece6cb43aa..1dc35fe80b 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala
@@ -1,15 +1,10 @@
 package code.api.v3_0_0
 
 import code.api.Constant._
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 class CounterpartyTest extends V300ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala
index f763fcf75e..47417995db 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala
@@ -1,25 +1,15 @@
 package code.api.v3_0_0
 
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole.{CanGetEntitlementRequestsAtAnyBank}
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
-import scala.language.reflectiveCalls
 import code.api.util.{ApiRole}
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 /*
 Note This does not test retrieval from a backend.
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala
index 1d50e0bbe3..45e6b1b361 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala
@@ -1,27 +1,16 @@
 package code.api.v3_0_0
 
 import code.api.Constant
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole.{CanUseAccountFirehose, CanUseAccountFirehoseAtAnyBank}
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.AccountFirehoseNotAllowedOnThisInstance
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import code.setup.PropsReset
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 class FirehoseTest extends V300ServerSetup with PropsReset{
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala
index a363ee2613..c3c7a1e0f2 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala
@@ -26,25 +26,15 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_0_0
 
 import code.api.util.ApiRole.canGetAdapterInfoAtOneBank
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{UserHasMissingRoles, UserNotLoggedIn}
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 class GetAdapterInfoTest extends V300ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala
index 66e250d6b2..487c22e051 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala
@@ -1,21 +1,13 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanUseAccountFirehoseAtAnyBank
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{AccountFirehoseNotAllowedOnThisInstance, UserHasMissingRoles}
-import scala.language.reflectiveCalls
 import code.api.util.{APIUtil, ErrorMessages}
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 class TransactionsTest extends V300ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala
index 4eccea066a..bc0ade4969 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala
@@ -1,35 +1,20 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.{ApiRole, ErrorMessages}
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanGetAnyUser
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.UserHasMissingRoles
-import scala.language.reflectiveCalls
 import code.api.v2_0_0.JSONFactory200.UsersJsonV200
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import net.liftweb.json.JsonAST._
-import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
-import scala.language.reflectiveCalls
 import net.liftweb.util.Helpers.randomString
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 
 class UserTest extends V300ServerSetup with DefaultUsers {
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala b/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala
index b567b3aa6b..1d6df40d91 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala
@@ -27,36 +27,21 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_0_0
 
 import code.api.Constant._
-import scala.language.reflectiveCalls
 import _root_.net.liftweb.json.Serialization.write
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import code.api.v1_2_1.{APIInfoJSON, PermissionJSON, PermissionsJSON}
-import scala.language.reflectiveCalls
 import code.api.v2_2_0.{ViewJSONV220, ViewsJSONV220}
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.setup.APIResponse
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{CreateViewJson, UpdateViewJSON}
-import scala.language.reflectiveCalls
 import net.liftweb.util.Helpers._
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 import scala.util.Random.nextInt
-import scala.language.reflectiveCalls
 
 class ViewsTests extends V300ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala
index 00a3649948..3a88f90f26 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala
@@ -3,25 +3,15 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanSearchWarehouse
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.UserHasMissingRoles
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.setup.{APIResponse, DefaultUsers}
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 
 class WarehouseTest extends V300ServerSetup with DefaultUsers {
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala
index 9dfa99f9b2..6d0ee31883 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala
@@ -3,28 +3,17 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanSearchWarehouse
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.UserHasMissingRoles
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.setup.{APIResponse, DefaultUsers}
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 import scala.concurrent.Future
-import scala.language.reflectiveCalls
 
 class WarehouseTestAsync extends V300ServerSetupAsync with DefaultUsers {
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala
index 94db2bbb53..68c6e00469 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala
@@ -1,56 +1,31 @@
 package code.api.v3_1_0
 
 import code.api.Constant
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{AccountRouting, AccountRoutingJsonV121, AmountOfMoneyJsonV121, ErrorMessage, enums}
-import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
-import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.updateAccountRequestJsonV310
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.extractErrorMessageCode
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{UserHasMissingRoles, UserNotLoggedIn}
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole
-import scala.language.reflectiveCalls
 import code.api.v2_0_0.BasicAccountJSON
-import scala.language.reflectiveCalls
 import code.api.v2_2_0.CreateAccountJSONV220
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.{CoreAccountsJsonV300, ModeratedCoreAccountJsonV300}
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
-import scala.language.reflectiveCalls
 import code.api.v2_0_0.OBPAPI2_0_0.Implementations2_0_0
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import code.model.dataAccess.BankAccountRouting
-import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.enums.AccountRoutingScheme
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 import java.util.UUID
-import scala.language.reflectiveCalls
 import java.util.concurrent.TimeUnit
-import scala.language.reflectiveCalls
 import scala.util.Random
-import scala.language.reflectiveCalls
 
 class AccountTest extends V310ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala b/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala
index 1b9db56e1a..894c29dbbf 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala
@@ -26,38 +26,22 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_1_0
 
 import code.api.Constant
-import scala.language.reflectiveCalls
 import code.api.RequestHeader
-import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
-import scala.language.reflectiveCalls
 import code.api.util.{APIUtil, Consent}
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.{APIMethods300, UserJsonV300}
-import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 import java.util.Date
-import scala.language.reflectiveCalls
 
 class ConsentTest extends V310ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala b/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala
index 8a5b254a4b..f67ddc6246 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala
@@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_1_0
 
 import code.api.Constant._
+import com.openbankproject.commons.model.ErrorMessage
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole.CanCreateHistoricalTransaction
@@ -41,11 +42,10 @@ import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations2_2_0
 import code.entitlement.Entitlement
 import com.github.dwickern.macros.NameOf.nameOf
-import com.openbankproject.commons.model.{AmountOfMoneyJsonV121, ErrorMessage}
+import com.openbankproject.commons.model.AmountOfMoneyJsonV121
 import com.openbankproject.commons.util.ApiVersion
-import net.liftweb.json.Serialization.write
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
+import net.liftweb.json.Serialization.write
 
 class TransactionTest extends V310ServerSetup {
 
@@ -448,7 +448,7 @@ class TransactionTest extends V310ServerSetup {
 
       val responseError1 = makePostRequest(request310, write(postJsonCounterparty1))
       Then("We should get a 400")
-
+      
       responseError1.code should equal(400)
       responseError1.body.toString contains("from object should only contain bank_id and account_id or counterparty_id in the post json body.") should be (true)
 
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala
index 9fa32b6528..3158ed64f3 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala
@@ -329,7 +329,7 @@ class AccountTest extends V400ServerSetup {
       When("We make a request v4.0.0")
       val request400 = (v4_0_0_Request / "management" / "accounts" / "account-routing-regex-query").POST
       val postBody = getAccountByRoutingJson.copy(account_routing = AccountRoutingJsonV121("AccountNumber", "123456789-[A-Z]{3}"))
-      val response400 = makePostRequest(request400, write(postBody))
+      val response400 = makePostRequest(request400, write())
       Then("We should get a 401")
       response400.code should equal(401)
       And("error should be " + UserNotLoggedIn)
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala
index 2088c9d495..8852f2f6bf 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala
@@ -1,35 +1,20 @@
 package code.api.v4_0_0
 
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations2_2_0
-import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import code.setup.APIResponse
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import net.liftweb.json
-import scala.language.reflectiveCalls
 import net.liftweb.json.JsonAST.JBool
-import scala.language.reflectiveCalls
 import net.liftweb.json.{JArray, JString}
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 class AuthenticationTypeValidationTest extends V400ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
index e2120abcf5..488b11fb3a 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
@@ -281,7 +281,7 @@ class ConnectorMethodTest extends V400ServerSetup {
       val future = connectorMethod.getBank(BankId("Hello_bank_id"), None)
       val result = Await.result(future, Duration.apply(10, TimeUnit.SECONDS))
 
-      result shouldBe a[net.liftweb.common.Box[_]]
+      result shouldBe a[Full[(Bank, Option[CallContext])]]
       val Full((bank, _)) = result
 
       bank.bankId.value shouldBe "Hello_bank_id"
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala
index 6dae1a3f3a..b524417ee0 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala
@@ -1,37 +1,21 @@
 package code.api.v4_0_0
 
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations2_2_0
-import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
-import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
-import scala.language.reflectiveCalls
 import code.api.dynamic.endpoint.APIMethodsDynamicEndpoint.ImplementationsDynamicEndpoint
-import scala.language.reflectiveCalls
 import code.api.dynamic.entity.APIMethodsDynamicEntity.ImplementationsDynamicEntity
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import code.setup.{APIResponse, PropsReset}
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import net.liftweb.json.{JInt, JString, prettyRender}
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 class ForceErrorValidationTest extends V400ServerSetup with PropsReset {
 
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala
index cde7f4bc61..8ae253ae46 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala
@@ -1,35 +1,20 @@
 package code.api.v4_0_0
 
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations2_2_0
-import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import code.setup.APIResponse
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import net.liftweb.json
-import scala.language.reflectiveCalls
 import net.liftweb.json.JsonAST.JBool
-import scala.language.reflectiveCalls
 import net.liftweb.json.{JArray, JString}
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 class JsonSchemaValidationTest extends V400ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala
index 645b0ee95f..2988f76c8a 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala
@@ -179,8 +179,8 @@ class TransactionRequestsTest extends V400ServerSetup with DefaultUsers {
           cvv = cardJsonV500.cvv,
           card_number = cardJsonV500.card_number,
           name_on_card = cardJsonV500.name_on_card,
-          expiry_year = (cardJsonV500.expires_date.toInstant.atZone(java.time.ZoneId.systemDefault()).getYear + 1900).toString,
-          expiry_month = (cardJsonV500.expires_date.toInstant.atZone(java.time.ZoneId.systemDefault()).getMonthValue).toString
+          expiry_year = (cardJsonV500.expires_date.getYear+1900).toString,
+          expiry_month = (cardJsonV500.expires_date.getMonth+1).toString
         ),
         CounterpartyIdJson(counterpartyCounterparty.counterpartyId), 
         bodyValue, 
diff --git a/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala
index 0bb35ed9f8..c6aae646c2 100644
--- a/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala
@@ -1,54 +1,30 @@
 package code.api.v5_0_0
 
 import code.api.Constant
-import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.extractErrorMessageCode
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{UserHasMissingRoles, UserNotLoggedIn}
-import scala.language.reflectiveCalls
 import code.api.v2_0_0.BasicAccountJSON
-import scala.language.reflectiveCalls
 import code.api.v2_0_0.OBPAPI2_0_0.Implementations2_0_0
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.CoreAccountsJsonV300
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.api.v3_1_0.CreateAccountResponseJsonV310
-import scala.language.reflectiveCalls
 import code.api.v4_0_0.{AccountsBalancesJsonV400, ModeratedCoreAccountJsonV400}
-import scala.language.reflectiveCalls
 import code.api.v5_0_0.OBPAPI5_0_0.Implementations5_0_0
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.enums.AccountRoutingScheme
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{AccountRoutingJsonV121, AmountOfMoneyJsonV121, ErrorMessage}
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 import java.util.UUID
-import scala.language.reflectiveCalls
 import java.util.concurrent.TimeUnit
-import scala.language.reflectiveCalls
 import scala.util.Random
-import scala.language.reflectiveCalls
 
 class AccountTest extends V500ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala b/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala
index c99176de7e..c2adc72c6f 100644
--- a/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala
+++ b/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala
@@ -27,26 +27,16 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v5_0_0
 
 import code.api.Constant._
-import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.v1_2_1.{PermissionJSON, PermissionsJSON}
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.setup.APIResponse
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 import scala.util.Random.nextInt
-import scala.language.reflectiveCalls
 
 class ViewsTests extends V500ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala b/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala
index dd934c7971..6ce76e53bf 100644
--- a/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala
@@ -26,37 +26,21 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v5_1_0
 
 import code.api.{Constant, RequestHeader}
-import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
-import scala.language.reflectiveCalls
 import code.api.util.{APIUtil, Consent}
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.{APIMethods300, UserJsonV300}
-import scala.language.reflectiveCalls
 import code.api.v3_1_0.{ConsentJsonV310, PostConsentChallengeJsonV310, PostConsentEntitlementJsonV310, PostConsentViewJsonV310}
-import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
-import scala.language.reflectiveCalls
 import code.api.v5_1_0.OBPAPI5_1_0.Implementations5_1_0
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 class ConsentObpTest extends V510ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala b/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala
index 3441b5a1e2..68789e3d5d 100644
--- a/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala
@@ -26,60 +26,33 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v5_1_0
 
 import code.api.RequestHeader
-import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
-import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.{accountRoutingJsonV121, bankRoutingJsonV121, branchRoutingJsonV141, postCounterpartyLimitV510}
-import scala.language.reflectiveCalls
 import code.api.v5_0_0.ConsentJsonV500
-import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
-import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
-import scala.language.reflectiveCalls
 import code.api.util.Consent
-import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
-import scala.language.reflectiveCalls
 import code.api.util.ExampleValue.counterpartyNameExample
-import scala.language.reflectiveCalls
 import code.api.v2_1_0.{CounterpartyIdJson, TransactionRequestBodyCounterpartyJSON}
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.CoreAccountsJsonV300
-import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
-import scala.language.reflectiveCalls
 import code.api.v3_1_0.PostConsentChallengeJsonV310
-import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
-import scala.language.reflectiveCalls
 import code.api.v4_0_0.{TransactionRequestWithChargeJSON400, UsersJsonV400}
-import scala.language.reflectiveCalls
 import code.api.v5_0_0.ConsentRequestResponseJson
-import scala.language.reflectiveCalls
 import code.api.v5_0_0.OBPAPI5_0_0.Implementations5_0_0
-import scala.language.reflectiveCalls
 import code.api.v5_1_0.OBPAPI5_1_0.Implementations5_1_0
-import scala.language.reflectiveCalls
 import code.consent.ConsentStatus
-import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
-import scala.language.reflectiveCalls
 import code.setup.PropsReset
-import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{AmountOfMoneyJsonV121, ErrorMessage}
-import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
-import scala.language.reflectiveCalls
 import org.scalatest.Tag
-import scala.language.reflectiveCalls
 
 import scala.language.postfixOps
-import scala.language.reflectiveCalls
 
 class VRPConsentRequestTest extends V510ServerSetup with PropsReset{
 
diff --git a/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala b/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala
index 9b14b44c75..7c24dc652f 100644
--- a/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala
+++ b/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala
@@ -31,7 +31,7 @@ import code.api.util.ApiRole.{CanCreateCustomer, CanGetCustomersAtOneBank}
 import code.api.util.ErrorMessages._
 import code.api.v3_1_0.PostCustomerNumberJsonV310
 import code.api.v6_0_0.OBPAPI6_0_0.Implementations6_0_0
-// Removed imports that shadow local object definitions: CustomerJsonV600, CustomerJSONsV600, CustomerWithAttributesJsonV600, PostCustomerJsonV600
+import code.api.v6_0_0.{CustomerJsonV600, CustomerJSONsV600, CustomerWithAttributesJsonV600, PostCustomerJsonV600}
 import code.customer.CustomerX
 import code.entitlement.Entitlement
 import code.usercustomerlinks.UserCustomerLink
diff --git a/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala b/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
index 7fb54f5047..90aaeca7e9 100644
--- a/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
+++ b/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
@@ -31,7 +31,7 @@ import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole._
 import com.openbankproject.commons.util.ApiVersion
 import code.api.util.ErrorMessages._
-// Removed import that shadows local object definition: APIMethods600
+import code.api.v6_0_0.APIMethods600
 
 import code.entitlement.Entitlement
 import code.model.dataAccess.{AuthUser, ResourceUser}
diff --git a/obp-api/src/test/scala/code/connector/ConnectorTest.scala b/obp-api/src/test/scala/code/connector/ConnectorTest.scala
index 13e12200ef..8765540a72 100644
--- a/obp-api/src/test/scala/code/connector/ConnectorTest.scala
+++ b/obp-api/src/test/scala/code/connector/ConnectorTest.scala
@@ -1,24 +1,15 @@
 package code.connector
 
 import code.api.util.{CallContext, OBPQueryParam}
-import scala.language.postfixOps
 import code.api.v5_1_0.V510ServerSetup
-import scala.language.postfixOps
 import code.bankconnectors.Connector
-import scala.language.postfixOps
 import com.github.dwickern.macros.NameOf
-import scala.language.postfixOps
 import com.openbankproject.commons.model.OutboundAdapterCallContext
-import scala.language.postfixOps
 import com.openbankproject.commons.util.ReflectUtils
-import scala.language.postfixOps
 import org.scalatest.{FlatSpec, Matchers, Tag}
-import scala.language.postfixOps
 
 import scala.collection.immutable.List
-import scala.language.postfixOps
 import scala.reflect.runtime.universe
-import scala.language.postfixOps
 
 class ConnectorTest extends V510ServerSetup {
   object ConnectorTestTag extends Tag(NameOf.nameOfType[ConnectorTest])
diff --git a/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala b/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala
index 792aea78e6..a663cf7079 100644
--- a/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala
+++ b/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala
@@ -8,7 +8,6 @@ import org.scalatest.{FlatSpec, Matchers}
 
 import scala.concurrent.duration._
 import scala.concurrent.Future
-import scala.language.postfixOps
 
 class InternalConnectorTest extends FlatSpec with Matchers {
 
diff --git a/obp-api/src/test/scala/code/connector/MessageDocTest.scala b/obp-api/src/test/scala/code/connector/MessageDocTest.scala
index 260bf29903..ab322bd4b6 100644
--- a/obp-api/src/test/scala/code/connector/MessageDocTest.scala
+++ b/obp-api/src/test/scala/code/connector/MessageDocTest.scala
@@ -7,7 +7,6 @@ import code.bankconnectors.LocalMappedConnector
 import code.setup.DefaultUsers
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.ApiVersion
-import scala.language.reflectiveCalls
 import net.liftweb.json
 import net.liftweb.json.JValue
 import org.scalatest.Tag
diff --git a/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala b/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala
index 352ac126c0..e52490a458 100644
--- a/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala
+++ b/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala
@@ -12,7 +12,6 @@ import org.scalatest.matchers.{MatchResult, Matcher}
 import org.scalatest.{BeforeAndAfter, FlatSpec, Matchers, Tag}
 
 import scala.reflect.runtime.universe._
-import scala.language.postfixOps
 
 
 /**
diff --git a/obp-api/src/test/scala/code/util/FrozenClassUtil.scala b/obp-api/src/test/scala/code/util/FrozenClassUtil.scala
index b5a34c6567..af669f57d6 100644
--- a/obp-api/src/test/scala/code/util/FrozenClassUtil.scala
+++ b/obp-api/src/test/scala/code/util/FrozenClassUtil.scala
@@ -11,7 +11,6 @@ import net.liftweb.common.Loggable
 import org.apache.commons.io.IOUtils
 
 import scala.reflect.runtime.universe._
-import scala.language.postfixOps
 
 /**
   * this util is for persist metadata of frozen type, those frozen type is versionStatus = "STABLE" related example classes,

From 6214d3f5d897c941c458f54a9088f454686a2c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Tue, 23 Dec 2025 13:36:47 +0100
Subject: [PATCH 6/7] feature/Reduce compiler warnings during compilation

---
 .../AUOpenBanking/v1_0_0/AccountsApi.scala    |  2 ++
 .../api/AUOpenBanking/v1_0_0/BankingApi.scala |  1 +
 .../api/AUOpenBanking/v1_0_0/CommonApi.scala  |  2 ++
 .../AUOpenBanking/v1_0_0/CustomerApi.scala    |  2 ++
 .../v1_0_0/DirectDebitsApi.scala              |  2 ++
 .../AUOpenBanking/v1_0_0/DiscoveryApi.scala   |  2 ++
 .../api/AUOpenBanking/v1_0_0/PayeesApi.scala  |  2 ++
 .../AUOpenBanking/v1_0_0/ProductsApi.scala    |  1 +
 .../v1_0_0/ScheduledPaymentsApi.scala         |  2 ++
 .../v1_0_0/AccountAccessConsentsApi.scala     |  1 +
 .../api/BahrainOBF/v1_0_0/AccountsApi.scala   |  1 +
 .../api/BahrainOBF/v1_0_0/BalancesApi.scala   |  1 +
 .../BahrainOBF/v1_0_0/BeneficiariesApi.scala  |  1 +
 .../BahrainOBF/v1_0_0/DirectDebitsApi.scala   |  1 +
 ...omesticFutureDatedPaymentConsentsApi.scala |  1 +
 .../DomesticFutureDatedPaymentsApi.scala      |  1 +
 .../v1_0_0/DomesticPaymentsApi.scala          |  1 +
 .../v1_0_0/DomesticPaymentsConsentsApi.scala  |  1 +
 .../v1_0_0/EventNotificationApi.scala         |  1 +
 .../v1_0_0/FilePaymentConsentsApi.scala       |  1 +
 .../BahrainOBF/v1_0_0/FilePaymentsApi.scala   |  1 +
 .../v1_0_0/FutureDatedPaymentsApi.scala       |  1 +
 .../InternationalPaymentConsentsApi.scala     |  1 +
 .../v1_0_0/InternationalPaymentsApi.scala     |  1 +
 .../api/BahrainOBF/v1_0_0/OffersApi.scala     |  1 +
 .../api/BahrainOBF/v1_0_0/PartiesApi.scala    |  1 +
 .../BahrainOBF/v1_0_0/StandingOrdersApi.scala |  1 +
 .../api/BahrainOBF/v1_0_0/StatementsApi.scala |  1 +
 .../v1_0_0/SupplementaryAccountInfoApi.scala  |  1 +
 .../BahrainOBF/v1_0_0/TransactionsApi.scala   |  1 +
 .../code/api/MxOF/APIMethods_AtmsApi.scala    |  2 ++
 .../main/scala/code/api/OBPRestHelper.scala   |  2 ++
 .../code/api/Polish/v2_1_1_1/AISApi.scala     |  1 +
 .../code/api/Polish/v2_1_1_1/ASApi.scala      |  1 +
 .../code/api/Polish/v2_1_1_1/CAFApi.scala     |  1 +
 .../code/api/Polish/v2_1_1_1/PISApi.scala     |  1 +
 .../ResourceDocs1_4_0/ResourceDocs140.scala   | 21 ++++++++++---------
 .../ResourceDocsAPIMethods.scala              |  8 ++++---
 .../scala/code/api/STET/v1_4/AISPApi.scala    |  1 +
 .../scala/code/api/STET/v1_4/CBPIIApi.scala   |  1 +
 .../scala/code/api/STET/v1_4/PISPApi.scala    |  1 +
 .../v3_1_0/AccountAccessApi.scala             |  1 +
 .../UKOpenBanking/v3_1_0/AccountsApi.scala    |  1 +
 .../UKOpenBanking/v3_1_0/BalancesApi.scala    |  1 +
 .../v3_1_0/BeneficiariesApi.scala             |  1 +
 .../v3_1_0/DirectDebitsApi.scala              |  1 +
 .../v3_1_0/DomesticPaymentsApi.scala          |  1 +
 .../v3_1_0/DomesticScheduledPaymentsApi.scala |  1 +
 .../v3_1_0/DomesticStandingOrdersApi.scala    |  1 +
 .../v3_1_0/FilePaymentsApi.scala              |  1 +
 .../v3_1_0/FundsConfirmationsApi.scala        |  1 +
 .../v3_1_0/InternationalPaymentsApi.scala     |  1 +
 .../InternationalScheduledPaymentsApi.scala   |  1 +
 .../InternationalStandingOrdersApi.scala      |  1 +
 .../api/UKOpenBanking/v3_1_0/OffersApi.scala  |  1 +
 .../api/UKOpenBanking/v3_1_0/PartysApi.scala  |  1 +
 .../UKOpenBanking/v3_1_0/ProductsApi.scala    |  1 +
 .../v3_1_0/ScheduledPaymentsApi.scala         |  1 +
 .../v3_1_0/StandingOrdersApi.scala            |  1 +
 .../UKOpenBanking/v3_1_0/StatementsApi.scala  |  1 +
 .../v3_1_0/TransactionsApi.scala              |  1 +
 .../AccountInformationServiceAISApi.scala     |  1 +
 .../berlin/group/v1_3/CommonServicesApi.scala |  1 +
 .../ConfirmationOfFundsServicePIISApi.scala   |  1 +
 .../v1_3/PaymentInitiationServicePISApi.scala |  1 +
 .../berlin/group/v1_3/SigningBasketsApi.scala |  1 +
 .../main/scala/code/api/util/APIUtil.scala    |  2 ++
 .../scala/code/api/v1_2_1/OBPAPI1.2.1.scala   |  4 +++-
 .../scala/code/api/v1_3_0/OBPAPI1_3_0.scala   |  1 +
 .../scala/code/api/v1_4_0/APIMethods140.scala |  1 +
 .../scala/code/api/v1_4_0/OBPAPI1_4_0.scala   |  1 +
 .../scala/code/api/v2_0_0/APIMethods200.scala |  1 +
 .../scala/code/api/v2_0_0/OBPAPI2_0_0.scala   |  1 +
 .../scala/code/api/v2_1_0/APIMethods210.scala |  1 +
 .../scala/code/api/v2_1_0/OBPAPI2_1_0.scala   |  1 +
 .../scala/code/api/v2_2_0/APIMethods220.scala |  1 +
 .../scala/code/api/v2_2_0/OBPAPI2_2_0.scala   |  1 +
 .../scala/code/api/v3_0_0/APIMethods300.scala |  1 +
 .../scala/code/api/v3_0_0/OBPAPI3_0_0.scala   |  1 +
 .../scala/code/api/v3_1_0/APIMethods310.scala |  1 +
 .../scala/code/api/v3_1_0/OBPAPI3_1_0.scala   |  1 +
 .../scala/code/api/v4_0_0/APIMethods400.scala |  1 +
 .../scala/code/api/v4_0_0/OBPAPI4_0_0.scala   |  1 +
 .../scala/code/api/v5_0_0/APIMethods500.scala |  1 +
 .../scala/code/api/v5_0_0/OBPAPI5_0_0.scala   |  1 +
 .../scala/code/api/v5_1_0/APIMethods510.scala |  1 +
 .../scala/code/api/v5_1_0/OBPAPI5_1_0.scala   |  1 +
 .../scala/code/api/v6_0_0/APIMethods600.scala |  1 +
 .../scala/code/api/v6_0_0/OBPAPI6_0_0.scala   |  2 ++
 89 files changed, 116 insertions(+), 14 deletions(-)

diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala
index 93488b0a9a..bca13258fd 100644
--- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala
+++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala
@@ -1,5 +1,7 @@
 package code.api.AUOpenBanking.v1_0_0
 
+import scala.language.reflectiveCalls
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala
index 21a2776d5a..60a9aadf76 100644
--- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala
+++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala
@@ -1,5 +1,6 @@
 package code.api.AUOpenBanking.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil.{defaultBankId, _}
 import code.api.util.ApiTag._
diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala
index d89052e675..4b39158e59 100644
--- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala
+++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala
@@ -1,5 +1,7 @@
 package code.api.AUOpenBanking.v1_0_0
 
+import scala.language.reflectiveCalls
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala
index 1f829ef995..3e648cab8c 100644
--- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala
+++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala
@@ -1,5 +1,7 @@
 package code.api.AUOpenBanking.v1_0_0
 
+import scala.language.reflectiveCalls
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala
index 4f3a82cac8..869e19fe9e 100644
--- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala
+++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala
@@ -1,5 +1,7 @@
 package code.api.AUOpenBanking.v1_0_0
 
+import scala.language.reflectiveCalls
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala
index ea53f9af55..b434d089c6 100644
--- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala
+++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala
@@ -1,5 +1,7 @@
 package code.api.AUOpenBanking.v1_0_0
 
+import scala.language.reflectiveCalls
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala
index 1e71822efe..386337d51a 100644
--- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala
+++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala
@@ -1,5 +1,7 @@
 package code.api.AUOpenBanking.v1_0_0
 
+import scala.language.reflectiveCalls
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala
index 12cbfe032b..646eed5d37 100644
--- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala
+++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala
@@ -1,5 +1,6 @@
 package code.api.AUOpenBanking.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala
index 363dbb5b5f..289c43eff8 100644
--- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala
@@ -1,5 +1,7 @@
 package code.api.AUOpenBanking.v1_0_0
 
+import scala.language.reflectiveCalls
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala
index 6a5275caab..0bfaa75264 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala
index fbbe36828b..aca6e29c03 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala
index f348050e2d..6dfe3ce89e 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala
index 4a58944c59..c10d058b4c 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala
index c956e1af7c..99e23cf40a 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala
index 5f59bfe661..b529269150 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala
index 157df8b116..97340d0a35 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala
index 9e0c1a894e..3491ae02da 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala
index 4db4c0b41e..8b03e9e4a7 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala
index 2d40272d5b..244088bda4 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala
index 965d1f09b3..8226770618 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala
index 0dbd97d5b6..166234039d 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala
index 1a3353ac24..bd2958efba 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala
index 684a13c20b..f5c2376895 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala
index ef052b2611..a566e2bb14 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala
index 107fec5c1c..1fb6ba9ee1 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala
index 847fec053d..1e5ab3666f 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala
index 2d9b227e27..d3722d3955 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala
index d17d2afa0c..aaa6102cd6 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala
index 0a26024cab..d4dec4f4de 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala
index 8528cd6908..12c2cf3d3d 100644
--- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala
+++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala
@@ -1,5 +1,6 @@
 package code.api.BahrainOBF.v1_0_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala b/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala
index 6ede06c1eb..65089ecf73 100644
--- a/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala
+++ b/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala
@@ -1,5 +1,7 @@
 package code.api.MxOF
 
+import scala.language.reflectiveCalls
+import scala.language.implicitConversions
 import code.api.Constant
 import code.api.MxOF.JSONFactory_MXOF_0_0_1.createGetAtmsResponse
 import code.api.util.APIUtil._
diff --git a/obp-api/src/main/scala/code/api/OBPRestHelper.scala b/obp-api/src/main/scala/code/api/OBPRestHelper.scala
index ea6adbdbb9..78dc3bde3c 100644
--- a/obp-api/src/main/scala/code/api/OBPRestHelper.scala
+++ b/obp-api/src/main/scala/code/api/OBPRestHelper.scala
@@ -27,6 +27,8 @@ TESOBE (http://www.tesobe.com/)
 
 package code.api
 
+import scala.language.reflectiveCalls
+import scala.language.implicitConversions
 import code.api.Constant._
 import code.api.OAuthHandshake._
 import code.api.util.APIUtil._
diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala
index 1c4b6fa182..82b4965c04 100644
--- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala
+++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala
@@ -1,5 +1,6 @@
 package code.api.Polish.v2_1_1_1
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala
index 40a4131f26..51c0488e0c 100644
--- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala
+++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala
@@ -1,5 +1,6 @@
 package code.api.Polish.v2_1_1_1
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala
index ac460d9966..a23d8151a9 100644
--- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala
+++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala
@@ -1,5 +1,6 @@
 package code.api.Polish.v2_1_1_1
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala
index bc343808a3..079d300303 100644
--- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala
+++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala
@@ -1,5 +1,6 @@
 package code.api.Polish.v2_1_1_1
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala
index 3845c33ea5..2a43e1d6ce 100644
--- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala
+++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala
@@ -1,5 +1,6 @@
 package code.api.ResourceDocs1_4_0
 
+import scala.language.reflectiveCalls
 import code.api.Constant.HostName
 import code.api.OBPRestHelper
 import code.api.cache.Caching
@@ -16,7 +17,7 @@ import net.liftweb.http.{GetRequest, InMemoryResponse, PlainTextResponse, Req, S
 object ResourceDocs140 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
   val version = ApiVersion.v1_4_0 //    "1.4.0" // We match other api versions so API explorer can easily use the path.
   val versionStatus = ApiVersionStatus.STABLE.toString
-  val routes = List(
+  val routes: Seq[OBPEndpoint] = List(
     ImplementationsResourceDocs.getResourceDocsObp,
     ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
     ImplementationsResourceDocs.getResourceDocsSwagger,
@@ -31,7 +32,7 @@ object ResourceDocs140 extends OBPRestHelper with ResourceDocsAPIMethods with Md
 object ResourceDocs200 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
   val version = ApiVersion.v2_0_0 // "2.0.0" // We match other api versions so API explorer can easily use the path.
   val versionStatus = ApiVersionStatus.STABLE.toString
-  val routes = List(
+  val routes: Seq[OBPEndpoint] = List(
     ImplementationsResourceDocs.getResourceDocsObp,
     ImplementationsResourceDocs.getResourceDocsSwagger,
     ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@@ -46,7 +47,7 @@ object ResourceDocs200 extends OBPRestHelper with ResourceDocsAPIMethods with Md
 object ResourceDocs210 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
   val version: ApiVersion = ApiVersion.v2_1_0 //   "2.1.0" // We match other api versions so API explorer can easily use the path.
   val versionStatus = ApiVersionStatus.STABLE.toString
-  val routes = List(
+  val routes: Seq[OBPEndpoint] = List(
     ImplementationsResourceDocs.getResourceDocsObp,
     ImplementationsResourceDocs.getResourceDocsSwagger,
     ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@@ -60,7 +61,7 @@ object ResourceDocs210 extends OBPRestHelper with ResourceDocsAPIMethods with Md
 object ResourceDocs220 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
   val version: ApiVersion = ApiVersion.v2_2_0 // "2.2.0" // We match other api versions so API explorer can easily use the path.
   val versionStatus = ApiVersionStatus.STABLE.toString
-  val routes = List(
+  val routes: Seq[OBPEndpoint] = List(
     ImplementationsResourceDocs.getResourceDocsObp,
     ImplementationsResourceDocs.getResourceDocsSwagger,
     ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@@ -74,7 +75,7 @@ object ResourceDocs220 extends OBPRestHelper with ResourceDocsAPIMethods with Md
 object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
   val version : ApiVersion = ApiVersion.v3_0_0 // = "3.0.0" // We match other api versions so API explorer can easily use the path.
   val versionStatus = ApiVersionStatus.STABLE.toString
-  val routes = List(
+  val routes: Seq[OBPEndpoint] = List(
     ImplementationsResourceDocs.getResourceDocsObp,
     ImplementationsResourceDocs.getResourceDocsSwagger,
     ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@@ -87,7 +88,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md
   object ResourceDocs310 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
     val version: ApiVersion = ApiVersion.v3_1_0 // = "3.0.0" // We match other api versions so API explorer can easily use the path.
     val versionStatus = ApiVersionStatus.STABLE.toString
-    val routes = List(
+    val routes: Seq[OBPEndpoint] = List(
       ImplementationsResourceDocs.getResourceDocsObp,
       ImplementationsResourceDocs.getResourceDocsSwagger,
       ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@@ -102,7 +103,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md
   object ResourceDocs400 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
     val version: ApiVersion = ApiVersion.v4_0_0 // = "4.0.0" // We match other api versions so API explorer can easily use the path.
     val versionStatus = ApiVersionStatus.STABLE.toString
-    val routes = List(
+    val routes: Seq[OBPEndpoint] = List(
       ImplementationsResourceDocs.getResourceDocsObpV400,
       ImplementationsResourceDocs.getResourceDocsSwagger,
       ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@@ -117,7 +118,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md
   object ResourceDocs500 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
     val version: ApiVersion = ApiVersion.v5_0_0 
     val versionStatus = ApiVersionStatus.STABLE.toString
-    val routes = List(
+    val routes: Seq[OBPEndpoint] = List(
       ImplementationsResourceDocs.getResourceDocsObpV400,
       ImplementationsResourceDocs.getResourceDocsSwagger,
       ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@@ -132,7 +133,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md
   object ResourceDocs510 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
     val version: ApiVersion = ApiVersion.v5_1_0 
     val versionStatus = ApiVersionStatus.BLEEDING_EDGE.toString
-    val routes = List(
+    val routes: Seq[OBPEndpoint] = List(
       ImplementationsResourceDocs.getResourceDocsObpV400,
       ImplementationsResourceDocs.getResourceDocsSwagger,
       ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@@ -148,7 +149,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md
   object ResourceDocs600 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
     val version: ApiVersion = ApiVersion.v6_0_0 
     val versionStatus = ApiVersionStatus.BLEEDING_EDGE.toString
-    val routes = List(
+    val routes: Seq[OBPEndpoint] = List(
       ImplementationsResourceDocs.getResourceDocsObpV400,
       ImplementationsResourceDocs.getResourceDocsSwagger,
       ImplementationsResourceDocs.getResourceDocsOpenAPI31,
diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala
index 9d5c894b31..27d3a22e0d 100644
--- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala
+++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala
@@ -1,6 +1,7 @@
 package code.api.ResourceDocs1_4_0
 
-import code.api.Constant.{GET_DYNAMIC_RESOURCE_DOCS_TTL, GET_STATIC_RESOURCE_DOCS_TTL, PARAM_LOCALE, HostName}
+import scala.language.reflectiveCalls
+import code.api.Constant.{GET_DYNAMIC_RESOURCE_DOCS_TTL, GET_STATIC_RESOURCE_DOCS_TTL, HostName, PARAM_LOCALE}
 import code.api.OBPRestHelper
 import code.api.cache.Caching
 import code.api.util.APIUtil._
@@ -39,6 +40,7 @@ import net.liftweb.json.JsonAST.{JField, JString, JValue}
 import net.liftweb.json._
 
 import java.util.concurrent.ConcurrentHashMap
+import scala.collection.immutable
 import scala.collection.immutable.{List, Nil}
 import scala.concurrent.Future
 
@@ -117,7 +119,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth
 
       logger.debug(s"getResourceDocsList says requestedApiVersion is $requestedApiVersion")
 
-      val resourceDocs = requestedApiVersion match {
+      val resourceDocs: ArrayBuffer[ResourceDoc] = requestedApiVersion match {
         case ApiVersion.v6_0_0 => OBPAPI6_0_0.allResourceDocs
         case ApiVersion.v5_1_0 => OBPAPI5_1_0.allResourceDocs
         case ApiVersion.v5_0_0 => OBPAPI5_0_0.allResourceDocs
@@ -138,7 +140,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth
 
       logger.debug(s"There are ${resourceDocs.length} resource docs available to $requestedApiVersion")
 
-      val versionRoutes = requestedApiVersion match {
+      val versionRoutes: immutable.Seq[OBPEndpoint] = requestedApiVersion match {
         case ApiVersion.v6_0_0 => OBPAPI6_0_0.routes
         case ApiVersion.v5_1_0 => OBPAPI5_1_0.routes
         case ApiVersion.v5_0_0 => OBPAPI5_0_0.routes
diff --git a/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala b/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala
index a2175d0b9c..7eeb835abe 100644
--- a/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala
+++ b/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala
@@ -1,5 +1,6 @@
 package code.api.STET.v1_4
 
+import scala.language.implicitConversions
 import code.api.APIFailureNewStyle
 import code.api.STET.v1_4.JSONFactory_STET_1_4._
 import code.api.berlin.group.v1_3.JvalueCaseClass
diff --git a/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala b/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala
index bd249bbc19..7c64f54ee9 100644
--- a/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala
+++ b/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala
@@ -1,5 +1,6 @@
 package code.api.STET.v1_4
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala b/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala
index 1a3b504bc1..8dde01b430 100644
--- a/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala
+++ b/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala
@@ -1,5 +1,6 @@
 package code.api.STET.v1_4
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala
index 1b99efeb1b..2221a08cb9 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.Constant
 import code.api.UKOpenBanking.v3_1_0.JSONFactory_UKOpenBanking_310.ConsentPostBodyUKV310
 import code.api.berlin.group.v1_3.JvalueCaseClass
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala
index d85e236eef..af76a559f0 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.Constant
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala
index afa47da0df..7f5196a241 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.Constant
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala
index 8b2a9202f8..a8bdf4a6fa 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala
index 0fa62f8616..691d74797b 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala
index a3eb5c672b..26c9f7441c 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala
index 235d2e139f..8a9c8fdf4c 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala
index ee21f7fc48..9af02bff7c 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala
index 216d31cc7c..ff17971f8f 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala
index 3dce3f6b8f..61d110fb43 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala
index d5206696dc..4902fc0c8d 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala
index e7f2ea6b04..7dd09f027e 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala
index bb6b4f77f6..f35323886d 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala
index eb7cfc90b4..953810052e 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala
index cc066d556a..4a8c43e583 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala
index a623afaa1f..4542578c98 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala
index 163759ba78..826fd9d8d1 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala
index 48772074d5..f447695250 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala
index 69a893f0d6..66be44423a 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil._
 import code.api.util.ApiTag
diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala
index 5a57181067..3b1f0e8b12 100644
--- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala
+++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala
@@ -1,5 +1,6 @@
 package code.api.UKOpenBanking.v3_1_0
 
+import scala.language.implicitConversions
 import code.api.berlin.group.v1_3.JvalueCaseClass
 import code.api.util.APIUtil.{defaultBankId, _}
 import code.api.util.ApiTag._
diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala
index d3684b2681..df55fbfd01 100644
--- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala
+++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala
@@ -1,5 +1,6 @@
 package code.api.builder.AccountInformationServiceAISApi
 
+import scala.language.implicitConversions
 import code.api.APIFailureNewStyle
 import code.api.Constant.{SYSTEM_READ_ACCOUNTS_BERLIN_GROUP_VIEW_ID, SYSTEM_READ_BALANCES_BERLIN_GROUP_VIEW_ID, SYSTEM_READ_TRANSACTIONS_BERLIN_GROUP_VIEW_ID}
 import code.api.berlin.group.ConstantsBG
diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala
index 34b0f54f6c..6a40112e93 100644
--- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala
+++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala
@@ -1,5 +1,6 @@
 package code.api.builder.CommonServicesApi
 
+import scala.language.implicitConversions
 import code.api.berlin.group.ConstantsBG
 import code.api.berlin.group.v1_3.{JvalueCaseClass, OBP_BERLIN_GROUP_1_3}
 import code.api.builder.AccountInformationServiceAISApi.APIMethods_AccountInformationServiceAISApi
diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala
index 7e5108aa7c..adde2f1fb6 100644
--- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala
+++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala
@@ -1,5 +1,6 @@
 package code.api.builder.ConfirmationOfFundsServicePIISApi
 
+import scala.language.implicitConversions
 import code.api.berlin.group.ConstantsBG
 import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3._
 import code.api.berlin.group.v1_3.{JvalueCaseClass, OBP_BERLIN_GROUP_1_3}
diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala
index 0d39f7502c..ac26183268 100644
--- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala
+++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala
@@ -1,5 +1,6 @@
 package code.api.builder.PaymentInitiationServicePISApi
 
+import scala.language.implicitConversions
 import code.api.berlin.group.ConstantsBG
 import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3.{CancelPaymentResponseJson, CancelPaymentResponseLinks, LinkHrefJson, UpdatePaymentPsuDataJson, checkAuthorisationConfirmation, checkSelectPsuAuthenticationMethod, checkTransactionAuthorisation, checkUpdatePsuAuthentication, createCancellationTransactionRequestJson}
 import code.api.berlin.group.v1_3.model.TransactionStatus.mapTransactionStatus
diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala
index 8b1c05891d..664bcee8ef 100644
--- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala
+++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala
@@ -1,5 +1,6 @@
 package code.api.builder.SigningBasketsApi
 
+import scala.language.implicitConversions
 import code.api.berlin.group.ConstantsBG
 import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3.{PostSigningBasketJsonV13, UpdatePaymentPsuDataJson, createSigningBasketResponseJson, createStartSigningBasketAuthorisationJson, getSigningBasketResponseJson, getSigningBasketStatusResponseJson}
 import code.api.berlin.group.v1_3.{JSONFactory_BERLIN_GROUP_1_3, JvalueCaseClass}
diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala
index d6fb5dbb4f..684290acbe 100644
--- a/obp-api/src/main/scala/code/api/util/APIUtil.scala
+++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala
@@ -26,6 +26,8 @@ TESOBE (http://www.tesobe.com/)
  */
 
 package code.api.util
+
+import scala.language.implicitConversions
 import bootstrap.liftweb.CustomDBVendor
 import code.accountholders.AccountHolders
 import code.api.Constant._
diff --git a/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala b/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala
index 5c550e036b..113d684b1e 100644
--- a/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala
+++ b/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala
@@ -26,6 +26,8 @@ TESOBE (http://www.tesobe.com/)
   */
 package code.api.v1_2_1
 
+import scala.language.implicitConversions
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}
@@ -40,7 +42,7 @@ object OBPAPI1_2_1 extends OBPRestHelper with APIMethods121 with MdcLoggable wit
   val version : ApiVersion = ApiVersion.v1_2_1  //    "1.2.1"
   val versionStatus = ApiVersionStatus.DEPRECATED.toString
 
-  lazy val endpointsOf1_2_1 = List(
+  lazy val endpointsOf1_2_1: Seq[OBPEndpoint] = List(
     Implementations1_2_1.root,
     Implementations1_2_1.getBanks,
     Implementations1_2_1.bankById,
diff --git a/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala b/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala
index 7dccdf33d3..d5b6ce0507 100644
--- a/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala
+++ b/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala
@@ -1,5 +1,6 @@
 package code.api.v1_3_0
 
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}
diff --git a/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala b/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala
index a8ac7072cb..31d7fe239c 100644
--- a/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala
+++ b/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala
@@ -1,5 +1,6 @@
 package code.api.v1_4_0
 
+import scala.language.reflectiveCalls
 import code.api.Constant._
 import code.api.util.ApiRole._
 import code.api.util.ApiTag._
diff --git a/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala b/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala
index 57d6d21801..86c2827573 100644
--- a/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala
+++ b/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala
@@ -1,5 +1,6 @@
 package code.api.v1_4_0
 
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}
diff --git a/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala b/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala
index b496bee72b..2ed09e34a7 100644
--- a/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala
+++ b/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala
@@ -1,5 +1,6 @@
 package code.api.v2_0_0
 
+import scala.language.reflectiveCalls
 import code.TransactionTypes.TransactionType
 import code.api.APIFailureNewStyle
 import code.api.Constant._
diff --git a/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala b/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala
index 6e037559c7..c642e154a2 100644
--- a/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala
+++ b/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala
@@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
   */
 package code.api.v2_0_0
 
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}
diff --git a/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala b/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala
index 5280a92673..4b98fa8358 100644
--- a/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala
+++ b/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala
@@ -1,5 +1,6 @@
 package code.api.v2_1_0
 
+import scala.language.reflectiveCalls
 import code.TransactionTypes.TransactionType
 import code.api.Constant.CAN_SEE_TRANSACTION_REQUESTS
 import code.api.util.ApiTag._
diff --git a/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala b/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala
index e796bbee58..eaab7b2d05 100644
--- a/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala
+++ b/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala
@@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
   */
 package code.api.v2_1_0
 
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import code.api.util.{APIUtil, VersionedOBPApis}
diff --git a/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala b/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala
index e6af9eba38..80ff18aae5 100644
--- a/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala
+++ b/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala
@@ -1,5 +1,6 @@
 package code.api.v2_2_0
 
+import scala.language.reflectiveCalls
 import code.api.Constant._
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
 import code.api.util.APIUtil._
diff --git a/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala b/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala
index d618322c20..eef3885781 100644
--- a/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala
+++ b/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala
@@ -1,6 +1,7 @@
 
 package code.api.v2_2_0
 
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import code.api.util.{APIUtil, VersionedOBPApis}
diff --git a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala
index 400da0234f..7c0be82d20 100644
--- a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala
+++ b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala
@@ -1,5 +1,6 @@
 package code.api.v3_0_0
 
+import scala.language.reflectiveCalls
 import code.accountattribute.AccountAttributeX
 import code.api.Constant._
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
diff --git a/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala b/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala
index fad91faae6..d8bd8f86c9 100644
--- a/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala
+++ b/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala
@@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
   */
 package code.api.v3_0_0
 
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}
diff --git a/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala b/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala
index b88d88b49b..cbec5f5b37 100644
--- a/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala
+++ b/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala
@@ -1,5 +1,6 @@
 package code.api.v3_1_0
 
+import scala.language.reflectiveCalls
 import code.api.Constant
 import code.api.Constant._
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
diff --git a/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala b/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala
index b581773be2..fe1b432498 100644
--- a/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala
+++ b/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala
@@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
   */
 package code.api.v3_1_0
 
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}
diff --git a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala
index 78228ef5fa..7453131ba4 100644
--- a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala
+++ b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala
@@ -1,5 +1,6 @@
 package code.api.v4_0_0
 
+import scala.language.reflectiveCalls
 import code.DynamicData.DynamicData
 import code.DynamicEndpoint.DynamicEndpointSwagger
 import code.accountattribute.AccountAttributeX
diff --git a/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala b/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala
index 0d8c671fab..089a7bc14e 100644
--- a/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala
+++ b/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala
@@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
   */
 package code.api.v4_0_0
 
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import code.api.util.VersionedOBPApis
diff --git a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala
index 129d217c34..f7f83ee98a 100644
--- a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala
+++ b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala
@@ -1,5 +1,6 @@
 package code.api.v5_0_0
 
+import scala.language.reflectiveCalls
 import code.accountattribute.AccountAttributeX
 import code.api.Constant._
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
diff --git a/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala b/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala
index 24110ea73c..ac3528d8d6 100644
--- a/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala
+++ b/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala
@@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
   */
 package code.api.v5_0_0
 
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import code.api.util.{APIUtil, VersionedOBPApis}
diff --git a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
index 6b5c0e4790..3029949c2f 100644
--- a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
+++ b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
@@ -1,6 +1,7 @@
 package code.api.v5_1_0
 
 
+import scala.language.reflectiveCalls
 import code.api.Constant
 import code.api.Constant._
 import code.api.OAuth2Login.{Keycloak, OBPOIDC}
diff --git a/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala b/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala
index 804e2eb5e5..3a7f94e390 100644
--- a/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala
+++ b/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala
@@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
   */
 package code.api.v5_1_0
 
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import code.api.util.{APIUtil, VersionedOBPApis}
diff --git a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala
index d761635784..881c93120f 100644
--- a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala
+++ b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala
@@ -1,5 +1,6 @@
 package code.api.v6_0_0
 
+import scala.language.reflectiveCalls
 import code.accountattribute.AccountAttributeX
 import code.api.Constant
 import code.api.{DirectLogin, ObpApiFailure}
diff --git a/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala b/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala
index 6b1868e7dc..b6a30baf51 100644
--- a/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala
+++ b/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala
@@ -26,6 +26,8 @@ TESOBE (http://www.tesobe.com/)
   */
 package code.api.v6_0_0
 
+
+import scala.language.reflectiveCalls
 import code.api.OBPRestHelper
 import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
 import code.api.util.VersionedOBPApis

From 5cbe019e5a77f287f41e1130704d320ff2527c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mili=C4=87?= <marko@tesobe.com>
Date: Tue, 23 Dec 2025 15:39:08 +0100
Subject: [PATCH 7/7] feature/Reduce compiler warnings during compilation 2

---
 .../ResourceDocsAPIMethods.scala              |  4 ++--
 .../SwaggerDefinitionsJSON.scala              |  1 +
 .../SwaggerJSONFactory.scala                  |  8 ++++----
 .../helper/DynamicCompileEndpoint.scala       |  3 ++-
 .../helper/DynamicEndpointHelper.scala        |  3 ++-
 .../main/scala/code/api/util/APIUtil.scala    | 11 +++++-----
 .../main/scala/code/api/util/NewStyle.scala   |  8 ++++----
 .../scala/code/api/v1_2_1/APIMethods121.scala |  4 ++--
 .../scala/code/api/v1_3_0/APIMethods130.scala |  2 +-
 .../scala/code/api/v1_4_0/APIMethods140.scala |  2 +-
 .../code/api/v1_4_0/JSONFactory1_4_0.scala    |  2 +-
 .../scala/code/api/v2_0_0/APIMethods200.scala |  2 +-
 .../scala/code/api/v2_1_0/APIMethods210.scala |  2 +-
 .../scala/code/api/v2_2_0/APIMethods220.scala |  8 ++++----
 .../scala/code/api/v3_0_0/APIMethods300.scala |  4 ++--
 .../scala/code/api/v3_1_0/APIMethods310.scala |  2 +-
 .../code/api/v3_1_0/JSONFactory3.1.0.scala    |  2 +-
 .../scala/code/api/v4_0_0/APIMethods400.scala | 20 +++++++++----------
 .../scala/code/api/v5_0_0/APIMethods500.scala |  6 +++---
 .../scala/code/api/v5_1_0/APIMethods510.scala |  4 ++--
 .../scala/code/api/v6_0_0/APIMethods600.scala |  8 ++++----
 .../scala/code/api/v7_0_0/Http4s700.scala     |  2 +-
 .../MappedAuthTypeValidationProvider.scala    |  2 +-
 .../scala/code/bankconnectors/Connector.scala |  7 ++++---
 .../bankconnectors/InternalConnector.scala    |  8 ++++----
 .../LocalMappedConnectorInternal.scala        |  2 +-
 .../akka/actor/AkkaConnectorActorInit.scala   |  2 +-
 .../rest/RestConnector_vMar2019.scala         |  1 +
 .../MappedConnectorMethodProvider.scala       |  4 ++--
 .../MapppedDynamicEndpointProvider.scala      |  2 +-
 .../MappedDynamicMessageDocProvider.scala     |  2 +-
 .../MappedDynamicResourceDocProvider.scala    |  2 +-
 obp-api/src/main/scala/code/fx/fx.scala       |  2 +-
 .../scala/code/management/ImporterAPI.scala   |  2 +-
 .../counterparties/MapperCounterparties.scala |  2 +-
 .../scala/code/metrics/ConnectorMetrics.scala |  2 +-
 .../scala/code/metrics/MappedMetrics.scala    |  8 ++++----
 .../code/model/ModeratedBankingData.scala     |  6 ++++++
 obp-api/src/main/scala/code/model/OAuth.scala |  4 ++--
 obp-api/src/main/scala/code/model/View.scala  |  2 ++
 .../code/model/dataAccess/AuthUser.scala      |  2 +-
 .../code/model/dataAccess/ResourceUser.scala  |  2 +-
 .../src/main/scala/code/model/package.scala   |  2 ++
 .../src/main/scala/code/obp/grpc/Client.scala |  1 +
 .../code/obp/grpc/HelloWorldServer.scala      |  2 ++
 .../src/main/scala/code/search/search.scala   |  4 ++--
 .../scala/code/snippet/GetHtmlFromUrl.scala   |  2 +-
 .../src/main/scala/code/snippet/WebUI.scala   |  2 +-
 .../main/scala/code/util/AkkaHttpClient.scala |  2 +-
 obp-api/src/main/scala/code/util/Helper.scala |  6 +++---
 .../MappedJsonSchemaValidationProvider.scala  |  2 +-
 .../main/scala/code/views/MapperViews.scala   |  4 ++--
 .../webuiprops/MappedWebUiPropsProvider.scala |  2 +-
 53 files changed, 110 insertions(+), 91 deletions(-)

diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala
index 3abd433239..d83e025068 100644
--- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala
+++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala
@@ -468,7 +468,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth
             case true => authenticatedAccess(cc) // If set resource_docs_requires_role=true, we need check the authentication
           }
           _ <- resourceDocsRequireRole match {
-            case false => Future()
+            case false => Future(())
             case true => // If set resource_docs_requires_role=true, we need check the roles as well
                 NewStyle.function.hasAtLeastOneEntitlement(failMsg = UserHasMissingRoles + canReadResourceDoc.toString)("", u.map(_.userId).getOrElse(""), ApiRole.canReadResourceDoc :: Nil, cc.callContext)
           }
@@ -592,7 +592,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth
             }
             (_, callContext) <- NewStyle.function.getBank(BankId(bankId), Option(cc))
             _ <- resourceDocsRequireRole match {
-              case false => Future()
+              case false => Future(())
               case true => // If set resource_docs_requires_role=true, we need check the the roles as well
                 NewStyle.function.hasAtLeastOneEntitlement(failMsg = UserHasMissingRoles + ApiRole.canReadDynamicResourceDocsAtOneBank.toString)(
                   bankId, u.map(_.userId).getOrElse(""), ApiRole.canReadDynamicResourceDocsAtOneBank::Nil, cc.callContext
diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala
index d6e9149ea2..a1e5223c01 100644
--- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala
+++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala
@@ -1,5 +1,6 @@
 package code.api.ResourceDocs1_4_0
 
+import scala.language.implicitConversions
 import code.api.Constant
 import code.api.Constant._
 import code.api.UKOpenBanking.v2_0_0.JSONFactory_UKOpenBanking_200
diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala
index 28f11e297f..2ac9c5782c 100644
--- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala
+++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala
@@ -889,7 +889,7 @@ object SwaggerJSONFactory extends MdcLoggable {
     * @return  a list of include original list and nested objects
     */
   private def getAllEntities(entities: List[AnyRef]) = {
-    val notNullEntities = entities.filter(null !=)
+    val notNullEntities = entities.filter(null.!=)
     val notSupportYetEntity = entities.filter(_.getClass.getSimpleName.equals(NotSupportedYet.getClass.getSimpleName.replace("$","")))
     val existsEntityTypes: Set[universe.Type] = notNullEntities.map(ReflectUtils.getType).toSet
 
@@ -919,10 +919,10 @@ object SwaggerJSONFactory extends MdcLoggable {
         val entityType = ReflectUtils.getType(obj)
         val constructorParamList = ReflectUtils.getPrimaryConstructor(entityType).paramLists.headOption.getOrElse(Nil)
         // if exclude current obj, the result list tail will be Nil
-        val resultTail = if(excludeTypes.exists(entityType =:=)) Nil else List(obj)
+        val resultTail = if(excludeTypes.exists(entityType.=:=)) Nil else List(obj)
 
         val refValues: List[Any] = constructorParamList
-          .filter(it => isSwaggerRefType(it.info) && !excludeTypes.exists(_ =:= it.info))
+          .filter(it => isSwaggerRefType(it.info) && !excludeTypes.exists(_.=:=(it.info)))
           .map(it => {
             val paramName = it.name.toString
             val value = ReflectUtils.invokeMethod(obj, paramName)
@@ -1009,7 +1009,7 @@ object SwaggerJSONFactory extends MdcLoggable {
     val errorMessages: Set[AnyRef] = resourceDocList.flatMap(_.error_response_bodies).toSet
 
     val errorDefinitions = ErrorMessages.allFields
-      .filterNot(null ==)
+      .filterNot(null.==)
       .filter(it => errorMessages.contains(it._2))
       .toList
       .map(it => {
diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala
index d052e21698..4022feacd9 100644
--- a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala
+++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala
@@ -1,5 +1,6 @@
 package code.api.dynamic.endpoint.helper
 
+import scala.language.implicitConversions
 import code.api.util.APIUtil.{OBPEndpoint, OBPReturnType, futureToBoxedResponse, scalaFutureToLaFuture}
 import code.api.util.DynamicUtil.{Sandbox, Validation}
 import code.api.util.{CallContext, CustomJsonFormats, DynamicUtil}
@@ -34,7 +35,7 @@ trait DynamicCompileEndpoint {
   }
 
   private def validateDependencies() = {
-    val dependencies = DynamicUtil.getDynamicCodeDependentMethods(this.getClass, "process" == )
+    val dependencies = DynamicUtil.getDynamicCodeDependentMethods(this.getClass, "process".==)
     Validation.validateDependency(dependencies)
   }
 }
diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala
index 757ea0465a..bf423d647b 100644
--- a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala
+++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala
@@ -1,5 +1,6 @@
 package code.api.dynamic.endpoint.helper
 
+import scala.language.existentials
 import org.apache.pekko.http.scaladsl.model.{HttpMethods, HttpMethod => PekkoHttpMethod}
 import code.DynamicData.{DynamicDataProvider, DynamicDataT}
 import code.DynamicEndpoint.{DynamicEndpointProvider, DynamicEndpointT}
@@ -677,7 +678,7 @@ object DynamicEndpointHelper extends RestHelper {
         schemas += schema
       }
       // check whether this schema already recurse two times
-      if(schemas.count(schema ==) > 3) {
+      if(schemas.count(schema.==) > 3) {
         return JObject(Nil)
       }
 
diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala
index 684290acbe..9b27333a73 100644
--- a/obp-api/src/main/scala/code/api/util/APIUtil.scala
+++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala
@@ -28,6 +28,7 @@ TESOBE (http://www.tesobe.com/)
 package code.api.util
 
 import scala.language.implicitConversions
+import scala.language.reflectiveCalls
 import bootstrap.liftweb.CustomDBVendor
 import code.accountholders.AccountHolders
 import code.api.Constant._
@@ -1766,9 +1767,9 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
     
     private val reversedRequestUrl = requestUrlPartPath.reverse
     def getPathParams(url: List[String]): Map[String, String] =
-      reversedRequestUrl.zip(url.reverse) collect {
+      reversedRequestUrl.zip(url.reverse).collect {
         case pair @(k, _) if isPathVariable(k) => pair
-      } toMap
+      }.toMap
 
     /**
      * According errorResponseBodies whether contains UserNotLoggedIn and UserHasMissingRoles do validation.
@@ -4024,7 +4025,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
   def parseDate(date: String): Option[Date] = {
     val currentSupportFormats = List(DateWithDayFormat, DateWithSecondsFormat, DateWithMsFormat, DateWithMsRollbackFormat)
     val parsePosition = new ParsePosition(0)
-    currentSupportFormats.toStream.map(_.parse(date, parsePosition)).find(null !=)
+    currentSupportFormats.toStream.map(_.parse(date, parsePosition)).find(null.!=)
   }
 
   private def passesPsd2ServiceProviderCommon(cc: Option[CallContext], serviceProvider: String) = {
@@ -4420,7 +4421,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
 
   private def getClassPool(classLoader: ClassLoader) = {
     import scala.concurrent.duration._
-    Caching.memoizeSyncWithImMemory(Some(classLoader.toString()))(DurationInt(30) days) {
+    Caching.memoizeSyncWithImMemory(Some(classLoader.toString()))(DurationInt(30).days) {
       val classPool: ClassPool = ClassPool.getDefault
       classPool.appendClassPath(new LoaderClassPath(classLoader))
       classPool
@@ -4521,7 +4522,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
      */
     def getObpTrace(clazzName: String, methodName: String, signature: String, exclude: List[(String, String, String)] = Nil): List[(String, String, String)] = {
       import scala.concurrent.duration._
-      Caching.memoizeSyncWithImMemory(Some(clazzName + methodName + signature))(DurationInt(30) days) {
+      Caching.memoizeSyncWithImMemory(Some(clazzName + methodName + signature))(DurationInt(30).days) {
         // List:: className->methodName->signature, find all the dependent methods for one 
         val methods = getDependentMethods(clazzName, methodName, signature)
 
diff --git a/obp-api/src/main/scala/code/api/util/NewStyle.scala b/obp-api/src/main/scala/code/api/util/NewStyle.scala
index 80394c0c5f..2a684e5164 100644
--- a/obp-api/src/main/scala/code/api/util/NewStyle.scala
+++ b/obp-api/src/main/scala/code/api/util/NewStyle.scala
@@ -3160,7 +3160,7 @@ object NewStyle extends MdcLoggable{
 
       var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
       CacheKeyFromArguments.buildCacheKey {
-        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(methodRoutingTTL second) {
+        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(methodRoutingTTL.second) {
           MethodRoutingProvider.connectorMethodProvider.vend.getMethodRoutings(methodName, isBankIdExactMatch, bankIdPattern)
         }
       }
@@ -3213,7 +3213,7 @@ object NewStyle extends MdcLoggable{
 
       var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
       CacheKeyFromArguments.buildCacheKey {
-        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(endpointMappingTTL second) {
+        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(endpointMappingTTL.second) {
           {(EndpointMappingProvider.endpointMappingProvider.vend.getAllEndpointMappings(bankId), callContext)}
         }
       }
@@ -3327,7 +3327,7 @@ object NewStyle extends MdcLoggable{
 
       var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
       CacheKeyFromArguments.buildCacheKey {
-        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL second) {
+        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL.second) {
           DynamicEntityProvider.connectorMethodProvider.vend.getDynamicEntities(bankId, returnBothBankAndSystemLevel)
         }
       }
@@ -3338,7 +3338,7 @@ object NewStyle extends MdcLoggable{
 
       var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
       CacheKeyFromArguments.buildCacheKey {
-        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL second) {
+        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL.second) {
           DynamicEntityProvider.connectorMethodProvider.vend.getDynamicEntitiesByUserId(userId: String)
         }
       }
diff --git a/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala b/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala
index f55e488a2c..7a93c9e15c 100644
--- a/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala
+++ b/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala
@@ -76,7 +76,7 @@ trait APIMethods121 {
 
   def checkIfLocationPossible(lat:Double,lon:Double) : Box[Unit] = {
     if(scala.math.abs(lat) <= 90 & scala.math.abs(lon) <= 180)
-      Full()
+      Full(())
     else
       Failure("Coordinates not possible")
   }
@@ -132,7 +132,7 @@ trait APIMethods121 {
         cc =>
           implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory.getApiInfoJSON(apiVersion,apiVersionStatus), HttpCode.`200`(cc.callContext))
           }
diff --git a/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala b/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala
index da3ea41bfc..5cd2d75cc2 100644
--- a/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala
+++ b/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala
@@ -50,7 +50,7 @@ trait APIMethods130 {
         cc =>
           implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory.getApiInfoJSON(OBPAPI1_3_0.version, OBPAPI1_3_0.versionStatus), HttpCode.`200`(cc.callContext))
           }
diff --git a/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala b/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala
index 31d7fe239c..b740080283 100644
--- a/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala
+++ b/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala
@@ -85,7 +85,7 @@ trait APIMethods140 extends MdcLoggable with APIMethods130 with APIMethods121{
         cc =>
           implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory.getApiInfoJSON(OBPAPI1_4_0.version, OBPAPI1_4_0.versionStatus), HttpCode.`200`(cc.callContext))
           }
diff --git a/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala b/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala
index bc27013648..db6f7ee9f0 100644
--- a/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala
+++ b/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala
@@ -530,7 +530,7 @@ object JSONFactory1_4_0 extends MdcLoggable{
     jsonResponseBodyFieldsI18n:String
   ): ResourceDocJson = {
     val cacheKey = LOCALISED_RESOURCE_DOC_PREFIX + s"operationId:${operationId}-locale:$locale- isVersion4OrHigher:$isVersion4OrHigher".intern()
-    Caching.memoizeSyncWithImMemory(Some(cacheKey))(CREATE_LOCALISED_RESOURCE_DOC_JSON_TTL seconds) {
+    Caching.memoizeSyncWithImMemory(Some(cacheKey))(CREATE_LOCALISED_RESOURCE_DOC_JSON_TTL.seconds) {
       val fieldsDescription =
         if (resourceDocUpdatedTags.tags.toString.contains("Dynamic-Entity")
           || resourceDocUpdatedTags.tags.toString.contains("Dynamic-Endpoint")
diff --git a/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala b/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala
index 2ed09e34a7..894261e4c2 100644
--- a/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala
+++ b/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala
@@ -148,7 +148,7 @@ trait APIMethods200 {
         cc =>
           implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory121.getApiInfoJSON(OBPAPI2_0_0.version, OBPAPI2_0_0.versionStatus), HttpCode.`200`(cc.callContext))
           }
diff --git a/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala b/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala
index 4b98fa8358..1c83ad6de7 100644
--- a/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala
+++ b/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala
@@ -92,7 +92,7 @@ trait APIMethods210 {
         cc =>
           implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory.getApiInfoJSON(OBPAPI2_1_0.version, OBPAPI2_1_0.versionStatus), HttpCode.`200`(cc.callContext))
           }
diff --git a/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala b/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala
index 80ff18aae5..0cc651df42 100644
--- a/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala
+++ b/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala
@@ -80,7 +80,7 @@ trait APIMethods220 {
         cc =>
           implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory.getApiInfoJSON(OBPAPI2_2_0.version, OBPAPI2_2_0.versionStatus), HttpCode.`200`(cc.callContext))
           }
@@ -536,14 +536,14 @@ trait APIMethods220 {
             _ <- entitlementsByBank.filter(_.roleName == CanCreateEntitlementAtOneBank.toString()).size > 0 match {
               case true =>
                 // Already has entitlement
-                Full()
+                Full(())
               case false =>
                 Full(Entitlement.entitlement.vend.addEntitlement(bank.id, u.userId, CanCreateEntitlementAtOneBank.toString()))
             }
             _ <- entitlementsByBank.filter(_.roleName == CanReadDynamicResourceDocsAtOneBank.toString()).size > 0 match {
               case true =>
                 // Already has entitlement
-                Full()
+                Full(())
               case false =>
                 Full(Entitlement.entitlement.vend.addEntitlement(bank.id, u.userId, CanReadDynamicResourceDocsAtOneBank.toString()))
             }
@@ -1247,7 +1247,7 @@ trait APIMethods220 {
                 (account, callContext)
               }
             }else
-              Future{(Full(), Some(cc))}
+              Future{(Full(()), Some(cc))}
 
 
             otherAccountRoutingSchemeOBPFormat = if(postJson.other_account_routing_scheme.equalsIgnoreCase("AccountNo")) "ACCOUNT_NUMBER" else StringHelpers.snakify(postJson.other_account_routing_scheme).toUpperCase
diff --git a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala
index 7c0be82d20..e556b67ea3 100644
--- a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala
+++ b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala
@@ -85,7 +85,7 @@ trait APIMethods300 {
         cc =>
           implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory.getApiInfoJSON(OBPAPI3_0_0.version, OBPAPI3_0_0.versionStatus), HttpCode.`200`(cc.callContext))
           }
@@ -2119,7 +2119,7 @@ trait APIMethods300 {
                   hasCanReadGlossaryRole
                 }
             } else {
-              Future{Full()}
+              Future{Full(())}
             }
             json = JSONFactory300.createGlossaryItemsJsonV300(getGlossaryItems)
           } yield {
diff --git a/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala b/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala
index cbec5f5b37..0141b3d58e 100644
--- a/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala
+++ b/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala
@@ -102,7 +102,7 @@ trait APIMethods310 {
         cc =>
           implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory.getApiInfoJSON(OBPAPI3_1_0.version, OBPAPI3_1_0.versionStatus), HttpCode.`200`(cc.callContext))
           }
diff --git a/obp-api/src/main/scala/code/api/v3_1_0/JSONFactory3.1.0.scala b/obp-api/src/main/scala/code/api/v3_1_0/JSONFactory3.1.0.scala
index fba8889ad4..7cfba99436 100644
--- a/obp-api/src/main/scala/code/api/v3_1_0/JSONFactory3.1.0.scala
+++ b/obp-api/src/main/scala/code/api/v3_1_0/JSONFactory3.1.0.scala
@@ -1074,7 +1074,7 @@ object JSONFactory310{
   def createEntitlementJsonsV310(tr: List[Entitlement]) = {
     val idToUser: Map[String, Box[String]] = tr.map(_.userId).distinct.map {
      userId => (userId, UserX.findByUserId(userId).map(_.name))
-    } toMap;
+    }.toMap;
 
     EntitlementJSonsV310(
       tr.map(e =>
diff --git a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala
index 7453131ba4..fa4a35a628 100644
--- a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala
+++ b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala
@@ -1547,7 +1547,7 @@ trait APIMethods400 extends MdcLoggable {
                           value = rejectReasonCode,
                           callContext = callContext
                         )
-                    } else Future.successful()
+                    } else Future.successful(())
                   rejectAdditionalInformation =
                     challengeAnswerJson.additional_information.getOrElse("")
                   _ <-
@@ -1563,7 +1563,7 @@ trait APIMethods400 extends MdcLoggable {
                           value = rejectAdditionalInformation,
                           callContext = callContext
                         )
-                    } else Future.successful()
+                    } else Future.successful(())
                   _ <- NewStyle.function.notifyTransactionRequest(
                     fromAccount,
                     toAccount,
@@ -3372,7 +3372,7 @@ trait APIMethods400 extends MdcLoggable {
       case (Nil | "root" :: Nil) JsonGet _ => { cc =>
         implicit val ec = EndpointContext(Some(cc))
         for {
-          _ <- Future() // Just start async call
+          _ <- Future(()) // Just start async call
         } yield {
           (
             JSONFactory400.getApiInfoJSON(
@@ -3406,7 +3406,7 @@ trait APIMethods400 extends MdcLoggable {
       case "development" :: "call_context" :: Nil JsonGet _ => { cc =>
         implicit val ec = EndpointContext(Some(cc))
         for {
-          _ <- Future() // Just start async call
+          _ <- Future(()) // Just start async call
         } yield {
           (cc.callContext, HttpCode.`200`(cc.callContext))
         }
@@ -3435,7 +3435,7 @@ trait APIMethods400 extends MdcLoggable {
         cc =>
           implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (cc.callContext, HttpCode.`200`(cc.callContext))
           }
@@ -10458,7 +10458,7 @@ trait APIMethods400 extends MdcLoggable {
                   (account, callContext)
                 }
               } else
-                Future { (Full(), Some(cc)) }
+                Future { (Full(()), Some(cc)) }
 
             otherAccountRoutingSchemeOBPFormat =
               if (
@@ -10811,7 +10811,7 @@ trait APIMethods400 extends MdcLoggable {
                   (account, callContext)
                 }
               } else
-                Future { (Full(), Some(cc)) }
+                Future { (Full(()), Some(cc)) }
 
             otherAccountRoutingSchemeOBPFormat =
               if (
@@ -12873,7 +12873,7 @@ trait APIMethods400 extends MdcLoggable {
 
     // auth type validation related endpoints
     private val allowedAuthTypes =
-      AuthenticationType.values.filterNot(AuthenticationType.Anonymous ==)
+      AuthenticationType.values.filterNot(AuthenticationType.Anonymous.==)
     staticResourceDocs += ResourceDoc(
       createAuthenticationTypeValidation,
       implementedInApiVersion,
@@ -16725,7 +16725,7 @@ trait APIMethods400 extends MdcLoggable {
         s"$EntitlementAlreadyExists user_id($userId) ${duplicatedRoles.mkString(",")}"
       Helper.booleanToFuture(errorMessages, cc = callContext) { false }
     } else
-      Future.successful(Full())
+      Future.successful(Full(()))
   }
 
   /** This method will check all the roles the loggedIn user already has and the
@@ -16759,7 +16759,7 @@ trait APIMethods400 extends MdcLoggable {
             .mkString(",")}"
       Helper.booleanToFuture(errorMessages, cc = callContext) { false }
     } else
-      Future.successful(Full())
+      Future.successful(Full(()))
   }
 
   private def checkRoleBankIdMapping(
diff --git a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala
index f7f83ee98a..77790a0305 100644
--- a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala
+++ b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala
@@ -105,7 +105,7 @@ trait APIMethods500 {
         cc =>
           implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory400.getApiInfoJSON(OBPAPI5_0_0.version,OBPAPI5_0_0.versionStatus), HttpCode.`200`(cc.callContext))
           }
@@ -221,14 +221,14 @@ trait APIMethods500 {
             _ <- entitlementsByBank.filter(_.roleName == CanCreateEntitlementAtOneBank.toString()).size > 0 match {
               case true =>
                 // Already has entitlement
-                Future()
+                Future(())
               case false =>
                 Future(Entitlement.entitlement.vend.addEntitlement(postJson.id.getOrElse(""), cc.userId, CanCreateEntitlementAtOneBank.toString()))
             }
             _ <- entitlementsByBank.filter(_.roleName == CanReadDynamicResourceDocsAtOneBank.toString()).size > 0 match {
               case true =>
                 // Already has entitlement
-                Future()
+                Future(())
               case false =>
                 Future(Entitlement.entitlement.vend.addEntitlement(postJson.id.getOrElse(""), cc.userId, CanReadDynamicResourceDocsAtOneBank.toString()))
             }
diff --git a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
index 3029949c2f..761edf843e 100644
--- a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
+++ b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala
@@ -108,7 +108,7 @@ trait APIMethods510 {
       case (Nil | "root" :: Nil) JsonGet _ => {
         cc => implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory510.getApiInfoJSON(OBPAPI5_1_0.version,OBPAPI5_1_0.versionStatus), HttpCode.`200`(cc.callContext))
           }
@@ -4286,7 +4286,7 @@ trait APIMethods510 {
       case "tags" ::  Nil JsonGet _ =>
         cc => implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future.successful() // Just start async call
+            _ <- Future.successful(()) // Just start async call
           } yield {
             (APITags(ApiTag.allDisplayTagNames.toList), HttpCode.`200`(cc.callContext))
           }
diff --git a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala
index 881c93120f..a37b92f8cc 100644
--- a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala
+++ b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala
@@ -112,7 +112,7 @@ trait APIMethods600 {
       case (Nil | "root" :: Nil) JsonGet _ => {
         cc => implicit val ec = EndpointContext(Some(cc))
           for {
-            _ <- Future() // Just start async call
+            _ <- Future(()) // Just start async call
           } yield {
             (JSONFactory510.getApiInfoJSON(OBPAPI6_0_0.version, OBPAPI6_0_0.versionStatus), HttpCode.`200`(cc.callContext))
           }
@@ -1103,14 +1103,14 @@ trait APIMethods600 {
             _ <- entitlementsByBank.exists(_.roleName == CanCreateEntitlementAtOneBank.toString()) match {
               case true =>
                 // Already has entitlement
-                Future()
+                Future(())
               case false =>
                 Future(Entitlement.entitlement.vend.addEntitlement(postJson.bank_id, cc.userId, CanCreateEntitlementAtOneBank.toString()))
             }
             _ <- entitlementsByBank.exists(_.roleName == CanReadDynamicResourceDocsAtOneBank.toString()) match {
               case true =>
                 // Already has entitlement
-                Future()
+                Future(())
               case false =>
                 Future(Entitlement.entitlement.vend.addEntitlement(postJson.bank_id, cc.userId, CanReadDynamicResourceDocsAtOneBank.toString()))
             }
@@ -1239,7 +1239,7 @@ trait APIMethods600 {
                */
               val cacheKey = "getConnectorMethodNames"
               val cacheTTL = APIUtil.getPropsAsIntValue("getConnectorMethodNames.cache.ttl.seconds", 3600)
-              Caching.memoizeSyncWithProvider(Some(cacheKey))(cacheTTL seconds) {
+              Caching.memoizeSyncWithProvider(Some(cacheKey))(cacheTTL.seconds) {
                 val connectorName = APIUtil.getPropsValue("connector", "mapped")
                 val connector = code.bankconnectors.Connector.getConnectorInstance(connectorName)
                 connector.callableMethods.keys.toList
diff --git a/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala b/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala
index 877b91b72d..8269843e95 100644
--- a/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala
+++ b/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala
@@ -48,7 +48,7 @@ object Http4s700 {
       val callContext = req.attributes.lookup(callContextKey).get.asInstanceOf[CallContext]
       Ok(IO.fromFuture(IO(
         for {
-          _ <- Future() // Just start async call
+          _ <- Future(()) // Just start async call
         } yield {
           convertAnyToJsonString(
             JSONFactory700.getApiInfoJSON(apiVersion, s"Hello, ${callContext.userId}! Your request ID is ${callContext.requestId}.")
diff --git a/obp-api/src/main/scala/code/authtypevalidation/MappedAuthTypeValidationProvider.scala b/obp-api/src/main/scala/code/authtypevalidation/MappedAuthTypeValidationProvider.scala
index 19e7cffd65..6f7d122198 100644
--- a/obp-api/src/main/scala/code/authtypevalidation/MappedAuthTypeValidationProvider.scala
+++ b/obp-api/src/main/scala/code/authtypevalidation/MappedAuthTypeValidationProvider.scala
@@ -22,7 +22,7 @@ object MappedAuthTypeValidationProvider extends AuthenticationTypeValidationProv
   override def getByOperationId(operationId: String): Box[JsonAuthTypeValidation] = {
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
-      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getValidationByOperationIdTTL second) {
+      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getValidationByOperationIdTTL.second) {
         AuthenticationTypeValidation.find(By(AuthenticationTypeValidation.OperationId, operationId))
           .map(it => JsonAuthTypeValidation(it.operationId, it.allowedAuthTypes))
       }}
diff --git a/obp-api/src/main/scala/code/bankconnectors/Connector.scala b/obp-api/src/main/scala/code/bankconnectors/Connector.scala
index 4fe2e3b84f..8ef5483e37 100644
--- a/obp-api/src/main/scala/code/bankconnectors/Connector.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/Connector.scala
@@ -1,5 +1,6 @@
 package code.bankconnectors
 
+import scala.language.implicitConversions
 import org.apache.pekko.http.scaladsl.model.HttpMethod
 import code.api.attributedefinition.AttributeDefinition
 import code.api.util.APIUtil.{OBPReturnType, _}
@@ -220,7 +221,7 @@ trait Connector extends MdcLoggable {
   protected implicit def OBPReturnTypeToFutureReturnType[T](value: OBPReturnType[Box[T]]): Future[Box[(T, Option[CallContext])]] =
     value map tupleToBoxTuple
 
-  private val futureTimeOut: Duration = 20 seconds
+  private val futureTimeOut: Duration = 20.seconds
   /**
     * convert OBPReturnType return type to Tuple type
     *
@@ -240,7 +241,7 @@ trait Connector extends MdcLoggable {
     */
   protected implicit def OBPReturnTypeToBoxTuple[T](value: OBPReturnType[Box[T]]):  Box[(T, Option[CallContext])] =
     Await.result(
-      OBPReturnTypeToFutureReturnType(value), 30 seconds
+      OBPReturnTypeToFutureReturnType(value), 30.seconds
     )
 
   /**
@@ -253,7 +254,7 @@ trait Connector extends MdcLoggable {
   protected implicit def OBPReturnTypeToBox[T](value: OBPReturnType[Box[T]]): Box[T] =
     Await.result(
       value.map(_._1),
-      30 seconds
+      30.seconds
     )
 
   protected def convertToTuple[T](callContext: Option[CallContext])(inbound: Box[InBoundTrait[T]]): (Box[T], Option[CallContext]) = {
diff --git a/obp-api/src/main/scala/code/bankconnectors/InternalConnector.scala b/obp-api/src/main/scala/code/bankconnectors/InternalConnector.scala
index b9d1464a4c..d5fac02b56 100644
--- a/obp-api/src/main/scala/code/bankconnectors/InternalConnector.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/InternalConnector.scala
@@ -241,19 +241,19 @@ object InternalConnector {
     val dynamicMethods: Map[String, MethodSymbol] = ConnectorMethodProvider.provider.vend.getAll().map {
       case JsonConnectorMethod(_, methodName, _, _) =>
         methodName -> Box(methodNameToSymbols.get(methodName)).openOrThrowException(s"method name $methodName does not exist in the Connector")
-    } toMap
+    }.toMap
 
     dynamicMethods
   }
 
-  private lazy val methodNameToSymbols: Map[String, MethodSymbol] = typeOf[Connector].decls collect {
+  private lazy val methodNameToSymbols: Map[String, MethodSymbol] = typeOf[Connector].decls.collect {
     case t: TermSymbol if t.isMethod && t.isPublic && !t.isConstructor && !t.isVal && !t.isVar =>
       val methodName = t.name.decodedName.toString.trim
       val method = t.asMethod
       methodName -> method
-  } toMap
+  }.toMap
 
-  lazy val methodNameToSignature: Map[String, String] = methodNameToSymbols map {
+  lazy val methodNameToSignature: Map[String, String] = methodNameToSymbols.map {
     case (methodName, methodSymbol) =>
       val signature = methodSymbol.typeSignature.toString
       val returnType = methodSymbol.returnType.toString
diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnectorInternal.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnectorInternal.scala
index 25e48a15fd..5313b89263 100644
--- a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnectorInternal.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnectorInternal.scala
@@ -947,7 +947,7 @@ object LocalMappedConnectorInternal extends MdcLoggable {
                 attributeType = TransactionRequestAttributeType.withName("STRING"),
                 value = refundReasonCode,
                 callContext = callContext)
-            } else Future.successful()
+            } else Future.successful(())
 
             (newTransactionRequestStatus, callContext) <- NewStyle.function.notifyTransactionRequest(refundFromAccount, refundToAccount, createdTransactionRequest, callContext)
             _ <- NewStyle.function.saveTransactionRequestStatusImpl(createdTransactionRequest.id, newTransactionRequestStatus.toString, callContext)
diff --git a/obp-api/src/main/scala/code/bankconnectors/akka/actor/AkkaConnectorActorInit.scala b/obp-api/src/main/scala/code/bankconnectors/akka/actor/AkkaConnectorActorInit.scala
index 2170bf6225..ec718d31d2 100644
--- a/obp-api/src/main/scala/code/bankconnectors/akka/actor/AkkaConnectorActorInit.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/akka/actor/AkkaConnectorActorInit.scala
@@ -9,5 +9,5 @@ import scala.concurrent.duration._
 trait AkkaConnectorActorInit extends MdcLoggable{
   // Default is 3 seconds, which should be more than enough for slower systems
   val ACTOR_TIMEOUT: Long = APIUtil.getPropsAsLongValue("akka_connector.timeout").openOr(3)
-  implicit val timeout = Timeout(ACTOR_TIMEOUT * (1000 milliseconds))
+  implicit val timeout = Timeout(ACTOR_TIMEOUT * (1000.milliseconds))
 }
\ No newline at end of file
diff --git a/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala b/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala
index 26304d01fa..c5bd84c1bd 100644
--- a/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala
+++ b/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala
@@ -23,6 +23,7 @@ Osloerstrasse 16/17
 Berlin 13359, Germany
 */
 
+import scala.language.implicitConversions
 import _root_.org.apache.pekko.stream.StreamTcpException
 import org.apache.pekko.http.scaladsl.model._
 import org.apache.pekko.http.scaladsl.model.headers.RawHeader
diff --git a/obp-api/src/main/scala/code/connectormethod/MappedConnectorMethodProvider.scala b/obp-api/src/main/scala/code/connectormethod/MappedConnectorMethodProvider.scala
index caf7cfa0ea..426f9b047a 100644
--- a/obp-api/src/main/scala/code/connectormethod/MappedConnectorMethodProvider.scala
+++ b/obp-api/src/main/scala/code/connectormethod/MappedConnectorMethodProvider.scala
@@ -31,14 +31,14 @@ object MappedConnectorMethodProvider extends ConnectorMethodProvider {
   override def getByMethodNameWithCache(methodName: String): Box[JsonConnectorMethod] = {
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
-      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getConnectorMethodTTL second) {
+      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getConnectorMethodTTL.second) {
         getByMethodNameWithoutCache(methodName)
       }}
   }
   override def getAll(): List[JsonConnectorMethod] = {
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
-      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getConnectorMethodTTL second) {
+      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getConnectorMethodTTL.second) {
         ConnectorMethod.findAll()
           .map(it => JsonConnectorMethod(Some(it.ConnectorMethodId.get), it.MethodName.get, it.MethodBody.get, getLang(it)))
       }}
diff --git a/obp-api/src/main/scala/code/dynamicEndpoint/MapppedDynamicEndpointProvider.scala b/obp-api/src/main/scala/code/dynamicEndpoint/MapppedDynamicEndpointProvider.scala
index 3ae9f9cc01..d4660d7b55 100644
--- a/obp-api/src/main/scala/code/dynamicEndpoint/MapppedDynamicEndpointProvider.scala
+++ b/obp-api/src/main/scala/code/dynamicEndpoint/MapppedDynamicEndpointProvider.scala
@@ -71,7 +71,7 @@ object MappedDynamicEndpointProvider extends DynamicEndpointProvider with Custom
   override def getAll(bankId: Option[String]): List[DynamicEndpointT] = {
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
-      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (dynamicEndpointTTL second) {
+      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (dynamicEndpointTTL.second) {
         if (bankId.isEmpty)
           DynamicEndpoint.findAll()
         else
diff --git a/obp-api/src/main/scala/code/dynamicMessageDoc/MappedDynamicMessageDocProvider.scala b/obp-api/src/main/scala/code/dynamicMessageDoc/MappedDynamicMessageDocProvider.scala
index 81b420b270..81240419f1 100644
--- a/obp-api/src/main/scala/code/dynamicMessageDoc/MappedDynamicMessageDocProvider.scala
+++ b/obp-api/src/main/scala/code/dynamicMessageDoc/MappedDynamicMessageDocProvider.scala
@@ -44,7 +44,7 @@ object MappedDynamicMessageDocProvider extends DynamicMessageDocProvider {
   override def getAll(bankId: Option[String]): List[JsonDynamicMessageDoc] = {
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
-      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getDynamicMessageDocTTL second) {
+      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getDynamicMessageDocTTL.second) {
         if(bankId.isEmpty){
           DynamicMessageDoc.findAll().map(DynamicMessageDoc.getJsonDynamicMessageDoc)
         } else {
diff --git a/obp-api/src/main/scala/code/dynamicResourceDoc/MappedDynamicResourceDocProvider.scala b/obp-api/src/main/scala/code/dynamicResourceDoc/MappedDynamicResourceDocProvider.scala
index 2b545f336d..142e64b2e9 100644
--- a/obp-api/src/main/scala/code/dynamicResourceDoc/MappedDynamicResourceDocProvider.scala
+++ b/obp-api/src/main/scala/code/dynamicResourceDoc/MappedDynamicResourceDocProvider.scala
@@ -50,7 +50,7 @@ object MappedDynamicResourceDocProvider extends DynamicResourceDocProvider {
   
   override def getAllAndConvert[T: Manifest](bankId: Option[String], transform: JsonDynamicResourceDoc => T): List[T] = {
     val cacheKey = (bankId.toString+transform.toString()).intern()
-    Caching.memoizeSyncWithImMemory(Some(cacheKey))(getDynamicResourceDocTTL seconds){
+    Caching.memoizeSyncWithImMemory(Some(cacheKey))(getDynamicResourceDocTTL.seconds){
         if(bankId.isEmpty){
           DynamicResourceDoc.findAll()
             .map(doc => transform(DynamicResourceDoc.getJsonDynamicResourceDoc(doc)))
diff --git a/obp-api/src/main/scala/code/fx/fx.scala b/obp-api/src/main/scala/code/fx/fx.scala
index f5a6ec9485..9abf2e2f9d 100644
--- a/obp-api/src/main/scala/code/fx/fx.scala
+++ b/obp-api/src/main/scala/code/fx/fx.scala
@@ -66,7 +66,7 @@ object fx extends MdcLoggable {
       */
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
-      Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(TTL seconds) {
+      Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(TTL.seconds) {
         getFallbackExchangeRate(fromCurrency, toCurrency)
       }
     }
diff --git a/obp-api/src/main/scala/code/management/ImporterAPI.scala b/obp-api/src/main/scala/code/management/ImporterAPI.scala
index 3a0fa9e283..0a65a03e01 100644
--- a/obp-api/src/main/scala/code/management/ImporterAPI.scala
+++ b/obp-api/src/main/scala/code/management/ImporterAPI.scala
@@ -160,7 +160,7 @@ object ImporterAPI extends RestHelper with MdcLoggable {
          * per "Account".
          */
         // TODO: this duration limit should be fixed
-        val createdEnvelopes = TransactionInserter !? (3 minutes, toInsert)
+        val createdEnvelopes = TransactionInserter !? (3.minutes, toInsert)
 
         createdEnvelopes match {
           case Full(inserted : InsertedTransactions) =>
diff --git a/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala b/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala
index 08c244a225..44d6b5cf41 100644
--- a/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala
+++ b/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala
@@ -35,7 +35,7 @@ object MapperCounterparties extends Counterparties with MdcLoggable {
       */
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
-      Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(MetadataTTL second) {
+      Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(MetadataTTL.second) {
 
         /**
           * Generates a new alias name that is guaranteed not to collide with any existing public alias names
diff --git a/obp-api/src/main/scala/code/metrics/ConnectorMetrics.scala b/obp-api/src/main/scala/code/metrics/ConnectorMetrics.scala
index edc8a1de19..9267e18c6a 100644
--- a/obp-api/src/main/scala/code/metrics/ConnectorMetrics.scala
+++ b/obp-api/src/main/scala/code/metrics/ConnectorMetrics.scala
@@ -33,7 +33,7 @@ object ConnectorMetrics extends ConnectorMetricsProvider {
       */
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
       CacheKeyFromArguments.buildCacheKey { 
-        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cachedAllConnectorMetrics days){
+        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cachedAllConnectorMetrics.days){
           val limit = queryParams.collect { case OBPLimit(value) => MaxRows[MappedConnectorMetric](value) }.headOption
           val offset = queryParams.collect { case OBPOffset(value) => StartAt[MappedConnectorMetric](value) }.headOption
           val fromDate = queryParams.collect { case OBPFromDate(date) => By_>=(MappedConnectorMetric.date, date) }.headOption
diff --git a/obp-api/src/main/scala/code/metrics/MappedMetrics.scala b/obp-api/src/main/scala/code/metrics/MappedMetrics.scala
index c62a4dc6e6..6ccdefb8a1 100644
--- a/obp-api/src/main/scala/code/metrics/MappedMetrics.scala
+++ b/obp-api/src/main/scala/code/metrics/MappedMetrics.scala
@@ -284,7 +284,7 @@ object MappedMetrics extends APIMetrics with MdcLoggable{
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
       val cacheTTL = determineMetricsCacheTTL(queryParams)
       CacheKeyFromArguments.buildCacheKey { 
-        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL seconds){
+        Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL.seconds){
           val optionalParams = getQueryParams(queryParams)
           MappedMetric.findAll(optionalParams: _*)
       }
@@ -339,7 +339,7 @@ object MappedMetrics extends APIMetrics with MdcLoggable{
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     val cacheTTL = determineMetricsCacheTTL(queryParams)
     logger.debug(s"getAllAggregateMetricsBox cache key: $cacheKey, TTL: $cacheTTL seconds")
-    CacheKeyFromArguments.buildCacheKey { Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL seconds){
+    CacheKeyFromArguments.buildCacheKey { Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL.seconds){
       logger.info(s"getAllAggregateMetricsBox - CACHE MISS - Executing database query for aggregate metrics")
       val startTime = System.currentTimeMillis()
       val fromDate = queryParams.collect { case OBPFromDate(value) => value }.headOption
@@ -457,7 +457,7 @@ object MappedMetrics extends APIMetrics with MdcLoggable{
   */                                                                                       
   var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
   val cacheTTL = determineMetricsCacheTTL(queryParams)
-  CacheKeyFromArguments.buildCacheKey {Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL seconds){
+  CacheKeyFromArguments.buildCacheKey {Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL.seconds){
     {
       val fromDate = queryParams.collect { case OBPFromDate(value) => value }.headOption
       val toDate = queryParams.collect { case OBPToDate(value) => value }.headOption
@@ -540,7 +540,7 @@ object MappedMetrics extends APIMetrics with MdcLoggable{
   */                                                                                       
   var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
   val cacheTTL = determineMetricsCacheTTL(queryParams)
-  CacheKeyFromArguments.buildCacheKey {Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL seconds){
+  CacheKeyFromArguments.buildCacheKey {Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL.seconds){
   
       val fromDate = queryParams.collect { case OBPFromDate(value) => value }.headOption
       val toDate = queryParams.collect { case OBPToDate(value) => value }.headOption
diff --git a/obp-api/src/main/scala/code/model/ModeratedBankingData.scala b/obp-api/src/main/scala/code/model/ModeratedBankingData.scala
index 569b48f997..d1623e060d 100644
--- a/obp-api/src/main/scala/code/model/ModeratedBankingData.scala
+++ b/obp-api/src/main/scala/code/model/ModeratedBankingData.scala
@@ -26,6 +26,8 @@ TESOBE (http://www.tesobe.com/)
   */
 
 package code.model
+
+import scala.language.implicitConversions
 import code.api.Constant._
 import code.api.util.ErrorMessages._
 import code.api.util.{APIUtil, CallContext}
@@ -182,6 +184,7 @@ class ModeratedTransactionMetadata(
 
 
 object ModeratedTransactionMetadata {
+  import scala.language.implicitConversions
   @deprecated(Helper.deprecatedJsonGenerationMessage)
   implicit def moderatedTransactionMetadata2Json(mTransactionMeta: ModeratedTransactionMetadata) : JObject = {
     JObject(JField("blah", JString("test")) :: Nil)
@@ -256,6 +259,7 @@ object ModeratedBankAccount {
     	("name" -> bankName))
   }
 
+  import scala.language.implicitConversions
   @deprecated(Helper.deprecatedJsonGenerationMessage)
   implicit def moderatedBankAccount2Json(mBankAccount: ModeratedBankAccount) : JObject = {
     val holderName = mBankAccount.owners match{
@@ -318,6 +322,7 @@ case class ModeratedOtherBankAccountCore(
 }
 
 object ModeratedOtherBankAccount {
+  import scala.language.implicitConversions
   @deprecated(Helper.deprecatedJsonGenerationMessage)
   implicit def moderatedOtherBankAccount2Json(mOtherBank: ModeratedOtherBankAccount) : JObject = {
     val holderName = mOtherBank.label.display
@@ -353,6 +358,7 @@ class ModeratedOtherBankAccountMetadata(
 )
 
 object ModeratedOtherBankAccountMetadata {
+  import scala.language.implicitConversions
   @deprecated(Helper.deprecatedJsonGenerationMessage)
   implicit def moderatedOtherBankAccountMetadata2Json(mOtherBankMeta: ModeratedOtherBankAccountMetadata) : JObject = {
     JObject(JField("blah", JString("test")) :: Nil)
diff --git a/obp-api/src/main/scala/code/model/OAuth.scala b/obp-api/src/main/scala/code/model/OAuth.scala
index f5b1b8c654..25d0f30462 100644
--- a/obp-api/src/main/scala/code/model/OAuth.scala
+++ b/obp-api/src/main/scala/code/model/OAuth.scala
@@ -299,7 +299,7 @@ object MappedConsumersProvider extends ConsumersProvider with MdcLoggable {
         if(integrateWithHydra && isActive.isDefined) {
           val clientId = c.key.get
           val existsOAuth2Client = Box.tryo(hydraAdmin.getOAuth2Client(clientId))
-            .filter(null !=)
+            .filter(null.!=)
           // TODO Involve Hydra ORY version with working update mechanism
           if (isActive == Some(false) && existsOAuth2Client.isDefined) {
               existsOAuth2Client
@@ -955,7 +955,7 @@ class Token extends LongKeyedMapper[Token]{
   }
 
   def generateThirdPartyApplicationSecret: String = {
-    if(thirdPartyApplicationSecret.get isEmpty){
+    if(thirdPartyApplicationSecret.get.isEmpty){
       def r() = randomInt(9).toString //from zero to 9
       val generatedSecret = (1 to 10).map(x => r()).foldLeft("")(_ + _)
       thirdPartyApplicationSecret(generatedSecret).save
diff --git a/obp-api/src/main/scala/code/model/View.scala b/obp-api/src/main/scala/code/model/View.scala
index b7d9d4ebd6..bbb44d32a2 100644
--- a/obp-api/src/main/scala/code/model/View.scala
+++ b/obp-api/src/main/scala/code/model/View.scala
@@ -505,6 +505,7 @@ case class ViewExtended(val view: View) extends MdcLoggable {
             None
       }
 
+      import scala.language.implicitConversions
       implicit def optionStringToString(x : Option[String]) : String = x.getOrElse("")
       val otherAccountNationalIdentifier = if(viewPermissions.exists(_ == CAN_SEE_OTHER_ACCOUNT_NATIONAL_IDENTIFIER)) Some(otherBankAccount.nationalIdentifier) else None
       val otherAccountSWIFT_BIC = if(viewPermissions.exists(_ == CAN_SEE_OTHER_ACCOUNT_SWIFT_BIC)) otherBankAccount.otherBankRoutingAddress else None
@@ -607,6 +608,7 @@ case class ViewExtended(val view: View) extends MdcLoggable {
           None
       }
 
+      import scala.language.implicitConversions
       implicit def optionStringToString(x : Option[String]) : String = x.getOrElse("")
       val otherAccountSWIFT_BIC = if(viewPermissions.exists(_ == CAN_SEE_OTHER_ACCOUNT_SWIFT_BIC)) counterpartyCore.otherBankRoutingAddress else None
       val otherAccountIBAN = if(viewPermissions.exists(_ == CAN_SEE_OTHER_ACCOUNT_IBAN)) counterpartyCore.otherAccountRoutingAddress else None
diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
index ee6d171a3d..11efcde0de 100644
--- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
+++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
@@ -347,7 +347,7 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga
   }
 
   override def save(): Boolean = {
-    if(! (user defined_?)){
+    if(! (user.defined_?)){
       logger.info("user reference is null. We will create a ResourceUser")
       val resourceUser = createUnsavedResourceUser()
       val savedUser = Users.users.vend.saveResourceUser(resourceUser)
diff --git a/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala b/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala
index 5b0174c21d..810d1bc6c0 100644
--- a/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala
+++ b/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala
@@ -139,7 +139,7 @@ object ResourceUser extends ResourceUser with LongKeyedMetaMapper[ResourceUser]{
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     val cacheTTL = APIUtil.getPropsAsIntValue("getDistinctProviders.cache.ttl.seconds", 3600)
     CacheKeyFromArguments.buildCacheKey {
-      Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL seconds) {
+      Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL.seconds) {
         val sql = "SELECT DISTINCT provider_ FROM resourceuser ORDER BY provider_"
         val (_, rows) = DB.runQuery(sql, List())
         rows.flatten
diff --git a/obp-api/src/main/scala/code/model/package.scala b/obp-api/src/main/scala/code/model/package.scala
index 2f79aed105..4f2626c131 100644
--- a/obp-api/src/main/scala/code/model/package.scala
+++ b/obp-api/src/main/scala/code/model/package.scala
@@ -1,5 +1,6 @@
 package code
 
+import scala.language.implicitConversions
 import code.metadata.comments.Comments
 import code.metadata.counterparties.Counterparties
 import code.metadata.narrative.Narrative
@@ -16,6 +17,7 @@ import com.openbankproject.commons.model._
   * Bank -> Bank + BankEx
   */
 package object model {
+  import scala.language.implicitConversions
 
   implicit def toBankExtended(bank: Bank) = BankExtended(bank)
 
diff --git a/obp-api/src/main/scala/code/obp/grpc/Client.scala b/obp-api/src/main/scala/code/obp/grpc/Client.scala
index 9d81a57bd6..c8209f6c16 100644
--- a/obp-api/src/main/scala/code/obp/grpc/Client.scala
+++ b/obp-api/src/main/scala/code/obp/grpc/Client.scala
@@ -1,5 +1,6 @@
 package code.obp.grpc
 
+import scala.language.existentials
 import code.obp.grpc.api._
 import com.google.protobuf.empty.Empty
 import io.grpc.{ManagedChannel, ManagedChannelBuilder}
diff --git a/obp-api/src/main/scala/code/obp/grpc/HelloWorldServer.scala b/obp-api/src/main/scala/code/obp/grpc/HelloWorldServer.scala
index 773b60f60f..c77752fc56 100644
--- a/obp-api/src/main/scala/code/obp/grpc/HelloWorldServer.scala
+++ b/obp-api/src/main/scala/code/obp/grpc/HelloWorldServer.scala
@@ -1,5 +1,7 @@
 package code.obp.grpc
 
+import scala.language.existentials
+import scala.language.reflectiveCalls
 import code.api.util.newstyle.ViewNewStyle
 import code.api.util.{APIUtil, CallContext, NewStyle}
 import code.api.v3_0_0.{CoreTransactionsJsonV300, ModeratedTransactionCoreWithAttributes}
diff --git a/obp-api/src/main/scala/code/search/search.scala b/obp-api/src/main/scala/code/search/search.scala
index 5c37eeaa97..e99dddf3d7 100644
--- a/obp-api/src/main/scala/code/search/search.scala
+++ b/obp-api/src/main/scala/code/search/search.scala
@@ -185,13 +185,13 @@ class elasticsearch extends MdcLoggable {
   }
 
   private def getParameters(queryString: String): Map[String, String] = {
-    val res = queryString.split('&') map { str =>
+    val res = queryString.split('&').map { str =>
     val pair = str.split('=')
       if (pair.length > 1)
         (pair(0) -> pair(1))
       else
         (pair(0) -> "")
-    } toMap
+    }.toMap
 
     res
   }
diff --git a/obp-api/src/main/scala/code/snippet/GetHtmlFromUrl.scala b/obp-api/src/main/scala/code/snippet/GetHtmlFromUrl.scala
index b1016ffa1f..2d4b82f5e4 100644
--- a/obp-api/src/main/scala/code/snippet/GetHtmlFromUrl.scala
+++ b/obp-api/src/main/scala/code/snippet/GetHtmlFromUrl.scala
@@ -55,7 +55,7 @@ object GetHtmlFromUrl extends MdcLoggable {
       logger.debug("jsVendorSupportHtml: " + jsVendorSupportHtml)
 
       // sleep for up to 5 seconds at development environment
-      if (Props.mode == Props.RunModes.Development) Thread.sleep(randomLong(3 seconds))
+      if (Props.mode == Props.RunModes.Development) Thread.sleep(randomLong(3.seconds))
 
       jsVendorSupportHtml
     }
diff --git a/obp-api/src/main/scala/code/snippet/WebUI.scala b/obp-api/src/main/scala/code/snippet/WebUI.scala
index c741558c58..c8861688b4 100644
--- a/obp-api/src/main/scala/code/snippet/WebUI.scala
+++ b/obp-api/src/main/scala/code/snippet/WebUI.scala
@@ -654,7 +654,7 @@ class WebUI extends MdcLoggable{
     val html = XML.loadString(htmlString)
 
     // Sleep if in development environment so can see the effects of content loading slowly
-    if (Props.mode == Props.RunModes.Development) Thread.sleep(10 seconds)
+    if (Props.mode == Props.RunModes.Development) Thread.sleep(10.seconds)
 
     // Return the HTML
     html
diff --git a/obp-api/src/main/scala/code/util/AkkaHttpClient.scala b/obp-api/src/main/scala/code/util/AkkaHttpClient.scala
index 946c1a92bb..46d229784c 100644
--- a/obp-api/src/main/scala/code/util/AkkaHttpClient.scala
+++ b/obp-api/src/main/scala/code/util/AkkaHttpClient.scala
@@ -52,7 +52,7 @@ object AkkaHttpClient extends MdcLoggable with CustomJsonFormats {
   private lazy val connectionPoolSettings: ConnectionPoolSettings = {
     val systemConfig = ConnectionPoolSettings(system.settings.config)
     //Note: get the timeout setting from here:  https://github.com/akka/akka-http/issues/742
-    val clientSettings = systemConfig.connectionSettings.withIdleTimeout(httpRequestTimeout seconds)
+    val clientSettings = systemConfig.connectionSettings.withIdleTimeout(httpRequestTimeout.seconds)
     // reset some settings value
     systemConfig.copy(
       /*
diff --git a/obp-api/src/main/scala/code/util/Helper.scala b/obp-api/src/main/scala/code/util/Helper.scala
index e2dd615629..51802a0ac4 100644
--- a/obp-api/src/main/scala/code/util/Helper.scala
+++ b/obp-api/src/main/scala/code/util/Helper.scala
@@ -89,14 +89,14 @@ object Helper extends Loggable {
    */
   def booleanToBox(statement: => Boolean, msg: String): Box[Unit] = {
     if(statement)
-      Full()
+      Full(())
     else
       Failure(msg)
   }
 
   def booleanToBox(statement: => Boolean): Box[Unit] = {
     if(statement)
-      Full()
+      Full(())
     else
       Empty
   }
@@ -450,7 +450,7 @@ object Helper extends Loggable {
   def getRequiredFieldInfo(tpe: Type): RequiredInfo = {
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
-      code.api.cache.Caching.memoizeSyncWithImMemory (Some(cacheKey.toString())) (100000 days) {
+      code.api.cache.Caching.memoizeSyncWithImMemory (Some(cacheKey.toString())) (100000.days) {
 
         RequiredFieldValidation.getRequiredInfo(tpe)
 
diff --git a/obp-api/src/main/scala/code/validation/MappedJsonSchemaValidationProvider.scala b/obp-api/src/main/scala/code/validation/MappedJsonSchemaValidationProvider.scala
index 53538d1527..17f7a663e7 100644
--- a/obp-api/src/main/scala/code/validation/MappedJsonSchemaValidationProvider.scala
+++ b/obp-api/src/main/scala/code/validation/MappedJsonSchemaValidationProvider.scala
@@ -20,7 +20,7 @@ object MappedJsonSchemaValidationProvider extends JsonSchemaValidationProvider {
   override def getByOperationId(operationId: String): Box[JsonValidation] = {
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
-      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getValidationByOperationIdTTL second) {
+      Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getValidationByOperationIdTTL.second) {
         JsonSchemaValidation.find(By(JsonSchemaValidation.OperationId, operationId))
           .map(it => JsonValidation(it.operationId, it.jsonSchema))
       }}
diff --git a/obp-api/src/main/scala/code/views/MapperViews.scala b/obp-api/src/main/scala/code/views/MapperViews.scala
index 19e7d1c4ec..01cacb7d69 100644
--- a/obp-api/src/main/scala/code/views/MapperViews.scala
+++ b/obp-api/src/main/scala/code/views/MapperViews.scala
@@ -469,7 +469,7 @@ object MapperViews extends Views with MdcLoggable {
         viewId
       ).length > 0 match {
         case true => Failure("Account Access record uses this View.") // We want to prevent account access orphans
-        case false => Full()
+        case false => Full(())
       }
     } yield {
       customView.deleteViewPermissions
@@ -481,7 +481,7 @@ object MapperViews extends Views with MdcLoggable {
       view <- ViewDefinition.findSystemView(viewId.value)
       _ <- AccountAccess.findAllBySystemViewId(viewId).length > 0 match {
         case true => Failure("Account Access record uses this View.") // We want to prevent account access orphans
-        case false => Full()
+        case false => Full(())
       }
     } yield {
       view.deleteViewPermissions
diff --git a/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala b/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala
index cec35e7c0c..93b7516beb 100644
--- a/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala
+++ b/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala
@@ -42,7 +42,7 @@ object MappedWebUiPropsProvider extends WebUiPropsProvider {
     import scala.concurrent.duration._
     var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
     CacheKeyFromArguments.buildCacheKey {
-      Caching.memoizeSyncWithImMemory(Some(cacheKey.toString()))(webUiPropsTTL second) {
+      Caching.memoizeSyncWithImMemory(Some(cacheKey.toString()))(webUiPropsTTL.second) {
         // If we have an active brand, construct a target property name to look for.
         val brandSpecificPropertyName = activeBrand() match {
           case Some(brand) => s"${requestedPropertyName}_FOR_BRAND_${brand}"