[DS-2902] Remove duplicate variable declaration when inheriting from an abstract class

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

@@ -23,7 +23,6 @@ import org.dspace.eperson.Group;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.eperson.service.SubscribeService;
 import org.dspace.event.Event;
-import org.dspace.handle.service.HandleService;
 import org.dspace.workflow.factory.WorkflowServiceFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -58,8 +57,6 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
     @Autowired(required = true)
     protected GroupService groupService;
 
-    @Autowired(required = true)
-    protected HandleService handleService;
     @Autowired(required = true)
     protected LicenseService licenseService;
     @Autowired(required = true)

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

@@ -24,7 +24,6 @@ import org.dspace.core.LogManager;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.event.Event;
-import org.dspace.handle.service.HandleService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
@@ -51,8 +50,6 @@ public class CommunityServiceImpl extends DSpaceObjectServiceImpl<Community> imp
     @Autowired(required = true)
     protected CollectionService collectionService;
     @Autowired(required = true)
-    protected HandleService handleService;
-    @Autowired(required = true)
     protected GroupService groupService;
     @Autowired(required = true)
     protected AuthorizeService authorizeService;

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

@@ -26,7 +26,6 @@ import org.dspace.core.LogManager;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.dspace.event.Event;
-import org.dspace.handle.service.HandleService;
 import org.dspace.identifier.IdentifierException;
 import org.dspace.identifier.service.IdentifierService;
 import org.dspace.versioning.service.VersioningService;
@@ -57,16 +56,12 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
     @Autowired(required = true)
     protected CommunityService communityService;
     @Autowired(required = true)
-    protected HandleService handleService;
-    @Autowired(required = true)
     protected AuthorizeService authorizeService;
     @Autowired(required = true)
     protected BundleService bundleService;
     @Autowired(required = true)
     protected BitstreamFormatService bitstreamFormatService;
     @Autowired(required = true)
-    protected ChoiceAuthorityService choiceAuthorityService;
-    @Autowired(required = true)
     protected MetadataSchemaService metadataSchemaService;
     @Autowired(required = true)
     protected BitstreamService bitstreamService;

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

@@ -15,7 +15,6 @@ import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.event.Event;
-import org.dspace.handle.service.HandleService;
 import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -35,9 +34,6 @@ public class SiteServiceImpl extends DSpaceObjectServiceImpl<Site> implements Si
     @Autowired(required = true)
     protected AuthorizeService authorizeService;
 
-    @Autowired(required = true)
-    protected HandleService handleService;
-
     @Autowired(required = true)
     protected ConfigurationService configurationService;
 

dspace-api/src/main/java/org/dspace/ctask/general/MicrosoftTranslator.java

@@ -35,7 +35,6 @@ public class MicrosoftTranslator extends AbstractTranslator
     protected final String PLUGIN_PREFIX = "translator";
 
     protected final String baseUrl = "http://api.microsofttranslator.com/V2/Http.svc/Translate";
-    protected String apiKey = "";
 
     private static final Logger log = Logger.getLogger(MicrosoftTranslator.class);
 

dspace-api/src/main/java/org/dspace/submit/step/UploadWithEmbargoStep.java

@@ -28,8 +28,6 @@ import org.dspace.authorize.ResourcePolicy;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.authorize.service.ResourcePolicyService;
 import org.dspace.content.*;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.core.Context;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.curate.Curator;
@@ -70,7 +68,6 @@ public class UploadWithEmbargoStep extends UploadStep
     /** log4j logger */
     private static Logger log = Logger.getLogger(UploadWithEmbargoStep.class);
 
-    protected BitstreamFormatService bitstreamFormatService = ContentServiceFactory.getInstance().getBitstreamFormatService();
     protected HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
     protected GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
     protected ResourcePolicyService resourcePolicyService = AuthorizeServiceFactory.getInstance().getResourcePolicyService();

dspace-api/src/main/java/org/dspace/versioning/DefaultItemVersionProvider.java

@@ -8,7 +8,6 @@
 package org.dspace.versioning;
 
 import org.dspace.authorize.AuthorizeException;
-import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.Item;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.service.WorkspaceItemService;
@@ -39,8 +38,6 @@ public class DefaultItemVersionProvider extends AbstractVersionProvider implemen
     protected VersionHistoryService versionHistoryService;
     @Autowired(required = true)
     protected IdentifierService identifierService;
