inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-01 14:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-3225 Replace all instances of "throws Exception". (#205)

Browse Source 
In many places there were actually no exceptions being throw.
This commit is contained in:
Tom Page
2022-07-19 14:19:29 +01:00
committed by GitHub
parent 732fa806e7
commit 7a66b812bb
45 changed files with 480 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/NetworkDataPrep.java
View File

@@ -14,7 +14,7 @@ public abstract class NetworkDataPrep extends RestTest
protected static String tenantDomain;
private static boolean isInitialized = false;
public void init() throws Exception
public void init()
{
if(!isInitialized)
{
@@ -23,7 +23,7 @@ public abstract class NetworkDataPrep extends RestTest
}
}
public void initialization() throws Exception
public void initialization()
{
adminUserModel = dataUser.getAdminUser();
//create first tenant Admin User.

11
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/RestTest.java
View File

@@ -64,9 +64,16 @@ public abstract class RestTest extends AbstractTestNGSpringContextTests
protected SiteModel testSite;
@BeforeSuite(alwaysRun = true)
public void checkServerHealth() throws Exception
public void checkServerHealth()
{
super.springTestContextPrepareTestInstance();
try
{
super.springTestContextPrepareTestInstance();
}
catch (Exception e)
{
throw new IllegalStateException("Error while preparing for test execution", e);
}
serverHealth.assertServerIsOnline();
testSite = dataSite.createPublicRandomSite();
}

14
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/assertion/ModelAssertion.java
View File

@@ -70,7 +70,7 @@ public class ModelAssertion<T>
return new AssertionVerbs(model, fieldValue, fieldName);
}
public AssertionItemVerbs fieldsCount() throws Exception
public AssertionItemVerbs fieldsCount()
{
int actualSize = 0;
@@ -80,7 +80,15 @@ public class ModelAssertion<T>
{
field.setAccessible(true);
Object fieldValue = field.get(model);
Object fieldValue = null;
try
{
fieldValue = field.get(model);
}
catch (IllegalAccessException e)
{
throw new IllegalStateException("Unable to load model using reflection.", e);
}
if (fieldValue != null)
actualSize++;
}
@@ -317,7 +325,7 @@ public class ModelAssertion<T>
private Object model;
private Object actual;
public AssertionItemVerbs(Object model, Object actual) throws Exception
public AssertionItemVerbs(Object model, Object actual)
{
this.model = model;
this.actual = actual;

140
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/assertion/ModelsCollectionAssertion.java
View File

@@ -2,6 +2,7 @@ package org.alfresco.rest.core.assertion;
import static org.alfresco.utility.report.log.Step.STEP;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
@@ -12,6 +13,7 @@ import org.alfresco.utility.model.Model;
import org.apache.commons.beanutils.BeanUtils;
import org.testng.Assert;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Ordering;
import io.restassured.path.json.JsonPath;
@@ -65,14 +67,13 @@ public class ModelsCollectionAssertion<C>
}
@SuppressWarnings("unchecked")
public C entriesListContains(String key, String value) throws Exception
public C entriesListContains(String key, String value)
{
List<Model> modelEntries = modelCollection.getEntries();
String fieldValue = "";
for (Model m : modelEntries) {
Method method = m.getClass().getMethod("onModel", new Class[] {});
Object model = method.invoke(m, new Object[] {});
try {
Object model = loadModel(m);
try {
ObjectMapper mapper = new ObjectMapper();
String jsonInString = mapper.writeValueAsString(model);
fieldValue = JsonPath.with(jsonInString).get(key);
@@ -91,15 +92,14 @@ public class ModelsCollectionAssertion<C>
return (C) modelCollection;
}
@SuppressWarnings("unchecked")
public C entriesListDoesNotContain(String key, String value) throws Exception
@SuppressWarnings("unchecked")
public C entriesListDoesNotContain(String key, String value)
{
boolean exist = false;
List<Model> modelEntries = modelCollection.getEntries();
for (Model m : modelEntries) {
Method method = m.getClass().getMethod("onModel", new Class[] {});
Object model = method.invoke(m, new Object[] {});
String fieldValue = "";
Object model = loadModel(m);
String fieldValue = "";
try {
ObjectMapper mapper = new ObjectMapper();
String jsonInString = mapper.writeValueAsString(model);
@@ -117,55 +117,54 @@ public class ModelsCollectionAssertion<C>
return (C) modelCollection;
}
@SuppressWarnings("unchecked")
public C entriesListDoesNotContain(String key) throws Exception
public C entriesListDoesNotContain(String key)
{
boolean exist = false;
List<Model> modelEntries = modelCollection.getEntries();
for (Model m : modelEntries) {
Method method = m.getClass().getMethod("onModel", new Class[] {});
Object model = method.invoke(m, new Object[] {});
String fieldValue = "";
ObjectMapper mapper = new ObjectMapper();
String jsonInString = mapper.writeValueAsString(model);
fieldValue = JsonPath.with(jsonInString).get(key);
if (fieldValue != null) {
exist = true;
break;
}
}
boolean exist = modelInList(key);
Assert.assertFalse(exist,
String.format("Entry list contains key: %s", key));
return (C) modelCollection;
}
@SuppressWarnings("unchecked")
public C entriesListContains(String key) throws Exception
public C entriesListContains(String key)
{
boolean exist = false;
List<Model> modelEntries = modelCollection.getEntries();
for (Model m : modelEntries) {
Method method = m.getClass().getMethod("onModel", new Class[] {});
Object model = method.invoke(m, new Object[] {});
Object fieldValue = null;
ObjectMapper mapper = new ObjectMapper();
String jsonInString = mapper.writeValueAsString(model);
fieldValue = JsonPath.with(jsonInString).get(key);
if (fieldValue != null) {
exist = true;
break;
}
}
boolean exist = modelInList(key);
Assert.assertTrue(exist,
String.format("Entry list doesn't contain key: %s", key));
String.format("Entry list doesn't contain key: %s", key));
return (C) modelCollection;
}
private boolean modelInList(String key)
{
List<Model> modelEntries = modelCollection.getEntries();
for (Model m : modelEntries)
{
Object model = loadModel(m);
ObjectMapper mapper = new ObjectMapper();
String jsonInString;
try
{
jsonInString = mapper.writeValueAsString(model);
}
catch (JsonProcessingException e)
{
throw new IllegalStateException("Failed to convert model to string.", e);
}
Object fieldValue = JsonPath.with(jsonInString).get(key);
if (fieldValue != null)
{
return true;
}
}
return false;
}
@SuppressWarnings("unchecked")
public C paginationExist()
public C paginationExist()
{
STEP("REST API: Assert that response has pagination");
Assert.assertNotNull(modelCollection.getPagination(), "Pagination is was not found in the response");
@@ -174,73 +173,82 @@ public class ModelsCollectionAssertion<C>
/**
* Check one field from pagination json body
*
*
* @param field
* @return
*/
*/
@SuppressWarnings("rawtypes")
public PaginationAssertionVerbs paginationField(String field)
public PaginationAssertionVerbs paginationField(String field)
{
return new PaginationAssertionVerbs<C>(modelCollection, field, modelCollection.getPagination());
}
/**
* check is the entries are ordered ASC by a specific field
*
*
* @param field from json response
* @return
* @throws Exception
*/
@SuppressWarnings("unchecked")
public C entriesListIsSortedAscBy(String field) throws Exception
public C entriesListIsSortedAscBy(String field)
{
List<Model> modelEntries = modelCollection.getEntries();
List<String> fieldValues = new ArrayList<String>();
for(Model m: modelEntries)
{
Method method = m.getClass().getMethod("onModel", new Class[] {});
Object model = method.invoke(m, new Object[] {});
Object model = loadModel(m);
String fieldValue = "";
try {
fieldValue = BeanUtils.getProperty(model, field);
fieldValues.add(fieldValue);
}
catch (Exception e)
}
catch (Exception e)
{
// nothing to do
}
}
}
}
Assert.assertTrue(Ordering.natural().isOrdered(fieldValues), String.format("Entries are not ordered ASC by %s", field));
return (C) modelCollection;
}
/**
* check is the entries are ordered DESC by a specific field
*
*
* @param field from json response
* @return
* @throws Exception
*/
@SuppressWarnings("unchecked")
public C entriesListIsSortedDescBy(String field) throws Exception
public C entriesListIsSortedDescBy(String field)
{
List<Model> modelEntries = modelCollection.getEntries();
List<String> fieldValues = new ArrayList<String>();
for(Model m: modelEntries)
{
Method method = m.getClass().getMethod("onModel", new Class[] {});
Object model = method.invoke(m, new Object[] {});
Object model = loadModel(m);
String fieldValue = "";
try {
fieldValue = BeanUtils.getProperty(model, field);
fieldValues.add(fieldValue);
}
catch (Exception e)
}
catch (Exception e)
{
// nothing to do
}
}
}
}
Assert.assertTrue(Ordering.natural().reverse().isOrdered(fieldValues), String.format("Entries are not ordered DESC by %s", field));
return (C) modelCollection;
}
private Object loadModel(Model m)
{
try
{
Method method = m.getClass().getMethod("onModel", new Class[] {});
return method.invoke(m, new Object[] {});
}
catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e)
{
throw new IllegalStateException("Failed to load model using reflection.", e);
}
}
}

15
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/assertion/PaginationAssertionVerbs.java
View File

