From f9da6185f0fa85e875443af45995e6717fb4217b Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Fri, 3 Jun 2016 01:33:13 +0000 Subject: [PATCH] Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2) 127621 jkaabimofrad: Replaced anonymous class with lambda, to force the use of Java 8! git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rest/api/impl/QuickShareLinksImpl.java | 48 ++++++++----------- .../rest/api/tests/AbstractBaseApiTest.java | 32 ++++--------- 2 files changed, 28 insertions(+), 52 deletions(-) diff --git a/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java b/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java index 70b1ab2d77..64349f0dcb 100644 --- a/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java +++ b/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java @@ -213,24 +213,20 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean String networkTenantDomain = pair.getFirst(); final NodeRef nodeRef = pair.getSecond(); - return TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork() - { - public BinaryResource doWork() throws Exception + return TenantUtil.runAsSystemTenant(() -> { + // belt-and-braces (similar to QuickShareContentGet) + if (!nodeService.hasAspect(nodeRef, QuickShareModel.ASPECT_QSHARE)) { - // belt-and-braces (similar to QuickShareContentGet) - if (!nodeService.hasAspect(nodeRef, QuickShareModel.ASPECT_QSHARE)) - { - throw new InvalidNodeRefException(nodeRef); - } + throw new InvalidNodeRefException(nodeRef); + } - if (renditionId != null) - { - return renditions.getContent(nodeRef, renditionId, parameters); - } - else - { - return nodes.getContent(nodeRef, parameters, false); - } + if (renditionId != null) + { + return renditions.getContent(nodeRef, renditionId, parameters); + } + else + { + return nodes.getContent(nodeRef, parameters, false); } }, networkTenantDomain); } @@ -396,21 +392,17 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean String networkTenantDomain = pair.getFirst(); final NodeRef nodeRef = pair.getSecond(); - return TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork>() - { - public CollectionWithPagingInfo doWork() throws Exception - { - String nodeId = nodeRef.getId(); + return TenantUtil.runAsSystemTenant(() -> { + String nodeId = nodeRef.getId(); - // hmm ... can we simplify ? - String filterStatusCreated = "("+Renditions.PARAM_STATUS+"='"+Rendition.RenditionStatus.CREATED+"')"; - Query whereQuery = ResourceWebScriptHelper.getWhereClause(filterStatusCreated); - Params.RecognizedParams recParams = new Params.RecognizedParams(null, null, null, null, null, null, whereQuery, null, false); - Parameters params = Params.valueOf(recParams, null, null, null); + // hmm ... can we simplify ? + String filterStatusCreated = "(" + Renditions.PARAM_STATUS + "='" + Rendition.RenditionStatus.CREATED + "')"; + Query whereQuery = ResourceWebScriptHelper.getWhereClause(filterStatusCreated); + Params.RecognizedParams recParams = new Params.RecognizedParams(null, null, null, null, null, null, whereQuery, null, false); + Parameters params = Params.valueOf(recParams, null, null, null); - return renditions.getRenditions(nodeId, params); + return renditions.getRenditions(nodeId, params); - } }, networkTenantDomain); } catch (InvalidSharedIdException ex) diff --git a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java index 6f4fb1acdf..4e57edc097 100644 --- a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.tenant.TenantUtil; +import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork; import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.model.Site; import org.alfresco.rest.api.nodes.NodesEntityResource; @@ -373,14 +374,9 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi { final String siteName = "RandomSite" + System.currentTimeMillis(); - final TestSite site = TenantUtil.runAsUserTenant(new TenantUtil.TenantRunAsWork() - { - @Override - public TestSite doWork() throws Exception - { - SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, siteVisibility); - return repoService.createSite(testNetwork, siteInfo); - } + final TestSite site = TenantUtil.runAsUserTenant(() -> { + SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, siteVisibility); + return repoService.createSite(testNetwork, siteInfo); }, user.getId(), testNetwork.getId()); return site; @@ -439,27 +435,15 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi protected void inviteToSite(final TestSite testSite, final TestPerson invitee, final SiteRole siteRole) { - TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork() - { - @Override - public Void doWork() throws Exception - { - testSite.inviteToSite(invitee.getId(), siteRole); - return null; - } + TenantUtil.runAsTenant((TenantRunAsWork) () -> { + testSite.inviteToSite(invitee.getId(), siteRole); + return null; }, testSite.getNetworkId()); } protected NodeRef getSiteDocLib(final TestSite testSite) { - return TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork() - { - @Override - public NodeRef doWork() throws Exception - { - return testSite.getContainerNodeRef(("documentLibrary")); - } - }, testSite.getNetworkId()); + return TenantUtil.runAsTenant(() -> testSite.getContainerNodeRef(("documentLibrary")), testSite.getNetworkId()); } protected void checkStatus(int expectedStatus, int actualStatus)