ACS-2348: removing @Experimental annotation on Storage Properties related methods. (#980)

This commit is contained in:
mpichura
2022-02-23 09:24:32 +01:00
committed by GitHub
parent 397539bbbe
commit abd9ec4eef
20 changed files with 2 additions and 86 deletions

View File

@@ -26,7 +26,6 @@
package org.alfresco.repo.content; package org.alfresco.repo.content;
import org.alfresco.service.Experimental;
/** /**
* Enumeration with values for archive-restore parameter keys. * Enumeration with values for archive-restore parameter keys.
@@ -35,7 +34,6 @@ import org.alfresco.service.Experimental;
* *
* @author mpichura * @author mpichura
*/ */
@Experimental
public enum ContentRestoreParams public enum ContentRestoreParams
{ {
/** /**

View File

@@ -26,7 +26,6 @@
package org.alfresco.repo.content; package org.alfresco.repo.content;
import org.alfresco.api.AlfrescoPublicApi; import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.repository.ContentAccessor; import org.alfresco.service.cmr.repository.ContentAccessor;
import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
@@ -340,7 +339,6 @@ public interface ContentStore
* @param contentUrl the URL of the content for which the storage properties are to be retrieved. * @param contentUrl the URL of the content for which the storage properties are to be retrieved.
* @return Returns a key-value (String-String) collection of storage headers/properties with their respective values. * @return Returns a key-value (String-String) collection of storage headers/properties with their respective values.
*/ */
@Experimental
default Map<String, String> getStorageProperties(String contentUrl) default Map<String, String> getStorageProperties(String contentUrl)
{ {
return Collections.emptyMap(); return Collections.emptyMap();
@@ -350,14 +348,12 @@ public interface ContentStore
* Submit a request to send content to archive (offline) state. * Submit a request to send content to archive (offline) state.
* If no connector is present or connector is not supporting sending to archive, then {@link UnsupportedOperationException} will be returned. * If no connector is present or connector is not supporting sending to archive, then {@link UnsupportedOperationException} will be returned.
* Specific connector will decide which storage class/tier will be set for content. * Specific connector will decide which storage class/tier will be set for content.
* This method is experimental and subject to changes.
* *
* @param contentUrl the URL of the content which is to be archived. * @param contentUrl the URL of the content which is to be archived.
* @param archiveParams a map of String-Serializable parameters defining Storage Provider specific request parameters (can be empty). * @param archiveParams a map of String-Serializable parameters defining Storage Provider specific request parameters (can be empty).
* @return true when request successful, false when unsuccessful. * @return true when request successful, false when unsuccessful.
* @throws UnsupportedOperationException when store is unable to handle request. * @throws UnsupportedOperationException when store is unable to handle request.
*/ */
@Experimental
default boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams) default boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
{ {
throw new UnsupportedOperationException("Request to archive content is not supported by this content store."); throw new UnsupportedOperationException("Request to archive content is not supported by this content store.");
@@ -370,14 +366,12 @@ public interface ContentStore
* Keys of this map should be restricted to {@code ContentRestoreParams} enumeration. * Keys of this map should be restricted to {@code ContentRestoreParams} enumeration.
* For AWS S3 map can indicating expiry days, Glacier restore tier. * For AWS S3 map can indicating expiry days, Glacier restore tier.
* For Azure Blob map can indicate rehydrate priority. * For Azure Blob map can indicate rehydrate priority.
* This method is experimental and subject to changes.
* *
* @param contentUrl the URL of the content which is to be archived. * @param contentUrl the URL of the content which is to be archived.
* @param restoreParams a map of String-Serializable parameters defining Storage Provider specific request parameters (can be empty). * @param restoreParams a map of String-Serializable parameters defining Storage Provider specific request parameters (can be empty).
* @return true when request successful, false when unsuccessful. * @return true when request successful, false when unsuccessful.
* @throws UnsupportedOperationException when store is unable to handle request. * @throws UnsupportedOperationException when store is unable to handle request.
*/ */
@Experimental
default boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams) default boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
{ {
throw new UnsupportedOperationException("Request to restore content from archive is not supported by this content store."); throw new UnsupportedOperationException("Request to restore content from archive is not supported by this content store.");

View File

@@ -26,8 +26,6 @@
package org.alfresco.repo.content; package org.alfresco.repo.content;
import org.alfresco.service.Experimental;
/** /**
* Enumeration with "header" values for Alfresco derived Storage Properties * Enumeration with "header" values for Alfresco derived Storage Properties
* Values of this enum should be used when adding Alfresco derived key-value pairs in Storage Properties map. * Values of this enum should be used when adding Alfresco derived key-value pairs in Storage Properties map.
@@ -35,7 +33,6 @@ import org.alfresco.service.Experimental;
* *
* @author mpichura * @author mpichura
*/ */
@Experimental
public enum ObjectStorageProps { public enum ObjectStorageProps {
/** /**
* Object's content is archived and not immediately accessible. * Object's content is archived and not immediately accessible.

View File

@@ -26,7 +26,6 @@
package org.alfresco.service.cmr.repository; package org.alfresco.service.cmr.repository;
import org.alfresco.api.AlfrescoPublicApi; import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.service.Experimental;
/** /**
* Unable to access as content is in an Archived state. * Unable to access as content is in an Archived state.
@@ -34,7 +33,6 @@ import org.alfresco.service.Experimental;
* *
* @author David Edwards * @author David Edwards
*/ */
@Experimental
@AlfrescoPublicApi @AlfrescoPublicApi
public class ArchivedIOException extends ContentIOException public class ArchivedIOException extends ContentIOException
{ {

View File

@@ -27,7 +27,6 @@ package org.alfresco.service.cmr.repository;
import org.alfresco.api.AlfrescoPublicApi; import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.service.Experimental;
/** /**
* Content Restoration in progress * Content Restoration in progress
@@ -35,7 +34,6 @@ import org.alfresco.service.Experimental;
* @author David Edwards * @author David Edwards
*/ */
@AlfrescoPublicApi @AlfrescoPublicApi
@Experimental
public class RestoreInProgressException extends AlfrescoRuntimeException public class RestoreInProgressException extends AlfrescoRuntimeException
{ {
private static final long serialVersionUID = 5483215922384016269L; private static final long serialVersionUID = 5483215922384016269L;

View File

@@ -30,49 +30,37 @@ import org.alfresco.rest.api.model.ArchiveContentRequest;
import org.alfresco.rest.api.model.ContentStorageInfo; import org.alfresco.rest.api.model.ContentStorageInfo;
import org.alfresco.rest.api.model.RestoreArchivedContentRequest; import org.alfresco.rest.api.model.RestoreArchivedContentRequest;
import org.alfresco.rest.framework.resource.parameters.Parameters; import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
/** /**
* Storage information for content API. * Storage information for content API.
* Note: Currently marked as experimental and subject to change.
* *
* @author mpichura * @author mpichura
*/ */
@Experimental
public interface ContentStorageInformation public interface ContentStorageInformation
{ {
/** /**
* Note: Currently marked as experimental and subject to change.
*
* @param nodeRef Node reference * @param nodeRef Node reference
* @param contentPropName Qualified name of content property (e.g. 'cm_content') * @param contentPropName Qualified name of content property (e.g. 'cm_content')
* @param parameters {@link Parameters} object to get the parameters passed into the request * @param parameters {@link Parameters} object to get the parameters passed into the request
* @return {@link ContentStorageInfo} object consisting of qualified name of content property and a map of storage properties * @return {@link ContentStorageInfo} object consisting of qualified name of content property and a map of storage properties
*/ */
@Experimental
ContentStorageInfo getStorageInfo(NodeRef nodeRef, String contentPropName, Parameters parameters); ContentStorageInfo getStorageInfo(NodeRef nodeRef, String contentPropName, Parameters parameters);
/** /**
* Note: Currently marked as experimental and subject to change.
*
* @param nodeRef Node reference * @param nodeRef Node reference
* @param contentPropName Qualified name of content property (e.g. 'cm_content') * @param contentPropName Qualified name of content property (e.g. 'cm_content')
* @param archiveContentRequest {@link ArchiveContentRequest} object holding parameters for archive content request * @param archiveContentRequest {@link ArchiveContentRequest} object holding parameters for archive content request
* @return true when request successful, false when unsuccessful * @return true when request successful, false when unsuccessful
*/ */
@Experimental
boolean requestArchiveContent(NodeRef nodeRef, String contentPropName, ArchiveContentRequest archiveContentRequest); boolean requestArchiveContent(NodeRef nodeRef, String contentPropName, ArchiveContentRequest archiveContentRequest);
/** /**
* Note: Currently marked as experimental and subject to change.
*
* @param nodeRef Node reference * @param nodeRef Node reference
* @param contentPropName Qualified name of content property (e.g. 'cm_content') * @param contentPropName Qualified name of content property (e.g. 'cm_content')
* @param restoreArchivedContentRequest {@link RestoreArchivedContentRequest} object holding parameters for restore from archive request * @param restoreArchivedContentRequest {@link RestoreArchivedContentRequest} object holding parameters for restore from archive request
* @return true when request successful, false when unsuccessful * @return true when request successful, false when unsuccessful
*/ */
@Experimental
boolean requestRestoreContentFromArchive(NodeRef nodeRef, String contentPropName, boolean requestRestoreContentFromArchive(NodeRef nodeRef, String contentPropName,
RestoreArchivedContentRequest restoreArchivedContentRequest); RestoreArchivedContentRequest restoreArchivedContentRequest);
} }

View File

@@ -33,7 +33,6 @@ import org.alfresco.rest.api.model.ContentStorageInfo;
import org.alfresco.rest.api.model.RestoreArchivedContentRequest; import org.alfresco.rest.api.model.RestoreArchivedContentRequest;
import org.alfresco.rest.framework.core.exceptions.RestoreInProgressException; import org.alfresco.rest.framework.core.exceptions.RestoreInProgressException;
import org.alfresco.rest.framework.resource.parameters.Parameters; import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
@@ -45,11 +44,9 @@ import java.util.Map;
/** /**
* Default implementation for {@link ContentStorageInformation} * Default implementation for {@link ContentStorageInformation}
* Note: Currently marked as experimental and subject to change.
* *
* @author mpichura * @author mpichura
*/ */
@Experimental
public class ContentStorageInformationImpl implements ContentStorageInformation public class ContentStorageInformationImpl implements ContentStorageInformation
{ {
@@ -68,7 +65,6 @@ public class ContentStorageInformationImpl implements ContentStorageInformation
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public ContentStorageInfo getStorageInfo(NodeRef nodeRef, String contentPropName, Parameters parameters) public ContentStorageInfo getStorageInfo(NodeRef nodeRef, String contentPropName, Parameters parameters)
{ {
final QName propQName = getQName(contentPropName); final QName propQName = getQName(contentPropName);

View File

@@ -38,7 +38,6 @@ import org.alfresco.rest.api.Nodes;
import org.alfresco.rest.api.model.Download; import org.alfresco.rest.api.model.Download;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException; import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.download.DownloadService; import org.alfresco.service.cmr.download.DownloadService;
import org.alfresco.service.cmr.download.DownloadStatus; import org.alfresco.service.cmr.download.DownloadStatus;
import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.cmr.module.ModuleService;
@@ -214,8 +213,7 @@ public class DownloadsImpl implements Downloads
* @param checkLimit The maximum number of nodes to check, set to -1 for no limit * @param checkLimit The maximum number of nodes to check, set to -1 for no limit
* @see #checkArchiveStatus(NodeRef[], int, Set) * @see #checkArchiveStatus(NodeRef[], int, Set)
*/ */
@Experimental protected void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit)
protected void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit)
{ {
if (canCheckArchived()) if (canCheckArchived())
{ {
@@ -234,7 +232,6 @@ public class DownloadsImpl implements Downloads
* @param checkLimit The maximum number of nodes to check, set to -1 for no limit * @param checkLimit The maximum number of nodes to check, set to -1 for no limit
* @param cache Tracks nodes that we have already checked, if null an empty cache will be created * @param cache Tracks nodes that we have already checked, if null an empty cache will be created
*/ */
@Experimental
private void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit, Set<NodeRef> cache) private void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit, Set<NodeRef> cache)
{ {
// Create the cache for recursive calls. // Create the cache for recursive calls.
@@ -291,8 +288,7 @@ public class DownloadsImpl implements Downloads
} }
} }
@Experimental protected boolean canCheckArchived()
protected boolean canCheckArchived()
{ {
return Arrays.stream(CLOUD_CONNECTOR_MODULES).anyMatch(m-> moduleService.getModule(m) != null); return Arrays.stream(CLOUD_CONNECTOR_MODULES).anyMatch(m-> moduleService.getModule(m) != null);
} }

View File

@@ -26,19 +26,15 @@
package org.alfresco.rest.api.model; package org.alfresco.rest.api.model;
import org.alfresco.service.Experimental;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
* Request for content archive. * Request for content archive.
* Marked as experimental and subject to change.
* *
* @author mpichura * @author mpichura
*/ */
@Experimental
public class ArchiveContentRequest public class ArchiveContentRequest
{ {
/** /**

View File

@@ -26,15 +26,11 @@
package org.alfresco.rest.api.model; package org.alfresco.rest.api.model;
import org.alfresco.service.Experimental;
/** /**
* Request for restore content from archive. * Request for restore content from archive.
* Marked as experimental and subject to change.
* *
* @author mpichura * @author mpichura
*/ */
@Experimental
public class RestoreArchivedContentRequest public class RestoreArchivedContentRequest
{ {
/** /**

View File

@@ -39,7 +39,6 @@ import org.alfresco.rest.framework.resource.RelationshipResource;
import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction; import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
import org.alfresco.rest.framework.resource.parameters.Parameters; import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.alfresco.rest.framework.webscripts.WithResponse; import org.alfresco.rest.framework.webscripts.WithResponse;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.util.PropertyCheck; import org.alfresco.util.PropertyCheck;
@@ -49,11 +48,9 @@ import javax.servlet.http.HttpServletResponse;
/** /**
* Node storage information. * Node storage information.
* Note: Currently marked as experimental and subject to change.
* *
* @author mpichura * @author mpichura
*/ */
@Experimental
@RelationshipResource(name = "storage-info", entityResource = NodesEntityResource.class, title = "Node's content storage information") @RelationshipResource(name = "storage-info", entityResource = NodesEntityResource.class, title = "Node's content storage information")
public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadById<ContentStorageInfo>, InitializingBean public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadById<ContentStorageInfo>, InitializingBean
{ {
@@ -82,7 +79,6 @@ public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadB
return storageInformation.getStorageInfo(nodeRef, contentPropName, parameters); return storageInformation.getStorageInfo(nodeRef, contentPropName, parameters);
} }
@Experimental
@Operation("archive") @Operation("archive")
@WebApiParam(name = "archiveContentRequest", title = "Request for archive content", @WebApiParam(name = "archiveContentRequest", title = "Request for archive content",
description = "Optional parameters for archive content", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT) description = "Optional parameters for archive content", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
@@ -103,7 +99,6 @@ public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadB
} }
} }
@Experimental
@Operation("archive-restore") @Operation("archive-restore")
@WebApiParam(name = "restoreArchivedContentRequest", title = "Request for restore content from archive", @WebApiParam(name = "restoreArchivedContentRequest", title = "Request for restore content from archive",
description = "Optional parameters for restore content from archive", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT) description = "Optional parameters for restore content from archive", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)

View File

@@ -40,7 +40,6 @@ import org.alfresco.rest.framework.resource.RelationshipResource;
import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction; import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
import org.alfresco.rest.framework.resource.parameters.Parameters; import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.alfresco.rest.framework.webscripts.WithResponse; import org.alfresco.rest.framework.webscripts.WithResponse;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.Version;
import org.alfresco.util.PropertyCheck; import org.alfresco.util.PropertyCheck;
@@ -52,12 +51,9 @@ import javax.servlet.http.HttpServletResponse;
* Node Versions storage information. * Node Versions storage information.
* *
* - GET /nodes/{nodeId}/versions/{versionId}/storage-info/{contentPropQNameId} * - GET /nodes/{nodeId}/versions/{versionId}/storage-info/{contentPropQNameId}
*
* Note: Currently marked as experimental and subject to change.
* *
* @author janv * @author janv
*/ */
@Experimental
@RelationshipResource(name = "storage-info", entityResource = NodeVersionsRelation.class, title = "Node Version's content storage information") @RelationshipResource(name = "storage-info", entityResource = NodeVersionsRelation.class, title = "Node Version's content storage information")
public class NodeVersionsStorageInfoRelation implements RelationshipResourceAction.ReadById<ContentStorageInfo>, InitializingBean public class NodeVersionsStorageInfoRelation implements RelationshipResourceAction.ReadById<ContentStorageInfo>, InitializingBean
{ {
@@ -91,7 +87,6 @@ public class NodeVersionsStorageInfoRelation implements RelationshipResourceActi
return storageInformation.getStorageInfo(versionNodeRef, contentPropQNameId, parameters); return storageInformation.getStorageInfo(versionNodeRef, contentPropQNameId, parameters);
} }
@Experimental
@Operation("archive") @Operation("archive")
@WebApiParam(name = "archiveContentRequest", title = "Request for archive version content", @WebApiParam(name = "archiveContentRequest", title = "Request for archive version content",
description = "Optional parameters for archive version content", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT) description = "Optional parameters for archive version content", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
@@ -116,7 +111,6 @@ public class NodeVersionsStorageInfoRelation implements RelationshipResourceActi
} }
} }
@Experimental
@Operation("archive-restore") @Operation("archive-restore")
@WebApiParam(name = "restoreArchivedContentRequest", title = "Request for restore version content from archive", @WebApiParam(name = "restoreArchivedContentRequest", title = "Request for restore version content from archive",
description = "Optional parameters for restore version content from archive", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT) description = "Optional parameters for restore version content from archive", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)

View File

@@ -25,15 +25,12 @@
*/ */
package org.alfresco.rest.framework.core.exceptions; package org.alfresco.rest.framework.core.exceptions;
import org.alfresco.service.Experimental;
/** /**
* Thrown when the content is archived and not readily accessible. * Thrown when the content is archived and not readily accessible.
* Status is <i>Precondition Failed</i> client error = 412. * Status is <i>Precondition Failed</i> client error = 412.
* *
* @author David Edwards * @author David Edwards
*/ */
@Experimental
public class ArchivedContentException extends ApiException public class ArchivedContentException extends ApiException
{ {

View File

@@ -25,9 +25,6 @@
*/ */
package org.alfresco.rest.framework.core.exceptions; package org.alfresco.rest.framework.core.exceptions;
import org.alfresco.service.Experimental;
@Experimental
public class RestoreInProgressException extends ApiException public class RestoreInProgressException extends ApiException
{ {
public static String DEFAULT_MESSAGE_ID = "framework.exception.RestoreInProgress"; public static String DEFAULT_MESSAGE_ID = "framework.exception.RestoreInProgress";

View File

@@ -35,7 +35,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.cache.SimpleCache; import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
@@ -425,7 +424,6 @@ public abstract class AbstractRoutingContentStore implements ContentStore
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public Map<String, String> getStorageProperties(String contentUrl) public Map<String, String> getStorageProperties(String contentUrl)
{ {
ContentStore contentStore = selectReadStore(contentUrl); ContentStore contentStore = selectReadStore(contentUrl);
@@ -445,7 +443,6 @@ public abstract class AbstractRoutingContentStore implements ContentStore
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams) public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
{ {
final ContentStore contentStore = selectReadStore(contentUrl); final ContentStore contentStore = selectReadStore(contentUrl);
@@ -463,7 +460,6 @@ public abstract class AbstractRoutingContentStore implements ContentStore
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams) public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
{ {
final ContentStore contentStore = selectReadStore(contentUrl); final ContentStore contentStore = selectReadStore(contentUrl);

View File

@@ -46,7 +46,6 @@ import org.alfresco.repo.policy.ClassPolicyDelegate;
import org.alfresco.repo.policy.JavaBehaviour; import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent; import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.InvalidTypeException; import org.alfresco.service.cmr.dictionary.InvalidTypeException;
@@ -668,7 +667,6 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public Map<String, String> getStorageProperties(NodeRef nodeRef, QName propertyQName) public Map<String, String> getStorageProperties(NodeRef nodeRef, QName propertyQName)
{ {
final ContentData contentData = getContentDataOrThrowError(nodeRef, propertyQName); final ContentData contentData = getContentDataOrThrowError(nodeRef, propertyQName);

View File

@@ -37,7 +37,6 @@ import org.alfresco.repo.content.caching.quota.QuotaManagerStrategy;
import org.alfresco.repo.content.caching.quota.UnlimitedQuotaStrategy; import org.alfresco.repo.content.caching.quota.UnlimitedQuotaStrategy;
import org.alfresco.repo.content.filestore.FileContentStore; import org.alfresco.repo.content.filestore.FileContentStore;
import org.alfresco.repo.content.filestore.SpoofedTextContentReader; import org.alfresco.repo.content.filestore.SpoofedTextContentReader;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentStreamListener; import org.alfresco.service.cmr.repository.ContentStreamListener;
@@ -387,7 +386,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public Map<String, String> getStorageProperties(final String contentUrl) public Map<String, String> getStorageProperties(final String contentUrl)
{ {
return backingStore.getStorageProperties(contentUrl); return backingStore.getStorageProperties(contentUrl);
@@ -397,7 +395,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams) public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
{ {
return backingStore.requestSendContentToArchive(contentUrl, archiveParams); return backingStore.requestSendContentToArchive(contentUrl, archiveParams);
@@ -407,7 +404,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams) public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
{ {
return backingStore.requestRestoreContentFromArchive(contentUrl, restoreParams); return backingStore.requestRestoreContentFromArchive(contentUrl, restoreParams);

View File

@@ -40,7 +40,6 @@ import org.alfresco.repo.content.ContentContext;
import org.alfresco.repo.content.ContentStore; import org.alfresco.repo.content.ContentStore;
import org.alfresco.repo.content.UnsupportedContentUrlException; import org.alfresco.repo.content.UnsupportedContentUrlException;
import org.alfresco.repo.content.caching.CachingContentStore; import org.alfresco.repo.content.caching.CachingContentStore;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
@@ -403,7 +402,6 @@ public class AggregatingContentStore extends AbstractContentStore
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public Map<String, String> getStorageProperties(String contentUrl) public Map<String, String> getStorageProperties(String contentUrl)
{ {
checkPrimaryStore(); checkPrimaryStore();
@@ -457,7 +455,6 @@ public class AggregatingContentStore extends AbstractContentStore
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Experimental
@Override @Override
public boolean requestSendContentToArchive(final String contentUrl, Map<String, Serializable> archiveParams) public boolean requestSendContentToArchive(final String contentUrl, Map<String, Serializable> archiveParams)
{ {
@@ -467,7 +464,6 @@ public class AggregatingContentStore extends AbstractContentStore
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Experimental
@Override @Override
public boolean requestRestoreContentFromArchive(final String contentUrl, final Map<String, Serializable> restoreParams) public boolean requestRestoreContentFromArchive(final String contentUrl, final Map<String, Serializable> restoreParams)
{ {

View File

@@ -43,7 +43,6 @@ import org.alfresco.repo.domain.tenant.TenantEntity;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork; import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.Experimental;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
@@ -276,7 +275,6 @@ public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingC
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Experimental
@Override @Override
public Map<String, String> getStorageProperties(String contentUrl) public Map<String, String> getStorageProperties(String contentUrl)
{ {
@@ -287,7 +285,6 @@ public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingC
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams) public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
{ {
return getTenantContentStore().requestSendContentToArchive(contentUrl, archiveParams); return getTenantContentStore().requestSendContentToArchive(contentUrl, archiveParams);
@@ -297,7 +294,6 @@ public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingC
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
@Experimental
public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams) public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
{ {
return getTenantContentStore().requestRestoreContentFromArchive(contentUrl, restoreParams); return getTenantContentStore().requestRestoreContentFromArchive(contentUrl, restoreParams);

View File

@@ -29,7 +29,6 @@ package org.alfresco.service.cmr.repository;
import org.alfresco.api.AlfrescoPublicApi; import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.service.Auditable; import org.alfresco.service.Auditable;
import org.alfresco.service.Experimental;
import org.alfresco.service.cmr.dictionary.InvalidTypeException; import org.alfresco.service.cmr.dictionary.InvalidTypeException;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
@@ -260,7 +259,6 @@ public interface ContentService
* @return Returns a key-value (String-String) collection of storage headers/properties with their respective values for a given {@link NodeRef}. * @return Returns a key-value (String-String) collection of storage headers/properties with their respective values for a given {@link NodeRef}.
*/ */
@Auditable(parameters = {"nodeRef", "propertyQName"}) @Auditable(parameters = {"nodeRef", "propertyQName"})
@Experimental
default Map<String, String> getStorageProperties(NodeRef nodeRef, QName propertyQName) default Map<String, String> getStorageProperties(NodeRef nodeRef, QName propertyQName)
{ {
return Collections.emptyMap(); return Collections.emptyMap();
@@ -270,7 +268,6 @@ public interface ContentService
* Submit a request to send content to archive (offline) state. * Submit a request to send content to archive (offline) state.
* If no connector is present or connector is not supporting sending to archive, then {@link UnsupportedOperationException} will be returned. * If no connector is present or connector is not supporting sending to archive, then {@link UnsupportedOperationException} will be returned.
* Specific connector will decide which storage class/tier will be set for content. * Specific connector will decide which storage class/tier will be set for content.
* This method is experimental and subject to changes.
* *
* @param nodeRef a reference to a node having a content property * @param nodeRef a reference to a node having a content property
* @param propertyQName the name of the property, which must be of type <b>content</b> * @param propertyQName the name of the property, which must be of type <b>content</b>
@@ -279,7 +276,6 @@ public interface ContentService
* @throws UnsupportedOperationException when method not implemented * @throws UnsupportedOperationException when method not implemented
*/ */
@Auditable(parameters = {"nodeRef", "propertyQName", "archiveParams"}) @Auditable(parameters = {"nodeRef", "propertyQName", "archiveParams"})
@Experimental
default boolean requestSendContentToArchive(NodeRef nodeRef, QName propertyQName, default boolean requestSendContentToArchive(NodeRef nodeRef, QName propertyQName,
Map<String, Serializable> archiveParams) Map<String, Serializable> archiveParams)
{ {
@@ -293,7 +289,6 @@ public interface ContentService
* Keys of this map should be restricted to {@code ContentRestoreParams} enumeration. * Keys of this map should be restricted to {@code ContentRestoreParams} enumeration.
* For AWS S3 map can indicating expiry days, Glacier restore tier. * For AWS S3 map can indicating expiry days, Glacier restore tier.
* For Azure Blob map can indicate rehydrate priority. * For Azure Blob map can indicate rehydrate priority.
* This method is experimental and subject to changes.
* *
* @param nodeRef a reference to a node having a content property * @param nodeRef a reference to a node having a content property
* @param propertyQName the name of the property, which must be of type <b>content</b> * @param propertyQName the name of the property, which must be of type <b>content</b>
@@ -302,7 +297,6 @@ public interface ContentService
* @throws UnsupportedOperationException when method not implemented * @throws UnsupportedOperationException when method not implemented
*/ */
@Auditable(parameters = {"nodeRef", "propertyQName", "restoreParams"}) @Auditable(parameters = {"nodeRef", "propertyQName", "restoreParams"})
@Experimental
default boolean requestRestoreContentFromArchive(NodeRef nodeRef, QName propertyQName, Map<String, Serializable> restoreParams) default boolean requestRestoreContentFromArchive(NodeRef nodeRef, QName propertyQName, Map<String, Serializable> restoreParams)
{ {
throw new UnsupportedOperationException("Request to restore content from archive is not supported by content service."); throw new UnsupportedOperationException("Request to restore content from archive is not supported by content service.");