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

77148: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73957: ContentStore API cleanup
       - Removed previously-deprecated ContentStore.getWriter(ContentReader existingContentReader, String newContentUrl)
       - Removed previously-deprecated getSpaceUsed()
       - Removed previously-deprecated getTotalSize()
       - Deprecated optional and unused getUrls() and variants
       - Clean up of implementations to ignore relevant deprecations, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 15:57:20 +00:00
parent 7fff2b6627
commit f1310c6c8d
13 changed files with 49 additions and 230 deletions

View File

@@ -92,81 +92,42 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
eventPublisher.publishEvent(new CachingContentStoreCreatedEvent(this));
}
/*
* @see org.alfresco.repo.content.ContentStore#isContentUrlSupported(java.lang.String)
*/
@Override
public boolean isContentUrlSupported(String contentUrl)
{
return backingStore.isContentUrlSupported(contentUrl);
}
/*
* @see org.alfresco.repo.content.ContentStore#isWriteSupported()
*/
@Override
public boolean isWriteSupported()
{
return backingStore.isWriteSupported();
}
/*
* @see org.alfresco.repo.content.ContentStore#getTotalSize()
*/
@Override
public long getTotalSize()
{
return backingStore.getTotalSize();
}
/*
* @see org.alfresco.repo.content.ContentStore#getSpaceUsed()
*/
@Override
public long getSpaceUsed()
{
return backingStore.getSpaceUsed();
}
/*
* @see org.alfresco.repo.content.ContentStore#getSpaceFree()
*/
@Override
public long getSpaceFree()
{
return backingStore.getSpaceFree();
}
/*
* @see org.alfresco.repo.content.ContentStore#getSpaceTotal()
*/
@Override
public long getSpaceTotal()
{
return backingStore.getSpaceTotal();
}
/*
* @see org.alfresco.repo.content.ContentStore#getRootLocation()
*/
@Override
public String getRootLocation()
{
return backingStore.getRootLocation();
}
/*
* @see org.alfresco.repo.content.ContentStore#exists(java.lang.String)
*/
@Override
public boolean exists(String contentUrl)
{
return backingStore.exists(contentUrl);
}
/*
* @see org.alfresco.repo.content.ContentStore#getReader(java.lang.String)
*/
@Override
public ContentReader getReader(String contentUrl)
{
@@ -284,9 +245,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
return reader;
}
/*
* @see org.alfresco.repo.content.ContentStore#getWriter(org.alfresco.repo.content.ContentContext)
*/
@Override
public ContentWriter getWriter(final ContentContext context)
{
@@ -335,28 +293,14 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
}
}
/*
* @see org.alfresco.repo.content.ContentStore#getWriter(org.alfresco.service.cmr.repository.ContentReader, java.lang.String)
*/
@Override
public ContentWriter getWriter(ContentReader existingContentReader, String newContentUrl)
{
ContentContext ctx = new ContentContext(existingContentReader, newContentUrl);
return getWriter(ctx);
}
/*
* @see org.alfresco.repo.content.ContentStore#getUrls(org.alfresco.repo.content.ContentStore.ContentUrlHandler)
*/
@SuppressWarnings("deprecation")
@Override
public void getUrls(ContentUrlHandler handler) throws ContentIOException
{
backingStore.getUrls(handler);
}
/*
* @see org.alfresco.repo.content.ContentStore#getUrls(java.util.Date, java.util.Date, org.alfresco.repo.content.ContentStore.ContentUrlHandler)
*/
@SuppressWarnings("deprecation")
@Override
public void getUrls(Date createdAfter, Date createdBefore, ContentUrlHandler handler)
throws ContentIOException
@@ -364,9 +308,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
backingStore.getUrls(createdAfter, createdBefore, handler);
}
/*
* @see org.alfresco.repo.content.ContentStore#delete(java.lang.String)
*/
@Override
public boolean delete(String contentUrl)
{