-    @Autowired(required = true)
-    protected AuthorizeService authorizeService;
 
     @Override
     public Item createNewItemAndAddItInWorkspace(Context context, Item nativeItem) {

dspace-swordv2/src/main/java/org/dspace/sword2/BinaryContentIngester.java

@@ -17,11 +17,9 @@ import org.dspace.content.WorkspaceItem;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.BundleService;
-import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.dspace.workflow.factory.WorkflowServiceFactory;
 import org.swordapp.server.Deposit;
 import org.swordapp.server.SwordAuthException;
 import org.swordapp.server.SwordError;
@@ -36,9 +34,6 @@ public class BinaryContentIngester extends AbstractSwordContentIngester
     protected WorkspaceItemService workspaceItemService = ContentServiceFactory
             .getInstance().getWorkspaceItemService();
 
-    protected ItemService itemService = ContentServiceFactory.getInstance()
-            .getItemService();
-
     protected BundleService bundleService = ContentServiceFactory.getInstance()
             .getBundleService();
 

dspace-swordv2/src/main/java/org/dspace/sword2/CollectionListManagerDSpace.java

@@ -16,7 +16,6 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
@@ -34,9 +33,6 @@ import java.util.List;
 public class CollectionListManagerDSpace extends DSpaceSwordAPI
         implements CollectionListManager
 {
-    protected ItemService itemService = ContentServiceFactory.getInstance()
-            .getItemService();
-
     protected WorkspaceItemService workspaceItemService = ContentServiceFactory
             .getInstance().getWorkspaceItemService();
 

dspace-swordv2/src/main/java/org/dspace/sword2/MediaResourceManagerDSpace.java

@@ -14,8 +14,6 @@ import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.Item;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.BitstreamService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
@@ -35,9 +33,6 @@ public class MediaResourceManagerDSpace extends DSpaceSwordAPI
     protected AuthorizeService authorizeService = AuthorizeServiceFactory
             .getInstance().getAuthorizeService();
 
-    protected BitstreamService bitstreamService = ContentServiceFactory
-            .getInstance().getBitstreamService();
-
     private VerboseDescription verboseDescription = new VerboseDescription();
 
     private boolean isAccessible(Context context, Bitstream bitstream)

dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCEntryIngester.java

@@ -11,7 +11,6 @@ import org.apache.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.*;
 import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
@@ -29,9 +28,6 @@ public class SimpleDCEntryIngester extends AbstractSimpleDC
     private static final Logger log = Logger
             .getLogger(SimpleDCEntryIngester.class);
 
-    protected ItemService itemService = ContentServiceFactory.getInstance()
-            .getItemService();
-
     protected WorkspaceItemService workspaceItemService = ContentServiceFactory
             .getInstance().getWorkspaceItemService();
 

dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentIngester.java

@@ -36,18 +36,12 @@ import java.util.zip.ZipFile;
 
 public class SimpleZipContentIngester extends AbstractSwordContentIngester
 {
-    protected ItemService itemService = ContentServiceFactory.getInstance()
-            .getItemService();
-
     protected BundleService bundleService = ContentServiceFactory.getInstance()
             .getBundleService();
 
     protected BitstreamService bitstreamService = ContentServiceFactory
             .getInstance().getBitstreamService();
 
-    protected BitstreamFormatService bitstreamFormatService = ContentServiceFactory
-            .getInstance().getBitstreamFormatService();
-
     protected WorkspaceItemService workspaceItemService = ContentServiceFactory
             .getInstance().getWorkspaceItemService();
 

dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java

@@ -20,12 +20,10 @@ import org.dspace.content.packager.PackageIngester;
 import org.dspace.content.packager.PackageParameters;
 import org.dspace.content.packager.PackageUtils;
 import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.PluginManager;
-import org.dspace.handle.HandleServiceImpl;
 
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
@@ -46,9 +44,6 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester
     protected CollectionService collectionService = ContentServiceFactory
             .getInstance().getCollectionService();
 
-    protected ItemService itemService = ContentServiceFactory.getInstance()
-            .getItemService();
-
     protected HandleService handleService = HandleServiceFactory.getInstance()
             .getHandleService();
 

dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/submission/submit/AccessStepUtil.java

@@ -10,7 +10,6 @@ package org.dspace.app.xmlui.aspect.submission.submit;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
 import org.dspace.app.xmlui.wing.Message;
-import org.dspace.authorize.AuthorizeServiceImpl;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.authorize.service.AuthorizeService;
@@ -38,7 +37,7 @@ import java.sql.SQLException;
  *
  */
 public class AccessStepUtil extends AbstractDSpaceTransformer {
-     Context context=null;
+    private Context context=null;
 
     protected static final Message T_name =message("xmlui.Submission.submit.AccessStep.name");
 	protected static final Message T_name_help = message("xmlui.Submission.submit.AccessStep.name_help");

dspace-xmlui/src/main/java/org/dspace/app/xmlui/opensearch/DiscoveryOpenSearchGenerator.java

@@ -19,9 +19,6 @@ import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.dspace.app.util.OpenSearchServiceImpl;
-import org.dspace.app.util.factory.UtilServiceFactory;
-import org.dspace.app.util.service.OpenSearchService;
 import org.dspace.app.xmlui.utils.ContextUtil;
 import org.dspace.app.xmlui.utils.FeedUtils;
 import org.dspace.content.DSpaceObject;
@@ -64,8 +61,6 @@ public class DiscoveryOpenSearchGenerator extends AbstractOpenSearchGenerator
     /** the  search service to use */
     private SearchService searchService = null;
 
-    protected OpenSearchService openSearchService = UtilServiceFactory.getInstance().getOpenSearchService();
-
     /**
      * Setup the Discovery search service. Other paramas are setup in superclass's methods
      */

dspace-xmlui/src/main/java/org/dspace/app/xmlui/opensearch/StandardOpenSearchGenerator.java

@@ -14,9 +14,6 @@ import org.apache.avalon.excalibur.pool.Recyclable;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
 import org.apache.cocoon.xml.dom.DOMStreamer;
-import org.dspace.app.util.OpenSearchServiceImpl;
-import org.dspace.app.util.factory.UtilServiceFactory;
-import org.dspace.app.util.service.OpenSearchService;
 import org.dspace.app.xmlui.utils.ContextUtil;
 import org.dspace.app.xmlui.utils.FeedUtils;
 import org.dspace.content.Collection;
@@ -24,7 +21,6 @@ import org.dspace.content.Community;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.dspace.handle.HandleServiceImpl;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
 import org.dspace.search.DSQuery;
@@ -60,7 +56,7 @@ public class StandardOpenSearchGenerator extends AbstractOpenSearchGenerator
 {
 
     protected HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
-    protected OpenSearchService openSearchService = UtilServiceFactory.getInstance().getOpenSearchService();
+
     /**
      * Generate the search results document.
      * Params have been parsed in superclass's setup() method