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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
75082: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73269: Renamed ContentReadEvent to ContentEventImpl


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-07-01 15:31:01 +00:00
parent 3bd6b5aedc
commit 6fd997a096
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/opencmis/CMISConnector.java
View File

@@ -49,7 +49,8 @@ import javax.xml.datatype.DatatypeFactory;
import org.alfresco.cmis.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.events.types.ContentReadEvent; import org.alfresco.events.types.ContentEvent;
import org.alfresco.events.types.ContentEventImpl;
import org.alfresco.events.types.ContentReadRangeEvent; import org.alfresco.events.types.ContentReadRangeEvent;
import org.alfresco.events.types.Event; import org.alfresco.events.types.Event;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
@@ -1725,7 +1726,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
} }
else else
{ {
return new ContentReadEvent(ContentReadEvent.DOWNLOAD, user, networkId, transactionId, return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId,
nodeRef.getId(), null, nodeType.toString(), Client.cmis, mimeType, contentSize, encoding); nodeRef.getId(), null, nodeType.toString(), Client.cmis, mimeType, contentSize, encoding);
} }
} }

8
source/test-java/org/alfresco/opencmis/OpenCmisLocalTest.java
View File

@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.alfresco.events.types.ContentReadEvent; import org.alfresco.events.types.ContentEventImpl;
import org.alfresco.events.types.ContentReadRangeEvent; import org.alfresco.events.types.ContentReadRangeEvent;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.content.filestore.FileContentWriter; import org.alfresco.repo.content.filestore.FileContentWriter;
@@ -206,10 +206,10 @@ public class OpenCmisLocalTest extends TestCase
//range request //range request
content = doc1.getContentStream(BigInteger.valueOf(2),BigInteger.valueOf(4)); content = doc1.getContentStream(BigInteger.valueOf(2),BigInteger.valueOf(4));
assertNotNull(content); assertNotNull(content);
List<ContentReadEvent> events = eventPublisher.getQueueByType(ContentReadEvent.class); List<ContentEventImpl> events = eventPublisher.getQueueByType(ContentEventImpl.class);
int found = 0; int found = 0;
for (ContentReadEvent cre : events) for (ContentEventImpl cre : events)
{ {
if (doc1NodeRef.getId().equals(cre.getNodeId())) if (doc1NodeRef.getId().equals(cre.getNodeId()))
{ {
@@ -237,7 +237,7 @@ public class OpenCmisLocalTest extends TestCase
} }
private void commonAsserts(byte[] byteContent,ContentReadEvent cre) private void commonAsserts(byte[] byteContent,ContentEventImpl cre)
{ {
assertEquals(Client.cmis, cre.getClient()); assertEquals(Client.cmis, cre.getClient());
assertEquals(byteContent.length, cre.getSize()); assertEquals(byteContent.length, cre.getSize());