Variable naming change. Javadocs addded.

dspace-api/src/main/java/org/dspace/browse/ItemCounter.java

@@ -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());

dspace-api/src/main/java/org/dspace/content/Collection.java

@@ -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);

dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java

@@ -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);

dspace-api/src/main/java/org/dspace/content/Community.java

@@ -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);

dspace-api/src/main/java/org/dspace/content/CommunityServiceImpl.java

@@ -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);

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

@@ -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;
 }

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

@@ -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;
 }

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

@@ -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();

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

@@ -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;
     }
 

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

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

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

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