@@ -25,9 +25,8 @@ public class PaginationAssertionVerbs<C> {
/**
* @return the value of the field
* @throws Exception
*/
private String getFieldValue() throws Exception {
private String getFieldValue() {
String value = "";
try {
value = BeanUtils.getProperty(pagination, fieldName);
@@ -46,34 +45,34 @@ public class PaginationAssertionVerbs<C> {
modelCollection.getClass().getCanonicalName(), info);
}
public C is(String expected) throws Exception {
public C is(String expected) {
Assert.assertEquals(getFieldValue(), expected, errorMessage("is NOT correct,"));
return modelCollection;
}
public C isNot(Object expected) throws Exception {
public C isNot(Object expected) {
Assert.assertNotEquals(getFieldValue(), expected, errorMessage("is correct,"));
return modelCollection;
}
public C isNotEmpty() throws Exception {
public C isNotEmpty() {
Assert.assertNotEquals(getFieldValue(), "", errorMessage("is empty,"));
return modelCollection;
}
public C isNotNull() throws Exception {
public C isNotNull() {
Assert.assertNotNull(getFieldValue(), errorMessage("is null,"));
return modelCollection;
}
public C isNotPresent() throws Exception {
public C isNotPresent() {
Assert.assertNull(getFieldValue(), errorMessage("is present,"));
return modelCollection;
}
public C isEmpty() throws Exception {
public C isEmpty() {
Assert.assertEquals(getFieldValue(), "", errorMessage("is NOT empty,"));
return modelCollection;
}

2
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/swagger/Generator.java
View File

@@ -14,7 +14,7 @@ public class Generator
{
public static String line = "********\n------------------------------------------------------------------------";
public static void main(String[] args) throws Exception
public static void main(String[] args)
{
if (!System.getProperties().containsKey("coverage") && !System.getProperties().containsKey("models") || System.getProperties().containsKey("help") )

49
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/swagger/SwaggerDefinitions.java
View File

@@ -2,6 +2,7 @@ package org.alfresco.rest.core.swagger;
import java.io.BufferedReader;
import java.io.Console;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.nio.file.Path;
@@ -34,21 +35,28 @@ public class SwaggerDefinitions
modelsPath = Paths.get(Paths.get(".").toAbsolutePath().normalize().toFile().getPath(), "src/main/java/org/alfresco/rest/model");
}
public void generateMissingDefinitions() throws Exception
public void generateMissingDefinitions()
{
/*
* read the content of ignore-moldels file
*/
List<String> ignoreModel = new ArrayList<String>();
try (BufferedReader br = new BufferedReader(new FileReader(Paths.get(modelsPath.toFile().getPath(), "ignore-models").toFile())))
try
{
String line;
while ((line = br.readLine()) != null)
try (BufferedReader br = new BufferedReader(new FileReader(Paths.get(modelsPath.toFile().getPath(), "ignore-models").toFile())))
{
if (!line.startsWith("#") && !line.equals(""))
ignoreModel.add(line);
String line;
while ((line = br.readLine()) != null)
{
if (!line.startsWith("#") && !line.equals(""))
ignoreModel.add(line);
}
}
}
catch (IOException e)
{
throw new IllegalStateException("Exception while generating missing definitions.", e);
}
/*
* filter all models, ignoring the ones from ignore-model or the ones that are already created locally
@@ -121,8 +129,8 @@ public class SwaggerDefinitions
{
System.out.println("\nStart generating all models...");
for (SwaggerModel swaggerModel : missingSwaggerModels)
{
swaggerModel.generate();
{
generateModel(swaggerModel);
}
}
else
@@ -147,27 +155,26 @@ public class SwaggerDefinitions
* Generate the model based on the ID provided
*
* @param id
* @throws Exception
*/
private void generateSelectedSwaggerModel(String id) throws Exception
private void generateSelectedSwaggerModel(String id)
{
int choise = Integer.parseInt(id);
if ((choise - 1) >= missingSwaggerModels.size())
int choice = Integer.parseInt(id);
if ((choice - 1) >= missingSwaggerModels.size())
{
throw new TestConfigurationException(
"You specified a wrong ID: [" + id + "] please select one value from the list displayed above. Run the command again!");
}
missingSwaggerModels.get(choise - 1).generate();
generateModel(missingSwaggerModels.get(choice - 1));
}
public boolean generateDefinition(String modelParamValue) throws IOException, TemplateException
public boolean generateDefinition(String modelParamValue)
{
for (Entry<String, Model> model : swagger.getDefinitions().entrySet())
{
SwaggerModel swaggerModel = new SwaggerModel(model, swagger);
if (swaggerModel.getName().equals(modelParamValue))
{
swaggerModel.generate();
generateModel(swaggerModel);
return true;
}
}
@@ -175,4 +182,16 @@ public class SwaggerDefinitions
System.err.printf("Model [%s] not found in Swagger file: %s\n", modelParamValue, swagger.getBasePath());
return false;
}
private void generateModel(SwaggerModel swaggerModel)
{
try
{
swaggerModel.generate();
}
catch (IOException | TemplateException e)
{
throw new IllegalStateException("Exception while generating model definition.", e);
}
}
}

81
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/swagger/SwaggerPaths.java
View File

@@ -47,51 +47,55 @@ public class SwaggerPaths
/**
* Compare requests that exist in swagger yaml file vs request implemented in your code
* any findings are saved to a missing-request txt file.
* @throws Exception
*
*
* @throws TestConfigurationException
*/
public void computeCoverage() throws Exception
public void computeCoverage()
{
System.out.println("Start computing the coverage of TAS vs Swagger file. Stand by...");
File missingReq = new File(String.format("missing-requests-%s.txt", FilenameUtils.getBaseName(swaggerFilePath)));
missingReq.delete();
fileWithMissingRequests = new BufferedWriter(new FileWriter(missingReq));
fileWithMissingRequests.write(String.format("BasePath: {%s}", swagger.getBasePath()));
fileWithMissingRequests.newLine();
fileWithMissingRequests.write("These requests generated should be analyzed and modified according to your needs.");
fileWithMissingRequests.newLine();
fileWithMissingRequests.write("PLEASE UPDATE your 'RestReturnedModel' name with the appropiate returned model by your request.");
fileWithMissingRequests.newLine();
fileWithMissingRequests.newLine();
File implReq = new File(String.format("implemented-requests-%s.txt", FilenameUtils.getBaseName(swaggerFilePath)));
implReq.delete();
fileWithImplementedRequests = new BufferedWriter(new FileWriter(implReq));
for (Entry<String, io.swagger.models.Path> path : swagger.getPaths().entrySet())
try
{
for (Map.Entry<HttpMethod, Operation> operation : path.getValue().getOperationMap().entrySet())
{
searchPattern(path.getKey(),operation);
}
}
System.out.println(toString());
fileWithImplementedRequests.close();
fileWithMissingRequests.close();
if (missingRequestCount > 0)
{
System.out.println("[ERROR] PLEASE ANALYSE THE GENERATED <missing-requests> file(s), it seems some request were NOT implemented!");
}
else
System.out.println("Start computing the coverage of TAS vs Swagger file. Stand by...");
File missingReq = new File(String.format("missing-requests-%s.txt", FilenameUtils.getBaseName(swaggerFilePath)));
missingReq.delete();
fileWithMissingRequests = new BufferedWriter(new FileWriter(missingReq));
fileWithMissingRequests.write(String.format("BasePath: {%s}", swagger.getBasePath()));
fileWithMissingRequests.newLine();
fileWithMissingRequests.write("These requests generated should be analyzed and modified according to your needs.");
fileWithMissingRequests.newLine();
fileWithMissingRequests.write("PLEASE UPDATE your 'RestReturnedModel' name with the appropiate returned model by your request.");
fileWithMissingRequests.newLine();
fileWithMissingRequests.newLine();
System.out.println("ALSO ANALYZE <implemented-requests.txt> for current implementation, take a look at duplicated requests if any!");
File implReq = new File(String.format("implemented-requests-%s.txt", FilenameUtils.getBaseName(swaggerFilePath)));
implReq.delete();
fileWithImplementedRequests = new BufferedWriter(new FileWriter(implReq));
for (Entry<String, io.swagger.models.Path> path : swagger.getPaths().entrySet())
{
for (Map.Entry<HttpMethod, Operation> operation : path.getValue().getOperationMap().entrySet())
{
searchPattern(path.getKey(), operation);
}
}
System.out.println(toString());
fileWithImplementedRequests.close();
fileWithMissingRequests.close();
if (missingRequestCount > 0)
{
System.out.println("[ERROR] PLEASE ANALYSE THE GENERATED <missing-requests> file(s), it seems some request were NOT implemented!");
}
else
missingReq.delete();
System.out.println("ALSO ANALYZE <implemented-requests.txt> for current implementation, take a look at duplicated requests if any!");
}
catch (IOException e)
{
throw new RuntimeException("Exception while trying to create coverage report.", e);
}
}
/**
@@ -100,9 +104,8 @@ public class SwaggerPaths
* @param httpMethod
* @param pathUrl
* @param methodName
* @throws Exception
*/
private void searchPattern(String pathUrl, Entry<HttpMethod, Operation> operation) throws Exception
private void searchPattern(String pathUrl, Entry<HttpMethod, Operation> operation)
{
String originalPathUrl = pathUrl;
String httpMethod = operation.getKey().name();

43
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/swagger/SwaggerRequest.java
View File

@@ -9,6 +9,7 @@ import java.util.Map;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import io.swagger.models.Operation;
public class SwaggerRequest
@@ -18,12 +19,19 @@ public class SwaggerRequest
private String httpMethod;
private String pathUrl;
private Configuration getConfig() throws IOException
private Configuration getConfig()
{
if (cfg == null)
{
cfg = new Configuration(Configuration.VERSION_2_3_23);
cfg.setDirectoryForTemplateLoading(new File("src/main/resources"));
try
{
cfg.setDirectoryForTemplateLoading(new File("src/main/resources"));
}
catch (IOException e)
{
throw new IllegalStateException("Exception while configuring Freemarker template directory.", e);
}
}
return cfg;
}
@@ -35,18 +43,25 @@ public class SwaggerRequest
this.pathUrl = pathUrl;
}
public String getRequestSample() throws Exception
public String getRequestSample()
{
Template template = getConfig().getTemplate("rest-request.ftl");
Map<String, Object> data = new HashMap<String, Object>();
data.put("operationId", swaggerRequest.getOperationId());
data.put("httpMethod", httpMethod);
data.put("pathUrl", pathUrl);
Writer append = new StringWriter();
template.process(data, append);
append.close();
return append.toString();
try
{
Template template = getConfig().getTemplate("rest-request.ftl");
Map<String, Object> data = new HashMap<String, Object>();
data.put("operationId", swaggerRequest.getOperationId());
data.put("httpMethod", httpMethod);
data.put("pathUrl", pathUrl);
Writer append = new StringWriter();
template.process(data, append);
append.close();
return append.toString();
}
catch (IOException | TemplateException e)
{
throw new IllegalStateException("Exception while loading sample request.", e);
}
}
}

4
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/swagger/SwaggerYamlParser.java
View File

@@ -26,12 +26,12 @@ public class SwaggerYamlParser
}
public void computeCoverage() throws Exception
public void computeCoverage()
{
new SwaggerPaths(swagger, this.swaggerFilePath).computeCoverage();
}
public void generateMissingModules() throws Exception
public void generateMissingModules()
{
String modelParamValue = System.getProperty("models");

2
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestHtmlResponse.java
View File

@@ -32,7 +32,7 @@ public class RestHtmlResponse
this.body = body;
}
public void assertResponseContainsImage() throws Exception
public void assertResponseContainsImage()
{
STEP("REST API: Assert that response has an image.");
Utility.checkObjectIsInitialized(headers, "Headers");

3
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestPersonModel.java
View File

@@ -344,9 +344,8 @@ public class RestPersonModel extends TestModel implements IModelAssertion<RestPe
*
* @param ignoredFields field to be excluded when generating a random model
* @return
* @throws Exception
*/
public static RestPersonModel getRandomPersonModel(String... ignoredFields) throws Exception
public static RestPersonModel getRandomPersonModel(String... ignoredFields)
{
RestPersonModel personModel = new RestPersonModel();
setRandomValuesForAllFields(personModel, ignoredFields);

8
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/builder/NodesBuilder.java
View File

@@ -61,7 +61,7 @@ public class NodesBuilder
this.lastNode = repoModel;
}
public NodeDetail folder(String prefix) throws Exception
public NodeDetail folder(String prefix)
{
NodeDetail n = new NodeDetail(prefix, lastNode.getNodeRef(), "cm:folder");
nodes.add(n);
@@ -81,7 +81,7 @@ public class NodesBuilder
cm.setNodeRef(getId());
return cm;
}
public NodeDetail(String prefix, String parentId, String nodeType) throws Exception
public NodeDetail(String prefix, String parentId, String nodeType)
{
this.prefix = prefix;
this.name = RandomData.getRandomName(prefix);
@@ -108,14 +108,14 @@ public class NodesBuilder
}
public NodeDetail folder(String prefix) throws Exception
public NodeDetail folder(String prefix)
{
NodeDetail n = new NodeDetail(prefix, parentNodeModel.getId(), "cm:folder");
nodes.add(n);
return n;
}
public NodeDetail file(String prefix) throws Exception
public NodeDetail file(String prefix)
{
NodeDetail n = new NodeDetail(prefix, parentNodeModel.getId(), "cm:content");
nodes.add(n);

8
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Actions.java
View File

@@ -21,7 +21,7 @@ public class Actions extends ModelRequest<Actions>
/**
* List available actions using GET on '/action-definitions'
*/
public RestActionDefinitionModelsCollection listActionDefinitions() throws Exception
public RestActionDefinitionModelsCollection listActionDefinitions()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "action-definitions?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestActionDefinitionModelsCollection.class, request);
@@ -30,7 +30,7 @@ public class Actions extends ModelRequest<Actions>
/**
* Execute action with parameters using POST on '/action-executions'
*/
public JSONObject executeAction(String actionDefinitionId, RepoTestModel targetNode, Map<String, String> params) throws Exception
public JSONObject executeAction(String actionDefinitionId, RepoTestModel targetNode, Map<String, String> params)
{
String postBody = JsonBodyGenerator.executeActionPostBody(actionDefinitionId, targetNode, params);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "action-executions");
@@ -40,7 +40,7 @@ public class Actions extends ModelRequest<Actions>
/**
* Execute action without parameters using POST on '/action-executions'
*/
public JSONObject executeAction(String actionDefinitionId, RepoTestModel targetNode) throws Exception
public JSONObject executeAction(String actionDefinitionId, RepoTestModel targetNode)
{
String postBody = JsonBodyGenerator.executeActionPostBody(actionDefinitionId, targetNode);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "action-executions");
@@ -50,7 +50,7 @@ public class Actions extends ModelRequest<Actions>
/**
* Get specific action definition using GET on '/action-definitions/{actionDefinitionId}'
*/
public RestActionDefinitionModel getActionDefinitionById(String actionDefinitionId) throws Exception
public RestActionDefinitionModel getActionDefinitionById(String actionDefinitionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "action-definitions/".concat(actionDefinitionId));
return restWrapper.processModel(RestActionDefinitionModel.class, request);

25
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Audit.java
View File

@@ -18,7 +18,7 @@ import org.springframework.http.HttpMethod;
public class Audit extends ModelRequest<Audit>
{
public Audit(RestWrapper restWrapper) throws Exception
public Audit(RestWrapper restWrapper)
{
super(restWrapper);
}
@@ -30,7 +30,7 @@ public class Audit extends ModelRequest<Audit>
* @return
* @throws JsonToModelConversionException
*/
public RestAuditAppModelsCollection getAuditApplications() throws Exception
public RestAuditAppModelsCollection getAuditApplications() throws JsonToModelConversionException
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "audit-applications?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestAuditAppModelsCollection.class, request);
@@ -41,9 +41,8 @@ public class Audit extends ModelRequest<Audit>
*
* @param auditApplicationId
* @return
* @throws Exception
*/
public RestAuditAppModel getAuditApp(RestAuditAppModel restAuditAppModel) throws Exception
public RestAuditAppModel getAuditApp(RestAuditAppModel restAuditAppModel)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "audit-applications/{auditApplicationId}?{parameters}", restAuditAppModel.getId(), restWrapper.getParameters());
return restWrapper.processModel(RestAuditAppModel.class, request);
@@ -54,9 +53,8 @@ public class Audit extends ModelRequest<Audit>
*
* @param auditApplicationId
* @return
* @throws Exception
*/
public RestAuditEntryModelsCollection listAuditEntriesForAnAuditApplication(String auditApplicationId) throws Exception
public RestAuditEntryModelsCollection listAuditEntriesForAnAuditApplication(String auditApplicationId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "audit-applications/{auditApplicationId}/audit-entries?{parameters}", auditApplicationId, restWrapper.getParameters());
return restWrapper.processModels(RestAuditEntryModelsCollection.class, request);
@@ -69,9 +67,8 @@ public class Audit extends ModelRequest<Audit>
* @param key
* @param value
* @return
* @throws Exception
*/
public RestAuditAppModel updateAuditApp(RestAuditAppModel restAuditAppModel, String key, String value) throws Exception
public RestAuditAppModel updateAuditApp(RestAuditAppModel restAuditAppModel, String key, String value)
{
String postBody = JsonBodyGenerator.keyValueJson(key, value);
@@ -85,9 +82,8 @@ public class Audit extends ModelRequest<Audit>
* @param auditApplicationId
* @param auditEntryId
* @return
* @throws Exception
*/
public RestAuditEntryModel getAuditEntryForAnAuditApplication(String auditApplicationId, String auditEntryId) throws Exception
public RestAuditEntryModel getAuditEntryForAnAuditApplication(String auditApplicationId, String auditEntryId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "audit-applications/{auditApplicationId}/audit-entries/{auditEntryId}?{parameters}", auditApplicationId, auditEntryId, restWrapper.getParameters());
return restWrapper.processModel(RestAuditEntryModel.class, request);
@@ -99,9 +95,8 @@ public class Audit extends ModelRequest<Audit>
* @param auditApplicationId
* @param auditEntryId
* @return
* @throws Exception
*/
public void deleteAuditEntryForAnAuditApplication(String auditApplicationId, String auditEntryId) throws Exception
public void deleteAuditEntryForAnAuditApplication(String auditApplicationId, String auditEntryId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "audit-applications/{auditApplicationId}/audit-entries/{auditEntryId}", auditApplicationId, auditEntryId);
restWrapper.processEmptyModel(request);
@@ -112,9 +107,8 @@ public class Audit extends ModelRequest<Audit>
*
* @param auditApplicationId
* @return
* @throws Exception
*/
public void deleteAuditEntriesForAnAuditApplication(String auditApplicationId) throws Exception
public void deleteAuditEntriesForAnAuditApplication(String auditApplicationId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "audit-applications/{auditApplicationId}/audit-entries?{parameters}", auditApplicationId, restWrapper.getParameters());
restWrapper.processEmptyModel(request);
@@ -125,9 +119,8 @@ public class Audit extends ModelRequest<Audit>
*
* @param nodeId
* @return
* @throws Exception
*/
public RestAuditEntryModelsCollection listAuditEntriesForNode(String nodeId) throws Exception
public RestAuditEntryModelsCollection listAuditEntriesForNode(String nodeId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/audit-entries?{parameters}", nodeId, restWrapper.getParameters());
return restWrapper.processModels(RestAuditEntryModelsCollection.class, request);

6
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Deployments.java
View File

@@ -31,7 +31,7 @@ public class Deployments extends ModelRequest<Deployments>
* @return
* @throws JsonToModelConversionException
*/
public RestDeploymentModelsCollection getDeployments() throws Exception
public RestDeploymentModelsCollection getDeployments()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "deployments?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestDeploymentModelsCollection.class, request);
@@ -43,7 +43,7 @@ public class Deployments extends ModelRequest<Deployments>
* @return
* @throws JsonToModelConversionException
*/
public void deleteDeployment() throws Exception
public void deleteDeployment()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "deployments/{deploymentId}", deployment.getId());
restWrapper.processEmptyModel(request);
@@ -55,7 +55,7 @@ public class Deployments extends ModelRequest<Deployments>
* @return
* @throws JsonToModelConversionException
*/
public RestDeploymentModel getDeployment() throws Exception
public RestDeploymentModel getDeployment()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "deployments/{deploymentId}?{parameters}",
deployment.getId(), restWrapper.getParameters());

8
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Downloads.java
View File

@@ -19,7 +19,7 @@ public class Downloads extends ModelRequest<Downloads> {
super(restWrapper);
}
public Downloads(RestDownloadsModel downloadsModel, RestWrapper restWrapper) throws Exception
public Downloads(RestDownloadsModel downloadsModel, RestWrapper restWrapper)
{
super(restWrapper);
this.downloadsModel = downloadsModel;
@@ -28,7 +28,7 @@ public class Downloads extends ModelRequest<Downloads> {
/**
* Get download details using POST call on "downloads"
*/
public RestDownloadsModel createDownload(String postBody) throws Exception
public RestDownloadsModel createDownload(String postBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "downloads");
return restWrapper.processModel(RestDownloadsModel.class, request);
@@ -37,7 +37,7 @@ public class Downloads extends ModelRequest<Downloads> {
/**
* Get download details using GET call on "downloads/{downloadId}"
*/
public RestDownloadsModel getDownload() throws Exception
public RestDownloadsModel getDownload()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "downloads/{downloadId}", downloadsModel.getId());
return restWrapper.processModel(RestDownloadsModel.class, request);
@@ -46,7 +46,7 @@ public class Downloads extends ModelRequest<Downloads> {
/**
* Cancel download using DELETE call on "downloads/{downloadId}"
*/
public void cancelDownload() throws Exception
public void cancelDownload()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "downloads/{downloadId}", downloadsModel.getId());
restWrapper.processEmptyModel(request);;

16
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Groups.java
View File

@@ -19,7 +19,7 @@ public class Groups extends ModelRequest<Groups>
/**
* List existing groups using GET on '/groups
*/
public RestGroupsModelsCollection listGroups() throws Exception
public RestGroupsModelsCollection listGroups()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "groups?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestGroupsModelsCollection.class, request);
@@ -28,7 +28,7 @@ public class Groups extends ModelRequest<Groups>
/**
* Create a group using POST on '/groups
*/
public RestGroupsModel createGroup(String groupBodyCreate) throws Exception
public RestGroupsModel createGroup(String groupBodyCreate)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, groupBodyCreate, "groups?{parameters}", restWrapper.getParameters());
return restWrapper.processModel(RestGroupsModel.class, request);
@@ -37,7 +37,7 @@ public class Groups extends ModelRequest<Groups>
/**
* Retrieve group details using GET on '/groups/{groupId}
*/
public RestGroupsModel getGroupDetail(String groupId) throws Exception
public RestGroupsModel getGroupDetail(String groupId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "groups/{groupId}?{parameters}", groupId, restWrapper.getParameters());
return restWrapper.processModel(RestGroupsModel.class, request);
@@ -46,7 +46,7 @@ public class Groups extends ModelRequest<Groups>
/**
* Delete a group using DELETE on '/groups/{groupId}
*/
public void deleteGroup(String groupId) throws Exception
public void deleteGroup(String groupId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "groups/{groupId}?{parameters}", groupId, restWrapper.getParameters());
restWrapper.processEmptyModel(request);
@@ -55,7 +55,7 @@ public class Groups extends ModelRequest<Groups>
/**
* Update group details using PUT on '/groups/{groupId}
*/
public RestGroupsModel updateGroupDetails(String groupId, String groupBodyUpdate) throws Exception
public RestGroupsModel updateGroupDetails(String groupId, String groupBodyUpdate)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, groupBodyUpdate, "groups/{groupId}?{parameters}", groupId, restWrapper.getParameters());
return restWrapper.processModel(RestGroupsModel.class, request);
@@ -64,7 +64,7 @@ public class Groups extends ModelRequest<Groups>
/**
* List memberships of a group using GET on '/groups/{groupId}/members
*/
public RestGroupMemberModelsCollection listGroupMemberships(String groupId) throws Exception
public RestGroupMemberModelsCollection listGroupMemberships(String groupId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "groups/{groupId}/members?{parameters}", groupId, restWrapper.getParameters());
return restWrapper.processModels(RestGroupMemberModelsCollection.class, request);
@@ -73,7 +73,7 @@ public class Groups extends ModelRequest<Groups>
/**
* Create a group membership using POST on '/groups/{groupId}/members
*/
public RestGroupMember createGroupMembership (String groupId, String groupMembershipBodyCreate) throws Exception
public RestGroupMember createGroupMembership (String groupId, String groupMembershipBodyCreate)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, groupMembershipBodyCreate, "groups/{groupId}/members?{parameters}", groupId,
restWrapper.getParameters());
@@ -83,7 +83,7 @@ public class Groups extends ModelRequest<Groups>
/**
* Delete a group membership using DELETE on '/groups/{groupId}/members/{groupMemberId}
*/
public void deleteGroupMembership(String groupId, String groupMemberId) throws Exception
public void deleteGroupMembership(String groupId, String groupMemberId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "groups/{groupId}/members/{groupMemberId}", groupId, groupMemberId);
restWrapper.processEmptyModel(request);

9
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Networks.java
View File

@@ -23,9 +23,8 @@ public class Networks extends ModelRequest<Networks>
* Retrieve details for the current user network using GET call on "networks/{networkId}"
*
* @return
* @throws Exception
*/
public RestNetworkModel getNetwork() throws Exception
public RestNetworkModel getNetwork()
{
return getNetwork(restWrapper.getTestUser());
}
@@ -34,9 +33,8 @@ public class Networks extends ModelRequest<Networks>
* Retrieve details of a specific network using GET call on "networks/{networkId}"
*
* @return
* @throws Exception
*/
public RestNetworkModel getNetwork(UserModel tenant) throws Exception
public RestNetworkModel getNetwork(UserModel tenant)
{
Utility.checkObjectIsInitialized(tenant.getDomain(), "tenant.getDomain()");
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "networks/{networkId}", tenant.getDomain());
@@ -47,9 +45,8 @@ public class Networks extends ModelRequest<Networks>
* Retrieve details of a specific network using GET call with parameters on "networks/{networkId}?{parameters}"
*
* @return JSONObject
* @throws Exception
*/
public JSONObject getNetworkWithParams(UserModel tenant) throws Exception
public JSONObject getNetworkWithParams(UserModel tenant)
{
Utility.checkObjectIsInitialized(tenant.getDomain(), "tenant.getDomain()");
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "networks/{networkId}?{parameters}", tenant.getDomain(), restWrapper.getParameters());

193
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java
View File

@@ -18,6 +18,7 @@ import org.testng.reporters.Files;
import javax.json.JsonArrayBuilder;
import java.io.File;
import java.io.IOException;
/**
* Declares all Rest API under the /nodes path
@@ -27,12 +28,12 @@ public class Node extends ModelRequest<Node>
{
private RepoTestModel repoModel;
public Node(RestWrapper restWrapper) throws Exception
public Node(RestWrapper restWrapper)
{
super(restWrapper);
}
public Node(RepoTestModel repoModel, RestWrapper restWrapper) throws Exception
public Node(RepoTestModel repoModel, RestWrapper restWrapper)
{
super(restWrapper);
this.repoModel = repoModel;
@@ -46,7 +47,7 @@ public class Node extends ModelRequest<Node>
* @return
* @throws JsonToModelConversionException
*/
public RestNodeModel getNode() throws Exception
public RestNodeModel getNode()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModel(RestNodeModel.class, request);
@@ -59,7 +60,7 @@ public class Node extends ModelRequest<Node>
* @return
* @throws JsonToModelConversionException
*/
public RestCommentModelsCollection getNodeComments() throws Exception
public RestCommentModelsCollection getNodeComments()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/comments?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModels(RestCommentModelsCollection.class, request);
@@ -71,9 +72,8 @@ public class Node extends ModelRequest<Node>
* @param node
* @param commentContent
* @return
* @throws Exception
*/
public RestCommentModel addComment(String commentContent) throws Exception
public RestCommentModel addComment(String commentContent)
{
String postBody = JsonBodyGenerator.keyValueJson("content", commentContent);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "nodes/{nodeId}/comments", repoModel.getNodeRef());
@@ -86,9 +86,8 @@ public class Node extends ModelRequest<Node>
* @param contentModel
* @param comments
* @return
* @throws Exception
*/
public RestCommentModelsCollection addComments(String... comments) throws Exception
public RestCommentModelsCollection addComments(String... comments)
{
JsonArrayBuilder array = JsonBodyGenerator.defineJSONArray();
for(String comment: comments)
@@ -109,7 +108,7 @@ public class Node extends ModelRequest<Node>
* @return
* @throws JsonToModelConversionException
*/
public RestCommentModel updateComment(RestCommentModel commentModel, String commentContent) throws Exception
public RestCommentModel updateComment(RestCommentModel commentModel, String commentContent)
{
String postBody = JsonBodyGenerator.keyValueJson("content", commentContent);
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, postBody, "nodes/{nodeId}/comments/{commentId}?{parameters}", repoModel.getNodeRef(), commentModel.getId(), restWrapper.getParameters());
@@ -126,7 +125,7 @@ public class Node extends ModelRequest<Node>
* @return
* @throws JsonToModelConversionException
*/
public void deleteComment(RestCommentModel comment) throws Exception
public void deleteComment(RestCommentModel comment)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/comments/{commentId}", repoModel.getNodeRef(), comment.getId());
restWrapper.processEmptyModel(request);
@@ -136,15 +135,16 @@ public class Node extends ModelRequest<Node>
* Like a document using POST call on "nodes/{nodeId}/ratings"
*
* @return
* @throws Exception
*/
public RestRatingModel likeDocument() throws Exception {
public RestRatingModel likeDocument()
{
String postBody = JsonBodyGenerator.likeRating(true);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "nodes/{nodeId}/ratings", repoModel.getNodeRef());
return restWrapper.processModel(RestRatingModel.class, request);
}
public RestRatingModel dislikeDocument() throws Exception {
public RestRatingModel dislikeDocument()
{
String postBody = JsonBodyGenerator.likeRating(false);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "nodes/{nodeId}/ratings", repoModel.getNodeRef());
return restWrapper.processModel(RestRatingModel.class, request);
@@ -154,9 +154,9 @@ public class Node extends ModelRequest<Node>
* POST call on "nodes/{nodeId}/ratings" using an invalid rating body
*
* @return
* @throws Exception
*/
public RestRatingModel addInvalidRating(String jsonBody) throws Exception {
public RestRatingModel addInvalidRating(String jsonBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, jsonBody, "nodes/{nodeId}/ratings", repoModel.getNodeRef());
return restWrapper.processModel(RestRatingModel.class, request);
}
@@ -168,9 +168,9 @@ public class Node extends ModelRequest<Node>
*
* @param stars
* @return
* @throws Exception
*/
public RestRatingModel rateStarsToDocument(int stars) throws Exception {
public RestRatingModel rateStarsToDocument(int stars)
{
String postBody = JsonBodyGenerator.fiveStarRating(stars);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "nodes/{nodeId}/ratings", repoModel.getNodeRef());
return restWrapper.processModel(RestRatingModel.class, request);
@@ -180,9 +180,9 @@ public class Node extends ModelRequest<Node>
* Retrieve node ratings using GET call on "nodes/{nodeId}/ratings"
*
* @return
* @throws Exception
*/
public RestRatingModelsCollection getRatings() throws Exception {
public RestRatingModelsCollection getRatings()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/ratings?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModels(RestRatingModelsCollection.class, request);
}
@@ -191,9 +191,9 @@ public class Node extends ModelRequest<Node>
* Delete like rating using DELETE call on "nodes/{nodeId}/ratings/{ratingId}"
*
* @return
* @throws Exception
*/
public void deleteLikeRating() throws Exception {
public void deleteLikeRating()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/ratings/{ratingId}", repoModel.getNodeRef(), "likes");
restWrapper.processEmptyModel(request);
}
@@ -202,9 +202,9 @@ public class Node extends ModelRequest<Node>
* Try to delete invalid rating using DELETE call on "nodes/{nodeId}/ratings/{ratingId}"
*
* @return
* @throws Exception
*/
public void deleteInvalidRating(String rating) throws Exception {
public void deleteInvalidRating(String rating)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/ratings/{ratingId}", repoModel.getNodeRef(), rating);
restWrapper.processEmptyModel(request);
}
@@ -213,7 +213,8 @@ public class Node extends ModelRequest<Node>
*
* Get like rating of a document using GET call on "nodes/{nodeId}/ratings/{ratingId}"
*/
public RestRatingModel getLikeRating() throws Exception {
public RestRatingModel getLikeRating()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/ratings/{ratingId}?{parameters}", repoModel.getNodeRef(), "likes", restWrapper.getParameters());
return restWrapper.processModel(RestRatingModel.class, request);
}
@@ -222,9 +223,9 @@ public class Node extends ModelRequest<Node>
* Delete fivestar rating using DELETE call on "nodes/{nodeId}/ratings/{ratingId}"
*
* @return
* @throws Exception
*/
public void deleteFiveStarRating() throws Exception {
public void deleteFiveStarRating()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/ratings/{ratingId}", repoModel.getNodeRef(), "fiveStar");
restWrapper.processEmptyModel(request);
}
@@ -233,9 +234,9 @@ public class Node extends ModelRequest<Node>
*
* Get fivestar rating of a document using GET call on "nodes/{nodeId}/ratings/{ratingId}"
* @return
* @throws Exception
*/
public RestRatingModel getFiveStarRating() throws Exception {
public RestRatingModel getFiveStarRating()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/ratings/{ratingId}?{parameters}", repoModel.getNodeRef(), "fiveStar", restWrapper.getParameters());
return restWrapper.processModel(RestRatingModel.class, request);
}
@@ -246,9 +247,8 @@ public class Node extends ModelRequest<Node>
* @param contentModel
* @param tag
* @return
* @throws Exception
*/
public RestTagModel addTag(String tag) throws Exception
public RestTagModel addTag(String tag)
{
String postBody = JsonBodyGenerator.keyValueJson("tag", tag);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "nodes/{nodeId}/tags", repoModel.getNodeRef());
@@ -261,9 +261,8 @@ public class Node extends ModelRequest<Node>
* @param contentModel
* @param tags
* @return
* @throws Exception
*/
public RestTagModelsCollection addTags(String... tags) throws Exception
public RestTagModelsCollection addTags(String... tags)
{
String postBody = "[";
for(String tag: tags)
@@ -285,7 +284,7 @@ public class Node extends ModelRequest<Node>
* @return
* @throws JsonToModelConversionException
*/
public void deleteTag(RestTagModel tag) throws Exception
public void deleteTag(RestTagModel tag)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/tags/{tagId}", repoModel.getNodeRef(), tag.getId());
restWrapper.processEmptyModel(request);
@@ -296,9 +295,8 @@ public class Node extends ModelRequest<Node>
*
* @param tag
* @return
* @throws Exception
*/
public RestTagModelsCollection getNodeTags() throws Exception
public RestTagModelsCollection getNodeTags()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/tags?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModels(RestTagModelsCollection.class, request);
@@ -308,10 +306,9 @@ public class Node extends ModelRequest<Node>
* Create new nodes using POST call on 'nodes/{nodeId}/children
*
* @param node
* @return
* @throws Exception
* @return
*/
public RestNodeModel createNode(RestNodeBodyModel node) throws Exception
public RestNodeModel createNode(RestNodeBodyModel node)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, node.toJson(), "nodes/{nodeId}/children?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModel(RestNodeModel.class, request);
@@ -324,9 +321,8 @@ public class Node extends ModelRequest<Node>
*
* <code>usingMultipartFile(new File("your-local-file.txt")).withCoreAPI().usingNode(ContentModel.my()).createNode();</code>
* @return
* @throws Exception
*/
public RestNodeModel createNode() throws Exception
public RestNodeModel createNode()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.POST, "nodes/{nodeId}/children", repoModel.getNodeRef());
return restWrapper.processModel(RestNodeModel.class, request);
@@ -336,9 +332,8 @@ public class Node extends ModelRequest<Node>
* Retrieve content for a specific node using GET call on "nodes/{nodeId}/content"
*
* @return
* @throws Exception
*/
public RestResponse getNodeContent() throws Exception
public RestResponse getNodeContent()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/content?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.process(request);
@@ -349,9 +344,8 @@ public class Node extends ModelRequest<Node>
*
* @return
* @param nodeId
* @throws Exception
*/
public RestResponse getNodeContent(String nodeId) throws Exception
public RestResponse getNodeContent(String nodeId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/content?{parameters}", nodeId, restWrapper.getParameters());
return restWrapper.process(request);
@@ -362,9 +356,8 @@ public class Node extends ModelRequest<Node>
*
* @param renditionId id of rendition to be created
* @return
* @throws Exception
*/
public void createNodeRendition(String renditionId) throws Exception
public void createNodeRendition(String renditionId)
{
String postBody = JsonBodyGenerator.keyValueJson("id", renditionId);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "nodes/{nodeId}/renditions", repoModel.getNodeRef());
@@ -377,9 +370,8 @@ public class Node extends ModelRequest<Node>
* @param renditionId id of rendition to be created
* @param versionId version id of node
* @return
* @throws Exception
*/
public void createNodeVersionRendition(String renditionId, String versionId) throws Exception
public void createNodeVersionRendition(String renditionId, String versionId)
{
String postBody = JsonBodyGenerator.keyValueJson("id", renditionId);
RestRequest request = RestRequest
@@ -394,9 +386,8 @@ public class Node extends ModelRequest<Node>
*
* @param renditionId id of rendition to be created
* @return
* @throws Exception
*/
public void createNodeRenditionIfNotExists(String renditionId) throws Exception
public void createNodeRenditionIfNotExists(String renditionId)
{
getNodeRendition(renditionId);
if (Integer.valueOf(restWrapper.getStatusCode()).equals(HttpStatus.OK.value()))
@@ -412,9 +403,8 @@ public class Node extends ModelRequest<Node>
*
* @param renditionId id of rendition to be retrieved
* @return
* @throws Exception
*/
public RestRenditionInfoModel getNodeRendition(String renditionId) throws Exception
public RestRenditionInfoModel getNodeRendition(String renditionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/renditions/{renditionId}", repoModel.getNodeRef(), renditionId);
return restWrapper.processModel(RestRenditionInfoModel.class, request);
@@ -426,9 +416,8 @@ public class Node extends ModelRequest<Node>
* @param renditionId id of rendition to be retrieved
* @param versionId versionId of the node
* @return
* @throws Exception
*/
public RestRenditionInfoModel getNodeVersionRendition(String renditionId, String versionId) throws Exception
public RestRenditionInfoModel getNodeVersionRendition(String renditionId, String versionId)
{
RestRequest request = RestRequest
.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}",
@@ -441,9 +430,8 @@ public class Node extends ModelRequest<Node>
* the renditions response several times because on the alfresco server the rendition can take a while to be created.
*
* @return
* @throws Exception
*/
public RestRenditionInfoModel getNodeRenditionUntilIsCreated(String renditionId) throws Exception
public RestRenditionInfoModel getNodeRenditionUntilIsCreated(String renditionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/renditions/{renditionId}",repoModel.getNodeRef(), renditionId);
RestRenditionInfoModel renditions = restWrapper.processModel(RestRenditionInfoModel.class, request);
@@ -465,9 +453,8 @@ public class Node extends ModelRequest<Node>
* the renditions response several times because on the alfresco server the rendition can take a while to be created.
*
* @return
* @throws Exception
*/
public RestRenditionInfoModel getNodeVersionRenditionUntilIsCreated(String renditionId, String versionId) throws Exception
public RestRenditionInfoModel getNodeVersionRenditionUntilIsCreated(String renditionId, String versionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}",repoModel.getNodeRef(), versionId, renditionId);
RestRenditionInfoModel renditions = restWrapper.processModel(RestRenditionInfoModel.class, request);
@@ -491,9 +478,8 @@ public class Node extends ModelRequest<Node>
* alfresco server the rendition can take a while to be created.
*
* @return
* @throws Exception
*/
public RestResponse getNodeRenditionContentUntilIsCreated(String renditionId) throws Exception
public RestResponse getNodeRenditionContentUntilIsCreated(String renditionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/renditions/{renditionId}/content", repoModel.getNodeRef(),
renditionId);
@@ -517,9 +503,8 @@ public class Node extends ModelRequest<Node>
* alfresco server the rendition can take a while to be created.
*
* @return
* @throws Exception
*/
public RestResponse getNodeVersionRenditionContentUntilIsCreated(String renditionId, String versionId) throws Exception
public RestResponse getNodeVersionRenditionContentUntilIsCreated(String renditionId, String versionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}/content", repoModel.getNodeRef(),
versionId, renditionId);
@@ -540,9 +525,8 @@ public class Node extends ModelRequest<Node>
* 'nodes/{nodeId}/renditions/{renditionId}/content
*
* @return
* @throws Exception
*/
public RestResponse getNodeRenditionContent(String renditionId) throws Exception
public RestResponse getNodeRenditionContent(String renditionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/renditions/{renditionId}/content", repoModel.getNodeRef(),
renditionId);
@@ -554,9 +538,8 @@ public class Node extends ModelRequest<Node>
* 'nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}/content
*
* @return
* @throws Exception
*/
public RestResponse getNodeVersionRenditionContent(String renditionId, String versionId) throws Exception
public RestResponse getNodeVersionRenditionContent(String renditionId, String versionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}/content", repoModel.getNodeRef(),
versionId, renditionId);
@@ -567,9 +550,8 @@ public class Node extends ModelRequest<Node>
* Get rendition information for available renditions for the node using GET call on
* 'nodes/{nodeId}/renditions'
* @return
* @throws Exception
*/
public RestRenditionInfoModelCollection getNodeRenditionsInfo() throws Exception
public RestRenditionInfoModelCollection getNodeRenditionsInfo()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/renditions?{parameters}", repoModel.getNodeRef(),
restWrapper.getParameters());
@@ -580,9 +562,8 @@ public class Node extends ModelRequest<Node>
* Get rendition information for available renditions for the node version using GET call on
* 'nodes/{nodeId}/versions/{versionId}/renditions'
* @return
* @throws Exception
*/
public RestRenditionInfoModelCollection getNodeVersionRenditionsInfo(String versionId) throws Exception
public RestRenditionInfoModelCollection getNodeVersionRenditionsInfo(String versionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/versions/{versionId}/renditions?{parameters}", repoModel.getNodeRef(),
versionId, restWrapper.getParameters());
@@ -594,9 +575,8 @@ public class Node extends ModelRequest<Node>
* Delete the rendition identified by renditionId using DELETE call on "/nodes/{nodeId}/renditions/{renditionId}"
*
* @param renditionId id of rendition to delete
* @throws Exception
*/
public void deleteNodeRendition(String renditionId) throws Exception
public void deleteNodeRendition(String renditionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/renditions/{renditionId}", repoModel.getNodeRef(), renditionId);
restWrapper.processEmptyModel(request);
@@ -606,9 +586,8 @@ public class Node extends ModelRequest<Node>
* Get a node's children using GET call 'nodes/{nodeId}/children
*
* @return a collection of nodes
* @throws Exception
*/
public RestNodeModelsCollection listChildren() throws Exception
public RestNodeModelsCollection listChildren()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/children?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModels(RestNodeModelsCollection.class, request);
@@ -619,9 +598,8 @@ public class Node extends ModelRequest<Node>
*
* @param moveBody a {@link RestNodeBodyMoveCopyModel} containing at least the target parent id
* @return the moved node's new information
* @throws Exception
*/
public RestNodeModel move(RestNodeBodyMoveCopyModel moveBody) throws Exception
public RestNodeModel move(RestNodeBodyMoveCopyModel moveBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, moveBody.toJson(), "nodes/{nodeId}/move?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModel(RestNodeModel.class, request);
@@ -632,9 +610,8 @@ public class Node extends ModelRequest<Node>
*
* @param copyBody a {@link RestNodeBodyMoveCopyModel} containing at least the target parent id
* @return the moved node's new information
* @throws Exception
*/
public RestNodeModel copy(RestNodeBodyMoveCopyModel copyBody) throws Exception
public RestNodeModel copy(RestNodeBodyMoveCopyModel copyBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, copyBody.toJson(),
"nodes/{nodeId}/copy?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
@@ -646,9 +623,8 @@ public class Node extends ModelRequest<Node>
* Lock a specific node using POST call on "nodes/{nodeId}/lock"
*
* @return
* @throws Exception
*/
public RestNodeModel lockNode(RestNodeLockBodyModel lockBody) throws Exception
public RestNodeModel lockNode(RestNodeLockBodyModel lockBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, lockBody.toJson(), "nodes/{nodeId}/lock?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModel(RestNodeModel.class, request);
@@ -658,9 +634,8 @@ public class Node extends ModelRequest<Node>
* Unlock a specific node using POST call on "nodes/{nodeId}/unlock"
*
* @return
* @throws Exception
*/
public RestNodeModel unlockNode() throws Exception
public RestNodeModel unlockNode()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.POST, "nodes/{nodeId}/unlock?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModel(RestNodeModel.class, request);
@@ -679,9 +654,8 @@ public class Node extends ModelRequest<Node>
*
* @param putBody
* @return
* @throws Exception
*/
public RestNodeModel updateNode(String putBody) throws Exception
public RestNodeModel updateNode(String putBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, putBody, "nodes/{nodeId}?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
request.setContentType("UTF-8");
@@ -692,9 +666,8 @@ public class Node extends ModelRequest<Node>
* Retrieve targets for a specific node using GET call on "nodes/{nodeId}/targets
*
* @return
* @throws Exception
*/
public RestNodeAssociationModelCollection getNodeTargets() throws Exception
public RestNodeAssociationModelCollection getNodeTargets()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/targets?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModels(RestNodeAssociationModelCollection.class, request);
@@ -705,9 +678,8 @@ public class Node extends ModelRequest<Node>
*
* @param target
* @return
* @throws Exception
*/
public RestNodeAssocTargetModel createTargetForNode(RestNodeAssocTargetModel target) throws Exception
public RestNodeAssocTargetModel createTargetForNode(RestNodeAssocTargetModel target)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, target.toJson(), "nodes/{nodeId}/targets?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModel(RestNodeAssocTargetModel.class, request);
@@ -718,9 +690,8 @@ public class Node extends ModelRequest<Node>
* nodes/{nodeId}/targets/{targetId}
*
* @param target
* @throws Exception
*/
public void deleteTarget(RestNodeAssocTargetModel target) throws Exception
public void deleteTarget(RestNodeAssocTargetModel target)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/targets/{targetId}", repoModel.getNodeRef(),
target.getTargetId());
@@ -731,9 +702,8 @@ public class Node extends ModelRequest<Node>
* Get sources for a specific node using GET call on GET /nodes/{nodeId}/sources
*
* @return
* @throws Exception
*/
public RestNodeAssociationModelCollection getNodeSources() throws Exception
public RestNodeAssociationModelCollection getNodeSources()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "/nodes/{nodeId}/sources?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModels(RestNodeAssociationModelCollection.class, request);
@@ -744,15 +714,22 @@ public class Node extends ModelRequest<Node>
*
* @param nodeContent
* @return
* @throws Exception
*/
public RestNodeModel updateNodeContent(File nodeContent) throws Exception
public RestNodeModel updateNodeContent(File nodeContent)
{
restWrapper.usingContentType(ContentType.BINARY);
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, Files.readFile(nodeContent), "nodes/{nodeId}/content?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
request.setContentType("UTF-8");
restWrapper.usingContentType(ContentType.JSON);
return restWrapper.processModel(RestNodeModel.class, request);
try
{
restWrapper.usingContentType(ContentType.BINARY);
String body = Files.readFile(nodeContent);
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, body, "nodes/{nodeId}/content?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
request.setContentType("UTF-8");
restWrapper.usingContentType(ContentType.JSON);
return restWrapper.processModel(RestNodeModel.class, request);
}
catch (IOException e)
{
throw new RuntimeException("Unexpected error when reading content file.", e);
}
}
/**
@@ -771,9 +748,8 @@ public class Node extends ModelRequest<Node>
* Get a node's parents using GET call 'nodes/{nodeId}/parents
*
* @return a collection of nodes
* @throws Exception
*/
public RestNodeAssociationModelCollection getParents() throws Exception
public RestNodeAssociationModelCollection getParents()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/parents?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModels(RestNodeAssociationModelCollection.class, request);
@@ -783,9 +759,8 @@ public class Node extends ModelRequest<Node>
* Get a node's secondary children using GET call 'nodes/{nodeId}/secondary-children
*
* @return a collection of nodes
* @throws Exception
*/
public RestNodeAssociationModelCollection getSecondaryChildren() throws Exception
public RestNodeAssociationModelCollection getSecondaryChildren()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/secondary-children?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModels(RestNodeAssociationModelCollection.class, request);
@@ -796,9 +771,8 @@ public class Node extends ModelRequest<Node>
* Use a list of secondary children nodes
*
* @return a collection of nodes
* @throws Exception
*/
public RestNodeChildAssocModelCollection createSecondaryChildren(String secondaryChildren) throws Exception
public RestNodeChildAssocModelCollection createSecondaryChildren(String secondaryChildren)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, secondaryChildren, "nodes/{nodeId}/secondary-children?{parameters}", repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModels(RestNodeChildAssocModelCollection.class, request);
@@ -808,9 +782,8 @@ public class Node extends ModelRequest<Node>
* Delete secondary children using DELETE call 'nodes/{nodeId}/secondary-children/{childId}
*
* @return a collection of nodes
* @throws Exception
*/
public void deleteSecondaryChild(RestNodeAssociationModel child) throws Exception
public void deleteSecondaryChild(RestNodeAssociationModel child)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/secondary-children/{childId}?{parameters}", repoModel.getNodeRef(), child.getId(), restWrapper.getParameters());
restWrapper.processEmptyModel(request);
@@ -880,9 +853,8 @@ public class Node extends ModelRequest<Node>
*
* @param nodeModel
* @return
* @throws Exception
*/
public void deleteNode(RestNodeModel nodeModel) throws Exception
public void deleteNode(RestNodeModel nodeModel)
{
deleteNode(nodeModel.getId());
}
@@ -893,9 +865,8 @@ public class Node extends ModelRequest<Node>
*
* @param nodeId
* @return
* @throws Exception
*/
public void deleteNode(String nodeId) throws Exception
public void deleteNode(String nodeId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}", nodeId);
restWrapper.processEmptyModel(request);

74
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/People.java
View File

@@ -46,7 +46,7 @@ public class People extends ModelRequest<People>
{
UserModel person;
public People(UserModel person, RestWrapper restWrapper) throws Exception
public People(UserModel person, RestWrapper restWrapper)
{
super(restWrapper);
this.person = person;
@@ -56,7 +56,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve details of a specific person using GET call on "people/{personId}"
*/
public RestPersonModel getPerson() throws Exception
public RestPersonModel getPerson()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}?{parameters}", this.person.getUsername(), restWrapper.getParameters());
return restWrapper.processModel(RestPersonModel.class, request);
@@ -65,7 +65,7 @@ public class People extends ModelRequest<People>
/**
* Update a person properties using PUT call on "people/{personId}"
*/
public RestPersonModel updatePerson(String putBody) throws Exception
public RestPersonModel updatePerson(String putBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, putBody, "people/{personId}", this.person.getUsername());
return restWrapper.processModel(RestPersonModel.class, request);
@@ -76,7 +76,7 @@ public class People extends ModelRequest<People>
* Please note that it retries to get the list of activities several times before returning the empty list. The list of activities are not displayed as
* they are created.
*/
public RestActivityModelsCollection getPersonActivitiesUntilEntriesCountIs(int expectedNoOfEntries) throws Exception
public RestActivityModelsCollection getPersonActivitiesUntilEntriesCountIs(int expectedNoOfEntries)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/activities?{parameters}", this.person.getUsername(), restWrapper.getParameters());
RestActivityModelsCollection activityCollection = restWrapper.processModels(RestActivityModelsCollection.class, request);
@@ -96,7 +96,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve list of activities for a specific person using GET call on "people/{personId}/activities" without retry
*/
public RestActivityModelsCollection getPersonActivities() throws Exception
public RestActivityModelsCollection getPersonActivities()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/activities?{parameters}", this.person.getUsername(), restWrapper.getParameters());
return restWrapper.processModels(RestActivityModelsCollection.class, request);
@@ -105,7 +105,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve preferences of a specific person using GET call on "people/{personId}/preferences"
*/
public RestPreferenceModelsCollection getPersonPreferences() throws Exception
public RestPreferenceModelsCollection getPersonPreferences()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/preferences?{parameters}", this.person.getUsername(), restWrapper.getParameters());
return restWrapper.processModels(RestPreferenceModelsCollection.class, request);
@@ -114,7 +114,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve the current site membership requests for a specific person using GET call on "/people/{personId}/site-membership-requests"
*/
public RestSiteMembershipRequestModelsCollection getSiteMembershipRequests() throws Exception
public RestSiteMembershipRequestModelsCollection getSiteMembershipRequests()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/site-membership-requests?{parameters}", this.person.getUsername(), restWrapper.getParameters());
return restWrapper.processModels(RestSiteMembershipRequestModelsCollection.class, request);
@@ -123,7 +123,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve a specific person's favorite sites using GET call on "people/{personId}/favorite-sites"
*/
public RestSiteModelsCollection getFavoriteSites() throws Exception
public RestSiteModelsCollection getFavoriteSites()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/favorite-sites?{parameters}", this.person.getUsername(), restWrapper.getParameters());
return restWrapper.processModels(RestSiteModelsCollection.class, request);
@@ -132,7 +132,7 @@ public class People extends ModelRequest<People>
/**
* Add a favorite site for a specific person using POST call on "people/{personId}/favorite-sites"
*/
public RestFavoriteSiteModel addFavoriteSite(SiteModel site) throws Exception
public RestFavoriteSiteModel addFavoriteSite(SiteModel site)
{
String postBody = JsonBodyGenerator.keyValueJson("id", site.getId());
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "people/{personId}/favorite-sites", this.person.getUsername());
@@ -142,7 +142,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve a specific preference of a specific person using GET call on "people/{personId}/preferences/{preferenceName}"
*/
public RestPreferenceModel getPersonPreferenceInformation(String preferenceName) throws Exception
public RestPreferenceModel getPersonPreferenceInformation(String preferenceName)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/preferences/{preferenceName}?{parameters}", this.person.getUsername(), preferenceName, restWrapper.getParameters());
return restWrapper.processModel(RestPreferenceModel.class, request);
@@ -151,7 +151,7 @@ public class People extends ModelRequest<People>
/**
* Remove a specific site from favorite sites list of a person using DELETE call on "people/{personId}/favorite-sites/{siteId}"
*/
public void removeFavoriteSite(SiteModel site) throws Exception
public void removeFavoriteSite(SiteModel site)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "people/{personId}/favorite-sites/{siteId}", this.person.getUsername(), site.getId());
restWrapper.processEmptyModel(request);
@@ -160,7 +160,7 @@ public class People extends ModelRequest<People>
/**
* Returns information on favorite site siteId of person personId. GET call on "people/{personId}/favorite-sites/{siteId}"
*/
public RestSiteModel getFavoriteSite(SiteModel site) throws Exception
public RestSiteModel getFavoriteSite(SiteModel site)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/favorite-sites/{siteId}?{parameters}", this.person.getUsername(), site.getId(), restWrapper.getParameters());
return restWrapper.processModel(RestSiteModel.class, request);
@@ -169,7 +169,7 @@ public class People extends ModelRequest<People>
/**
* Delete site member with DELETE call on "people/{personId}/sites/{siteId}"
*/
public void deleteSiteMember(SiteModel site) throws Exception
public void deleteSiteMember(SiteModel site)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "people/{personId}/sites/{siteId}", person.getUsername(), site.getId());
restWrapper.processEmptyModel(request);
@@ -178,7 +178,7 @@ public class People extends ModelRequest<People>
/**
* Add new site membership request using POST call on "people/{personId}/site-membership-requests"
*/
public RestSiteMembershipRequestModel addSiteMembershipRequest(String siteMembershipRequest) throws Exception
public RestSiteMembershipRequestModel addSiteMembershipRequest(String siteMembershipRequest)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, siteMembershipRequest, "people/{personId}/site-membership-requests", this.person.getUsername());
return restWrapper.processModel(RestSiteMembershipRequestModel.class, request);
@@ -187,7 +187,7 @@ public class People extends ModelRequest<People>
/**
* Add new site membership request using POST call on "people/{personId}/site-membership-requests"
*/
public RestSiteMembershipRequestModel addSiteMembershipRequest(SiteModel siteModel) throws Exception
public RestSiteMembershipRequestModel addSiteMembershipRequest(SiteModel siteModel)
{
String json = JsonBodyGenerator.siteMemberhipRequest("Please accept me", siteModel, "New request");
return addSiteMembershipRequest(json);
@@ -196,7 +196,7 @@ public class People extends ModelRequest<People>
/**
* Add new site membership request using POST call on "people/{personId}/site-membership-requests"
*/
public RestSiteMembershipRequestModel addSiteMembershipRequest(String message, SiteModel siteModel, String title) throws Exception
public RestSiteMembershipRequestModel addSiteMembershipRequest(String message, SiteModel siteModel, String title)
{
String json = JsonBodyGenerator.siteMemberhipRequest(message, siteModel, title);
return addSiteMembershipRequest(json);
@@ -206,7 +206,7 @@ public class People extends ModelRequest<People>
* Get site membership information using GET call on "/people/{personId}/sites"
*/
public RestSiteMembershipModelsCollection getSitesMembershipInformation() throws Exception
public RestSiteMembershipModelsCollection getSitesMembershipInformation()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/sites?{parameters}", person.getUsername(), restWrapper.getParameters());
return restWrapper.processModels(RestSiteMembershipModelsCollection.class, request);
@@ -215,7 +215,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve site membership information for a person using GET call on "people/{personId}/sites/{siteId}"
*/
public RestSiteEntry getSiteMembership(SiteModel site) throws Exception
public RestSiteEntry getSiteMembership(SiteModel site)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/sites/{siteId}?{parameters}", person.getUsername(), site.getId(), restWrapper.getParameters());
return restWrapper.processModel(RestSiteEntry.class, request);
@@ -224,7 +224,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve site membership request details for a person/site using GET call on "people/{personId}/site-membership-requests/{siteId}"
*/
public RestSiteMembershipRequestModel getSiteMembershipRequest(SiteModel site) throws Exception
public RestSiteMembershipRequestModel getSiteMembershipRequest(SiteModel site)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/site-membership-requests/{siteId}?{parameters}", person.getUsername(),
site.getId(), restWrapper.getParameters());
@@ -244,7 +244,7 @@ public class People extends ModelRequest<People>
/**
* Update site membership request using PUT call on "people/{personId}/site-membership-requests/{siteId}"
*/
public RestSiteMembershipRequestModel updateSiteMembershipRequest(SiteModel siteModel, String message) throws Exception
public RestSiteMembershipRequestModel updateSiteMembershipRequest(SiteModel siteModel, String message)
{
String json = JsonBodyGenerator.siteMemberhipRequest(message, siteModel, "New request");
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, json, "people/{personId}/site-membership-requests/{siteId}", person.getUsername(),
@@ -255,7 +255,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve favorite site for a specific user using GET call on "people/{personId}/favorites/{favoriteId}"
*/
public RestPersonFavoritesModel getFavorite(String favoriteId) throws Exception
public RestPersonFavoritesModel getFavorite(String favoriteId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/favorites/{favoriteId}?{parameters}", this.person.getUsername(), favoriteId, restWrapper.getParameters());
return restWrapper.processModel(RestPersonFavoritesModel.class, request);
@@ -264,7 +264,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve specific favorites for a specific user using GET call on "people/{personId}/favorites"
*/
public RestPersonFavoritesModelsCollection getFavorites() throws Exception
public RestPersonFavoritesModelsCollection getFavorites()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/favorites?{parameters}", this.person.getUsername(), restWrapper.getParameters());
return restWrapper.processModels(RestPersonFavoritesModelsCollection.class, request);
@@ -273,7 +273,7 @@ public class People extends ModelRequest<People>
/**
* Add a folder to favorites for a specific user using POST call on "people/{personId}/favorites"
*/
public RestPersonFavoritesModel addFolderToFavorites(FolderModel folderModel) throws Exception
public RestPersonFavoritesModel addFolderToFavorites(FolderModel folderModel)
{
String jsonPost = JsonBodyGenerator.targetFolderWithGuid(folderModel);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, jsonPost, "people/{personId}/favorites?{parameters}", this.person.getUsername(),
@@ -284,7 +284,7 @@ public class People extends ModelRequest<People>
/**
* Add a folder to favorites for a specific user using POST call on "people/{personId}/favorites"
*/
public RestPersonFavoritesModel addFileToFavorites(FileModel fileModel) throws Exception
public RestPersonFavoritesModel addFileToFavorites(FileModel fileModel)
{
String jsonPost = JsonBodyGenerator.targetFileWithGuid(fileModel);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, jsonPost, "people/{personId}/favorites?{parameters}", this.person.getUsername(),
@@ -295,7 +295,7 @@ public class People extends ModelRequest<People>
/**
* Add a site to favorites for a specific user using POST call on "people/{personId}/favorites"
*/
public RestPersonFavoritesModel addSiteToFavorites(SiteModel siteModel) throws Exception
public RestPersonFavoritesModel addSiteToFavorites(SiteModel siteModel)
{
String jsonPost = JsonBodyGenerator.targetSiteWithGuid(siteModel);
@@ -307,7 +307,7 @@ public class People extends ModelRequest<People>
/**
* Delete site from favorites for a specific user using DELETE call on "people/{personId}/favorites/{favoriteId}"
*/
public RestWrapper deleteSiteFromFavorites(SiteModel site) throws Exception
public RestWrapper deleteSiteFromFavorites(SiteModel site)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "people/{personId}/favorites/{favoriteId}", this.person.getUsername(), site.getGuid());
restWrapper.processEmptyModel(request);
@@ -317,7 +317,7 @@ public class People extends ModelRequest<People>
/**
* Delete a folder from favorites for a specific user using DELETE call on "people/{personId}/favorites/{favoriteId}"
*/
public RestWrapper deleteFolderFromFavorites(FolderModel folderModel) throws Exception
public RestWrapper deleteFolderFromFavorites(FolderModel folderModel)
{
String jsonPost = JsonBodyGenerator.targetFolderWithGuid(folderModel);
@@ -330,7 +330,7 @@ public class People extends ModelRequest<People>
/**
* Delete a file from favorites for a specific user using DELETE call on "people/{personId}/favorites/{favoriteId}"
*/
public RestWrapper deleteFileFromFavorites(FileModel fileModel) throws Exception
public RestWrapper deleteFileFromFavorites(FileModel fileModel)
{
String jsonPost = JsonBodyGenerator.targetFileWithGuid(fileModel);
@@ -343,7 +343,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve details of the current user network using GET call on "people/{personId}/networks/{networkId}"
*/
public RestNetworkModel getNetwork() throws Exception
public RestNetworkModel getNetwork()
{
return getNetwork(person);
}
@@ -351,7 +351,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve details of a specific network using GET call on "people/{personId}/networks/{networkId}"
*/
public RestNetworkModel getNetwork(UserModel tenant) throws Exception
public RestNetworkModel getNetwork(UserModel tenant)
{
Utility.checkObjectIsInitialized(tenant.getDomain(), "tenant.getDomain()");
String personId = tenant.getUsername().contains("-me-@")? "-me-" : tenant.getUsername();
@@ -362,7 +362,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve details of all networks related to the current person using GET call on "people/{personId}/networks"
*/
public RestNetworkModelsCollection getNetworks() throws Exception
public RestNetworkModelsCollection getNetworks()
{
return getNetworks(person);
}
@@ -370,7 +370,7 @@ public class People extends ModelRequest<People>
/**
* Retrieve details of all networks related to a specific person using GET call on "people/{personId}/networks"
*/
public RestNetworkModelsCollection getNetworks(UserModel tenant) throws Exception
public RestNetworkModelsCollection getNetworks(UserModel tenant)
{
String personId = tenant.getUsername().contains("-me-@") ? "-me-" : tenant.getUsername();
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/networks?{parameters}", personId, restWrapper.getParameters());
@@ -380,7 +380,7 @@ public class People extends ModelRequest<People>
/**
* Create new person with given newPerson details using POST call on "people"
*/
public RestPersonModel createPerson(RestPersonModel newPerson) throws Exception
public RestPersonModel createPerson(RestPersonModel newPerson)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, newPerson.toJson(), "people");
return restWrapper.processModel(RestPersonModel.class, request);
@@ -390,7 +390,7 @@ public class People extends ModelRequest<People>
* Get people avatar image using GET call on '/people/{personId}/avatar Please note that it retries to get the
* renditions response several times because on the alfresco server the rendition can take a while to be created.
*/
public RestResponse downloadAvatarContent() throws Exception
public RestResponse downloadAvatarContent()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/avatar?{parameters}",
this.person.getUsername(), restWrapper.getParameters());
@@ -409,7 +409,7 @@ public class People extends ModelRequest<People>
/**
* Update avatar image PUT call on 'people/{nodeId}/children
*/
public ValidatableResponse uploadAvatarContent(String fullServerUrL, File avatarFile) throws Exception
public ValidatableResponse uploadAvatarContent(String fullServerUrL, File avatarFile)
{
return given().auth().preemptive().basic(person.getUsername(), person.getPassword()).contentType(ContentType.BINARY)
.body(avatarFile).when()
@@ -420,7 +420,7 @@ public class People extends ModelRequest<People>
/**
* List group memberships for a person using GET on '/people/{personId}/groups
*/
public RestGroupsModelsCollection listGroupMemberships() throws Exception
public RestGroupsModelsCollection listGroupMemberships()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/groups?{parameters}", this.person.getUsername(), restWrapper.getParameters());
return restWrapper.processModels(RestGroupsModelsCollection.class, request);
@@ -486,7 +486,7 @@ public class People extends ModelRequest<People>
return this;
}
public RestPersonFavoritesModelsCollection getFavorites() throws Exception
public RestPersonFavoritesModelsCollection getFavorites()
{
restWrapper.withParams(String.format(whereClause, expression));
return people.getFavorites();

11
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/ProcessDefinitions.java
View File

@@ -35,7 +35,7 @@ public class ProcessDefinitions extends ModelRequest<ProcessDefinitions>
* @return
* @throws JsonToModelConversionException
*/
public RestProcessDefinitionModelsCollection getAllProcessDefinitions() throws Exception
public RestProcessDefinitionModelsCollection getAllProcessDefinitions()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "process-definitions?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestProcessDefinitionModelsCollection.class, request);
@@ -45,9 +45,8 @@ public class ProcessDefinitions extends ModelRequest<ProcessDefinitions>
* Retrieves a process definition using GET call on "/process-definitions/{processDefinitionId}"
*
* @return
* @throws Exception
*/
public RestProcessDefinitionModel getProcessDefinition() throws Exception
public RestProcessDefinitionModel getProcessDefinition()
{
Utility.checkObjectIsInitialized(processDefinition, "processDefinition");
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "process-definitions/{processDefinitionId}?{parameters}",
@@ -59,9 +58,8 @@ public class ProcessDefinitions extends ModelRequest<ProcessDefinitions>
* Retrieves an image that represents a single process definition using GET call on "/process-definitions/{processDefinitionId}/image"
*
* @return
* @throws Exception
*/
public RestHtmlResponse getProcessDefinitionImage() throws Exception
public RestHtmlResponse getProcessDefinitionImage()
{
Utility.checkObjectIsInitialized(processDefinition, "processDefinition");
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "process-definitions/{processDefinitionId}/image", processDefinition.getId());
@@ -72,9 +70,8 @@ public class ProcessDefinitions extends ModelRequest<ProcessDefinitions>
* Retrieves start form type definitions using GET call on "/process-definitions/{processDefinitionId}/start-form-model"
*
* @return
* @throws Exception
*/
public RestFormModelsCollection getProcessDefinitionStartFormModel() throws Exception
public RestFormModelsCollection getProcessDefinitionStartFormModel()
{
Utility.checkObjectIsInitialized(processDefinition, "processDefinition.onModel()");
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "process-definitions/{processDefinitionId}/start-form-model?{parameters}",

37
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Processes.java
View File

@@ -42,7 +42,7 @@ public class Processes extends ModelRequest<Processes>
* @return
* @throws JsonToModelConversionException
*/
public RestProcessModelsCollection getProcesses() throws Exception
public RestProcessModelsCollection getProcesses()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "processes?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestProcessModelsCollection.class, request);
@@ -54,7 +54,7 @@ public class Processes extends ModelRequest<Processes>
* @return
* @throws JsonToModelConversionException
*/
public RestProcessVariableCollection getProcessVariables() throws Exception
public RestProcessVariableCollection getProcessVariables()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "processes/{processId}/variables?{parameters}", processModel.getId(), restWrapper.getParameters());
return restWrapper.processModels(RestProcessVariableCollection.class, request);
@@ -63,9 +63,8 @@ public class Processes extends ModelRequest<Processes>
/**
* Retrieves the process identified by processId using GET /processes/{processId}
* @return
* @throws Exception
*/
public RestProcessModel getProcess() throws Exception
public RestProcessModel getProcess()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "processes/{processId}?{parameters}", processModel.getId(), restWrapper.getParameters());
return restWrapper.processModel(RestProcessModel.class, request);
@@ -73,10 +72,8 @@ public class Processes extends ModelRequest<Processes>
/**
* Delete a process using DELETE call on processes/{processId}
*
* @throws Exception
*/
public void deleteProcess() throws Exception
public void deleteProcess()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "processes/{processId}", processModel.getId());
restWrapper.processEmptyModel(request);
@@ -90,9 +87,8 @@ public class Processes extends ModelRequest<Processes>
* @param sendEmailNotifications
* @param priority
* @return
* @throws Exception
*/
public RestProcessModel addProcess(String processDefinitionKey, UserModel assignee, boolean sendEmailNotifications, Priority priority) throws Exception
public RestProcessModel addProcess(String processDefinitionKey, UserModel assignee, boolean sendEmailNotifications, Priority priority)
{
String postBody = JsonBodyGenerator.process(processDefinitionKey, assignee, sendEmailNotifications, priority);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "processes");
@@ -104,9 +100,8 @@ public class Processes extends ModelRequest<Processes>
*
* @param postBody
* @return
* @throws Exception
*/
public RestProcessModel addProcessWithBody(String postBody) throws Exception
public RestProcessModel addProcessWithBody(String postBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "processes");
return restWrapper.processModel(RestProcessModel.class, request);
@@ -119,7 +114,7 @@ public class Processes extends ModelRequest<Processes>
* @return
* @throws JsonToModelConversionException
*/
public RestProcessVariableModel addProcessVariable(RestProcessVariableModel variableModel) throws Exception
public RestProcessVariableModel addProcessVariable(RestProcessVariableModel variableModel)
{
String postBody = JsonBodyGenerator.processVariable(variableModel);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "processes/{processId}/variables", processModel.getId());
@@ -133,7 +128,7 @@ public class Processes extends ModelRequest<Processes>
* @return
* @throws JsonToModelConversionException
*/
public RestProcessVariableCollection addProcessVariables(RestProcessVariableModel... processVariablesModel) throws Exception
public RestProcessVariableCollection addProcessVariables(RestProcessVariableModel... processVariablesModel)
{
JsonArrayBuilder array = JsonBodyGenerator.defineJSONArray();
for(RestProcessVariableModel processVariableModel: processVariablesModel)
@@ -155,7 +150,7 @@ public class Processes extends ModelRequest<Processes>
* @return
* @throws JsonToModelConversionException
*/
public RestItemModelsCollection getProcessItems() throws Exception
public RestItemModelsCollection getProcessItems()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "processes/{processId}/items?{parameters}", processModel.getId(), restWrapper.getParameters());
return restWrapper.processModels(RestItemModelsCollection.class, request);
@@ -165,9 +160,8 @@ public class Processes extends ModelRequest<Processes>
* Delete a process variable using DELETE call on processes/{processId}/variables/{variableName}
*
* @param variableModel
* @throws Exception
*/
public void deleteProcessVariable(RestProcessVariableModel variableModel) throws Exception
public void deleteProcessVariable(RestProcessVariableModel variableModel)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "processes/{processId}/variables/{variableName}", processModel.getId(),
variableModel.getName());
@@ -181,7 +175,7 @@ public class Processes extends ModelRequest<Processes>
* @return
* @throws JsonToModelConversionException
*/
public RestProcessVariableModel updateProcessVariable(RestProcessVariableModel variableModel) throws Exception
public RestProcessVariableModel updateProcessVariable(RestProcessVariableModel variableModel)
{
String postBody = JsonBodyGenerator.processVariable(variableModel);
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, postBody, "processes/{processId}/variables/{variableName}", processModel.getId(),
@@ -195,7 +189,7 @@ public class Processes extends ModelRequest<Processes>
* @return
* @throws JsonToModelConversionException
*/
public RestTaskModelsCollection getProcessTasks() throws Exception
public RestTaskModelsCollection getProcessTasks()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "processes/{processId}/tasks?{parameters}", processModel.getId(), restWrapper.getParameters());
return restWrapper.processModels(RestTaskModelsCollection.class, request);
@@ -208,7 +202,7 @@ public class Processes extends ModelRequest<Processes>
* @return
* @throws JsonToModelConversionException
*/
public RestItemModel addProcessItem(FileModel fileModel) throws Exception
public RestItemModel addProcessItem(FileModel fileModel)
{
String postBody = JsonBodyGenerator.keyValueJson("id", fileModel.getNodeRefWithoutVersion());
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "processes/{processId}/items", processModel.getId());
@@ -222,7 +216,7 @@ public class Processes extends ModelRequest<Processes>
* @return
* @throws JsonToModelConversionException
*/
public RestItemModelsCollection addProcessItems(FileModel... fileModels) throws Exception
public RestItemModelsCollection addProcessItems(FileModel... fileModels)
{
JsonArrayBuilder array = JsonBodyGenerator.defineJSONArray();
for(FileModel fileModel: fileModels)
@@ -239,9 +233,8 @@ public class Processes extends ModelRequest<Processes>
* Delete a process item using DELETE call on processes/{processId}/items/{itemId}
*
* @param itemModel
* @throws Exception
*/
public void deleteProcessItem(RestItemModel itemModel) throws Exception
public void deleteProcessItem(RestItemModel itemModel)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "processes/{processId}/items/{itemId}", processModel.getId(), itemModel.getId());
restWrapper.processEmptyModel(request);

9
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Queries.java
View File

@@ -19,9 +19,8 @@ public class Queries extends ModelRequest<Queries>
* GET on queries/nodes
*
* @return
* @throws Exception
*/
public RestNodeModelsCollection findNodes() throws Exception
public RestNodeModelsCollection findNodes()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "queries/nodes?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestNodeModelsCollection.class, request);
@@ -31,9 +30,8 @@ public class Queries extends ModelRequest<Queries>
* GET on queries/people
*
* @return
* @throws Exception
*/
public RestPersonModelsCollection findPeople() throws Exception
public RestPersonModelsCollection findPeople()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "queries/people?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestPersonModelsCollection.class, request);
@@ -43,9 +41,8 @@ public class Queries extends ModelRequest<Queries>
* GET on queries/people
*
* @return
* @throws Exception
*/
public RestSiteModelsCollection findSites() throws Exception
public RestSiteModelsCollection findSites()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "queries/sites?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestSiteModelsCollection.class, request);

29
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/SharedLinks.java
View File

@@ -34,7 +34,7 @@ public class SharedLinks extends ModelRequest<SharedLinks>
* @return RestSharedLinksModelCollection
* @throws JsonToModelConversionException
*/
public RestSharedLinksModelCollection getSharedLinks() throws Exception
public RestSharedLinksModelCollection getSharedLinks()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "shared-links?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestSharedLinksModelCollection.class, request);
@@ -47,7 +47,7 @@ public class SharedLinks extends ModelRequest<SharedLinks>
* @return RestSharedLinkModel
* @throws JsonToModelConversionException
*/
public RestSharedLinksModel getSharedLink(RestSharedLinksModel sharedLinksModel) throws Exception
public RestSharedLinksModel getSharedLink(RestSharedLinksModel sharedLinksModel)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "shared-links/{sharedLinkId}?{parameters}", sharedLinksModel.getId(),
restWrapper.getParameters());
@@ -59,9 +59,8 @@ public class SharedLinks extends ModelRequest<SharedLinks>
*
* @param sharedLinksModel
* @return RestResponse
* @throws Exception
*/
public RestResponse getSharedLinkContent(RestSharedLinksModel sharedLinksModel) throws Exception
public RestResponse getSharedLinkContent(RestSharedLinksModel sharedLinksModel)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "shared-links/{sharedLinkId}/content?{parameters}", sharedLinksModel.getId(),
restWrapper.getParameters());
@@ -74,9 +73,8 @@ public class SharedLinks extends ModelRequest<SharedLinks>
* @param sharedLinksModel
* @param postBody
* @return RestResponse
* @throws Exception
*/
public RestResponse sendSharedLinkEmail(RestSharedLinksModel sharedLinksModel, String postBody) throws Exception
public RestResponse sendSharedLinkEmail(RestSharedLinksModel sharedLinksModel, String postBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "shared-links/{sharedLinkId}/email?{parameters}", sharedLinksModel.getId(),
restWrapper.getParameters());
@@ -89,7 +87,7 @@ public class SharedLinks extends ModelRequest<SharedLinks>
* @return RestRenditionInfoModelCollection
* @throws JsonToModelConversionException
*/
public RestRenditionInfoModelCollection getSharedLinkRenditions(RestSharedLinksModel sharedLinksModel) throws Exception
public RestRenditionInfoModelCollection getSharedLinkRenditions(RestSharedLinksModel sharedLinksModel)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "shared-links/{sharedLinkId}/renditions?{parameters}", sharedLinksModel.getId(),
restWrapper.getParameters());
@@ -104,7 +102,7 @@ public class SharedLinks extends ModelRequest<SharedLinks>
* @return RestRenditionInfoModel
* @throws JsonToModelConversionException
*/
public RestRenditionInfoModel getSharedLinkRendition(RestSharedLinksModel sharedLinksModel, String renditionId) throws Exception
public RestRenditionInfoModel getSharedLinkRendition(RestSharedLinksModel sharedLinksModel, String renditionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "shared-links/{sharedLinkId}/renditions/{renditionId}?{parameters}",
sharedLinksModel.getId(), renditionId, restWrapper.getParameters());
@@ -117,9 +115,8 @@ public class SharedLinks extends ModelRequest<SharedLinks>
* @param sharedLinksModel
* @param renditionId
* @return RestRenditionInfoModel
* @throws Exception
*/
public RestResponse getSharedLinkRenditionContent(RestSharedLinksModel sharedLinksModel, String renditionId) throws Exception
public RestResponse getSharedLinkRenditionContent(RestSharedLinksModel sharedLinksModel, String renditionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "shared-links/{sharedLinkId}/renditions/{renditionId}/content?{parameters}",
sharedLinksModel.getId(), renditionId, restWrapper.getParameters());
@@ -131,9 +128,8 @@ public class SharedLinks extends ModelRequest<SharedLinks>
*
* @param RestSharedLinksModel
* @return void
* @throws Exception
*/
public void deleteSharedLink(RestSharedLinksModel sharedLinksModel) throws Exception
public void deleteSharedLink(RestSharedLinksModel sharedLinksModel)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "shared-links/{sharedLinkId}", sharedLinksModel.getId());
restWrapper.processEmptyModel(request);
@@ -144,9 +140,8 @@ public class SharedLinks extends ModelRequest<SharedLinks>
*
* @param file
* @return RestSharedLinksModel
* @throws Exception
*/
public RestSharedLinksModel createSharedLink(FileModel file) throws Exception
public RestSharedLinksModel createSharedLink(FileModel file)
{
String postBody = JsonBodyGenerator.keyValueJson("nodeId", file.getNodeRefWithoutVersion());
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "shared-links?{parameters}", restWrapper.getParameters());
@@ -158,9 +153,8 @@ public class SharedLinks extends ModelRequest<SharedLinks>
*
* @param file list
* @return RestSharedLinksModelCollection
* @throws Exception
*/
public RestSharedLinksModelCollection createSharedLinks(FileModel... files) throws Exception
public RestSharedLinksModelCollection createSharedLinks(FileModel... files)
{
JsonArrayBuilder array = JsonBodyGenerator.defineJSONArray();
for (FileModel file : files)
@@ -179,9 +173,8 @@ public class SharedLinks extends ModelRequest<SharedLinks>
* @param file
* @param expiryDate: format: "2027-03-23T23:00:00.000+0000";
* @return RestSharedLinksModel
* @throws Exception
*/
public RestSharedLinksModel createSharedLinkWithExpiryDate(FileModel file, String expiryDate) throws Exception
public RestSharedLinksModel createSharedLinkWithExpiryDate(FileModel file, String expiryDate)
{
HashMap<String, String> body = new HashMap<String, String>();
body.put("nodeId", file.getNodeRefWithoutVersion());

6
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Site.java
View File

@@ -187,9 +187,8 @@ public class Site extends ModelRequest<Site>
* Create a collaboration site
*
* @return the properties of the created site
* @throws Exception
*/
public RestSiteModel createSite() throws Exception
public RestSiteModel createSite()
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, site.toJson(), "sites?{parameters}", restWrapper.getParameters());
return restWrapper.processModel(RestSiteModel.class, request);
@@ -218,9 +217,8 @@ public class Site extends ModelRequest<Site>
* }
*
* @return the properties of an updated site
* @throws Exception
*/
public RestSiteModel updateSite(SiteModel site) throws Exception
public RestSiteModel updateSite(SiteModel site)
{
String siteBody = JsonBodyGenerator.updateSiteRequest(site);
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, siteBody, "sites/{siteId}", site.getId());

7
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Tags.java
View File

@@ -24,7 +24,7 @@ public class Tags extends ModelRequest<Tags>
* @return
* @throws JsonToModelConversionException
*/
public RestTagModelsCollection getTags() throws Exception
public RestTagModelsCollection getTags()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "tags?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestTagModelsCollection.class, request);
@@ -35,9 +35,8 @@ public class Tags extends ModelRequest<Tags>
*
* @param tag
* @return
* @throws Exception
*/
public RestTagModel getTag() throws Exception
public RestTagModel getTag()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "tags/{tagId}?{parameters}", tag.getId(), restWrapper.getParameters());
return restWrapper.processModel(RestTagModel.class, request);
@@ -51,7 +50,7 @@ public class Tags extends ModelRequest<Tags>
* @return
* @throws JsonToModelConversionException
*/
public RestTagModel update(String newTag) throws Exception
public RestTagModel update(String newTag)
{
String postBody = JsonBodyGenerator.keyValueJson("tag", newTag);
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, postBody, "tags/{tagId}", tag.getId());

39
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Task.java
View File

@@ -38,9 +38,8 @@ public class Task extends ModelRequest<Task>
* Retrieve a list of tasks visible for the authenticated user using GET call on "/tasks"
*
* @return
* @throws Exception
*/
public RestTaskModelsCollection getTasks() throws Exception
public RestTaskModelsCollection getTasks()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "tasks?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestTaskModelsCollection.class, request);
@@ -51,9 +50,8 @@ public class Task extends ModelRequest<Task>
*
* @param taskId
* @return
* @throws Exception
*/
public RestTaskModel getTask() throws Exception
public RestTaskModel getTask()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "tasks/{taskId}?{parameters}", task.getId(), restWrapper.getParameters());
return restWrapper.processModel(RestTaskModel.class, request);
@@ -66,7 +64,7 @@ public class Task extends ModelRequest<Task>
* @return
* @throws JsonToModelConversionException
*/
public RestTaskModel updateTask(String newStateValue) throws Exception
public RestTaskModel updateTask(String newStateValue)
{
return updateTask(JsonBodyGenerator.defineJSON().add("state", newStateValue).build());
}
@@ -76,9 +74,8 @@ public class Task extends ModelRequest<Task>
*
* @param inputJson the json used as input for PUT call
* @return
* @throws Exception
*/
public RestTaskModel updateTask(JsonObject inputJson) throws Exception
public RestTaskModel updateTask(JsonObject inputJson)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, inputJson.toString(), "tasks/{taskId}?{parameters}", task.getId(), restWrapper.getParameters());
return restWrapper.processModel(RestTaskModel.class, request);
@@ -89,9 +86,8 @@ public class Task extends ModelRequest<Task>
*
* @param taskId
* @return
* @throws Exception
*/
public RestVariableModelsCollection getTaskVariables() throws Exception
public RestVariableModelsCollection getTaskVariables()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "tasks/{taskId}/variables?{parameters}", task.getId(), restWrapper.getParameters());
return restWrapper.processModels(RestVariableModelsCollection.class, request);
@@ -105,7 +101,7 @@ public class Task extends ModelRequest<Task>
* @return
* @throws JsonToModelConversionException
*/
public RestVariableModel updateTaskVariable(RestVariableModel variableModel) throws Exception
public RestVariableModel updateTaskVariable(RestVariableModel variableModel)
{
String postBody = JsonBodyGenerator.taskVariable(variableModel);
RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, postBody, "tasks/{taskId}/variables/{variableName}", task.getId(),
@@ -120,7 +116,7 @@ public class Task extends ModelRequest<Task>
* @return
* @throws JsonToModelConversionException
*/
public RestVariableModel addTaskVariable(RestVariableModel variableModel) throws Exception
public RestVariableModel addTaskVariable(RestVariableModel variableModel)
{
String postBody = JsonBodyGenerator.taskVariable(variableModel);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "tasks/{taskId}/variables", task.getId());
@@ -134,7 +130,7 @@ public class Task extends ModelRequest<Task>
* @return
* @throws JsonToModelConversionException
*/
public RestVariableModelsCollection addTaskVariables(RestVariableModel... taskVariablesModel) throws Exception
public RestVariableModelsCollection addTaskVariables(RestVariableModel... taskVariablesModel)
{
JsonArrayBuilder array = JsonBodyGenerator.defineJSONArray();
for(RestVariableModel taskVariableModel: taskVariablesModel)
@@ -156,7 +152,7 @@ public class Task extends ModelRequest<Task>
* @return
* @throws JsonToModelConversionException
*/
public void deleteTaskVariable(RestVariableModel variableModel) throws Exception
public void deleteTaskVariable(RestVariableModel variableModel)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "tasks/{taskId}/variables/{variableName} ", task.getId(),
variableModel.getName());
@@ -170,7 +166,7 @@ public class Task extends ModelRequest<Task>
* @return
* @throws JsonToModelConversionException
*/
public RestItemModel addTaskItem(FileModel fileModel) throws Exception
public RestItemModel addTaskItem(FileModel fileModel)
{
String postBody = JsonBodyGenerator.keyValueJson("id", fileModel.getNodeRef().split(";")[0]);
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "tasks/{taskId}/items", task.getId());
@@ -184,7 +180,7 @@ public class Task extends ModelRequest<Task>
* @return
* @throws JsonToModelConversionException
*/
public RestItemModelsCollection addTaskItems(FileModel... fileModels) throws Exception
public RestItemModelsCollection addTaskItems(FileModel... fileModels)
{
JsonArrayBuilder array = JsonBodyGenerator.defineJSONArray();
for(FileModel fileModel: fileModels)
@@ -203,9 +199,8 @@ public class Task extends ModelRequest<Task>
*
* @param taskId
* @return
* @throws Exception
*/
public RestItemModelsCollection getTaskItems() throws Exception
public RestItemModelsCollection getTaskItems()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "tasks/{taskId}/items?{parameters}", task.getId(), restWrapper.getParameters());
return restWrapper.processModels(RestItemModelsCollection.class, request);
@@ -215,9 +210,8 @@ public class Task extends ModelRequest<Task>
* Retrieves models of the task form type definition
* @param taskModel
* @return
* @throws Exception
*/
public RestFormModelsCollection getTaskFormModel() throws Exception
public RestFormModelsCollection getTaskFormModel()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "tasks/{taskId}/task-form-model?{parameters}", task.getId(), restWrapper.getParameters());
return restWrapper.processModels(RestFormModelsCollection.class, request);
@@ -228,10 +222,8 @@ public class Task extends ModelRequest<Task>
*
* @param taskId
* @param itemId
*
* @throws Exception
*/
public void deleteTaskItem(RestItemModel itemModel) throws Exception
public void deleteTaskItem(RestItemModel itemModel)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "tasks/{taskId}/items/{itemId}", task.getId(),
itemModel.getId());
@@ -243,9 +235,8 @@ public class Task extends ModelRequest<Task>
*
* @param taskId
* @return
* @throws Exception
*/
public RestCandidateModelsCollection getTaskCandidates() throws Exception
public RestCandidateModelsCollection getTaskCandidates()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "tasks/{taskId}/candidates?{parameters}", task.getId(), restWrapper.getParameters());
return restWrapper.processModels(RestCandidateModelsCollection.class, request);

5
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Tenant.java
View File

@@ -32,10 +32,9 @@ public class Tenant extends ModelRequest<Tenant>
*
* @param userModel
* @return
* @throws Exception
* @throws JsonToModelConversionException
*/
public void createTenant(UserModel userModel) throws Exception
public void createTenant(UserModel userModel)
{
STEP(String.format("DATAPREP: Create new tenant %s", userModel.getDomain()));
String json = String.format("{\"tenantDomain\": \"%s\", \"tenantAdminPassword\": \"%s\"}", userModel.getDomain(), DataUser.PASSWORD);
@@ -45,7 +44,7 @@ public class Tenant extends ModelRequest<Tenant>
.post(String.format("%s/%s", restProperties.envProperty().getFullServerUrl(), "alfresco/service/api/tenants")).andReturn();
if (!Integer.valueOf(returnedResponse.getStatusCode()).equals(HttpStatus.OK.value()))
{
throw new Exception(String.format("Tenant is not created: %s", returnedResponse.asString()));
throw new IllegalStateException(String.format("Tenant is not created: %s", returnedResponse.asString()));
}
}
}

2
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/authAPI/RestAuthAPI.java
View File

@@ -18,7 +18,7 @@ public class RestAuthAPI extends ModelRequest<RestAuthAPI>
restWrapper.configureRequestSpec().setBasePath(RestAssured.basePath);
}
public RestTicketModel createTicket(RestTicketBodyModel ticketBody) throws Exception
public RestTicketModel createTicket(RestTicketBodyModel ticketBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, ticketBody.toJson(), "tickets");
return restWrapper.processModel(RestTicketModel.class, request);

28
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/coreAPI/RestCoreAPI.java
View File

@@ -64,9 +64,8 @@ public class RestCoreAPI extends ModelRequest<RestCoreAPI>
* Provides DSL on all REST calls under <code>/sites</code> API path
*
* @return {@link Site}
* @throws Exception
*/
public RestSiteModelsCollection getSites() throws Exception
public RestSiteModelsCollection getSites()
{
return new Site(null, restWrapper).getSites();
}
@@ -75,9 +74,8 @@ public class RestCoreAPI extends ModelRequest<RestCoreAPI>
* Provides DSL on all REST calls under <code>/nodes</code> API path
*
* @return {@link Node}
* @throws Exception
*/
public Node usingResource(RepoTestModel node) throws Exception
public Node usingResource(RepoTestModel node)
{
return new Node(node, restWrapper);
}
@@ -87,14 +85,13 @@ public class RestCoreAPI extends ModelRequest<RestCoreAPI>
*
* @param node
* @return
* @throws Exception
*/
public Node usingNode(RepoTestModel node) throws Exception
public Node usingNode(RepoTestModel node)
{
return new Node(node, restWrapper);
}
public Node usingNode() throws Exception
public Node usingNode()
{
return new Node(restWrapper);
}
@@ -108,9 +105,8 @@ public class RestCoreAPI extends ModelRequest<RestCoreAPI>
* Provides DSL of all REST calls under <code>/people</code> API path
*
* @return {@link People}
* @throws Exception
*/
public People usingUser(UserModel person) throws Exception
public People usingUser(UserModel person)
{
return new People(person, restWrapper);
}
@@ -119,9 +115,8 @@ public class RestCoreAPI extends ModelRequest<RestCoreAPI>
* Make REST calls using current authenticated user, but using -me- instead of username
*
* @return {@link People}
* @throws Exception
*/
public People usingMe() throws Exception
public People usingMe()
{
UserModel userModel = new UserModel("-me-", restWrapper.getTestUser().getPassword());
userModel.setDomain(restWrapper.getTestUser().getDomain());
@@ -134,9 +129,8 @@ public class RestCoreAPI extends ModelRequest<RestCoreAPI>
* This is set on the {@link #authenticateUser(UserModel)} call
*
* @return {@link People}
* @throws Exception
*/
public People usingAuthUser() throws Exception
public People usingAuthUser()
{
return new People(restWrapper.getTestUser(), restWrapper);
}
@@ -156,12 +150,12 @@ public class RestCoreAPI extends ModelRequest<RestCoreAPI>
return new Tags(tag, restWrapper);
}
public RestTagModelsCollection getTags() throws Exception
public RestTagModelsCollection getTags()
{
return new Tags(null, restWrapper).getTags();
}
public RestTagModel getTag(RestTagModel tag) throws Exception
public RestTagModel getTag(RestTagModel tag)
{
return new Tags(tag, restWrapper).getTag();
}
@@ -171,7 +165,7 @@ public class RestCoreAPI extends ModelRequest<RestCoreAPI>
return new Queries(restWrapper);
}
public Audit usingAudit() throws Exception
public Audit usingAudit()
{
return new Audit(restWrapper);
}
@@ -209,7 +203,7 @@ public class RestCoreAPI extends ModelRequest<RestCoreAPI>
return new Downloads(restWrapper);
}
public Downloads usingDownloads(RestDownloadsModel downloadsModel) throws Exception
public Downloads usingDownloads(RestDownloadsModel downloadsModel)
{
return new Downloads(downloadsModel, restWrapper);
}

6
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/privateAPI/RestPrivateAPI.java
View File

@@ -84,7 +84,7 @@ public class RestPrivateAPI extends ModelRequest<RestPrivateAPI>
*
* @return {@link Subscribers}
*/
public Subscriptions withSubscriber(RestSubscriberModel subscriber) throws Exception
public Subscriptions withSubscriber(RestSubscriberModel subscriber)
{
return new Subscriptions(subscriber, restWrapper);
}
@@ -94,7 +94,7 @@ public class RestPrivateAPI extends ModelRequest<RestPrivateAPI>
*
* @return {@link Subscribers}
*/
public Subscriptions withSubscriber(String subscriberID) throws Exception
public Subscriptions withSubscriber(String subscriberID)
{
RestSubscriberModel s = new RestSubscriberModel();
s.setId(subscriberID);
@@ -106,7 +106,7 @@ public class RestPrivateAPI extends ModelRequest<RestPrivateAPI>
*
* @return {@link Subscribers}
*/
public Sync withSubscription(RestSyncNodeSubscriptionModel nodeSubscription) throws Exception
public Sync withSubscription(RestSyncNodeSubscriptionModel nodeSubscription)
{
RestSubscriberModel s = new RestSubscriberModel();
s.setId(nodeSubscription.getDeviceSubscriptionId());

14
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SolrAPI.java
View File

@@ -43,25 +43,25 @@ public class SolrAPI extends ModelRequest<SolrAPI>
restWrapper.configureRequestSpec().setBasePath(RestAssured.basePath);
}
public RestTextResponse getConfig() throws Exception
public RestTextResponse getConfig()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "config?{parameters}", restWrapper.getParameters());
return restWrapper.processTextResponse(request);
}
public RestTextResponse getConfigOverlay() throws Exception
public RestTextResponse getConfigOverlay()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "config/overlay?{parameters}", restWrapper.getParameters());
return restWrapper.processTextResponse(request);
}
public RestTextResponse getConfigParams() throws Exception
public RestTextResponse getConfigParams()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "config/params?{parameters}", restWrapper.getParameters());
return restWrapper.processTextResponse(request);
}
public RestTextResponse postConfig(String queryBody) throws Exception
public RestTextResponse postConfig(String queryBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, queryBody, "config");
return restWrapper.processTextResponse(request);
@@ -72,13 +72,13 @@ public class SolrAPI extends ModelRequest<SolrAPI>
* @param urlActionPath some action name (like "delete")
* @param queryBody parameters for the action
*/
public RestTextResponse postAction(String urlActionPath, String queryBody) throws Exception
public RestTextResponse postAction(String urlActionPath, String queryBody)
{
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, queryBody, urlActionPath);
return restWrapper.processTextResponse(request);
}
public RestTextResponse getSelectQuery() throws Exception
public RestTextResponse getSelectQuery()
{
List<Header> headers = new ArrayList<Header>();
headers.add(new Header("Content-Type", "application/xml"));
@@ -92,7 +92,7 @@ public class SolrAPI extends ModelRequest<SolrAPI>
/**
* Executes a query in SOLR using JSON format for the results
*/
public RestTextResponse getSelectQueryJson() throws Exception
public RestTextResponse getSelectQueryJson()
{
List<Header> headers = new ArrayList<Header>();
headers.add(new Header("Content-Type", "application/json"));

2
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SolrAdminAPI.java
View File

@@ -44,7 +44,7 @@ public class SolrAdminAPI extends ModelRequest<SolrAdminAPI>
restWrapper.configureRequestSpec().setBasePath(RestAssured.basePath);
}
public RestResponse getAction(String action) throws Exception
public RestResponse getAction(String action)
{
List<Header> headers = new ArrayList<Header>();
headers.add(new Header("Content-Type", "application/json"));

3
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Healthcheck.java
View File

@@ -24,9 +24,8 @@ public class Healthcheck extends ModelRequest<RestPrivateAPI>
/**
* Get Healthcheck using GET call on alfresco/healthcheck
* @return {@link RestSyncServiceHealthCheckModel}
* @throws Exception
*/
public RestSyncServiceHealthCheckModel getHealthcheck() throws Exception
public RestSyncServiceHealthCheckModel getHealthcheck()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "healthcheck?{parameters}", restWrapper.getParameters());
return restWrapper.processModelWithoutEntryObject(RestSyncServiceHealthCheckModel.class, request);

6
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Subscribers.java
View File

@@ -26,9 +26,8 @@ public class Subscribers extends ModelRequest<RestPrivateAPI>
/**
* Get Subscription(s) using GET call on /subscribers
* @return {@link RestSubscriberModelCollection}
* @throws Exception
*/
public RestSubscriberModelCollection getSubscribers() throws Exception
public RestSubscriberModelCollection getSubscribers()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "subscribers?{parameters}", restWrapper.getParameters());
return restWrapper.processModels(RestSubscriberModelCollection.class, request);
@@ -40,9 +39,8 @@ public class Subscribers extends ModelRequest<RestPrivateAPI>
* @param deviceOS
* @param clientVersion
* @return {@link RestSubscriberModel}
* @throws Exception
*/
public RestSubscriberModel registerDevice(String deviceOS, String clientVersion) throws Exception
public RestSubscriberModel registerDevice(String deviceOS, String clientVersion)
{
HashMap<String, String> body = new HashMap<String, String>();
body.put("deviceOS", deviceOS);

13
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Subscriptions.java
View File

@@ -32,7 +32,7 @@ public class Subscriptions extends ModelRequest<RestPrivateAPI>
String nodeSubscriptionURL = subscriptionsURL + "/{nodeSubscriptionId}";
String params = "?{parameters}";
public Subscriptions(RestSubscriberModel subscriber, RestWrapper restWrapper) throws Exception
public Subscriptions(RestSubscriberModel subscriber, RestWrapper restWrapper)
{
super(restWrapper);
this.subscriber = subscriber;
@@ -44,9 +44,9 @@ public class Subscriptions extends ModelRequest<RestPrivateAPI>
*
* @param targetNodeIds: one or more
* @return RestSyncNodeSubscriptionModel
* @throws Exception: EmptyJsonResponseException, JsonToModelConversionException
* @throws EmptyJsonResponseException, JsonToModelConversionException
*/
public RestSyncNodeSubscriptionModelCollection subscribeToNodes(String... targetNodeIds) throws Exception
public RestSyncNodeSubscriptionModelCollection subscribeToNodes(String... targetNodeIds)
{
JsonArrayBuilder array = JsonBodyGenerator.defineJSONArray();
@@ -86,9 +86,8 @@ public class Subscriptions extends ModelRequest<RestPrivateAPI>
* Get NODE Subscription(s) using GET call on /subscribers/{deviceSubscriptionId}/subscriptions
*
* @return {@link RestSyncNodeSubscriptionModelCollection}
* @throws Exception
*/
public RestSyncNodeSubscriptionModelCollection getSubscriptions() throws Exception
public RestSyncNodeSubscriptionModelCollection getSubscriptions()
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, subscriptionsURL + params, this.subscriber.getId(), restWrapper.getParameters());
return restWrapper.processModels(RestSyncNodeSubscriptionModelCollection.class, request);
@@ -98,9 +97,9 @@ public class Subscriptions extends ModelRequest<RestPrivateAPI>
* Get NODE Subscription using GET call on /subscribers/{deviceSubscriptionId}/subscriptions/{nodeSubscriptionId}
*
* @return RestSyncNodeSubscriptionModelCollection
* @throws Exception: EmptyJsonResponseException, JsonToModelConversionException
* @throws EmptyJsonResponseException, JsonToModelConversionException
*/
public RestSyncNodeSubscriptionModel getSubscription(String nodeSubscriptionId) throws Exception
public RestSyncNodeSubscriptionModel getSubscription(String nodeSubscriptionId)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, nodeSubscriptionURL + params, this.subscriber.getId(), nodeSubscriptionId,
restWrapper.getParameters());

9
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Sync.java
View File

@@ -31,7 +31,7 @@ public class Sync extends ModelRequest<RestPrivateAPI>
String syncSetURL = requestSyncURL + "/{syncId}";
String params = "?{parameters}";
public Sync(RestSyncNodeSubscriptionModel subscription, RestWrapper restWrapper) throws Exception
public Sync(RestSyncNodeSubscriptionModel subscription, RestWrapper restWrapper)
{
super(restWrapper);
restWrapper.configureSyncServiceEndPoint();
@@ -46,10 +46,8 @@ public class Sync extends ModelRequest<RestPrivateAPI>
* @param nodeSubscriptionId
* @param clientChanges
* @return
* @throws Exception
*/
public RestSyncSetRequestModel startSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, List<RestSyncSetChangesModel> clientChanges, String clientVersion)
throws Exception
{
JsonArrayBuilder array = JsonBodyGenerator.defineJSONArray();
for (RestSyncSetChangesModel change : clientChanges)
@@ -69,7 +67,7 @@ public class Sync extends ModelRequest<RestPrivateAPI>
return model;
}
public RestWrapper endSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, RestSyncSetRequestModel sync) throws Exception
public RestWrapper endSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, RestSyncSetRequestModel sync)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, syncSetURL + params, this.subscriber, nodeSubscriptionModel.getId(),
sync.getSyncId(), restWrapper.getParameters());
@@ -85,9 +83,8 @@ public class Sync extends ModelRequest<RestPrivateAPI>
*
* @param syncRequest
* @return
* @throws Exception
*/
public RestSyncSetGetModel getSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, RestSyncSetRequestModel sync) throws Exception
public RestSyncSetGetModel getSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, RestSyncSetRequestModel sync)
{
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, syncSetURL + params, this.subscriber, nodeSubscriptionModel.getId(), sync.getSyncId(),
restWrapper.getParameters());

