You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/16 14:27:37 UTC
svn commit: r1231992 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/
archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/j...
Author: olamy
Date: Mon Jan 16 13:27:37 2012
New Revision: 1231992
URL: http://svn.apache.org/viewvc?rev=1231992&view=rev
Log:
when possible rest error must return the field with issue to map it in the ui
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/RepositoryAdminException.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/RepositoryCommonValidator.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/RepositoryAdminException.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/RepositoryAdminException.java?rev=1231992&r1=1231991&r2=1231992&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/RepositoryAdminException.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/RepositoryAdminException.java Mon Jan 16 13:27:37 2012
@@ -26,13 +26,43 @@ package org.apache.archiva.admin.model;
public class RepositoryAdminException
extends Exception
{
+
+ /**
+ * can return the field name of bean with issue
+ * can be <code>null</code>
+ * @since 1.4-M3
+ */
+ private String fieldName;
+
public RepositoryAdminException( String s )
{
super( s );
}
+ public RepositoryAdminException( String s, String fieldName )
+ {
+ this( s );
+ this.fieldName = fieldName;
+ }
+
public RepositoryAdminException( String message, Throwable cause )
{
super( message, cause );
}
+
+ public RepositoryAdminException( String message, Throwable cause, String fieldName )
+ {
+ super( message, cause );
+ this.fieldName = fieldName;
+ }
+
+ public String getFieldName()
+ {
+ return fieldName;
+ }
+
+ public void setFieldName( String fieldName )
+ {
+ this.fieldName = fieldName;
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/RepositoryCommonValidator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/RepositoryCommonValidator.java?rev=1231992&r1=1231991&r2=1231992&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/RepositoryCommonValidator.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/RepositoryCommonValidator.java Mon Jan 16 13:27:37 2012
@@ -132,7 +132,7 @@ public class RepositoryCommonValidator
if ( !validator.validate( cronExpression ) )
{
- throw new RepositoryAdminException( "Invalid cron expression." );
+ throw new RepositoryAdminException( "Invalid cron expression.", "cronExpression" );
}
}
else
@@ -147,7 +147,8 @@ public class RepositoryCommonValidator
{
throw new RepositoryAdminException(
"Invalid repository location. Directory must only contain alphanumeric characters, equals(=), question-marks(?), "
- + "exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." );
+ + "exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-).",
+ "location" );
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java?rev=1231992&r1=1231991&r2=1231992&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaRestServiceException.java Mon Jan 16 13:27:37 2012
@@ -30,18 +30,38 @@ public class ArchivaRestServiceException
private String errorKey;
+ /**
+ * can return the field name of bean with issue
+ * can be <code>null</code>
+ *
+ * @since 1.4-M3
+ */
+ private String fieldName;
+
public ArchivaRestServiceException( String message )
{
super( message );
}
+ public ArchivaRestServiceException( String message, String fieldName )
+ {
+ this( message );
+ this.fieldName = fieldName;
+ }
+
public ArchivaRestServiceException( String s, int httpErrorCode )
{
super( s );
this.httpErrorCode = httpErrorCode;
}
+ public ArchivaRestServiceException( String s, int httpErrorCode, String fieldName )
+ {
+ this( s, httpErrorCode );
+ this.fieldName = fieldName;
+ }
+
public int getHttpErrorCode()
{
return httpErrorCode;
@@ -61,4 +81,14 @@ public class ArchivaRestServiceException
{
this.errorKey = errorKey;
}
+
+ public String getFieldName()
+ {
+ return fieldName;
+ }
+
+ public void setFieldName( String fieldName )
+ {
+ this.fieldName = fieldName;
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java?rev=1231992&r1=1231991&r2=1231992&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ArchivaRestError.java Mon Jan 16 13:27:37 2012
@@ -34,6 +34,14 @@ public class ArchivaRestError
private String errorMessage;
+ /**
+ * can return the field name of bean with issue
+ * can be <code>null</code>
+ *
+ * @since 1.4-M3
+ */
+ private String fieldName;
+
public ArchivaRestError()
{
// no op
@@ -43,6 +51,7 @@ public class ArchivaRestError
{
errorKey = e.getErrorKey();
errorMessage = e.getMessage();
+ fieldName = e.getFieldName();
}
public String getErrorKey()
@@ -64,4 +73,14 @@ public class ArchivaRestError
{
this.errorMessage = errorMessage;
}
+
+ public String getFieldName()
+ {
+ return fieldName;
+ }
+
+ public void setFieldName( String fieldName )
+ {
+ this.fieldName = fieldName;
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java?rev=1231992&r1=1231991&r2=1231992&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultManagedRepositoriesService.java Mon Jan 16 13:27:37 2012
@@ -89,7 +89,7 @@ public class DefaultManagedRepositoriesS
catch ( RepositoryAdminException e )
{
log.error( e.getMessage(), e );
- throw new ArchivaRestServiceException( e.getMessage() );
+ throw new ArchivaRestServiceException( e.getMessage(), e.getFieldName() );
}
}
@@ -105,7 +105,7 @@ public class DefaultManagedRepositoriesS
}
catch ( RepositoryAdminException e )
{
- throw new ArchivaRestServiceException( e.getMessage() );
+ throw new ArchivaRestServiceException( e.getMessage(), e.getFieldName() );
}
}
@@ -123,7 +123,7 @@ public class DefaultManagedRepositoriesS
}
catch ( RepositoryAdminException e )
{
- throw new ArchivaRestServiceException( e.getMessage() );
+ throw new ArchivaRestServiceException( e.getMessage(), e.getFieldName() );
}
}