mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -18,28 +18,11 @@
|
||||
*/
|
||||
package org.alfresco.opencmis;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.BufferedOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.math.BigInteger;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.service.cmr.repository.ContentIOException;
|
||||
import org.alfresco.util.FileFilterMode;
|
||||
import org.alfresco.util.FileFilterMode.Client;
|
||||
import org.alfresco.util.TempFileProvider;
|
||||
import org.aopalliance.intercept.MethodInterceptor;
|
||||
import org.aopalliance.intercept.MethodInvocation;
|
||||
import org.apache.chemistry.opencmis.commons.data.CmisExtensionElement;
|
||||
import org.apache.chemistry.opencmis.commons.data.ContentStream;
|
||||
import org.apache.chemistry.opencmis.commons.exceptions.CmisStorageException;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
@@ -62,12 +45,6 @@ public class AlfrescoCmisServiceInterceptor implements MethodInterceptor
|
||||
{
|
||||
}
|
||||
|
||||
private PersistedContentStream getPersistedContentStream(ContentStream stream)
|
||||
{
|
||||
PersistedContentStream newStream = (stream != null ? new PersistedContentStream(stream) : null);
|
||||
return newStream;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object invoke(MethodInvocation invocation) throws Throwable
|
||||
{
|
||||
@@ -93,8 +70,6 @@ public class AlfrescoCmisServiceInterceptor implements MethodInterceptor
|
||||
Object ret = null;
|
||||
AlfrescoCmisService service = (AlfrescoCmisService) invocation.getThis();
|
||||
|
||||
List<PersistedContentStream> persistedContentStreams = new LinkedList<PersistedContentStream>();
|
||||
|
||||
try
|
||||
{
|
||||
// Wrap with pre- and post-method calls
|
||||
@@ -118,18 +93,6 @@ public class AlfrescoCmisServiceInterceptor implements MethodInterceptor
|
||||
" Effective auth: " + AuthenticationUtil.getRunAsUser() + "\n");
|
||||
}
|
||||
|
||||
// wrap CMIS content streams to make them useable with retrying transactions by persisting their contents
|
||||
for(int i = 0; i < args.length; i++)
|
||||
{
|
||||
Object arg = args[i];
|
||||
if(arg instanceof ContentStream)
|
||||
{
|
||||
PersistedContentStream persistedContentStream = getPersistedContentStream((ContentStream)arg);
|
||||
args[i] = persistedContentStream;
|
||||
persistedContentStreams.add(persistedContentStream);
|
||||
}
|
||||
}
|
||||
|
||||
FileFilterMode.setClient(Client.cmis);
|
||||
|
||||
ret = invocation.proceed();
|
||||
@@ -140,12 +103,6 @@ public class AlfrescoCmisServiceInterceptor implements MethodInterceptor
|
||||
|
||||
service.afterCall();
|
||||
|
||||
// cleanup persisted content streams
|
||||
for(PersistedContentStream stream : persistedContentStreams)
|
||||
{
|
||||
stream.cleanup();
|
||||
}
|
||||
|
||||
if(debug || trace)
|
||||
{
|
||||
sb.append(
|
||||
@@ -174,140 +131,4 @@ public class AlfrescoCmisServiceInterceptor implements MethodInterceptor
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Persisted content stream, for use in retrying transactions.
|
||||
*
|
||||
* @author steveglover
|
||||
*
|
||||
*/
|
||||
private static class PersistedContentStream implements ContentStream
|
||||
{
|
||||
private File tempFile = null;
|
||||
private ContentStream stream;
|
||||
|
||||
public PersistedContentStream(ContentStream stream)
|
||||
{
|
||||
this.stream = stream;
|
||||
copyToTempFile();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<CmisExtensionElement> getExtensions()
|
||||
{
|
||||
return stream.getExtensions();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setExtensions(List<CmisExtensionElement> extensions)
|
||||
{
|
||||
stream.setExtensions(extensions);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getLength()
|
||||
{
|
||||
return stream.getLength();
|
||||
}
|
||||
|
||||
@Override
|
||||
public BigInteger getBigLength()
|
||||
{
|
||||
return stream.getBigLength();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMimeType()
|
||||
{
|
||||
return stream.getMimeType();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFileName()
|
||||
{
|
||||
return stream.getFileName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputStream getStream()
|
||||
{
|
||||
try
|
||||
{
|
||||
if(tempFile != null)
|
||||
{
|
||||
InputStream stream = new BufferedInputStream(new FileInputStream(tempFile));
|
||||
return stream;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new CmisStorageException("Stream is null");
|
||||
}
|
||||
}
|
||||
catch (FileNotFoundException e)
|
||||
{
|
||||
throw new ContentIOException("Failed to copy content from input stream: \n" +
|
||||
" writer: " + this,
|
||||
e);
|
||||
}
|
||||
}
|
||||
|
||||
private void copyToTempFile()
|
||||
{
|
||||
int bufferSize = 40 * 1014;
|
||||
long count = 0;
|
||||
|
||||
try
|
||||
{
|
||||
tempFile = TempFileProvider.createTempFile("cmis", "content");
|
||||
if (stream.getStream() != null)
|
||||
{
|
||||
OutputStream out = new BufferedOutputStream(new FileOutputStream(tempFile), bufferSize);
|
||||
//InputStream in = new BufferedInputStream(stream.getStream(), bufferSize);
|
||||
// Temporary work around for bug in InternalTempFileInputStream which auto closes during read
|
||||
// BufferedInputStream subsequent use of available() throws an exception.
|
||||
InputStream in = stream.getStream();
|
||||
|
||||
byte[] buffer = new byte[bufferSize];
|
||||
int i;
|
||||
while ((i = in.read(buffer)) > -1)
|
||||
{
|
||||
out.write(buffer, 0, i);
|
||||
count += i;
|
||||
}
|
||||
|
||||
in.close();
|
||||
out.close();
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
cleanup();
|
||||
throw new CmisStorageException("Unable to store content: " + e.getMessage(), e);
|
||||
}
|
||||
|
||||
if (stream.getLength() > -1 && stream.getLength() != count)
|
||||
{
|
||||
cleanup();
|
||||
throw new CmisStorageException(
|
||||
"Expected " + stream.getLength() + " bytes but retrieved " + count + "bytes!");
|
||||
}
|
||||
}
|
||||
|
||||
public void cleanup()
|
||||
{
|
||||
if (tempFile == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
tempFile.delete();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// ignore - file will be removed by TempFileProvider
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user