You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oltu.apache.org by st...@apache.org on 2016/02/23 09:10:24 UTC
svn commit: r1731802 - in /oltu/trunk/oauth-2.0:
client/src/main/java/org/apache/oltu/oauth2/client/response/
client/src/main/java/org/apache/oltu/oauth2/client/validator/
client/src/test/java/org/apache/oltu/oauth2/client/response/
dynamicreg-client/s...
Author: stein
Date: Tue Feb 23 08:10:24 2016
New Revision: 1731802
URL: http://svn.apache.org/viewvc?rev=1731802&view=rev
Log:
OLTU-185 Fix tests.. Make sure that the validators are set, also when using the new init method
Modified:
oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAccessTokenResponse.java
oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactory.java
oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java
oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactoryTest.java
oltu/trunk/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java
Modified: oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAccessTokenResponse.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAccessTokenResponse.java?rev=1731802&r1=1731801&r2=1731802&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAccessTokenResponse.java (original)
+++ oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAccessTokenResponse.java Tue Feb 23 08:10:24 2016
@@ -25,6 +25,9 @@ import org.apache.oltu.oauth2.client.val
import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
import org.apache.oltu.oauth2.common.token.OAuthToken;
+import java.util.List;
+import java.util.Map;
+
/**
*
*
@@ -32,6 +35,10 @@ import org.apache.oltu.oauth2.common.tok
*/
public abstract class OAuthAccessTokenResponse extends OAuthClientResponse {
+ public OAuthAccessTokenResponse() {
+ validator = new TokenValidator();
+ }
+
public abstract String getAccessToken();
public abstract Long getExpiresIn();
@@ -48,7 +55,11 @@ public abstract class OAuthAccessTokenRe
@Override
protected void init(String body, String contentType, int responseCode) throws OAuthProblemException {
- validator = new TokenValidator();
super.init(body, contentType, responseCode);
}
+
+ @Override
+ protected void init(String body, String contentType, int responseCode, Map<String, List<String>> headers) throws OAuthProblemException {
+ super.init(body, contentType, responseCode, headers);
+ }
}
Modified: oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactory.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactory.java?rev=1731802&r1=1731801&r2=1731802&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactory.java (original)
+++ oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactory.java Tue Feb 23 08:10:24 2016
@@ -57,7 +57,7 @@ public class OAuthClientResponseFactory
Map<String, List<String>> headers, Class<T> clazz)
throws OAuthSystemException, OAuthProblemException {
- OAuthClientResponse resp = (OAuthClientResponse)OAuthUtils
+ OAuthClientResponse resp = OAuthUtils
.instantiateClassWithParameters(clazz, null, null);
resp.init(body, contentType, responseCode, headers);
Modified: oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java?rev=1731802&r1=1731801&r2=1731802&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java (original)
+++ oltu/trunk/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java Tue Feb 23 08:10:24 2016
@@ -60,7 +60,7 @@ public abstract class OAuthClientValidat
String errorDesc = response.getParam(OAuthError.OAUTH_ERROR_DESCRIPTION);
String errorUri = response.getParam(OAuthError.OAUTH_ERROR_URI);
String state = response.getParam(OAuth.OAUTH_STATE);
- throw OAuthProblemException.error(error).description(errorDesc).uri(errorUri).state(state);
+ throw OAuthProblemException.error(error).description(errorDesc).uri(errorUri).responseStatus(response.getResponseCode()).state(state);
}
}
Modified: oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactoryTest.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactoryTest.java?rev=1731802&r1=1731801&r2=1731802&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactoryTest.java (original)
+++ oltu/trunk/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactoryTest.java Tue Feb 23 08:10:24 2016
@@ -23,8 +23,6 @@ package org.apache.oltu.oauth2.client.re
import org.junit.Assert;
import org.junit.Test;
-import org.apache.oltu.oauth2.client.response.OAuthClientResponse;
-import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory;
import org.apache.oltu.oauth2.common.OAuth;
Modified: oltu/trunk/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java?rev=1731802&r1=1731801&r2=1731802&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java (original)
+++ oltu/trunk/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java Tue Feb 23 08:10:24 2016
@@ -28,6 +28,9 @@ import org.apache.oltu.oauth2.common.uti
import org.apache.oltu.oauth2.ext.dynamicreg.client.validators.RegistrationValidator;
import org.apache.oltu.oauth2.ext.dynamicreg.common.OAuthRegistration;
+import java.util.List;
+import java.util.Map;
+
/**
*
@@ -37,14 +40,18 @@ import org.apache.oltu.oauth2.ext.dynami
public class OAuthClientRegistrationResponse extends OAuthClientResponse {
public OAuthClientRegistrationResponse() {
+ validator = new RegistrationValidator();
}
@Override
protected void init(String body, String contentType, int responseCode) throws OAuthProblemException {
- validator = new RegistrationValidator();
super.init(body, contentType, responseCode);
}
+ @Override
+ protected void init(String body, String contentType, int responseCode, Map<String, List<String>> headers) throws OAuthProblemException {
+ super.init(body, contentType, responseCode, headers);
+ }
protected void setBody(String body) throws OAuthProblemException {
try {