From b8c79cf8c6357094c957426865f934e163b49c7a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 14 Nov 2011 17:58:54 +0000 Subject: [PATCH] use a Archiva* name git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1201812 13f79535-47bb-0310-9956-ffa450edef68 --- .../services/{RestError.java => ArchivaRestError.java} | 8 ++++---- .../interceptors/ArchivaRestServiceExceptionMapper.java | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) rename archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/{RestError.java => ArchivaRestError.java} (91%) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java similarity index 91% rename from archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java rename to archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java index e93c5b7a2..94ff51b1a 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/RestError.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java @@ -26,8 +26,8 @@ import javax.xml.bind.annotation.XmlRootElement; * @author Olivier Lamy * @since 1.4-M2 */ -@XmlRootElement( name = "restError" ) -public class RestError +@XmlRootElement( name = "archivaRestError" ) +public class ArchivaRestError { private int httpErrorCode; @@ -36,12 +36,12 @@ public class RestError private String errorMessage; - public RestError() + public ArchivaRestError() { // no op } - public RestError( ArchivaRestServiceException e) + public ArchivaRestError( ArchivaRestServiceException e ) { httpErrorCode = e.getHttpErrorCode(); errorKey = e.getErrorKey(); diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java index 4f3500ab3..04e4ced19 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/ArchivaRestServiceExceptionMapper.java @@ -19,10 +19,9 @@ package org.apache.archiva.rest.services.interceptors; */ import org.apache.archiva.rest.api.services.ArchivaRestServiceException; -import org.apache.archiva.rest.services.RestError; +import org.apache.archiva.rest.services.ArchivaRestError; import org.springframework.stereotype.Service; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; @@ -38,7 +37,7 @@ public class ArchivaRestServiceExceptionMapper { public Response toResponse( ArchivaRestServiceException e ) { - RestError restError = new RestError( e ); + ArchivaRestError restError = new ArchivaRestError( e ); Response.ResponseBuilder responseBuilder = Response.status( e.getHttpErrorCode() ).entity( restError ); return responseBuilder.build(); } -- 2.39.5