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

2025-07-24 17:32:48 +00:00 · 2022-02-23 09:24:32 +01:00
parent 397539bbbe
commit abd9ec4eef
20 changed files with 2 additions and 86 deletions
--- a/remote-api/src/main/java/org/alfresco/rest/api/ContentStorageInformation.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/ContentStorageInformation.java
@@ -30,49 +30,37 @@ import org.alfresco.rest.api.model.ArchiveContentRequest;
 import org.alfresco.rest.api.model.ContentStorageInfo;
 import org.alfresco.rest.api.model.RestoreArchivedContentRequest;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.NodeRef;

 /**
 * Storage information for content API.
- * Note: Currently marked as experimental and subject to change.
 *
 * @author mpichura
 */
-@Experimental
 public interface ContentStorageInformation
 {
    /**
-     * Note: Currently marked as experimental and subject to change.
-     *
     * @param nodeRef         Node reference
     * @param contentPropName Qualified name of content property (e.g. 'cm_content')
     * @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
     */
-    @Experimental
    ContentStorageInfo getStorageInfo(NodeRef nodeRef, String contentPropName, Parameters parameters);

    /**
-     * Note: Currently marked as experimental and subject to change.
-     *
     * @param nodeRef               Node reference
     * @param contentPropName       Qualified name of content property (e.g. 'cm_content')
     * @param archiveContentRequest {@link ArchiveContentRequest} object holding parameters for archive content request
     * @return true when request successful, false when unsuccessful
     */
-    @Experimental
    boolean requestArchiveContent(NodeRef nodeRef, String contentPropName, ArchiveContentRequest archiveContentRequest);

    /**
-     * Note: Currently marked as experimental and subject to change.
-     *
     * @param nodeRef                       Node reference
     * @param contentPropName               Qualified name of content property (e.g. 'cm_content')
     * @param restoreArchivedContentRequest {@link RestoreArchivedContentRequest} object holding parameters for restore from archive request
     * @return true when request successful, false when unsuccessful
     */
-    @Experimental
    boolean requestRestoreContentFromArchive(NodeRef nodeRef, String contentPropName,
                                             RestoreArchivedContentRequest restoreArchivedContentRequest);
 }
--- a/remote-api/src/main/java/org/alfresco/rest/api/impl/ContentStorageInformationImpl.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/ContentStorageInformationImpl.java
@@ -33,7 +33,6 @@ import org.alfresco.rest.api.model.ContentStorageInfo;
 import org.alfresco.rest.api.model.RestoreArchivedContentRequest;
 import org.alfresco.rest.framework.core.exceptions.RestoreInProgressException;
 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.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
@@ -45,11 +44,9 @@ import java.util.Map;

 /**
 * Default implementation for {@link ContentStorageInformation}
- * Note: Currently marked as experimental and subject to change.
 *
 * @author mpichura
 */
-@Experimental
 public class ContentStorageInformationImpl implements ContentStorageInformation
 {

@@ -68,7 +65,6 @@ public class ContentStorageInformationImpl implements ContentStorageInformation
     * {@inheritDoc}
     */
    @Override
-    @Experimental
    public ContentStorageInfo getStorageInfo(NodeRef nodeRef, String contentPropName, Parameters parameters)
    {
        final QName propQName = getQName(contentPropName);
--- a/remote-api/src/main/java/org/alfresco/rest/api/impl/DownloadsImpl.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/DownloadsImpl.java
@@ -38,7 +38,6 @@ import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.model.Download;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 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.DownloadStatus;
 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
     * @see #checkArchiveStatus(NodeRef[], int, Set)
     */
-    @Experimental
-    protected void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit) 
+    protected void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit)
    {
        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 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)
    {
        // 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);
    }
--- a/remote-api/src/main/java/org/alfresco/rest/api/model/ArchiveContentRequest.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/ArchiveContentRequest.java
@@ -26,19 +26,15 @@

 package org.alfresco.rest.api.model;

-import org.alfresco.service.Experimental;
-
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;

 /**
 * Request for content archive.
- * Marked as experimental and subject to change.
 *
 * @author mpichura
 */
-@Experimental
 public class ArchiveContentRequest
 {
    /**
--- a/remote-api/src/main/java/org/alfresco/rest/api/model/RestoreArchivedContentRequest.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/model/RestoreArchivedContentRequest.java
@@ -26,15 +26,11 @@

 package org.alfresco.rest.api.model;

-import org.alfresco.service.Experimental;
-
 /**
 * Request for restore content from archive.
- * Marked as experimental and subject to change.
 *
 * @author mpichura
 */
-@Experimental
 public class RestoreArchivedContentRequest
 {
    /**
--- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelation.java
+++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelation.java
@@ -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.parameters.Parameters;
 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.StoreRef;
 import org.alfresco.util.PropertyCheck;
@@ -49,11 +48,9 @@ import javax.servlet.http.HttpServletResponse;

 /**
 * Node storage information.
- * Note: Currently marked as experimental and subject to change.
 *
 * @author mpichura
 */
-@Experimental
@RelationshipResource(name = "storage-info", entityResource = NodesEntityResource.class, title = "Node's content storage information")
 public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadById<ContentStorageInfo>, InitializingBean
 {
@@ -82,7 +79,6 @@ public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadB
        return storageInformation.getStorageInfo(nodeRef, contentPropName, parameters);
    }

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

-    @Experimental
    @Operation("archive")
    @WebApiParam(name = "archiveContentRequest", title = "Request for archive version content",
            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")
    @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)
--- a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ArchivedContentException.java
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ArchivedContentException.java
@@ -25,15 +25,12 @@
 */
 package org.alfresco.rest.framework.core.exceptions;

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

--- a/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/RestoreInProgressException.java
+++ b/remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/RestoreInProgressException.java
@@ -25,9 +25,6 @@
 */
 package org.alfresco.rest.framework.core.exceptions;

-import org.alfresco.service.Experimental;
-
-@Experimental
 public class RestoreInProgressException extends  ApiException
 {
    public static String DEFAULT_MESSAGE_ID = "framework.exception.RestoreInProgress";