Merge pull request #67 from /issues/66-backport-validation-error

Backport fix of #65: Validation fails because of missing enclosing method
wultra · Feb 20, 2019 · 8b7624f · 8b7624f
2 parents 006cfa6 + a642123
commit 8b7624f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...va/io/getlime/security/powerauth/app/dataadapter/controller/AuthenticationController.java b/...va/io/getlime/security/powerauth/app/dataadapter/controller/AuthenticationController.java
@@ -38,7 +38,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.lang.invoke.MethodHandles;
 
 /**
  * Controller class which handles user authentication.
@@ -87,8 +86,8 @@ private void initBinder(WebDataBinder binder) {
     @RequestMapping(value = "/authenticate", method = RequestMethod.POST)
     public @ResponseBody ObjectResponse<AuthenticationResponse> authenticate(@Valid @RequestBody ObjectRequest<AuthenticationRequest> request, BindingResult result) throws MethodArgumentNotValidException, DataAdapterRemoteException, AuthenticationFailedException {
         if (result.hasErrors()) {
-            // Call of getEnclosingMethod() on class found using MethodHandles.lookup() returns a reference to current method
-            MethodParameter methodParam = new MethodParameter(MethodHandles.lookup().lookupClass().getEnclosingMethod(),0);
+            // Call of getEnclosingMethod() on new object returns a reference to current method
+            MethodParameter methodParam = new MethodParameter(new Object(){}.getClass().getEnclosingMethod(), 0);
             logger.warn("The authenticate request failed due to validation errors");
             throw new MethodArgumentNotValidException(methodParam, result);
         }

diff --git a/.../io/getlime/security/powerauth/app/dataadapter/controller/SMSAuthorizationController.java b/.../io/getlime/security/powerauth/app/dataadapter/controller/SMSAuthorizationController.java
@@ -39,7 +39,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.lang.invoke.MethodHandles;
 
 /**
  * Controller class which handles SMS OTP authorization.
@@ -92,8 +91,8 @@ private void initBinder(WebDataBinder binder) {
     @RequestMapping(value = "create", method = RequestMethod.POST)
     public @ResponseBody ObjectResponse<CreateSMSAuthorizationResponse> createAuthorizationSMS(@Valid @RequestBody ObjectRequest<CreateSMSAuthorizationRequest> request, BindingResult result) throws MethodArgumentNotValidException, DataAdapterRemoteException, SMSAuthorizationFailedException, InvalidOperationContextException {
         if (result.hasErrors()) {
-            // Call of getEnclosingMethod() on class found using MethodHandles.lookup() returns a reference to current method
-            MethodParameter methodParam = new MethodParameter(MethodHandles.lookup().lookupClass().getEnclosingMethod(),0);
+            // Call of getEnclosingMethod() on new object returns a reference to current method
+            MethodParameter methodParam = new MethodParameter(new Object(){}.getClass().getEnclosingMethod(), 0);
             logger.warn("The createAuthorizationSMS request failed due to validation errors");
             throw new MethodArgumentNotValidException(methodParam, result);
         }