Changeset 7302

Timestamp:

06/08/10 17:33:55 (9 years ago)

Author:

mnagni

Message:

Created an HarvestFactory? to isolate the specific harvest instance from the general code

Location:

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization

Files:

• HarvesterFactory.java (added)
• ejb/ModelManager.java (modified) (1 diff)
• ejb/interfaces/ModelManagerLocal.java (modified) (1 diff)
• ejb/interfaces/ModelManagerRemote.java (modified) (1 diff)
• harvest/ejb/HarvestRequestConsumer.java (modified) (4 diffs)

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/ModelManager.java

@@ -124 +124 @@
          * @return an Harvester instance, otherwise <code>null</code> 
          * */
-        public Object getHarvesterConfiguration(int commonID){
-                Object ret = null;
+        public ProviderCommon getHarvesterConfiguration(int commonID){
+                ProviderCommon ret = null;
                 ret = getProvider(commonID, GET_OAI_PROVIDER);
                 if (ret == null)

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/interfaces/ModelManagerLocal.java

@@ -38 +38 @@
         public String getConfigurationParameter(String param);
         
-        public Object getHarvesterConfiguration(int commonID);
+        public ProviderCommon getHarvesterConfiguration(int commonID);
 }

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/ejb/interfaces/ModelManagerRemote.java

@@ -38 +38 @@
         public String getConfigurationParameter(String parameterName);
         
-        public Object getHarvesterConfiguration(int commonID);
+        public ProviderCommon getHarvesterConfiguration(int commonID);
         
         public ProviderCommon getProviderCommon(int commonId);

RevitalizationWS/ws/DPWS/trunk/src/main/java/ndg/services/revitalization/harvest/ejb/HarvestRequestConsumer.java

@@ -1 +1 @@
 package ndg.services.revitalization.harvest.ejb;
-
-import java.io.File;
-import java.util.Calendar;
 
 import javax.annotation.Resource;
@@ -15 +12 @@
 import javax.jms.ObjectMessage;
 
-import ndg.common.NdgMessage;
 import ndg.common.exception.NdgExecutionException;
-import ndg.services.revitalization.dictionary.ServiceConfigurationParameter;
+import ndg.services.revitalization.HarvesterFactory;
 import ndg.services.revitalization.ejb.interfaces.ModelManagerLocal;
 import ndg.services.revitalization.exception.NdgHarvestNotExistingException;
@@ -24 +20 @@
 import ndg.services.revitalization.harvest.Harvester;
 import ndg.services.revitalization.harvest.ejb.interfaces.AsyncHarvesterLocal;
-import ndg.services.revitalization.harvest.oai.OAIHarvestRequest;
-import ndg.services.revitalization.harvest.oai.OAIHarvester;
-import ndg.services.revitalization.jpa.OaiProvider;
-import ndg.services.schemas.revitalization.DoHarvestRequest;
 
 @MessageDriven(activationConfig = {
@@ -60 +52 @@
         
         private <T extends HarvestRequest> Harvester<T> getHarvester(DispatchedHarvestRequest request) throws NdgHarvestNotExistingException, NdgExecutionException {
-                Harvester harvester = null;
-                DoHarvestRequest doRequest = request.getDoHarvestRequest();
-                if (doRequest == null)
-                        throw new NdgHarvestNotExistingException(new NdgMessage("null.object", new Object[]{"DoHarvestRequest"}));
-                
-                Object harvConfig = hmm.getHarvesterConfiguration(doRequest.getProviderID());
-                if (harvConfig instanceof OaiProvider) {
-                        OAIHarvestRequest harvesterReq = new OAIHarvestRequest((OaiProvider)harvConfig, doRequest);
-                        File tmpDir = new File(hmm.getConfigurationParameter(ServiceConfigurationParameter.HARVEST_ROOT_PATH.name()) + "/" + Long.toString(Calendar.getInstance().getTimeInMillis()));
-                        if (!tmpDir.mkdir())
-                                throw new NdgExecutionException(new NdgMessage("execution.error", new Object[] {"createNewFile()", "Cannot create " + tmpDir.getAbsolutePath()}, null));
-                        harvesterReq.setOutdir(tmpDir.getAbsolutePath());                       
-                        harvester = new OAIHarvester(harvesterReq, request.getHiProcess());                     
-                }
-
-                // ADD HERE OTHER Harvester types
-                /*
-                if (harvConfig instanceof CSWProvider) {
-                        CSWHarvestRequest harvesterReq = new CSWHarvestRequest((CswProvider)harvConfig, doRequest);
-                        harvester = new CSWHarvester(harvesterReq);                     
-                }
-                */
-                
-                
-                if (harvester == null)
-                        throw new NdgHarvestNotExistingException(new NdgMessage("no.object.with.id", new Object[]{"Harvester", doRequest.getProviderID()}));
-                
-                return harvester;
+                return HarvesterFactory.getInstance().getHarvester(request);
         }