profileMethod -> profileVerb

pac4j · Dec 12, 2016 · 917f1c8 · 917f1c8
1 parent 085c35f
commit 917f1c8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/pac4j-oauth/src/main/java/org/pac4j/oauth/client/GenericOAuth20Client.java b/pac4j-oauth/src/main/java/org/pac4j/oauth/client/GenericOAuth20Client.java
@@ -2,6 +2,8 @@
 
 import java.util.Map;
 import java.util.logging.Logger;
+
+import com.github.scribejava.core.model.Verb;
 import org.pac4j.core.context.WebContext;
 import org.pac4j.oauth.profile.OAuth20Profile;
 import org.pac4j.oauth.profile.generic.GenericOAuth20ProfileDefinition;
@@ -22,7 +24,7 @@ public class GenericOAuth20Client extends OAuth20Client<OAuth20Profile> {
     private String tokenUrl;
     private String profileUrl;
     private String profilePath;
-    private String profileMethod;
+    private Verb profileVerb;
     private Map<String, String> profileAttrs;
     private Map<String, String> customParams;
 
@@ -43,7 +45,7 @@ protected void internalInit(final WebContext context) {
 
         GenericOAuth20ProfileDefinition profileDefinition = new GenericOAuth20ProfileDefinition();
         profileDefinition.setFirstNodePath(profilePath);
-        profileDefinition.setProfileMethod(profileMethod);
+        profileDefinition.setProfileVerb(profileVerb);
         profileDefinition.setProfileUrl(profileUrl);
 
         if (profileAttrs != null) {
@@ -57,31 +59,31 @@ protected void internalInit(final WebContext context) {
         super.internalInit(context);
     }
 
-    public void setAuthUrl(String authUrl) {
+    public void setAuthUrl(final String authUrl) {
         this.authUrl = authUrl;
     }
 
-    public void setTokenUrl(String tokenUrl) {
+    public void setTokenUrl(final String tokenUrl) {
         this.tokenUrl = tokenUrl;
     }
 
-    public void setProfileUrl(String profileUrl) {
+    public void setProfileUrl(final String profileUrl) {
         this.profileUrl = profileUrl;
     }
 
-    public void setProfileNodePath(String profilePath) {
+    public void setProfileNodePath(final String profilePath) {
         this.profilePath = profilePath;
     }
 
-    public void setProfileMethod(String profileMethod) {
+    public void setProfileVerb(final Verb profileVerb) {
-        this.profileMethod = profileMethod;
+        this.profileVerb = profileVerb;
     }
 
-    public void setProfileAttrs(Map<String, String> profileAttrsMap) {
+    public void setProfileAttrs(final Map<String, String> profileAttrsMap) {
         this.profileAttrs = profileAttrsMap;
     }
 
-    public void setCustomParams(Map<String, String> customParamsMap) {
+    public void setCustomParams(final Map<String, String> customParamsMap) {
         this.customParams = customParamsMap;
     }
 }
diff --git a/...-oauth/src/main/java/org/pac4j/oauth/profile/generic/GenericOAuth20ProfileDefinition.java b/...-oauth/src/main/java/org/pac4j/oauth/profile/generic/GenericOAuth20ProfileDefinition.java
@@ -27,21 +27,19 @@ public class GenericOAuth20ProfileDefinition extends OAuth20ProfileDefinition<OA
     private final Map<String,String> profileAttributes = new HashMap<>();
 
     String profileUrl = null;
-    String profileMethod = null;
+    Verb profileVerb = null;
     String firstNodePath = null;
 
-    public void setProfileMethod(String value) {
+    public void setProfileVerb(final Verb value) {
-        this.profileMethod = value;
+        this.profileVerb = value;
     }
 
     @Override
     public Verb getProfileVerb() {
-        if ("POST".equalsIgnoreCase(profileMethod)) {
+        if (profileVerb != null) {
-            return Verb.POST;
+            return this.profileVerb;
-        } else if ("GET".equalsIgnoreCase(profileMethod)) {
-            return Verb.GET;
         } else {
-            return super.getProfileVerb(); 
+            return super.getProfileVerb();
         }
     }
 
@@ -109,10 +107,7 @@ public String getFirstNodePath() {
         return firstNodePath;
     }
 
-    public void setFirstNodePath(String firstNodePath) {
+    public void setFirstNodePath(final String firstNodePath) {
         this.firstNodePath = firstNodePath;
     }
-
-
-
 }