hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-09 19:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-3406: Sort communities and collections in-memory using a comparator

Browse Source
This commit is contained in:
Tom Desair
2017-03-23 15:27:02 +01:00
committed by Tim Donohue
parent 27255735c4
commit 73e6724ac4
5 changed files with 120 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dspace-api/src/main/java/org/dspace/content/Collection.java
View File

@@ -7,6 +7,7 @@
*/
package org.dspace.content;
import org.dspace.content.comparator.NameAscendingComparator;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.CollectionService;
import org.dspace.core.*;
@@ -16,6 +17,7 @@ import org.hibernate.proxy.HibernateProxyHelper;
import javax.persistence.*;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@@ -263,6 +265,7 @@ public class Collection extends DSpaceObject implements DSpaceObjectLegacySuppor
*/
public List<Community> getCommunities() throws SQLException
{
Collections.sort(communities, new NameAscendingComparator());
return communities;
}

4
dspace-api/src/main/java/org/dspace/content/Community.java
View File

@@ -9,6 +9,7 @@ package org.dspace.content;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.log4j.Logger;
import org.dspace.content.comparator.NameAscendingComparator;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.CommunityService;
import org.dspace.core.*;
@@ -140,6 +141,7 @@ public class Community extends DSpaceObject implements DSpaceObjectLegacySupport
*/
public List<Collection> getCollections()
{
Collections.sort(collections, new NameAscendingComparator());
return collections;
}
@@ -162,6 +164,7 @@ public class Community extends DSpaceObject implements DSpaceObjectLegacySupport
*/
public List<Community> getSubcommunities()
{
Collections.sort(subCommunities, new NameAscendingComparator());
return subCommunities;
}
@@ -173,6 +176,7 @@ public class Community extends DSpaceObject implements DSpaceObjectLegacySupport
*/
public List<Community> getParentCommunities()
{
Collections.sort(parentCommunities, new NameAscendingComparator());
return parentCommunities;
}

3
dspace-api/src/main/java/org/dspace/content/Item.java
View File

@@ -7,6 +7,7 @@
*/
package org.dspace.content;
import org.dspace.content.comparator.NameAscendingComparator;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.ItemService;
import org.dspace.core.Constants;
@@ -16,6 +17,7 @@ import org.hibernate.proxy.HibernateProxyHelper;
import javax.persistence.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -230,6 +232,7 @@ public class Item extends DSpaceObject implements DSpaceObjectLegacySupport
*/
public List<Collection> getCollections()
{
Collections.sort(collections, new NameAscendingComparator());
return collections;
}

29
dspace-api/src/main/java/org/dspace/content/comparator/NameAscendingComparator.java Normal file
View File

@@ -0,0 +1,29 @@
/**
* The contents of this file are subject to the license and copyright
* detailed in the LICENSE and NOTICE files at the root of the source
* tree and available online at
*
* http://www.dspace.org/license/
*/
package org.dspace.content.comparator;
import org.apache.commons.lang3.ObjectUtils;
import org.dspace.content.DSpaceObject;
import java.util.Comparator;
public class NameAscendingComparator implements Comparator<DSpaceObject>{
@Override
public int compare(DSpaceObject dso1, DSpaceObject dso2) {
if (dso1 == dso2){
return 0;
}else if (dso1 == null){
return -1;
}else if (dso2 == null){
return 1;
}else {
return ObjectUtils.compare(dso1.getName(),dso2.getName());
}
}
}

81
dspace-api/src/test/java/org/dspace/content/comparator/NameAscendingComparatorTest.java Normal file
View File

@@ -0,0 +1,81 @@
/**
* The contents of this file are subject to the license and copyright
* detailed in the LICENSE and NOTICE files at the root of the source
* tree and available online at
*
* http://www.dspace.org/license/
*/
package org.dspace.content.comparator;
import org.dspace.content.DSpaceObject;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class NameAscendingComparatorTest {
private NameAscendingComparator comparator = new NameAscendingComparator();
@Mock
private DSpaceObject dso1;
@Mock
private DSpaceObject dso2;
@Test
public void testCompareLessThan() throws Exception {
when(dso1.getName()).thenReturn("a");
when(dso2.getName()).thenReturn("b");
assertTrue(comparator.compare(dso1, dso2) < 0);
}
@Test
public void testCompareGreaterThan() throws Exception {
when(dso1.getName()).thenReturn("b");
when(dso2.getName()).thenReturn("a");
assertTrue(comparator.compare(dso1, dso2) > 0);
}
@Test
public void testCompareEqual() throws Exception {
when(dso1.getName()).thenReturn("b");
when(dso2.getName()).thenReturn("b");
assertTrue(comparator.compare(dso1, dso2) == 0);
}
@Test
public void testCompareFirstNull() throws Exception {
when(dso2.getName()).thenReturn("b");
assertTrue(comparator.compare(null, dso2) < 0);
}
@Test
public void testCompareSecondNull() throws Exception {
when(dso2.getName()).thenReturn("b");
assertTrue(comparator.compare(dso1, null) > 0);
}
@Test
public void testCompareBothNull() throws Exception {
assertTrue(comparator.compare(null, null) == 0);
}
@Test
public void testCompareNameNull() throws Exception {
when(dso1.getName()).thenReturn(null);
when(dso2.getName()).thenReturn("b");
assertTrue(comparator.compare(dso1, dso2) < 0);
}
}