14
packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/workflowAPI/RestWorkflowAPI.java
View File

@@ -40,7 +40,7 @@ public class RestWorkflowAPI extends ModelRequest<RestWorkflowAPI>
*
* @return {@link RestProcessModel}
*/
public RestProcessModel addProcess(String processDefinitionKey, UserModel assignee, boolean sendEmailNotifications, Priority priority) throws Exception
public RestProcessModel addProcess(String processDefinitionKey, UserModel assignee, boolean sendEmailNotifications, Priority priority)
{
return new Processes(restWrapper).addProcess(processDefinitionKey, assignee, sendEmailNotifications, priority);
}
@@ -50,7 +50,7 @@ public class RestWorkflowAPI extends ModelRequest<RestWorkflowAPI>
*
* @return {@link RestProcessModel}
*/
public RestProcessModel addProcessWithBody(JsonObject postBody) throws Exception
public RestProcessModel addProcessWithBody(JsonObject postBody)
{
return new Processes(restWrapper).addProcessWithBody(postBody.toString());
}
@@ -70,7 +70,7 @@ public class RestWorkflowAPI extends ModelRequest<RestWorkflowAPI>
*
* @return {@link RestProcessModelsCollection}
*/
public RestProcessModelsCollection getProcesses() throws Exception
public RestProcessModelsCollection getProcesses()
{
return new Processes(restWrapper).getProcesses();
}
@@ -80,7 +80,7 @@ public class RestWorkflowAPI extends ModelRequest<RestWorkflowAPI>
*
* @return {@link RestDeploymentModelsCollection}
*/
public RestDeploymentModelsCollection getDeployments() throws Exception
public RestDeploymentModelsCollection getDeployments()
{
return new Deployments(restWrapper).getDeployments();
}
@@ -100,7 +100,7 @@ public class RestWorkflowAPI extends ModelRequest<RestWorkflowAPI>
*
* @return {@link RestProcessDefinitionModelsCollection}
*/
public RestProcessDefinitionModelsCollection getAllProcessDefinitions() throws Exception
public RestProcessDefinitionModelsCollection getAllProcessDefinitions()
{
return new ProcessDefinitions(restWrapper).getAllProcessDefinitions();
}
@@ -120,7 +120,7 @@ public class RestWorkflowAPI extends ModelRequest<RestWorkflowAPI>
*
* @return {@link Processes}
*/
public Processes usingProcess(ProcessModel processModel) throws Exception
public Processes usingProcess(ProcessModel processModel)
{
return new Processes(processModel, restWrapper);
}
@@ -130,7 +130,7 @@ public class RestWorkflowAPI extends ModelRequest<RestWorkflowAPI>
*
* @return {@link RestTaskModelsCollection}
*/
public RestTaskModelsCollection getTasks() throws Exception
public RestTaskModelsCollection getTasks()
{
return new Task(restWrapper, null).getTasks();
}

