You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2015/01/03 14:13:49 UTC
svn commit: r1649200 - in /directory/escimo/trunk:
common/src/main/java/org/apache/directory/scim/
schema/src/main/java/org/apache/directory/scim/
schema/src/main/java/org/apache/directory/scim/schema/
server/src/main/java/org/apache/directory/scim/res...
Author: kayyagari
Date: Sat Jan 3 13:13:49 2015
New Revision: 1649200
URL: http://svn.apache.org/r1649200
Log:
renamed ErrorCode to StatusCode
Added:
directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/StatusCode.java
- copied, changed from r1649190, directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/ErrorCode.java
Removed:
directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/ErrorCode.java
Modified:
directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/ScimUtil.java
directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/ScimErrorDeserializer.java
directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/ErrorResponse.java
directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/MetaSchemaService.java
directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/SchemaService.java
directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/auth/AuthenticationFilter.java
directory/escimo/trunk/tests/src/test/java/org/apache/directory/scim/UserResourceTest.java
Modified: directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/ScimUtil.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/ScimUtil.java?rev=1649200&r1=1649199&r2=1649200&view=diff
==============================================================================
--- directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/ScimUtil.java (original)
+++ directory/escimo/trunk/common/src/main/java/org/apache/directory/scim/ScimUtil.java Sat Jan 3 13:13:49 2015
@@ -19,11 +19,11 @@
package org.apache.directory.scim;
-import static org.apache.directory.scim.schema.ErrorCode.BAD_REQUEST;
-import static org.apache.directory.scim.schema.ErrorCode.CONFLICT;
-import static org.apache.directory.scim.schema.ErrorCode.INTERNAL_SERVER_ERROR;
-import static org.apache.directory.scim.schema.ErrorCode.NOT_FOUND;
-import static org.apache.directory.scim.schema.ErrorCode.UNAUTHORIZED;
+import static org.apache.directory.scim.schema.StatusCode.BAD_REQUEST;
+import static org.apache.directory.scim.schema.StatusCode.CONFLICT;
+import static org.apache.directory.scim.schema.StatusCode.INTERNAL_SERVER_ERROR;
+import static org.apache.directory.scim.schema.StatusCode.NOT_FOUND;
+import static org.apache.directory.scim.schema.StatusCode.UNAUTHORIZED;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -36,7 +36,7 @@ import org.apache.directory.scim.excepti
import org.apache.directory.scim.exception.ResourceNotFoundException;
import org.apache.directory.scim.exception.UnauthorizedException;
import org.apache.directory.scim.json.ResourceSerializer;
-import org.apache.directory.scim.schema.ErrorCode;
+import org.apache.directory.scim.schema.StatusCode;
import org.apache.directory.scim.schema.ErrorResponse;
import org.apache.directory.scim.schema.ErrorResponse.ScimError;
import org.apache.directory.scim.schema.SchemaUtil;
@@ -78,7 +78,7 @@ public class ScimUtil
public static ResponseBuilder buildError( Exception e )
{
// set the default type to server error
- ErrorCode ec = INTERNAL_SERVER_ERROR;
+ StatusCode ec = INTERNAL_SERVER_ERROR;
String detail = e.getMessage();
ScimType scimType = null;
@@ -121,7 +121,7 @@ public class ScimUtil
public static Response sendBadRequest( String message )
{
- ScimError err = new ScimError( ErrorCode.BAD_REQUEST, message );
+ ScimError err = new ScimError( StatusCode.BAD_REQUEST, message );
ErrorResponse resp = new ErrorResponse( err );
String json = ResourceSerializer.serialize( resp );
@@ -132,7 +132,7 @@ public class ScimUtil
public static void main( String[] args )
{
- ErrorResponse.ScimError error = new ErrorResponse.ScimError( ErrorCode.BAD_REQUEST, ScimType.INVALID_FILTER, "detail error" );
+ ErrorResponse.ScimError error = new ErrorResponse.ScimError( StatusCode.BAD_REQUEST, ScimType.INVALID_FILTER, "detail error" );
ErrorResponse erResp = new ErrorResponse( error );
Modified: directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/ScimErrorDeserializer.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/ScimErrorDeserializer.java?rev=1649200&r1=1649199&r2=1649200&view=diff
==============================================================================
--- directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/ScimErrorDeserializer.java (original)
+++ directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/ScimErrorDeserializer.java Sat Jan 3 13:13:49 2015
@@ -24,7 +24,7 @@ package org.apache.directory.scim;
import java.lang.reflect.Type;
import org.apache.directory.scim.schema.ErrorResponse.ScimError;
-import org.apache.directory.scim.schema.ErrorCode;
+import org.apache.directory.scim.schema.StatusCode;
import org.apache.directory.scim.schema.ScimType;
import com.google.gson.JsonDeserializationContext;
@@ -77,11 +77,11 @@ public class ScimErrorDeserializer imple
JsonPrimitive elStatus = ( JsonPrimitive ) obj.get( "status" );
- ErrorCode status = null;
+ StatusCode status = null;
if ( elStatus != null )
{
- status = ErrorCode.getByVal( elStatus.getAsInt() );
+ status = StatusCode.getByVal( elStatus.getAsInt() );
}
JsonPrimitive elDetail = ( JsonPrimitive ) obj.get( "detail" );
Modified: directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/ErrorResponse.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/ErrorResponse.java?rev=1649200&r1=1649199&r2=1649200&view=diff
==============================================================================
--- directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/ErrorResponse.java (original)
+++ directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/ErrorResponse.java Sat Jan 3 13:13:49 2015
@@ -44,7 +44,7 @@ public class ErrorResponse
}
- public ErrorCode getFirstErrorCode()
+ public StatusCode getFirstErrorCode()
{
return Errors.get( 0 ).getCode();
}
@@ -88,18 +88,18 @@ public class ErrorResponse
private ScimType scimType;
- private ErrorCode code;
+ private StatusCode code;
// this is an eSCIMo specific field used for
// debugging purpose
private String stackTrace;
- public ScimError( ErrorCode code, String description )
+ public ScimError( StatusCode code, String description )
{
this( code, null, description );
}
- public ScimError( ErrorCode code, ScimType scimType, String description )
+ public ScimError( StatusCode code, ScimType scimType, String description )
{
this.code = code;
this.scimType = scimType;
@@ -146,7 +146,7 @@ public class ErrorResponse
/**
* @return the code
*/
- public ErrorCode getCode()
+ public StatusCode getCode()
{
return code;
}
Copied: directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/StatusCode.java (from r1649190, directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/ErrorCode.java)
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/StatusCode.java?p2=directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/StatusCode.java&p1=directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/ErrorCode.java&r1=1649190&r2=1649200&rev=1649200&view=diff
==============================================================================
--- directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/ErrorCode.java (original)
+++ directory/escimo/trunk/schema/src/main/java/org/apache/directory/scim/schema/StatusCode.java Sat Jan 3 13:13:49 2015
@@ -20,11 +20,11 @@
package org.apache.directory.scim.schema;
/**
- * TODO ErrorCode.
+ * TODO StatusCode.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public enum ErrorCode
+public enum StatusCode
{
TEMPORARY_REDIRECT(307, " The client is directed to repeat the same HTTP request at the location identified."
@@ -57,16 +57,16 @@ public enum ErrorCode
private String detail;
- private ErrorCode( int val, String detail )
+ private StatusCode( int val, String detail )
{
this.val = val;
this.detail = detail;
}
- public static ErrorCode getByVal( int v )
+ public static StatusCode getByVal( int v )
{
- for( ErrorCode ec : values() )
+ for( StatusCode ec : values() )
{
if ( ec.val == v )
{
Modified: directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/MetaSchemaService.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/MetaSchemaService.java?rev=1649200&r1=1649199&r2=1649200&view=diff
==============================================================================
--- directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/MetaSchemaService.java (original)
+++ directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/MetaSchemaService.java Sat Jan 3 13:13:49 2015
@@ -36,7 +36,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.directory.scim.ResourceProvider;
import org.apache.directory.scim.json.ResourceSerializer;
-import org.apache.directory.scim.schema.ErrorCode;
+import org.apache.directory.scim.schema.StatusCode;
import org.apache.directory.scim.schema.ErrorResponse;
import org.apache.directory.scim.schema.ErrorResponse.ScimError;
import org.apache.directory.scim.schema.JsonSchema;
@@ -131,7 +131,7 @@ public class MetaSchemaService
}
else
{
- ScimError err = new ScimError( ErrorCode.NOT_FOUND, "No schema found with the URI "
+ ScimError err = new ScimError( StatusCode.NOT_FOUND, "No schema found with the URI "
+ SchemaUtil.PROVIDER_SERVICE_SCHEMA_ID );
ErrorResponse resp = new ErrorResponse( err );
@@ -181,7 +181,7 @@ public class MetaSchemaService
}
else
{
- ScimError err = new ScimError( ErrorCode.NOT_FOUND, "No schema found with the URI " + schemaId );
+ ScimError err = new ScimError( StatusCode.NOT_FOUND, "No schema found with the URI " + schemaId );
ErrorResponse resp = new ErrorResponse( err );
String json = ResourceSerializer.serialize( resp );
@@ -219,7 +219,7 @@ public class MetaSchemaService
}
else
{
- ScimError err = new ScimError( ErrorCode.NOT_FOUND, "No ResourceType found with the name " + resType );
+ ScimError err = new ScimError( StatusCode.NOT_FOUND, "No ResourceType found with the name " + resType );
ErrorResponse resp = new ErrorResponse( err );
String json = ResourceSerializer.serialize( resp );
Modified: directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/SchemaService.java?rev=1649200&r1=1649199&r2=1649200&view=diff
==============================================================================
--- directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/SchemaService.java (original)
+++ directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/SchemaService.java Sat Jan 3 13:13:49 2015
@@ -32,7 +32,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.directory.scim.ResourceProvider;
import org.apache.directory.scim.json.ResourceSerializer;
-import org.apache.directory.scim.schema.ErrorCode;
+import org.apache.directory.scim.schema.StatusCode;
import org.apache.directory.scim.schema.ErrorResponse;
import org.apache.directory.scim.schema.ErrorResponse.ScimError;
import org.apache.directory.scim.schema.JsonSchema;
Modified: directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/auth/AuthenticationFilter.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/auth/AuthenticationFilter.java?rev=1649200&r1=1649199&r2=1649200&view=diff
==============================================================================
--- directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/auth/AuthenticationFilter.java (original)
+++ directory/escimo/trunk/server/src/main/java/org/apache/directory/scim/rest/auth/AuthenticationFilter.java Sat Jan 3 13:13:49 2015
@@ -36,7 +36,7 @@ import org.apache.directory.scim.Resourc
import org.apache.directory.scim.RequestContext;
import org.apache.directory.scim.ScimUtil;
import org.apache.directory.scim.json.ResourceSerializer;
-import org.apache.directory.scim.schema.ErrorCode;
+import org.apache.directory.scim.schema.StatusCode;
import org.apache.directory.scim.schema.ErrorResponse;
import org.apache.directory.scim.schema.ErrorResponse.ScimError;
@@ -114,7 +114,7 @@ public class AuthenticationFilter implem
errorMsg = "Not authenticated";
}
- ScimError error = new ScimError( ErrorCode.UNAUTHORIZED, errorMsg );
+ ScimError error = new ScimError( StatusCode.UNAUTHORIZED, errorMsg );
ErrorResponse erResp = new ErrorResponse( error );
String json = ResourceSerializer.serialize( erResp );
Modified: directory/escimo/trunk/tests/src/test/java/org/apache/directory/scim/UserResourceTest.java
URL: http://svn.apache.org/viewvc/directory/escimo/trunk/tests/src/test/java/org/apache/directory/scim/UserResourceTest.java?rev=1649200&r1=1649199&r2=1649200&view=diff
==============================================================================
--- directory/escimo/trunk/tests/src/test/java/org/apache/directory/scim/UserResourceTest.java (original)
+++ directory/escimo/trunk/tests/src/test/java/org/apache/directory/scim/UserResourceTest.java Sat Jan 3 13:13:49 2015
@@ -34,7 +34,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.scim.User.Email;
import org.apache.directory.scim.User.Name;
import org.apache.directory.scim.schema.CoreResource;
-import org.apache.directory.scim.schema.ErrorCode;
+import org.apache.directory.scim.schema.StatusCode;
import org.apache.directory.scim.schema.ScimType;
import org.apache.directory.scim.schema.ErrorResponse.ScimError;
import org.apache.directory.scim.schema.MetaData;
@@ -104,7 +104,7 @@ public class UserResourceTest
assertFalse( errorResult.isSuccess() );
ScimError err = errorResult.getErrorResponse().getErrors().get( 0 );
assertEquals( ScimType.UNIQUENESS, err.getScimType() );
- assertEquals( ErrorCode.CONFLICT, err.getCode() );
+ assertEquals( StatusCode.CONFLICT, err.getCode() );
User addedUser = ( User ) result.getResource();
@@ -120,7 +120,7 @@ public class UserResourceTest
result = client.addUser( user );
assertFalse( result.isSuccess() );
- assertEquals( ErrorCode.CONFLICT, result.getErrorResponse().getFirstErrorCode() );
+ assertEquals( StatusCode.CONFLICT, result.getErrorResponse().getFirstErrorCode() );
result = client.deleteUser( fetchedUser.getId() );
assertTrue( result.isSuccess() );