inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
127622 jkaabimofrad: 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/BRANCHES/DEV/5.2.N/root@127728 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 15:19:51 +00:00
parent 241ed23c04
commit 15899820ce
2 changed files with 28 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
View File

@@ -220,24 +220,20 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean
String networkTenantDomain = pair.getFirst(); String networkTenantDomain = pair.getFirst();
final NodeRef nodeRef = pair.getSecond(); final NodeRef nodeRef = pair.getSecond();
return TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<BinaryResource>() return TenantUtil.runAsSystemTenant(() -> {
{ // belt-and-braces (similar to QuickShareContentGet)
public BinaryResource doWork() throws Exception if (!nodeService.hasAspect(nodeRef, QuickShareModel.ASPECT_QSHARE))
{ {
// belt-and-braces (similar to QuickShareContentGet) throw new InvalidNodeRefException(nodeRef);
if (!nodeService.hasAspect(nodeRef, QuickShareModel.ASPECT_QSHARE)) }
{
throw new InvalidNodeRefException(nodeRef);
}
if (renditionId != null) if (renditionId != null)
{ {
return renditions.getContent(nodeRef, renditionId, parameters); return renditions.getContent(nodeRef, renditionId, parameters);
} }
else else
{ {
return nodes.getContent(nodeRef, parameters, false); return nodes.getContent(nodeRef, parameters, false);
}
} }
}, networkTenantDomain); }, networkTenantDomain);
} }
@@ -403,21 +399,17 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean
String networkTenantDomain = pair.getFirst(); String networkTenantDomain = pair.getFirst();
final NodeRef nodeRef = pair.getSecond(); final NodeRef nodeRef = pair.getSecond();
return TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<CollectionWithPagingInfo<Rendition>>() return TenantUtil.runAsSystemTenant(() -> {
{ String nodeId = nodeRef.getId();
public CollectionWithPagingInfo<Rendition> doWork() throws Exception
{
String nodeId = nodeRef.getId();
// hmm ... can we simplify ? // hmm ... can we simplify ?
String filterStatusCreated = "("+Renditions.PARAM_STATUS+"='"+Rendition.RenditionStatus.CREATED+"')"; String filterStatusCreated = "(" + Renditions.PARAM_STATUS + "='" + Rendition.RenditionStatus.CREATED + "')";
Query whereQuery = ResourceWebScriptHelper.getWhereClause(filterStatusCreated); Query whereQuery = ResourceWebScriptHelper.getWhereClause(filterStatusCreated);
Params.RecognizedParams recParams = new Params.RecognizedParams(null, null, null, null, null, null, whereQuery, null, false); Params.RecognizedParams recParams = new Params.RecognizedParams(null, null, null, null, null, null, whereQuery, null, false);
Parameters params = Params.valueOf(recParams, null, null, null); Parameters params = Params.valueOf(recParams, null, null, null);
return renditions.getRenditions(nodeId, params); return renditions.getRenditions(nodeId, params);
}
}, networkTenantDomain); }, networkTenantDomain);
} }
catch (InvalidSharedIdException ex) catch (InvalidSharedIdException ex)

32
source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
View File

@@ -33,6 +33,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.tenant.TenantUtil; import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
import org.alfresco.rest.api.Nodes; import org.alfresco.rest.api.Nodes;
import org.alfresco.rest.api.model.Site; import org.alfresco.rest.api.model.Site;
import org.alfresco.rest.api.nodes.NodesEntityResource; import org.alfresco.rest.api.nodes.NodesEntityResource;
@@ -380,14 +381,9 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
{ {
final String siteName = "RandomSite" + System.currentTimeMillis(); final String siteName = "RandomSite" + System.currentTimeMillis();
final TestSite site = TenantUtil.runAsUserTenant(new TenantUtil.TenantRunAsWork<TestSite>() final TestSite site = TenantUtil.runAsUserTenant(() -> {
{ SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, siteVisibility);
@Override return repoService.createSite(testNetwork, siteInfo);
public TestSite doWork() throws Exception
{
SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, siteVisibility);
return repoService.createSite(testNetwork, siteInfo);
}
}, user.getId(), testNetwork.getId()); }, user.getId(), testNetwork.getId());
return site; return site;
@@ -446,27 +442,15 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
protected void inviteToSite(final TestSite testSite, final TestPerson invitee, final SiteRole siteRole) protected void inviteToSite(final TestSite testSite, final TestPerson invitee, final SiteRole siteRole)
{ {
TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<Void>() TenantUtil.runAsTenant((TenantRunAsWork<Void>) () -> {
{ testSite.inviteToSite(invitee.getId(), siteRole);
@Override return null;
public Void doWork() throws Exception
{
testSite.inviteToSite(invitee.getId(), siteRole);
return null;
}
}, testSite.getNetworkId()); }, testSite.getNetworkId());
} }
protected NodeRef getSiteDocLib(final TestSite testSite) protected NodeRef getSiteDocLib(final TestSite testSite)
{ {
return TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<NodeRef>() return TenantUtil.runAsTenant(() -> testSite.getContainerNodeRef(("documentLibrary")), testSite.getNetworkId());
{
@Override
public NodeRef doWork() throws Exception
{
return testSite.getContainerNodeRef(("documentLibrary"));
}
}, testSite.getNetworkId());
} }
protected void checkStatus(int expectedStatus, int actualStatus) protected void checkStatus(int expectedStatus, int actualStatus)