this, final , static imports, manual formatting, removed redundant variables

Author: lbownik

fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvesterServiceBean.java

@@ -1,13 +1,17 @@
 package edu.harvard.iq.dataverse.harvest.client;
 
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.SEVERE;
+import static java.util.logging.Logger.getLogger;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.FileHandler;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 
@@ -19,8 +23,6 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.gson.Gson;
 
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
@@ -46,7 +48,7 @@ public class HarvesterServiceBean {
 
     private final Map<HarvestType, Harvester<?>> harvesterMap = new HashMap<>();
 
-    private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.client.HarvesterServiceBean");
+    private static final Logger logger = getLogger(HarvesterServiceBean.class.getName());
     private static final SimpleDateFormat logFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss");
 
     public HarvesterServiceBean() {
@@ -57,103 +59,107 @@ public HarvesterServiceBean() {
 
     @PostConstruct
     public void postConstruct() {
-        harvesterMap.put(oaiHarvester.harvestType(), oaiHarvester);
-        harvesterMap.put(dataciteDOIHarvester.harvestType(), dataciteDOIHarvester);
+        this.harvesterMap.put(this.oaiHarvester.harvestType(), this.oaiHarvester);
+        this.harvesterMap.put(this.dataciteDOIHarvester.harvestType(), this.dataciteDOIHarvester);
     }
 
     /**
      * Called to run an "On Demand" harvest.
      */
     @Asynchronous
-    public void doAsyncHarvest(DataverseRequest dataverseRequest, 
-    		HarvestingClient harvestingClient, HarvesterParams params) {
+    public void doAsyncHarvest(final DataverseRequest request, 
+    		final HarvestingClient client, final HarvesterParams params) {
 
         try {
-            doHarvest(dataverseRequest, harvestingClient.getId(), params);
-        } catch (Exception e) {
+            doHarvest(request, client.getId(), params);
+        } catch (final Exception e) {
             logger.info("Caught exception running an asynchronous harvest (dataverse \"" + 
-            			harvestingClient.getName() + "\")");
+            			client.getName() + "\")");
         }
     }
 
     /**
      * Run a harvest for an individual harvesting Dataverse
      *
-     * @param dataverseRequest
+     * @param request
      * @param harvestingClientId
      * @throws IOException
      */
-    public <T extends HarvesterParams> void doHarvest(DataverseRequest dataverseRequest, 
-    		Long harvestingClientId, HarvesterParams params) throws IOException {
-        HarvestingClient client = harvestingClientService.find(harvestingClientId);
-
+    public <T extends HarvesterParams> void doHarvest(final DataverseRequest request, 
+    		final Long harvestingClientId, final HarvesterParams params) 
+    				throws IOException {
+    	
+        final HarvestingClient client = harvestingClientService.find(harvestingClientId);
         if (client == null) {
             throw new IOException("No such harvesting client: id=" + harvestingClientId);
         }
 
-        Dataverse harvestingDataverse = client.getDataverse();
+        final Dataverse harvestingDataverse = client.getDataverse();
 
-        String logTimestamp = logFormatter.format(new Date());
-        Logger hdLogger = Logger.getLogger("edu.harvard.iq.dataverse.harvest.client.HarvesterServiceBean." + harvestingDataverse.getAlias() + logTimestamp);
-        String logFileName = "../logs" + File.separator + "harvest_" + client.getName() + '_' + logTimestamp + ".log";
-        FileHandler fileHandler = new FileHandler(logFileName);
+        final String logTimestamp = logFormatter.format(new Date());
+        Logger hdLogger = getLogger(HarvesterServiceBean.class.getName() + '.' + 
+        		harvestingDataverse.getAlias() + logTimestamp);
+        final String logFileName = "../logs" + File.separator + "harvest_" + 
+        		client.getName() + '_' + logTimestamp + ".log";
+        final FileHandler fileHandler = new FileHandler(logFileName);
         fileHandler.setFormatter(new SimpleFormatter()); 
         hdLogger.setUseParentHandlers(false);
         hdLogger.addHandler(fileHandler);
 
-        Date harvestStartTime = new Date();
-
         try {
-            boolean harvestingNow = client.isHarvestingNow();
-
-            if (harvestingNow) {
-                hdLogger.log(Level.SEVERE, "Cannot begin harvesting, Dataverse " + harvestingDataverse.getName() + " is currently being harvested.");
+            if (client.isHarvestingNow()) {
+                hdLogger.log(SEVERE, "Cannot begin harvesting, Dataverse " + 
+                		harvestingDataverse.getName() + " is currently being harvested.");
 
             } else {
-                harvestingClientService.resetHarvestInProgress(harvestingClientId);
-                harvestingClientService.setHarvestInProgress(harvestingClientId, harvestStartTime);
-
-                Harvester<T> harvester = resolveHarvester(client);
-                HarvesterResult result = harvester.harvest(dataverseRequest, client, hdLogger, params.getParams(harvester.getParamsClass()));
-
-                harvestingClientService.setHarvestSuccess(harvestingClientId, new Date(), result.getNumHarvested(), result.getNumFailed(), result.getNumDeleted());
-                hdLogger.log(Level.INFO, "COMPLETED HARVEST, server=" + client.getArchiveUrl() + ", metadataPrefix=" + client.getMetadataPrefix());
-                hdLogger.log(Level.INFO, "Datasets created/updated: " + result.getNumHarvested() + ", datasets deleted: " + result.getNumDeleted() + ", datasets failed: " + result.getNumFailed());
+                this.harvestingClientService.resetHarvestInProgress(harvestingClientId);
+                this.harvestingClientService.setHarvestInProgress(harvestingClientId, new Date());
+
+                final Harvester<T> harvester = resolveHarvester(client);
+                final HarvesterResult result = harvester.harvest(request, 
+                		client, hdLogger, params.getParams(harvester.getParamsClass()));
+
+                this.harvestingClientService.setHarvestSuccess(harvestingClientId,
+                		new Date(), result.getNumHarvested(), result.getNumFailed(), 
+                		result.getNumDeleted());
+                hdLogger.log(INFO, "COMPLETED HARVEST, server=" + client.getArchiveUrl() + 
+                		", metadataPrefix=" + client.getMetadataPrefix());
+                hdLogger.log(INFO, "Datasets created/updated: " + result.getNumHarvested() + 
+                		", datasets deleted: " + result.getNumDeleted() + 
+                		", datasets failed: " + result.getNumFailed());
             }
         } catch (Throwable e) {
-            String message = "Exception processing harvest, server= " + 
+            final String message = "Exception processing harvest, server= " + 
                     client.getHarvestingUrl() + ",format=" + 
                     client.getMetadataPrefix() + ' ' + e.getClass().getName();
-            hdLogger.log(Level.SEVERE, message, e);
+            hdLogger.log(SEVERE, message, e);
             //logException(e, hdLogger);
-            hdLogger.log(Level.INFO, "HARVEST NOT COMPLETED DUE TO UNEXPECTED ERROR.");
+            hdLogger.log(INFO, "HARVEST NOT COMPLETED DUE TO UNEXPECTED ERROR.");
             // TODO:
             // even though this harvesting run failed, we may have had successfully
             // processed some number of datasets, by the time the exception was thrown.
             // We should record that number too. And the number of the datasets that
             // had failed, that we may have counted.  -- L.A. 4.4
-            harvestingClientService.setHarvestFailure(harvestingClientId, new Date());
+            this.harvestingClientService.setHarvestFailure(harvestingClientId, new Date());
 
         } finally {
-            harvestingClientService.resetHarvestInProgress(harvestingClientId);
+            this.harvestingClientService.resetHarvestInProgress(harvestingClientId);
             fileHandler.close();
             hdLogger.removeHandler(fileHandler);
         }
     }
 
-    public HarvesterParams parseParams(HarvestingClient client, String paramsJson) {
-        if (StringUtils.isBlank(paramsJson)) {
-            return HarvesterParams.empty();
-        }
-
-        return new Gson().fromJson(paramsJson, resolveHarvester(client).getParamsClass());
+    public HarvesterParams parseParams(final HarvestingClient client, final String paramsJson) {
+        return isBlank(paramsJson)
+            ? HarvesterParams.empty()
+            : new Gson().fromJson(paramsJson, resolveHarvester(client).getParamsClass());
     }
 
     // -------------------- PRIVATE --------------------
 
     @SuppressWarnings("unchecked")
-    private <T extends HarvesterParams> Harvester<T> resolveHarvester(HarvestingClient client) {
-        Harvester<?> harvester = harvesterMap.get(client.getHarvestType());
+    private <T extends HarvesterParams> Harvester<T> resolveHarvester(final HarvestingClient client) {
+        final Harvester<?> harvester = this.harvesterMap.get(client.getHarvestType());
         if (harvester == null) {
             throw new IllegalStateException("Unsupported harvest type");
         }