diff --git a/remote-api/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java b/remote-api/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java index b177942b84..60bbadd32a 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java @@ -284,8 +284,7 @@ public class RepositoryInfo .setMaxDocs(licenseDescriptor.getMaxDocs()) .setMaxUsers(licenseDescriptor.getMaxUsers()) .setClusterEnabled(licenseDescriptor.isClusterEnabled()) - .setCryptodocEnabled(licenseDescriptor.isCryptodocEnabled()) - .setCustomEmbeddedWorkflowEnabled(licenseDescriptor.isCustomEmbeddedWorkflowEnabled()); + .setCryptodocEnabled(licenseDescriptor.isCryptodocEnabled()); } public Date getIssuedAt() @@ -344,7 +343,6 @@ public class RepositoryInfo private Long maxDocs; private boolean isClusterEnabled; private boolean isCryptodocEnabled; - private boolean isCustomEmbeddedWorkflowEnabled; public LicenseEntitlement() { @@ -394,17 +392,6 @@ public class RepositoryInfo return this; } - public boolean getIsCustomEmbeddedWorkflowEnabled() - { - return isCustomEmbeddedWorkflowEnabled; - } - - public LicenseEntitlement setCustomEmbeddedWorkflowEnabled(boolean customEmbeddedWorkflowEnabled) - { - isCustomEmbeddedWorkflowEnabled = customEmbeddedWorkflowEnabled; - return this; - } - @Override public String toString() { @@ -413,7 +400,6 @@ public class RepositoryInfo .append(", maxDocs=").append(maxDocs) .append(", isClusterEnabled=").append(isClusterEnabled) .append(", isCryptodocEnabled=").append(isCryptodocEnabled) - .append(", isCustomEmbeddedWorkflowEnabled=").append(isCustomEmbeddedWorkflowEnabled) .append(']'); return sb.toString(); } diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java index ba70eea362..f244401350 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2022 Alfresco Software Limited + * Copyright (C) 2005 - 2021 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -177,7 +177,6 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest assertEquals(1000L, entitlements.getMaxDocs().longValue()); assertTrue(entitlements.getIsClusterEnabled()); assertFalse(entitlements.getIsCryptodocEnabled()); - assertFalse(entitlements.getIsCustomEmbeddedWorkflowEnabled()); // Check status StatusInfo statusInfo = repositoryInfo.getStatus(); @@ -298,13 +297,11 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest assertEquals(1000L, entitlements.getMaxDocs().longValue()); assertTrue(entitlements.getIsClusterEnabled()); assertFalse(entitlements.getIsCryptodocEnabled()); - assertFalse(entitlements.getIsCustomEmbeddedWorkflowEnabled()); // Override entitlements when(licenseDescriptorMock.getMaxDocs()).thenReturn(null); when(licenseDescriptorMock.isClusterEnabled()).thenReturn(false); when(licenseDescriptorMock.isCryptodocEnabled()).thenReturn(true); - when(licenseDescriptorMock.isCustomEmbeddedWorkflowEnabled()).thenReturn(true); response = get("discovery", null, 200); @@ -322,7 +319,6 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest assertNull(entitlements.getMaxDocs()); assertFalse(entitlements.getIsClusterEnabled()); assertTrue(entitlements.getIsCryptodocEnabled()); - assertTrue(entitlements.getIsCustomEmbeddedWorkflowEnabled()); } @Test