inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-3358 We no longer need to explicitly give the "?". (#227)

Browse Source
This commit is contained in:
Tom Page
2022-08-11 10:01:17 +01:00
committed by GitHub
parent 830898c605
commit 91fcbb0b59
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1018,7 +1018,7 @@ public class Node extends ModelRequest<Node>
*/ */
public RestRuleSetModelsCollection getListOfRuleSets() public RestRuleSetModelsCollection getListOfRuleSets()
{ {
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SETS_URI + "?{parameters}", RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SETS_URI,
repoModel.getNodeRef(), restWrapper.getParameters()); repoModel.getNodeRef(), restWrapper.getParameters());
return restWrapper.processModels(RestRuleSetModelsCollection.class, request); return restWrapper.processModels(RestRuleSetModelsCollection.class, request);
} }
@@ -1031,7 +1031,7 @@ public class Node extends ModelRequest<Node>
*/ */
public RestRuleSetModel getRuleSet(String ruleSetId) public RestRuleSetModel getRuleSet(String ruleSetId)
{ {
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SET_BY_ID + "?{parameters}", RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SET_BY_ID,
repoModel.getNodeRef(), ruleSetId, restWrapper.getParameters()); repoModel.getNodeRef(), ruleSetId, restWrapper.getParameters());
return restWrapper.processModel(RestRuleSetModel.class, request); return restWrapper.processModel(RestRuleSetModel.class, request);
} }
@@ -1043,7 +1043,7 @@ public class Node extends ModelRequest<Node>
*/ */
public RestRuleSetModel getDefaultRuleSet() public RestRuleSetModel getDefaultRuleSet()
{ {
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SET_BY_ID + "?{parameters}", RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SET_BY_ID,
repoModel.getNodeRef(), "-default-", restWrapper.getParameters()); repoModel.getNodeRef(), "-default-", restWrapper.getParameters());
return restWrapper.processModel(RestRuleSetModel.class, request); return restWrapper.processModel(RestRuleSetModel.class, request);
} }

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

@@ -54,7 +54,6 @@ public class Sync extends ModelRequest<RestPrivateAPI>
RestSyncNodeSubscriptionModel subscription; RestSyncNodeSubscriptionModel subscription;
String requestSyncURL = "subscribers/{deviceSubscriptionId}/subscriptions/{nodeSubscriptionId}/sync"; String requestSyncURL = "subscribers/{deviceSubscriptionId}/subscriptions/{nodeSubscriptionId}/sync";
String syncSetURL = requestSyncURL + "/{syncId}"; String syncSetURL = requestSyncURL + "/{syncId}";
String params = "?{parameters}";
public Sync(RestSyncNodeSubscriptionModel subscription, RestWrapper restWrapper) public Sync(RestSyncNodeSubscriptionModel subscription, RestWrapper restWrapper)
{ {
@@ -82,7 +81,7 @@ public class Sync extends ModelRequest<RestPrivateAPI>
String postBody = JsonBodyGenerator.defineJSON().add("changes", array.build()).add("clientVersion", clientVersion).build().toString(); String postBody = JsonBodyGenerator.defineJSON().add("changes", array.build()).add("clientVersion", clientVersion).build().toString();
RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, requestSyncURL + params, this.subscriber, nodeSubscriptionModel.getId(), RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, requestSyncURL, this.subscriber, nodeSubscriptionModel.getId(),
restWrapper.getParameters()); restWrapper.getParameters());
// This step is necessary for this request. Without it, empty json response is returned // This step is necessary for this request. Without it, empty json response is returned
@@ -94,7 +93,7 @@ public class Sync extends ModelRequest<RestPrivateAPI>
public RestWrapper endSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, RestSyncSetRequestModel sync) public RestWrapper endSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, RestSyncSetRequestModel sync)
{ {
RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, syncSetURL + params, this.subscriber, nodeSubscriptionModel.getId(), RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, syncSetURL, this.subscriber, nodeSubscriptionModel.getId(),
sync.getSyncId(), restWrapper.getParameters()); sync.getSyncId(), restWrapper.getParameters());
restWrapper.processEmptyModel(request); restWrapper.processEmptyModel(request);
@@ -111,7 +110,7 @@ public class Sync extends ModelRequest<RestPrivateAPI>
*/ */
public RestSyncSetGetModel getSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, RestSyncSetRequestModel sync) public RestSyncSetGetModel getSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, RestSyncSetRequestModel sync)
{ {
RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, syncSetURL + params, this.subscriber, nodeSubscriptionModel.getId(), sync.getSyncId(), RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, syncSetURL, this.subscriber, nodeSubscriptionModel.getId(), sync.getSyncId(),
restWrapper.getParameters()); restWrapper.getParameters());
RestSyncSetGetModel model = restWrapper.processModelWithoutEntryObject(RestSyncSetGetModel.class, request); RestSyncSetGetModel model = restWrapper.processModelWithoutEntryObject(RestSyncSetGetModel.class, request);

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

@@ -25,21 +25,22 @@
*/ */
package org.alfresco.rest.model; package org.alfresco.rest.model;
import com.google.common.collect.ImmutableMap; import static com.google.common.collect.Sets.newHashSet;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import com.google.common.collect.ImmutableMap;
import org.alfresco.rest.core.IRestModel; import org.alfresco.rest.core.IRestModel;
import org.alfresco.rest.core.assertion.ModelAssertion; import org.alfresco.rest.core.assertion.ModelAssertion;
import org.alfresco.rest.model.RestPersonModel;
import org.junit.Ignore;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import static com.google.common.collect.Sets.newHashSet;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
public class ModelAssertionTest { public class ModelAssertionTest {
@Test(groups = "unit") @Test(groups = "unit")