From b0297595fb2ce5e7d5f6f079f93529f5481ee30b Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 5 Mar 2018 21:44:23 +0000 Subject: [PATCH 01/11] REPO-3351: Remove NodeIndexer --- .../java/org/alfresco/rest/api/tests/RepoService.java | 8 -------- .../java/org/alfresco/rest/api/tests/TestFavourites.java | 5 ----- 2 files changed, 13 deletions(-) diff --git a/src/test/java/org/alfresco/rest/api/tests/RepoService.java b/src/test/java/org/alfresco/rest/api/tests/RepoService.java index b8490309bb..0a36470384 100644 --- a/src/test/java/org/alfresco/rest/api/tests/RepoService.java +++ b/src/test/java/org/alfresco/rest/api/tests/RepoService.java @@ -63,7 +63,6 @@ import org.alfresco.repo.invitation.InvitationSearchCriteriaImpl; import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory; import org.alfresco.repo.model.filefolder.HiddenAspect; import org.alfresco.repo.model.filefolder.HiddenAspect.Visibility; -import org.alfresco.repo.node.index.NodeIndexer; import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; @@ -201,7 +200,6 @@ public class RepoService protected InvitationService invitationService; protected LockService lockService; protected CMISConnector cmisConnector; - protected NodeIndexer nodeIndexer; protected HiddenAspect hiddenAspect; protected NetworksService networksService; protected NamespaceService namespaceService; @@ -257,7 +255,6 @@ public class RepoService this.invitationService = (InvitationService)applicationContext.getBean("InvitationService"); this.lockService = (LockService)applicationContext.getBean("LockService"); this.cmisConnector = (CMISConnector)applicationContext.getBean("CMISConnector"); - this.nodeIndexer = (NodeIndexer)applicationContext.getBean("nodeIndexer"); this.activities = (Activities)applicationContext.getBean("activities"); this.hiddenAspect = (HiddenAspect)applicationContext.getBean("hiddenAspect"); this.networksService = (NetworksService)applicationContext.getBean("networksService"); @@ -315,11 +312,6 @@ public class RepoService return allPeople.get(username.toLowerCase()); } - public void disableInTxnIndexing() - { - nodeIndexer.setDisabled(true); - } - public int getClientVisibilityMask(Client client, Visibility visibility) { return hiddenAspect.getClientVisibilityMask(client, visibility); diff --git a/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java b/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java index 299309d56e..a2963cef5a 100644 --- a/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java +++ b/src/test/java/org/alfresco/rest/api/tests/TestFavourites.java @@ -94,8 +94,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; -import junit.framework.Assert; - /** * * @author steveglover @@ -145,9 +143,6 @@ public class TestFavourites extends AbstractBaseApiTest final Iterator networksIt = getTestFixture().networksIterator(); - // Workaround for domain name mismatch in lucene indexing that occurs when this test runs. - repoService.disableInTxnIndexing(); - transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback() { @SuppressWarnings("synthetic-access") From 7e49bd6992193b8c019c5a2168aec351e3dc1401 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Fri, 9 Mar 2018 10:40:53 +0000 Subject: [PATCH 02/11] [maven-release-plugin] prepare release alfresco-remote-api-6.19 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e2e96b6f3a..b5b6467c0f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-remote-api Alfresco Remote API - 6.19-SNAPSHOT + 6.19 jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-remote-api.git scm:git:git@github.com:Alfresco/alfresco-remote-api.git https://github.com/Alfresco/alfresco-remote-api - HEAD + alfresco-remote-api-6.19 From 2a8c79b2bcb6e022009007fc6468a34763ff53b5 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Fri, 9 Mar 2018 10:40:59 +0000 Subject: [PATCH 03/11] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b5b6467c0f..ec4d0ddeb2 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-remote-api Alfresco Remote API - 6.19 + 6.20-SNAPSHOT jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-remote-api.git scm:git:git@github.com:Alfresco/alfresco-remote-api.git https://github.com/Alfresco/alfresco-remote-api - alfresco-remote-api-6.19 + HEAD From 4a85b581d5e9b4bcd788684a314f099c78357131 Mon Sep 17 00:00:00 2001 From: Cristian Turlica Date: Tue, 13 Mar 2018 08:28:54 +0200 Subject: [PATCH 04/11] REPO-2093: Allow site managers to accept and reject site invitations - added comment detailing changing role --- .../org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java b/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java index 73422c483d..846f96ac1d 100644 --- a/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java +++ b/src/main/java/org/alfresco/rest/api/impl/SiteMembershipRequestsImpl.java @@ -597,6 +597,8 @@ public class SiteMembershipRequestsImpl implements SiteMembershipRequests throw new PermissionDeniedException(); } + // Workflow doesn't allow changing the role, so a new update may be required if + // approval role differs from default one. if (siteMembershipApproval != null && !(siteMembershipApproval.getRole() == null || siteMembershipApproval.getRole().isEmpty())) { String role = siteMembershipApproval.getRole(); From 7addb05cbe99c39d9aaa5a1e313937983e2ca043 Mon Sep 17 00:00:00 2001 From: CodrinChirica Date: Wed, 14 Mar 2018 15:25:43 +0200 Subject: [PATCH 05/11] Update alfresco-repository to 6.32 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec4d0ddeb2..55b89daffc 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ ${project.build.directory}/alf_data convert - 6.30 + 6.32 7.0 8.1 1.1 From 28a93b849e3bf56f6c775257dcd0d0890ff7e38e Mon Sep 17 00:00:00 2001 From: ramunteanu Date: Wed, 14 Mar 2018 15:32:51 +0200 Subject: [PATCH 06/11] fix/REPO-3344_WebApiParam_required_notUsed (#56) * REPO-3344: Web Api Parameter `required` is not being used - Set required parameter to true where necessary. --- .../rest/api/groups/GroupMembersRelation.java | 2 +- .../rest/api/groups/GroupsEntityResource.java | 2 +- .../rest/api/nodes/NodeRatingsRelation.java | 52 +++++++++---------- .../rest/api/people/PeopleEntityResource.java | 4 +- .../rest/api/sites/SiteEntityResource.java | 2 +- .../tests/api/mocks/GrassEntityResource.java | 11 +++- .../tests/core/JsonJacksonTests.java | 1 + .../tests/core/ParamsExtractorTests.java | 26 +++++++++- 8 files changed, 67 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/alfresco/rest/api/groups/GroupMembersRelation.java b/src/main/java/org/alfresco/rest/api/groups/GroupMembersRelation.java index 6deefd2481..dfef446cc1 100644 --- a/src/main/java/org/alfresco/rest/api/groups/GroupMembersRelation.java +++ b/src/main/java/org/alfresco/rest/api/groups/GroupMembersRelation.java @@ -70,7 +70,7 @@ public class GroupMembersRelation @Override @WebApiDescription(title = "Create group membership.") - @WebApiParam(name = "entity", title = "A single group member", description = "A single group member, multiple groups members are not supported.", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple = false) + @WebApiParam(name = "entity", title = "A single group member", description = "A single group member, multiple groups members are not supported.", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple = false, required = true) public List create(String groupId, List entity, Parameters params) { List result = new ArrayList<>(1); diff --git a/src/main/java/org/alfresco/rest/api/groups/GroupsEntityResource.java b/src/main/java/org/alfresco/rest/api/groups/GroupsEntityResource.java index 93cf94052e..bd6ecc71de 100644 --- a/src/main/java/org/alfresco/rest/api/groups/GroupsEntityResource.java +++ b/src/main/java/org/alfresco/rest/api/groups/GroupsEntityResource.java @@ -80,7 +80,7 @@ public class GroupsEntityResource implements EntityResourceAction.Read, E @Override @WebApiDescription(title="Create group", description="Create group") @WebApiParam(name="entity", title="A single group", description="A single group, multiple groups are not supported.", - kind= ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false) + kind= ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false, required = true) public List create(List entity, Parameters parameters) { List result = new ArrayList<>(1); diff --git a/src/main/java/org/alfresco/rest/api/nodes/NodeRatingsRelation.java b/src/main/java/org/alfresco/rest/api/nodes/NodeRatingsRelation.java index 14d63ffad1..3381d6d7d2 100644 --- a/src/main/java/org/alfresco/rest/api/nodes/NodeRatingsRelation.java +++ b/src/main/java/org/alfresco/rest/api/nodes/NodeRatingsRelation.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Remote API - * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ package org.alfresco.rest.api.nodes; import java.util.Collections; @@ -73,7 +73,7 @@ RelationshipResourceAction.Create, InitializingBean @Override @WebApiDescription(title="Rate a node for 'nodeId'.") @WebApiParam(name="ratingEntity", title="A single rating", description="A single node rating, multiple ratings are not supported.", - kind=ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false) + kind=ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false, required = true) public List create(String nodeId, List ratingEntity, Parameters parameters) { //There will always be 1 value because allowMultiple=false diff --git a/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java b/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java index bf5af1df97..114098121f 100644 --- a/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java +++ b/src/main/java/org/alfresco/rest/api/people/PeopleEntityResource.java @@ -100,8 +100,8 @@ public class PeopleEntityResource implements EntityResourceAction.ReadById create(List persons, Parameters parameters) { Person p = persons.get(0); diff --git a/src/main/java/org/alfresco/rest/api/sites/SiteEntityResource.java b/src/main/java/org/alfresco/rest/api/sites/SiteEntityResource.java index accd3d40ae..3e90c68b4e 100644 --- a/src/main/java/org/alfresco/rest/api/sites/SiteEntityResource.java +++ b/src/main/java/org/alfresco/rest/api/sites/SiteEntityResource.java @@ -112,7 +112,7 @@ public class SiteEntityResource implements EntityResourceAction.Read, @Override @WebApiDescription(title="Create site", description="Create the default/functional Share site") @WebApiParam(name="entity", title="A single site", description="A single site, multiple sites are not supported.", - kind= ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false) + kind= ResourceParameter.KIND.HTTP_BODY_OBJECT, allowMultiple=false, required = true) public List create(List entity, Parameters parameters) { List result = new ArrayList<>(1); diff --git a/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java b/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java index cc2c7d0a4b..438b0e5936 100644 --- a/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java +++ b/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java @@ -39,7 +39,7 @@ import org.springframework.extensions.webscripts.Status; import java.util.List; @EntityResource(name = "grass", title="Grass") -public class GrassEntityResource implements EntityResourceAction.ReadById, EntityResourceAction.Create, EntityResourceAction.Delete, EntityResourceAction.DeleteSet { +public class GrassEntityResource implements EntityResourceAction.ReadById, EntityResourceAction.Create, EntityResourceAction.CreateWithResponse, EntityResourceAction.Delete, EntityResourceAction.DeleteSet { @Override @WebApiDescription(title = "Gets grass by id") @@ -64,11 +64,20 @@ public class GrassEntityResource implements EntityResourceAction.ReadById @Override @WebApiDescription(title = "Create some grass") + @WebApiParam(name = "entity", title = "The grass.", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT, required=false, allowMultiple = false) public List create(List entity, Parameters parameters) { return entity; } + @Override + @WebApiDescription(title = "Create grass") + @WebApiParam(name = "entity", title = "The grass.", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT, required=true, allowMultiple = false) + public List create(List entity, Parameters parameters, WithResponse withResponse) + { + return entity; + } + @Override public void delete(String id, Parameters parameters) { diff --git a/src/test/java/org/alfresco/rest/framework/tests/core/JsonJacksonTests.java b/src/test/java/org/alfresco/rest/framework/tests/core/JsonJacksonTests.java index 9cc5529f7c..10bb2d9a2e 100644 --- a/src/test/java/org/alfresco/rest/framework/tests/core/JsonJacksonTests.java +++ b/src/test/java/org/alfresco/rest/framework/tests/core/JsonJacksonTests.java @@ -65,6 +65,7 @@ public class JsonJacksonTests static JacksonHelper jsonHelper = null; public static final String FARMER_JSON = "{\"name\":\"Giles\",\"created\":\"2012-03-23T15:56:18.552+0000\",\"age\":54,\"id\":\"1234A3\",\"farm\":\"LARGE\"}"; + public static final String GRASS_JSON = "{\"id\":\"grass\",\"color\":\"green\"}"; public static final String COLLECTION_START = "[ "; public static final String COLLECTION_END = " ]"; public static final String FARMERS_COLLECTION_JSON = COLLECTION_START + FARMER_JSON + "," + FARMER_JSON + "," + FARMER_JSON + COLLECTION_END; diff --git a/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java b/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java index f3301f0395..2bbb3a090b 100644 --- a/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java +++ b/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java @@ -25,7 +25,6 @@ */ package org.alfresco.rest.framework.tests.core; -import static org.hamcrest.CoreMatchers.any; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -40,6 +39,7 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.io.StringReader; +import java.lang.reflect.Method; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -48,16 +48,20 @@ import org.alfresco.repo.content.MimetypeMap; import org.alfresco.rest.api.tests.util.MultiPartBuilder; import org.alfresco.rest.api.tests.util.MultiPartBuilder.FileData; import org.alfresco.rest.api.tests.util.MultiPartBuilder.MultiPartRequest; +import org.alfresco.rest.framework.core.ResourceInspector; import org.alfresco.rest.framework.core.ResourceLocator; import org.alfresco.rest.framework.core.ResourceMetadata; import org.alfresco.rest.framework.core.ResourceOperation; +import org.alfresco.rest.framework.core.ResourceParameter; import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationException; import org.alfresco.rest.framework.jacksonextensions.BeanPropertiesFilter; import org.alfresco.rest.framework.jacksonextensions.JacksonHelper; import org.alfresco.rest.framework.jacksonextensions.RestJsonModule; +import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction; import org.alfresco.rest.framework.resource.parameters.Paging; import org.alfresco.rest.framework.resource.parameters.Params; import org.alfresco.rest.framework.tests.api.mocks.Farmer; +import org.alfresco.rest.framework.tests.api.mocks.GrassEntityResource; import org.alfresco.rest.framework.tools.ApiAssistant; import org.alfresco.rest.framework.webscripts.ParamsExtractor; import org.alfresco.rest.framework.webscripts.ResourceWebScriptDelete; @@ -234,6 +238,26 @@ public class ParamsExtractorTests assertNotNull(uoe); //Must throw this exception } testExtractOperationParams(templateVars, request, extractor); + + templateVars.clear(); + Method aMethod = ResourceInspector.findMethod(EntityResourceAction.Create.class, GrassEntityResource.class); + ResourceOperation op = ResourceInspector.inspectOperation(GrassEntityResource.class, aMethod, HttpMethod.POST); + List metainfo = ResourceInspector.inspect(GrassEntityResource.class); + assertNotNull(op); + assertTrue(op.getTitle().startsWith("Create some grass")); + assertTrue("Create method should have two params", op.getParameters().size() == 2); + ResourceParameter singleParam = op.getParameters().get(0); + assertTrue(ResourceParameter.KIND.HTTP_BODY_OBJECT.equals(singleParam.getParamType())); + assertFalse("Create grass does not support multiple grass creations", singleParam.isAllowMultiple()); + assertFalse(singleParam.isRequired()); + + when(request.getHeader("content-length")).thenReturn("0"); + params = extractor.extractParams(metainfo.get(0), request); + assertNotNull(params); + + when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.GRASS_JSON)); + params = extractor.extractParams(metainfo.get(0), request); + assertNotNull(params); } private Params testExtractOperationParams(Map templateVars, WebScriptRequest request, ParamsExtractor extractor) From 7f756c2cbc2269878622af76b1b82e10341aa39f Mon Sep 17 00:00:00 2001 From: ramunteanu Date: Wed, 14 Mar 2018 16:04:49 +0200 Subject: [PATCH 07/11] REPO-3344: Web Api Parameter `required` is not being used (#57) - Test fix --- .../framework/tests/api/mocks/GrassEntityResource.java | 10 +--------- .../framework/tests/core/ParamsExtractorTests.java | 5 +++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java b/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java index 438b0e5936..7659970f0c 100644 --- a/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java +++ b/src/test/java/org/alfresco/rest/framework/tests/api/mocks/GrassEntityResource.java @@ -39,7 +39,7 @@ import org.springframework.extensions.webscripts.Status; import java.util.List; @EntityResource(name = "grass", title="Grass") -public class GrassEntityResource implements EntityResourceAction.ReadById, EntityResourceAction.Create, EntityResourceAction.CreateWithResponse, EntityResourceAction.Delete, EntityResourceAction.DeleteSet { +public class GrassEntityResource implements EntityResourceAction.ReadById, EntityResourceAction.Create, EntityResourceAction.Delete, EntityResourceAction.DeleteSet { @Override @WebApiDescription(title = "Gets grass by id") @@ -69,14 +69,6 @@ public class GrassEntityResource implements EntityResourceAction.ReadById { return entity; } - - @Override - @WebApiDescription(title = "Create grass") - @WebApiParam(name = "entity", title = "The grass.", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT, required=true, allowMultiple = false) - public List create(List entity, Parameters parameters, WithResponse withResponse) - { - return entity; - } @Override public void delete(String id, Parameters parameters) diff --git a/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java b/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java index 2bbb3a090b..6019fa8b42 100644 --- a/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java +++ b/src/test/java/org/alfresco/rest/framework/tests/core/ParamsExtractorTests.java @@ -238,23 +238,24 @@ public class ParamsExtractorTests assertNotNull(uoe); //Must throw this exception } testExtractOperationParams(templateVars, request, extractor); - + templateVars.clear(); Method aMethod = ResourceInspector.findMethod(EntityResourceAction.Create.class, GrassEntityResource.class); ResourceOperation op = ResourceInspector.inspectOperation(GrassEntityResource.class, aMethod, HttpMethod.POST); List metainfo = ResourceInspector.inspect(GrassEntityResource.class); assertNotNull(op); - assertTrue(op.getTitle().startsWith("Create some grass")); assertTrue("Create method should have two params", op.getParameters().size() == 2); ResourceParameter singleParam = op.getParameters().get(0); assertTrue(ResourceParameter.KIND.HTTP_BODY_OBJECT.equals(singleParam.getParamType())); assertFalse("Create grass does not support multiple grass creations", singleParam.isAllowMultiple()); assertFalse(singleParam.isRequired()); + // Test context when the request body is null and 'required' webApiParam is false when(request.getHeader("content-length")).thenReturn("0"); params = extractor.extractParams(metainfo.get(0), request); assertNotNull(params); + // Test context when the request body is provided and 'required' property is false when(content.getReader()).thenReturn(new StringReader(JsonJacksonTests.GRASS_JSON)); params = extractor.extractParams(metainfo.get(0), request); assertNotNull(params); From 09c8e87ba9216eb0678041689538207e3d2ab3a7 Mon Sep 17 00:00:00 2001 From: Cristian Turlica Date: Thu, 15 Mar 2018 09:24:44 +0200 Subject: [PATCH 08/11] Update alfresco-repository to 6.33 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 55b89daffc..1a4136af77 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ ${project.build.directory}/alf_data convert - 6.32 + 6.33 7.0 8.1 1.1 From 9e85134c50b32c0063007fb6e27db3726b72c936 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Thu, 15 Mar 2018 12:38:06 +0000 Subject: [PATCH 09/11] [maven-release-plugin] prepare release alfresco-remote-api-6.20 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1a4136af77..2af5bd8c1e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-remote-api Alfresco Remote API - 6.20-SNAPSHOT + 6.20 jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-remote-api.git scm:git:git@github.com:Alfresco/alfresco-remote-api.git https://github.com/Alfresco/alfresco-remote-api - HEAD + alfresco-remote-api-6.20 From 02ed112052b513c723087188dc20275c54da7aaf Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Thu, 15 Mar 2018 12:38:13 +0000 Subject: [PATCH 10/11] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2af5bd8c1e..d8dbcf8312 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-remote-api Alfresco Remote API - 6.20 + 6.21-SNAPSHOT jar @@ -15,7 +15,7 @@ scm:git:git@github.com:Alfresco/alfresco-remote-api.git scm:git:git@github.com:Alfresco/alfresco-remote-api.git https://github.com/Alfresco/alfresco-remote-api - alfresco-remote-api-6.20 + HEAD From 092e33c3fed4e067320d0d58f29b12f892f72527 Mon Sep 17 00:00:00 2001 From: Cristian Turlica Date: Mon, 19 Mar 2018 11:08:06 +0200 Subject: [PATCH 11/11] Upgrade to core 7.1, data-model 8.2 and repo 6.36 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d8dbcf8312..d9a0104962 100644 --- a/pom.xml +++ b/pom.xml @@ -35,9 +35,9 @@ ${project.build.directory}/alf_data convert - 6.33 - 7.0 - 8.1 + 6.36 + 7.1 + 8.2 1.1 2.8.10