inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
127573 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      126282 gjames: RA-878:All api errors should return the standard error, fix 404s


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:14:15 +00:00
parent 5a9ef6c22a
commit a8bf2940b6
3 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java
View File

@@ -2076,13 +2076,14 @@ public class PublicApiClient
private String stackTrace;
private Map<String, Object> additionalState;
private String descriptionURL;
private String logId;
public ExpectedErrorResponse()
{
}
public ExpectedErrorResponse(String errorKey, int statusCode, String briefSummary, StackTraceElement[] stackTrace,
Map<String, Object> additionalState)
Map<String, Object> additionalState, String logId)
{
super();
this.errorKey = errorKey;
@@ -2090,6 +2091,7 @@ public class PublicApiClient
this.briefSummary = briefSummary;
this.stackTrace = Arrays.toString(stackTrace);
this.additionalState = additionalState;
this.logId = logId;
}
public String getErrorKey()
@@ -2125,6 +2127,14 @@ public class PublicApiClient
return this;
}
public String getLogId() {
return logId;
}
public void setLogId(String logId) {
this.logId = logId;
}
public String getStackTrace()
{
return stackTrace;
@@ -2165,6 +2175,7 @@ public class PublicApiClient
sb.append("ExpectedErrorResponse [errorKey='").append(errorKey)
.append(", statusCode=").append(statusCode)
.append(", briefSummary='").append(briefSummary)
.append(", logId='").append(logId)
.append(", stackTrace='").append(stackTrace)
.append(", additionalState=").append(additionalState)
.append(", descriptionURL='").append(descriptionURL)