mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
This reverts commit 541bf63d80
.
This commit is contained in:
@@ -284,8 +284,7 @@ public class RepositoryInfo
|
|||||||
.setMaxDocs(licenseDescriptor.getMaxDocs())
|
.setMaxDocs(licenseDescriptor.getMaxDocs())
|
||||||
.setMaxUsers(licenseDescriptor.getMaxUsers())
|
.setMaxUsers(licenseDescriptor.getMaxUsers())
|
||||||
.setClusterEnabled(licenseDescriptor.isClusterEnabled())
|
.setClusterEnabled(licenseDescriptor.isClusterEnabled())
|
||||||
.setCryptodocEnabled(licenseDescriptor.isCryptodocEnabled())
|
.setCryptodocEnabled(licenseDescriptor.isCryptodocEnabled());
|
||||||
.setCustomEmbeddedWorkflowEnabled(licenseDescriptor.isCustomEmbeddedWorkflowEnabled());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Date getIssuedAt()
|
public Date getIssuedAt()
|
||||||
@@ -344,7 +343,6 @@ public class RepositoryInfo
|
|||||||
private Long maxDocs;
|
private Long maxDocs;
|
||||||
private boolean isClusterEnabled;
|
private boolean isClusterEnabled;
|
||||||
private boolean isCryptodocEnabled;
|
private boolean isCryptodocEnabled;
|
||||||
private boolean isCustomEmbeddedWorkflowEnabled;
|
|
||||||
|
|
||||||
public LicenseEntitlement()
|
public LicenseEntitlement()
|
||||||
{
|
{
|
||||||
@@ -394,17 +392,6 @@ public class RepositoryInfo
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getIsCustomEmbeddedWorkflowEnabled()
|
|
||||||
{
|
|
||||||
return isCustomEmbeddedWorkflowEnabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LicenseEntitlement setCustomEmbeddedWorkflowEnabled(boolean customEmbeddedWorkflowEnabled)
|
|
||||||
{
|
|
||||||
isCustomEmbeddedWorkflowEnabled = customEmbeddedWorkflowEnabled;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
@@ -413,7 +400,6 @@ public class RepositoryInfo
|
|||||||
.append(", maxDocs=").append(maxDocs)
|
.append(", maxDocs=").append(maxDocs)
|
||||||
.append(", isClusterEnabled=").append(isClusterEnabled)
|
.append(", isClusterEnabled=").append(isClusterEnabled)
|
||||||
.append(", isCryptodocEnabled=").append(isCryptodocEnabled)
|
.append(", isCryptodocEnabled=").append(isCryptodocEnabled)
|
||||||
.append(", isCustomEmbeddedWorkflowEnabled=").append(isCustomEmbeddedWorkflowEnabled)
|
|
||||||
.append(']');
|
.append(']');
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
* #%L
|
* #%L
|
||||||
* Alfresco Remote API
|
* 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.
|
* This file is part of the Alfresco software.
|
||||||
* If the software was purchased under a paid Alfresco license, the terms of
|
* 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());
|
assertEquals(1000L, entitlements.getMaxDocs().longValue());
|
||||||
assertTrue(entitlements.getIsClusterEnabled());
|
assertTrue(entitlements.getIsClusterEnabled());
|
||||||
assertFalse(entitlements.getIsCryptodocEnabled());
|
assertFalse(entitlements.getIsCryptodocEnabled());
|
||||||
assertFalse(entitlements.getIsCustomEmbeddedWorkflowEnabled());
|
|
||||||
|
|
||||||
// Check status
|
// Check status
|
||||||
StatusInfo statusInfo = repositoryInfo.getStatus();
|
StatusInfo statusInfo = repositoryInfo.getStatus();
|
||||||
@@ -298,13 +297,11 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
|
|||||||
assertEquals(1000L, entitlements.getMaxDocs().longValue());
|
assertEquals(1000L, entitlements.getMaxDocs().longValue());
|
||||||
assertTrue(entitlements.getIsClusterEnabled());
|
assertTrue(entitlements.getIsClusterEnabled());
|
||||||
assertFalse(entitlements.getIsCryptodocEnabled());
|
assertFalse(entitlements.getIsCryptodocEnabled());
|
||||||
assertFalse(entitlements.getIsCustomEmbeddedWorkflowEnabled());
|
|
||||||
|
|
||||||
// Override entitlements
|
// Override entitlements
|
||||||
when(licenseDescriptorMock.getMaxDocs()).thenReturn(null);
|
when(licenseDescriptorMock.getMaxDocs()).thenReturn(null);
|
||||||
when(licenseDescriptorMock.isClusterEnabled()).thenReturn(false);
|
when(licenseDescriptorMock.isClusterEnabled()).thenReturn(false);
|
||||||
when(licenseDescriptorMock.isCryptodocEnabled()).thenReturn(true);
|
when(licenseDescriptorMock.isCryptodocEnabled()).thenReturn(true);
|
||||||
when(licenseDescriptorMock.isCustomEmbeddedWorkflowEnabled()).thenReturn(true);
|
|
||||||
|
|
||||||
response = get("discovery", null, 200);
|
response = get("discovery", null, 200);
|
||||||
|
|
||||||
@@ -322,7 +319,6 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
|
|||||||
assertNull(entitlements.getMaxDocs());
|
assertNull(entitlements.getMaxDocs());
|
||||||
assertFalse(entitlements.getIsClusterEnabled());
|
assertFalse(entitlements.getIsClusterEnabled());
|
||||||
assertTrue(entitlements.getIsCryptodocEnabled());
|
assertTrue(entitlements.getIsCryptodocEnabled());
|
||||||
assertTrue(entitlements.getIsCustomEmbeddedWorkflowEnabled());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Reference in New Issue
Block a user