8
packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/RestDemoTests.java
View File

@@ -34,10 +34,9 @@ public class RestDemoTests extends RestTest
* Perform GET site call, validate that site title, description and visibility are correct <br/>
*
* @throws JsonToModelConversionException
* @throws Exception
*/
@Test(groups = { "demo" })
public void adminRetrievesCorrectSiteDetails() throws JsonToModelConversionException, Exception
public void adminRetrievesCorrectSiteDetails() throws JsonToModelConversionException
{
restClient.withCoreAPI().getSites().assertThat()
.entriesListContains("id", siteModel.getId());
@@ -54,11 +53,10 @@ public class RestDemoTests extends RestTest
* POST one comment to file using admin user <br/>
* Perform GET comments, check the new one is listed <br/>
* Update existing comment using PUT call, check that comment content is updated <br/>
* @throws Exception
*/
//Opened DESKTOPAPP-475 for fixing the failing test
// @Test(groups = { "demo" })
public void adminCanPostAndUpdateComments() throws Exception
public void adminCanPostAndUpdateComments()
{
FileModel fileModel = dataContent.usingUser(userModel)
.usingResource(FolderModel.getSharedFolderModel())
@@ -80,7 +78,7 @@ public class RestDemoTests extends RestTest
* @throws JsonToModelConversionException
*/
@Test(groups = { "demo" })
public void adminCanAddAndUpdateSiteMemberDetails() throws Exception
public void adminCanAddAndUpdateSiteMemberDetails()
{
UserModel testUser = dataUser.createRandomTestUser("testUser");
testUser.setUserRole(UserRole.SiteConsumer);

8
packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/SampleCommentsTests.java
View File

@@ -21,7 +21,7 @@ public class SampleCommentsTests extends RestTest
private FileModel document;
@BeforeClass(alwaysRun=true)
public void dataPreparation() throws Exception
public void dataPreparation()
{
userModel = dataUser.getAdminUser();
siteModel = dataSite.usingUser(userModel).createPublicRandomSite();
@@ -31,21 +31,21 @@ public class SampleCommentsTests extends RestTest
}
@Test(groups = { "demo" })
public void admiShouldAddComment() throws JsonToModelConversionException, Exception
public void admiShouldAddComment() throws JsonToModelConversionException
{
restClient.withCoreAPI().usingResource(document).addComment("This is a new comment");
restClient.assertStatusCodeIs(HttpStatus.CREATED);
}
@Test(groups = { "demo" })
public void admiShouldRetrieveComments() throws Exception
public void admiShouldRetrieveComments()
{
restClient.withCoreAPI().usingResource(document).getNodeComments();
restClient.assertStatusCodeIs(HttpStatus.OK);
}
@Test(groups = { "demo" })
public void adminShouldUpdateComment() throws JsonToModelConversionException, Exception
public void adminShouldUpdateComment() throws JsonToModelConversionException
{
RestCommentModel commentModel = restClient.withCoreAPI().usingResource(document).addComment("This is a new comment");

2
packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/SamplePeopleTests.java
View File

@@ -23,7 +23,7 @@ public class SamplePeopleTests extends RestTest
}
@Test(groups = { "demo" })
public void adminShouldRetrievePerson() throws Exception
public void adminShouldRetrievePerson()
{
restClient.withCoreAPI().usingUser(userModel).getPerson().assertThat().field("id").isNotEmpty();
restClient.assertStatusCodeIs(HttpStatus.OK);

4
packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/workshop/RestApiDemoTests.java
View File

@@ -18,7 +18,7 @@ public class RestApiDemoTests extends RestTest
* Expected: the response contains the user added as a member to the site
*/
@Test(groups = { "demo" })
public void verifyGetSiteMembersRestApiCall() throws Exception
public void verifyGetSiteMembersRestApiCall()
{
UserModel user = dataUser.createRandomTestUser();
SiteModel site = dataSite.usingUser(user).createPublicRandomSite();
@@ -40,7 +40,7 @@ public class RestApiDemoTests extends RestTest
*/
@Test(groups = { "demo" })
public void verifyGetASiteMemberApiCall() throws Exception
public void verifyGetASiteMemberApiCall()
{
UserModel user = dataUser.createRandomTestUser();
SiteModel site = dataSite.usingUser(user).createPublicRandomSite();

4
packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/demo/workshop/RestApiWorkshopTests.java
View File

@@ -11,7 +11,7 @@ import org.testng.annotations.Test;
public class RestApiWorkshopTests extends RestTest
{
@Test(groups = { "demo" })
public void verifyGetSitesRestApiCall() throws Exception
public void verifyGetSitesRestApiCall()
{
// creating a random user in repository
@@ -24,7 +24,7 @@ public class RestApiWorkshopTests extends RestTest
}
@Test(groups = { "demo" })
public void verifyGetASiteRestApiCall() throws Exception
public void verifyGetASiteRestApiCall()
{
// creating a random user in repository

8
packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/model/ModelAssertionTest.java
View File

@@ -18,13 +18,13 @@ import static org.testng.Assert.fail;
public class ModelAssertionTest {
@Test(groups = "unit")
public void iCanAssertExistingProperty() throws Exception {
public void iCanAssertExistingProperty() {
Person p = new Person();
p.assertThat().field("id").is("1234");
}
@Test(groups = "unit")
public void iCanAssertExistingPropertyNegative() throws Exception {
public void iCanAssertExistingPropertyNegative() {
Person p = new Person();
p.assertThat().field("id").isNot("12342");
RestPersonModel rp = new RestPersonModel();
@@ -33,14 +33,14 @@ public class ModelAssertionTest {
}
@Test(groups = "unit", expectedExceptions = AssertionError.class)
public void iHaveOneExceptionThrownWithSelfExplanatoryMessageOnMissingField() throws Exception {
public void iHaveOneExceptionThrownWithSelfExplanatoryMessageOnMissingField() {
Person p = new Person();
p.assertThat().field("id2").is("12342");
}
@Test(groups = "unit")
public void iCanTakeTheValueOfFieldsThatDoesntHaveGetters() throws Exception {
public void iCanTakeTheValueOfFieldsThatDoesntHaveGetters() {
Person p = new Person();
p.assertThat().field("name").is("test");