You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/01/07 06:12:33 UTC
svn commit: r1556117 - in
/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue:
./ execution/
Author: olamy
Date: Tue Jan 7 05:12:33 2014
New Revision: 1556117
URL: http://svn.apache.org/r1556117
Log:
better use of 1.5
Modified:
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
Modified: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java?rev=1556117&r1=1556116&r2=1556117&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java Tue Jan 7 05:12:33 2014
@@ -152,12 +152,13 @@ public class DefaultTaskQueue
return queue.remove( task );
}
- public boolean removeAll( List<Task> tasks )
+ public boolean removeAll( List tasks )
throws ClassCastException, NullPointerException
{
return queue.removeAll( tasks );
}
+
// ----------------------------------------------------------------------
// Queue Inspection
// ----------------------------------------------------------------------
Modified: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java?rev=1556117&r1=1556116&r2=1556117&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java Tue Jan 7 05:12:33 2014
@@ -24,8 +24,8 @@ package org.apache.archiva.redback.compo
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskEntryEvaluator
+public interface TaskEntryEvaluator<T extends Task>
{
- boolean evaluate( Task task )
+ boolean evaluate( T task )
throws TaskQueueException;
}
Modified: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java?rev=1556117&r1=1556116&r2=1556117&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java Tue Jan 7 05:12:33 2014
@@ -24,8 +24,8 @@ package org.apache.archiva.redback.compo
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskExitEvaluator
+public interface TaskExitEvaluator<T extends Task>
{
- boolean evaluate( Task task )
+ boolean evaluate( T task )
throws TaskQueueException;
}
Modified: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java?rev=1556117&r1=1556116&r2=1556117&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java Tue Jan 7 05:12:33 2014
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskQueue
+public interface TaskQueue<T extends Task>
{
// ----------------------------------------------------------------------
@@ -40,23 +40,23 @@ public interface TaskQueue
* @param task The task to add to the queue.
* @return Returns true if the task was accepted into the queue.
*/
- boolean put( Task task )
+ boolean put( T task )
throws TaskQueueException;
- Task take()
+ T take()
throws TaskQueueException;
- boolean remove( Task task )
+ boolean remove( T task )
throws ClassCastException, NullPointerException;
- boolean removeAll( List<Task> tasks )
+ boolean removeAll( List<T> tasks )
throws ClassCastException, NullPointerException;
// ----------------------------------------------------------------------
// Queue Inspection
// ----------------------------------------------------------------------
- List<Task> getQueueSnapshot()
+ List<T> getQueueSnapshot()
throws TaskQueueException;
/**
@@ -67,6 +67,6 @@ public interface TaskQueue
* @return the head of the queue, or null if the timeout elapsed
* @throws InterruptedException when this thread is interrupted while waiting
*/
- Task poll( int timeout, TimeUnit timeUnit )
+ T poll( int timeout, TimeUnit timeUnit )
throws InterruptedException;
}
Modified: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java?rev=1556117&r1=1556116&r2=1556117&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java Tue Jan 7 05:12:33 2014
@@ -26,7 +26,7 @@ import java.util.Collection;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskViabilityEvaluator
+public interface TaskViabilityEvaluator<T extends Task>
{
/**
@@ -34,6 +34,6 @@ public interface TaskViabilityEvaluator
* @return Returns a list of tasks to remove from the queue.
* @throws TaskQueueException
*/
- Collection<Task> evaluate( Collection<Task> tasks )
+ Collection<Task> evaluate( Collection<T> tasks )
throws TaskQueueException;
}
Modified: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java?rev=1556117&r1=1556116&r2=1556117&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java Tue Jan 7 05:12:33 2014
@@ -25,8 +25,8 @@ import org.apache.archiva.redback.compon
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskExecutor
+public interface TaskExecutor<T extends Task>
{
- void executeTask( Task task )
+ void executeTask( T task )
throws TaskExecutionException;
}
Modified: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java?rev=1556117&r1=1556116&r2=1556117&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java Tue Jan 7 05:12:33 2014
@@ -26,7 +26,7 @@ import org.apache.archiva.redback.compon
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskQueueExecutor
+public interface TaskQueueExecutor<T extends Task>
{
/**
@@ -34,7 +34,7 @@ public interface TaskQueueExecutor
*
* @return the currently executing task.
*/
- Task getCurrentTask();
+ T getCurrentTask();
/**
* Cancels execution of this task, if it's currently running.
@@ -43,5 +43,5 @@ public interface TaskQueueExecutor
* @param task The task to cancel
* @return true if the task was cancelled, false if the task was not executing.
*/
- boolean cancelTask( Task task );
+ boolean cancelTask( T task );
}