Changeset 1148 for OAIHarvester

Timestamp:

02/25/11 09:08:19 (13 years ago)

Author:

oschonef

Message:

• fix fallout from HarvestJob? id type change

Location:

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester

Files:

• Harvester.java (modified) (1 diff)
• impl/AbstractHarvester.java (modified) (2 diffs)
• impl/ParallelHarvester.java (modified) (1 diff)
• impl/SimpleHarvester.java (modified) (1 diff)

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/Harvester.java

@@ -17 +17 @@
             throws HarvesterException;
 
-    public HarvestJob findJob(String id)
+    public HarvestJob findJob(long id)
             throws HarvesterException;
 
-    public HarvestJob cancelJob(String id)
+    public HarvestJob cancelJob(long id)
             throws HarvesterException;
 

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/AbstractHarvester.java

@@ -66 +66 @@
 
     @Override
-    public final HarvestJob findJob(String id) throws HarvesterException {
-        if (id == null) {
-            throw new NullPointerException("id == null");
-        }
+    public final HarvestJob findJob(long id) throws HarvesterException {
         return doFindJob(id);
     }
 
     @Override
-    public final HarvestJob cancelJob(String id) throws HarvesterException {
-        if (id == null) {
-            throw new NullPointerException("id == null");
-        }
+    public final HarvestJob cancelJob(long id) throws HarvesterException {
         HarvestJob job = doFindJob(id);
         if (job != null) {
@@ -104 +98 @@
     abstract void doCancelJob(HarvestJobImpl job) throws HarvesterException;
 
-    protected abstract HarvestJob doFindJob(String id)
+    protected abstract HarvestJob doFindJob(long id)
         throws HarvesterException;
 

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/ParallelHarvester.java

@@ -108 +108 @@
 
     @Override
-    protected HarvestJob doFindJob(String id) throws HarvesterException {
+    protected HarvestJob doFindJob(long id) throws HarvesterException {
         for (HarvestJobImpl job : queue) {
-            if (id.equals(job.getId())) {
+            if (id == job.getId()) {
                 queue.remove(job);
                 return job;

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/SimpleHarvester.java

@@ -70 +70 @@
 
     @Override
-    protected HarvestJob doFindJob(String id) throws HarvesterException {
+    protected HarvestJob doFindJob(long id) throws HarvesterException {
         throw new HarvesterException("findJob() is not supported"); 
     }