inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38 from Alfresco/feature/REPO-2372

Browse Source 
REPO-2372: Add repository ID to the discovery API
This commit is contained in:
Cristian Turlica
2018-01-30 15:17:40 +02:00
committed by GitHub
parent d7500c5400 f59b29dad4
commit 459ea8e9a5
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
View File

@@ -145,6 +145,7 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
} }
Descriptor serverDescriptor = descriptorService.getServerDescriptor(); Descriptor serverDescriptor = descriptorService.getServerDescriptor();
return new RepositoryInfo() return new RepositoryInfo()
.setId(descriptorService.getCurrentRepositoryDescriptor().getId())
.setEdition(serverDescriptor.getEdition()) .setEdition(serverDescriptor.getEdition())
.setVersion(new VersionInfo(serverDescriptor)) .setVersion(new VersionInfo(serverDescriptor))
.setLicense(licenseInfo) .setLicense(licenseInfo)

12
src/main/java/org/alfresco/rest/api/model/RepositoryInfo.java
View File

@@ -44,12 +44,24 @@ import java.util.stream.Collectors;
*/ */
public class RepositoryInfo public class RepositoryInfo
{ {
private String id;
private String edition; private String edition;
private VersionInfo version; private VersionInfo version;
private LicenseInfo license; private LicenseInfo license;
private StatusInfo status; private StatusInfo status;
private List<ModulePackage> modules; private List<ModulePackage> modules;
public String getId()
{
return id;
}
public RepositoryInfo setId(String id)
{
this.id = id;
return this;
}
public String getEdition() public String getEdition()
{ {
return edition; return edition;

5
src/test/java/org/alfresco/rest/api/tests/DiscoveryApiTest.java
View File

@@ -74,6 +74,8 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
@Mock @Mock
private Descriptor serverDescriptor; private Descriptor serverDescriptor;
@Mock @Mock
private Descriptor currentRepositoryDescriptor;
@Mock
private LicenseDescriptor licenseDescriptorMock; private LicenseDescriptor licenseDescriptorMock;
private DiscoveryApiWebscript discoveryApiWebscript; private DiscoveryApiWebscript discoveryApiWebscript;
@@ -94,6 +96,8 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
this.licenseDescriptorMock = mock(LicenseDescriptor.class); this.licenseDescriptorMock = mock(LicenseDescriptor.class);
when(descriptorServiceMock.getServerDescriptor()).thenReturn(serverDescriptor); when(descriptorServiceMock.getServerDescriptor()).thenReturn(serverDescriptor);
when(descriptorServiceMock.getCurrentRepositoryDescriptor()).thenReturn(currentRepositoryDescriptor);
when(currentRepositoryDescriptor.getId()).thenReturn("repoId");
when(serverDescriptor.getEdition()).thenReturn("Enterprise"); when(serverDescriptor.getEdition()).thenReturn("Enterprise");
when(serverDescriptor.getVersionMajor()).thenReturn("5"); when(serverDescriptor.getVersionMajor()).thenReturn("5");
when(serverDescriptor.getVersionMinor()).thenReturn("2"); when(serverDescriptor.getVersionMinor()).thenReturn("2");
@@ -143,6 +147,7 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
assertNotNull(discoveryDetails); assertNotNull(discoveryDetails);
RepositoryInfo repositoryInfo = discoveryDetails.getRepository(); RepositoryInfo repositoryInfo = discoveryDetails.getRepository();
assertNotNull(repositoryInfo); assertNotNull(repositoryInfo);
assertEquals("repoId", repositoryInfo.getId());
assertEquals("Enterprise", repositoryInfo.getEdition()); assertEquals("Enterprise", repositoryInfo.getEdition());
// Check version info // Check version info