hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 05:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Variable naming change. Javadocs addded.

Browse Source
This commit is contained in:
damian
2023-06-09 16:56:26 +02:00
parent c6cf19d40c
commit ff504e35d1
11 changed files with 65 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dspace-api/src/main/java/org/dspace/browse/ItemCounter.java
View File

@@ -50,6 +50,12 @@ public class ItemCounter {
*/
private Context context;
/**
* This field is used to hold singular instance of a class.
* Singleton pattern is used but this class should be
* refactored to modern DSpace approach (injectible service).
*/
private static ItemCounter instance;
protected ItemService itemService;
@@ -73,6 +79,13 @@ public class ItemCounter {
this.useCache = configurationService.getBooleanProperty("webui.strengths.cache", true);
}
/**
* Get the singular instance of a class.
* It creates a new instance at the first usage of this method.
*
* @return instance af a class
* @throws ItemCountException when error occurs
*/
public static ItemCounter getInstance() throws ItemCountException {
if (instance == null) {
instance = new ItemCounter(ContextUtil.obtainCurrentRequestContext());

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

@@ -337,6 +337,11 @@ public class Collection extends DSpaceObject implements DSpaceObjectLegacySuppor
return collectionService;
}
/**
* return count of the collection items
*
* @return int
*/
public int countArchivedItem() {
try {
return collectionService.countArchivedItem(this);

7
dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
View File

@@ -1069,6 +1069,13 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
return collectionList;
}
/**
* Returns total collection archived items
*
* @param collection Collection
* @return total collection archived items
* @throws ItemCountException
*/
@Override
public int countArchivedItem(Collection collection) throws ItemCountException {
return ItemCounter.getInstance().getCount(collection);

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

@@ -265,6 +265,11 @@ public class Community extends DSpaceObject implements DSpaceObjectLegacySupport
return communityService;
}
/**
* return count of the community items
*
* @return int
*/
public int countArchivedItem() {
try {
return communityService.getArchivedItems(this);

7
dspace-api/src/main/java/org/dspace/content/CommunityServiceImpl.java
View File

@@ -711,6 +711,13 @@ public class CommunityServiceImpl extends DSpaceObjectServiceImpl<Community> imp
return communityDAO.countRows(context);
}
/**
* Returns total community archived items
*
* @param community Community
* @return total community archived items
* @throws ItemCountException
*/
@Override
public int getArchivedItems(Community community) throws ItemCountException {
return ItemCounter.getInstance().getCount(community);

8
dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
View File

@@ -470,5 +470,13 @@ public interface CollectionService
*/
public List<Collection> findAllCollectionsByEntityType(Context context, String entityType)
throws SearchServiceException;
/**
* Returns total collection archived items
*
* @param collection Collection
* @return total collection archived items
* @throws ItemCountException
*/
int countArchivedItem(Collection collection) throws ItemCountException;
}

7
dspace-api/src/main/java/org/dspace/content/service/CommunityService.java
View File

@@ -294,5 +294,12 @@ public interface CommunityService extends DSpaceObjectService<Community>, DSpace
int countTotal(Context context) throws SQLException;
/**
* Returns total community archived items
*
* @param community Community
* @return total community archived items
* @throws ItemCountException
*/
int getArchivedItems(Community community) throws ItemCountException;
}

3
dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/CollectionConverter.java
View File

@@ -26,9 +26,10 @@ public class CollectionConverter extends DSpaceObjectConverter<Collection, Colle
@Override
public CollectionRest convert(Collection collection, Projection projection) {
CollectionRest resource = super.convert(collection, projection);
resource.setArchivedItems(collection.countArchivedItem());
resource.setArchivedItemsCount(collection.countArchivedItem());
return resource;
}
@Override
protected CollectionRest newInstance() {
return new CollectionRest();

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/CommunityConverter.java
View File

@@ -26,7 +26,7 @@ public class CommunityConverter
public CommunityRest convert(Community community, Projection projection) {
CommunityRest resource = super.convert(community, projection);
resource.setArchivedItems(community.countArchivedItem());
resource.setArchivedItemsCount(community.countArchivedItem());
return resource;
}

10
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CollectionRest.java
View File

@@ -75,14 +75,14 @@ public class CollectionRest extends DSpaceObjectRest {
return NAME;
}
private int archivedItems;
private int archivedItemsCount;
public int getArchivedItems() {
return archivedItems;
public int getArchivedItemsCount() {
return archivedItemsCount;
}
public void setArchivedItems(int archivedItems) {
this.archivedItems = archivedItems;
public void setArchivedItemsCount(int archivedItemsCount) {
this.archivedItemsCount = archivedItemsCount;
}

10
dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CommunityRest.java
View File

@@ -59,13 +59,13 @@ public class CommunityRest extends DSpaceObjectRest {
return NAME;
}
private int archivedItems;
private int archivedItemsCount;
public int getArchivedItems() {
return archivedItems;
public int getArchivedItemsCount() {
return archivedItemsCount;
}
public void setArchivedItems(int archivedItems) {
this.archivedItems = archivedItems;
public void setArchivedItemsCount(int archivedItemsCount) {
this.archivedItemsCount = archivedItemsCount;
}
}