You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/11/21 20:33:56 UTC
[archiva-components] 03/07: Reformatting code
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-components.git
commit 8a5dc50f9db022d0d3b0724143561264a2644ba0
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Thu Nov 21 21:20:04 2019 +0100
Reformatting code
---
.../components/taskqueue/DefaultTaskQueue.java | 31 +++++-----
.../apache/archiva/components/taskqueue/Task.java | 3 +-
.../components/taskqueue/TaskEntryEvaluator.java | 1 -
.../components/taskqueue/TaskExitEvaluator.java | 1 -
.../archiva/components/taskqueue/TaskQueue.java | 5 +-
.../components/taskqueue/TaskQueueException.java | 1 -
.../taskqueue/TaskViabilityEvaluator.java | 1 -
.../execution/TaskExecutionException.java | 1 -
.../taskqueue/execution/TaskExecutor.java | 1 -
.../taskqueue/execution/TaskQueueExecutor.java | 3 +-
.../execution/ThreadedTaskQueueExecutor.java | 70 +++++++++++-----------
.../src/main/resources/META-INF/spring-context.xml | 4 +-
spring-taskqueue/src/site/site.xml | 22 +++----
.../components/taskqueue/ATaskEntryEvaluator.java | 5 +-
.../components/taskqueue/ATaskExitEvaluator.java | 5 +-
.../components/taskqueue/BTaskEntryEvaluator.java | 5 +-
.../components/taskqueue/BTaskExitEvaluator.java | 5 +-
.../components/taskqueue/BuildProjectTask.java | 34 +++++------
.../BuildProjectTaskViabilityEvaluator.java | 9 ++-
.../components/taskqueue/TaskQueueTest.java | 39 ++++++------
.../execution/BuildProjectTaskExecutor.java | 32 +++++-----
.../taskqueue/execution/TaskQueueExecutorTest.java | 20 +++----
.../src/test/resources/log4j2-test.xml | 24 ++++----
.../src/test/resources/spring-context.xml | 64 ++++++++++----------
24 files changed, 183 insertions(+), 203 deletions(-)
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/DefaultTaskQueue.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/DefaultTaskQueue.java
index 087f900..1d63f35 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/DefaultTaskQueue.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/DefaultTaskQueue.java
@@ -35,21 +35,20 @@ import java.util.concurrent.TimeUnit;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public class DefaultTaskQueue
implements TaskQueue
{
- private Logger logger = LoggerFactory.getLogger( getClass() );
+ private Logger logger = LoggerFactory.getLogger( getClass( ) );
- private List<TaskEntryEvaluator> taskEntryEvaluators = new ArrayList<>();
+ private List<TaskEntryEvaluator> taskEntryEvaluators = new ArrayList<>( );
- private List<TaskExitEvaluator> taskExitEvaluators = new ArrayList<>();
+ private List<TaskExitEvaluator> taskExitEvaluators = new ArrayList<>( );
- private List<TaskViabilityEvaluator> taskViabilityEvaluators = new ArrayList<>();
+ private List<TaskViabilityEvaluator> taskViabilityEvaluators = new ArrayList<>( );
- private BlockingQueue<Task> queue = new LinkedBlockingQueue<>();
+ private BlockingQueue<Task> queue = new LinkedBlockingQueue<>( );
// ----------------------------------------------------------------------
// Component Lifecycle
@@ -95,9 +94,9 @@ public class DefaultTaskQueue
Collection<Task> toBeRemoved =
taskViabilityEvaluator.evaluate( Collections.unmodifiableCollection( queue ) );
- for ( Iterator<Task> it = toBeRemoved.iterator(); it.hasNext(); )
+ for ( Iterator<Task> it = toBeRemoved.iterator( ); it.hasNext( ); )
{
- Task t = it.next();
+ Task t = it.next( );
queue.remove( t );
}
@@ -106,13 +105,13 @@ public class DefaultTaskQueue
return true;
}
- public Task take()
+ public Task take( )
throws TaskQueueException
{
logger.debug( "take" );
while ( true )
{
- Task task = dequeue();
+ Task task = dequeue( );
if ( task == null )
{
@@ -163,7 +162,7 @@ public class DefaultTaskQueue
// Queue Inspection
// ----------------------------------------------------------------------
- public List<Task> getQueueSnapshot()
+ public List<Task> getQueueSnapshot( )
throws TaskQueueException
{
return Collections.unmodifiableList( new ArrayList( queue ) );
@@ -179,13 +178,13 @@ public class DefaultTaskQueue
logger.debug( "enqueue success {}", success );
}
- private Task dequeue()
+ private Task dequeue( )
{
logger.debug( "dequeue" );
- return queue.poll();
+ return queue.poll( );
}
- public List<TaskEntryEvaluator> getTaskEntryEvaluators()
+ public List<TaskEntryEvaluator> getTaskEntryEvaluators( )
{
return taskEntryEvaluators;
}
@@ -195,7 +194,7 @@ public class DefaultTaskQueue
this.taskEntryEvaluators = taskEntryEvaluators;
}
- public List<TaskExitEvaluator> getTaskExitEvaluators()
+ public List<TaskExitEvaluator> getTaskExitEvaluators( )
{
return taskExitEvaluators;
}
@@ -205,7 +204,7 @@ public class DefaultTaskQueue
this.taskExitEvaluators = taskExitEvaluators;
}
- public List<TaskViabilityEvaluator> getTaskViabilityEvaluators()
+ public List<TaskViabilityEvaluator> getTaskViabilityEvaluators( )
{
return taskViabilityEvaluators;
}
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/Task.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/Task.java
index 5da122e..2e3f224 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/Task.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/Task.java
@@ -22,12 +22,11 @@ package org.apache.archiva.components.taskqueue;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public interface Task
{
/**
* @return the maximum time in milliseconds this task may run before it's cancelled.
*/
- long getMaxExecutionTime();
+ long getMaxExecutionTime( );
}
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskEntryEvaluator.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskEntryEvaluator.java
index 5086655..a19b58f 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskEntryEvaluator.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskEntryEvaluator.java
@@ -22,7 +22,6 @@ package org.apache.archiva.components.taskqueue;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public interface TaskEntryEvaluator<T extends Task>
{
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskExitEvaluator.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskExitEvaluator.java
index 22de4b4..703c17f 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskExitEvaluator.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskExitEvaluator.java
@@ -22,7 +22,6 @@ package org.apache.archiva.components.taskqueue;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public interface TaskExitEvaluator<T extends Task>
{
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskQueue.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskQueue.java
index e7b7dfb..b885623 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskQueue.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskQueue.java
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public interface TaskQueue<T extends Task>
{
@@ -43,7 +42,7 @@ public interface TaskQueue<T extends Task>
boolean put( T task )
throws TaskQueueException;
- T take()
+ T take( )
throws TaskQueueException;
boolean remove( T task )
@@ -56,7 +55,7 @@ public interface TaskQueue<T extends Task>
// Queue Inspection
// ----------------------------------------------------------------------
- List<T> getQueueSnapshot()
+ List<T> getQueueSnapshot( )
throws TaskQueueException;
/**
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskQueueException.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskQueueException.java
index 34c6d58..ffc1ae6 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskQueueException.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskQueueException.java
@@ -21,7 +21,6 @@ package org.apache.archiva.components.taskqueue;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public class TaskQueueException
extends Exception
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskViabilityEvaluator.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskViabilityEvaluator.java
index a02cba7..d709d54 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskViabilityEvaluator.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/TaskViabilityEvaluator.java
@@ -24,7 +24,6 @@ import java.util.Collection;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public interface TaskViabilityEvaluator<T extends Task>
{
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskExecutionException.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskExecutionException.java
index f260cc2..a7cc35a 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskExecutionException.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskExecutionException.java
@@ -21,7 +21,6 @@ package org.apache.archiva.components.taskqueue.execution;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public class TaskExecutionException
extends Exception
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskExecutor.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskExecutor.java
index 24410e2..dc4a9cc 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskExecutor.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskExecutor.java
@@ -23,7 +23,6 @@ import org.apache.archiva.components.taskqueue.Task;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public interface TaskExecutor<T extends Task>
{
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutor.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutor.java
index 9c54387..1d6e1b0 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutor.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutor.java
@@ -24,7 +24,6 @@ import org.apache.archiva.components.taskqueue.Task;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public interface TaskQueueExecutor<T extends Task>
{
@@ -34,7 +33,7 @@ public interface TaskQueueExecutor<T extends Task>
*
* @return the currently executing task.
*/
- T getCurrentTask();
+ T getCurrentTask( );
/**
* Cancels execution of this task, if it's currently running.
diff --git a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/ThreadedTaskQueueExecutor.java b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
index 198d714..4042435 100644
--- a/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
+++ b/spring-taskqueue/src/main/java/org/apache/archiva/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
@@ -43,7 +43,7 @@ public class ThreadedTaskQueueExecutor
implements TaskQueueExecutor
{
- private Logger logger = LoggerFactory.getLogger( getClass() );
+ private Logger logger = LoggerFactory.getLogger( getClass( ) );
private static final int SHUTDOWN = 1;
@@ -81,7 +81,7 @@ public class ThreadedTaskQueueExecutor
private boolean done;
- public void run()
+ public void run( )
{
while ( command != SHUTDOWN )
{
@@ -108,9 +108,9 @@ public class ThreadedTaskQueueExecutor
currentTask = task;
- Future future = executorService.submit( new Runnable()
+ Future future = executorService.submit( new Runnable( )
{
- public void run()
+ public void run( )
{
try
{
@@ -118,7 +118,7 @@ public class ThreadedTaskQueueExecutor
}
catch ( TaskExecutionException e )
{
- logger.error( "Error executing task: {}", e.getMessage(), e );
+ logger.error( "Error executing task: {}", e.getMessage( ), e );
}
}
} );
@@ -129,7 +129,7 @@ public class ThreadedTaskQueueExecutor
}
catch ( ExecutionException e )
{
- logger.error( "Error executing task: {}", e.getMessage(), e );
+ logger.error( "Error executing task: {}", e.getMessage( ), e );
}
}
@@ -139,9 +139,9 @@ public class ThreadedTaskQueueExecutor
done = true;
- synchronized ( this )
+ synchronized (this)
{
- notifyAll();
+ notifyAll( );
}
}
@@ -154,23 +154,23 @@ public class ThreadedTaskQueueExecutor
{
try
{
- if ( task.getMaxExecutionTime() == 0 )
+ if ( task.getMaxExecutionTime( ) == 0 )
{
logger.debug( "Waiting indefinitely for task to complete" );
- future.get();
+ future.get( );
return;
}
else
{
- logger.debug( "Waiting at most {} ms for task completion", task.getMaxExecutionTime() );
- future.get( task.getMaxExecutionTime(), TimeUnit.MILLISECONDS );
- logger.debug( "Task completed within {} ms", task.getMaxExecutionTime() );
+ logger.debug( "Waiting at most {} ms for task completion", task.getMaxExecutionTime( ) );
+ future.get( task.getMaxExecutionTime( ), TimeUnit.MILLISECONDS );
+ logger.debug( "Task completed within {} ms", task.getMaxExecutionTime( ) );
return;
}
}
catch ( InterruptedException e )
{
- switch ( command )
+ switch (command)
{
case SHUTDOWN:
{
@@ -211,14 +211,14 @@ public class ThreadedTaskQueueExecutor
{
if ( !future.cancel( true ) )
{
- if ( !future.isDone() && !future.isCancelled() )
+ if ( !future.isDone( ) && !future.isCancelled( ) )
{
logger.warn( "Unable to cancel task" );
}
else
{
logger.warn(
- "Task not cancelled (Flags: done: {} cancelled: {})", future.isDone(), future.isCancelled() );
+ "Task not cancelled (Flags: done: {} cancelled: {})", future.isDone( ), future.isCancelled( ) );
}
}
else
@@ -227,13 +227,13 @@ public class ThreadedTaskQueueExecutor
}
}
- public synchronized void shutdown()
+ public synchronized void shutdown( )
{
logger.debug( "Signalling executor thread to shutdown" );
command = SHUTDOWN;
- interrupt();
+ interrupt( );
}
public synchronized boolean cancelTask( Task task )
@@ -250,7 +250,7 @@ public class ThreadedTaskQueueExecutor
command = CANCEL_TASK;
- interrupt();
+ interrupt( );
}
else
{
@@ -260,7 +260,7 @@ public class ThreadedTaskQueueExecutor
return true;
}
- public boolean isDone()
+ public boolean isDone( )
{
return done;
}
@@ -271,7 +271,7 @@ public class ThreadedTaskQueueExecutor
// ----------------------------------------------------------------------
@PostConstruct
- public void start()
+ public void start( )
{
if ( StringUtils.isBlank( name ) )
@@ -281,29 +281,29 @@ public class ThreadedTaskQueueExecutor
logger.info( "Starting task executor, thread name '{}'.", name );
- this.executorService = Executors.newSingleThreadExecutor();
+ this.executorService = Executors.newSingleThreadExecutor( );
- executorRunnable = new ExecutorRunnable();
+ executorRunnable = new ExecutorRunnable( );
executorRunnable.setDaemon( true );
- executorRunnable.start();
+ executorRunnable.start( );
}
@PreDestroy
- public void stop()
+ public void stop( )
{
- executorRunnable.shutdown();
+ executorRunnable.shutdown( );
int maxSleep = 10 * 1000; // 10 seconds
int interval = 1000;
- long endTime = System.currentTimeMillis() + maxSleep;
+ long endTime = System.currentTimeMillis( ) + maxSleep;
- while ( !executorRunnable.isDone() && executorRunnable.isAlive() )
+ while ( !executorRunnable.isDone( ) && executorRunnable.isAlive( ) )
{
- if ( System.currentTimeMillis() > endTime )
+ if ( System.currentTimeMillis( ) > endTime )
{
logger.warn( "Timeout waiting for executor thread '{}' to stop, aborting", name );
break;
@@ -313,7 +313,7 @@ public class ThreadedTaskQueueExecutor
try
{
- synchronized ( executorRunnable )
+ synchronized (executorRunnable)
{
executorRunnable.wait( interval );
}
@@ -324,11 +324,11 @@ public class ThreadedTaskQueueExecutor
}
// notify again, just in case.
- executorRunnable.shutdown();
+ executorRunnable.shutdown( );
}
}
- public Task getCurrentTask()
+ public Task getCurrentTask( )
{
return currentTask;
}
@@ -338,7 +338,7 @@ public class ThreadedTaskQueueExecutor
return executorRunnable.cancelTask( task );
}
- public TaskQueue getQueue()
+ public TaskQueue getQueue( )
{
return queue;
}
@@ -348,7 +348,7 @@ public class ThreadedTaskQueueExecutor
this.queue = queue;
}
- public TaskExecutor getExecutor()
+ public TaskExecutor getExecutor( )
{
return executor;
}
@@ -358,7 +358,7 @@ public class ThreadedTaskQueueExecutor
this.executor = executor;
}
- public String getName()
+ public String getName( )
{
return name;
}
diff --git a/spring-taskqueue/src/main/resources/META-INF/spring-context.xml b/spring-taskqueue/src/main/resources/META-INF/spring-context.xml
index 83a8857..1b0d9d8 100755
--- a/spring-taskqueue/src/main/resources/META-INF/spring-context.xml
+++ b/spring-taskqueue/src/main/resources/META-INF/spring-context.xml
@@ -27,7 +27,7 @@
http://www.springframework.org/schema/context/spring-context-3.0.xsd"
default-lazy-init="true">
- <context:annotation-config />
- <context:component-scan base-package="org.apache.archiva.components.taskqueue"/>
+ <context:annotation-config/>
+ <context:component-scan base-package="org.apache.archiva.components.taskqueue"/>
</beans>
diff --git a/spring-taskqueue/src/site/site.xml b/spring-taskqueue/src/site/site.xml
index c3b26e6..da2f8e5 100644
--- a/spring-taskqueue/src/site/site.xml
+++ b/spring-taskqueue/src/site/site.xml
@@ -18,17 +18,17 @@
~ under the License.
-->
-<project name="Spring Taskqueue Component" >
+<project name="Spring Taskqueue Component">
- <publishDate format="yyyy-MM-dd" position="none" />
+ <publishDate format="yyyy-MM-dd" position="none"/>
- <body>
- <menu ref="modules" />
- <menu ref="reports" />
- <menu ref="ASF" />
- <breadcrumbs>
- <item name="Archiva Components" href="../index.html" />
- <item name="Spring Taskqueue" href="index.html" />
- </breadcrumbs>
- </body>
+ <body>
+ <menu ref="modules"/>
+ <menu ref="reports"/>
+ <menu ref="ASF"/>
+ <breadcrumbs>
+ <item name="Archiva Components" href="../index.html"/>
+ <item name="Spring Taskqueue" href="index.html"/>
+ </breadcrumbs>
+ </body>
</project>
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/ATaskEntryEvaluator.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/ATaskEntryEvaluator.java
index 4f28006..2c661e3 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/ATaskEntryEvaluator.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/ATaskEntryEvaluator.java
@@ -23,15 +23,14 @@ import org.springframework.stereotype.Service;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
-@Service("taskEntryEvaluator#a")
+@Service( "taskEntryEvaluator#a" )
public class ATaskEntryEvaluator
implements TaskEntryEvaluator
{
public boolean evaluate( Task task )
throws TaskQueueException
{
- return ( (BuildProjectTask) task).isPassAEntryEvaluator();
+ return ( (BuildProjectTask) task ).isPassAEntryEvaluator( );
}
}
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/ATaskExitEvaluator.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/ATaskExitEvaluator.java
index 6954fde..d39df83 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/ATaskExitEvaluator.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/ATaskExitEvaluator.java
@@ -23,15 +23,14 @@ import org.springframework.stereotype.Service;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
-@Service("taskExitEvaluator#a")
+@Service( "taskExitEvaluator#a" )
public class ATaskExitEvaluator
implements TaskExitEvaluator
{
public boolean evaluate( Task task )
throws TaskQueueException
{
- return ( (BuildProjectTask) task ).isPassAExitEvaluator();
+ return ( (BuildProjectTask) task ).isPassAExitEvaluator( );
}
}
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BTaskEntryEvaluator.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BTaskEntryEvaluator.java
index cd3b031..de161e0 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BTaskEntryEvaluator.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BTaskEntryEvaluator.java
@@ -23,15 +23,14 @@ import org.springframework.stereotype.Service;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
-@Service("taskEntryEvaluator#b")
+@Service( "taskEntryEvaluator#b" )
public class BTaskEntryEvaluator
implements TaskEntryEvaluator
{
public boolean evaluate( Task task )
throws TaskQueueException
{
- return ( (BuildProjectTask) task ).isPassBEntryEvaluator();
+ return ( (BuildProjectTask) task ).isPassBEntryEvaluator( );
}
}
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BTaskExitEvaluator.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BTaskExitEvaluator.java
index e0b480e..b755128 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BTaskExitEvaluator.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BTaskExitEvaluator.java
@@ -23,15 +23,14 @@ import org.springframework.stereotype.Service;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
-@Service("taskExitEvaluator#b")
+@Service( "taskExitEvaluator#b" )
public class BTaskExitEvaluator
implements TaskExitEvaluator
{
public boolean evaluate( Task task )
throws TaskQueueException
{
- return ( (BuildProjectTask) task ).isPassBExitEvaluator();
+ return ( (BuildProjectTask) task ).isPassBExitEvaluator( );
}
}
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BuildProjectTask.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BuildProjectTask.java
index 8a21742..051ed63 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BuildProjectTask.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BuildProjectTask.java
@@ -19,11 +19,8 @@ package org.apache.archiva.components.taskqueue;
* under the License.
*/
-import org.apache.archiva.components.taskqueue.Task;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
public class BuildProjectTask
implements Task
@@ -71,32 +68,32 @@ public class BuildProjectTask
this.timestamp = timestamp;
}
- public boolean isPassAEntryEvaluator()
+ public boolean isPassAEntryEvaluator( )
{
return passAEntryEvaluator;
}
- public boolean isPassBEntryEvaluator()
+ public boolean isPassBEntryEvaluator( )
{
return passBEntryEvaluator;
}
- public boolean isPassAExitEvaluator()
+ public boolean isPassAExitEvaluator( )
{
return passAExitEvaluator;
}
- public boolean isPassBExitEvaluator()
+ public boolean isPassBExitEvaluator( )
{
return passBExitEvaluator;
}
- public long getTimestamp()
+ public long getTimestamp( )
{
return timestamp;
}
- public long getMaxExecutionTime()
+ public long getMaxExecutionTime( )
{
return maxExecutionTime;
}
@@ -111,37 +108,37 @@ public class BuildProjectTask
this.executionTime = l;
}
- public long getExecutionTime()
+ public long getExecutionTime( )
{
return executionTime;
}
- public boolean isCancelled()
+ public boolean isCancelled( )
{
return cancelled;
}
- public void cancel()
+ public void cancel( )
{
cancelled = true;
}
- public void done()
+ public void done( )
{
this.done = true;
}
- public boolean isDone()
+ public boolean isDone( )
{
return done;
}
- public boolean isStarted()
+ public boolean isStarted( )
{
return started;
}
- public void start()
+ public void start( )
{
this.started = true;
this.wasStarted = true;
@@ -152,12 +149,13 @@ public class BuildProjectTask
this.ignoreInterrupts = ignore;
}
- public boolean ignoreInterrupts()
+ public boolean ignoreInterrupts( )
{
return ignoreInterrupts;
}
- public boolean wasStarted() {
+ public boolean wasStarted( )
+ {
return wasStarted;
}
}
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BuildProjectTaskViabilityEvaluator.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
index 1007199..656aaaf 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
@@ -28,7 +28,6 @@ import java.util.List;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
@Service( "taskViabilityEvaluator#build-project" )
public class BuildProjectTaskViabilityEvaluator
@@ -39,11 +38,11 @@ public class BuildProjectTaskViabilityEvaluator
{
BuildProjectTask okTask = null;
- List<Task> toBeRemoved = new ArrayList<>( tasks.size() );
+ List<Task> toBeRemoved = new ArrayList<>( tasks.size( ) );
- for ( Iterator<BuildProjectTask> it = tasks.iterator(); it.hasNext(); )
+ for ( Iterator<BuildProjectTask> it = tasks.iterator( ); it.hasNext( ); )
{
- BuildProjectTask buildProjectTask = it.next();
+ BuildProjectTask buildProjectTask = it.next( );
if ( okTask == null )
{
@@ -52,7 +51,7 @@ public class BuildProjectTaskViabilityEvaluator
continue;
}
- if ( buildProjectTask.getTimestamp() - okTask.getTimestamp() < 100 )
+ if ( buildProjectTask.getTimestamp( ) - okTask.getTimestamp( ) < 100 )
{
toBeRemoved.add( buildProjectTask );
}
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/TaskQueueTest.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/TaskQueueTest.java
index 5834ee3..e405c7a 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/TaskQueueTest.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/TaskQueueTest.java
@@ -34,10 +34,9 @@ import java.util.concurrent.LinkedBlockingQueue;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- *
*/
@RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml"} )
public class TaskQueueTest
extends TestCase
{
@@ -49,14 +48,14 @@ public class TaskQueueTest
// NOTE: If we were using a blocking queue, the sleep/continue in the ThreadedTaskQueueExecutor wouldn't
// be necessary; the queue would block until an element was available.
@Test
- public void testEmptyQueue()
+ public void testEmptyQueue( )
throws Exception
{
- assertNull( taskQueue.take() );
+ assertNull( taskQueue.take( ) );
}
@Test
- public void testTaskEntryAndExitEvaluators()
+ public void testTaskEntryAndExitEvaluators( )
throws Exception
{
assertTaskIsAccepted( new BuildProjectTask( true, true, true, true ) );
@@ -71,7 +70,7 @@ public class TaskQueueTest
}
@Test
- public void testTaskViabilityEvaluators()
+ public void testTaskViabilityEvaluators( )
throws Exception
{
// The first and last task should be accepted
@@ -100,23 +99,23 @@ public class TaskQueueTest
assertTrue( taskQueue.put( task6 ) );
- Task actualTask1 = taskQueue.take();
+ Task actualTask1 = taskQueue.take( );
assertNotNull( actualTask1 );
assertEquals( task1, actualTask1 );
- Task actualTask6 = taskQueue.take();
+ Task actualTask6 = taskQueue.take( );
assertNotNull( actualTask6 );
assertEquals( task6, actualTask6 );
- assertNull( taskQueue.take() );
+ assertNull( taskQueue.take( ) );
}
@Test
- public void testRemoveTask()
+ public void testRemoveTask( )
throws Exception
{
Task task = new BuildProjectTask( 0 );
@@ -125,17 +124,17 @@ public class TaskQueueTest
taskQueue.remove( task );
- assertNull( taskQueue.take() );
+ assertNull( taskQueue.take( ) );
}
@Test
- public void testRemoveAll()
+ public void testRemoveAll( )
throws Exception
{
- BlockingQueue<String> foo = new LinkedBlockingQueue<String>();
- foo.offer("1");
- foo.offer("2");
+ BlockingQueue<String> foo = new LinkedBlockingQueue<String>( );
+ foo.offer( "1" );
+ foo.offer( "2" );
Task firstTask = new BuildProjectTask( 110 );
@@ -145,9 +144,9 @@ public class TaskQueueTest
taskQueue.put( secondTask );
- assertEquals( 2, taskQueue.getQueueSnapshot().size() );
+ assertEquals( 2, taskQueue.getQueueSnapshot( ).size( ) );
- List<Task> tasks = new ArrayList<>();
+ List<Task> tasks = new ArrayList<>( );
tasks.add( firstTask );
@@ -155,7 +154,7 @@ public class TaskQueueTest
taskQueue.removeAll( tasks );
- assertTrue( taskQueue.getQueueSnapshot().isEmpty() );
+ assertTrue( taskQueue.getQueueSnapshot( ).isEmpty( ) );
}
// ----------------------------------------------------------------------
@@ -167,7 +166,7 @@ public class TaskQueueTest
{
taskQueue.put( expectedTask );
- Task actualTask = taskQueue.take();
+ Task actualTask = taskQueue.take( );
assertEquals( expectedTask, actualTask );
}
@@ -177,7 +176,7 @@ public class TaskQueueTest
{
taskQueue.put( expectedTask );
- Task actualTask = taskQueue.take();
+ Task actualTask = taskQueue.take( );
assertNull( actualTask );
}
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/BuildProjectTaskExecutor.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/BuildProjectTaskExecutor.java
index b39ed51..efffb1d 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/BuildProjectTaskExecutor.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/BuildProjectTaskExecutor.java
@@ -19,8 +19,6 @@ package org.apache.archiva.components.taskqueue.execution;
* under the License.
*/
-import org.apache.archiva.components.taskqueue.execution.TaskExecutionException;
-import org.apache.archiva.components.taskqueue.execution.TaskExecutor;
import org.apache.archiva.components.taskqueue.BuildProjectTask;
import org.apache.archiva.components.taskqueue.Task;
import org.slf4j.Logger;
@@ -30,46 +28,46 @@ import org.springframework.stereotype.Service;
/**
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
*/
-@Service ( "taskExecutor#build-project" )
+@Service( "taskExecutor#build-project" )
public class BuildProjectTaskExecutor
implements TaskExecutor
{
- private Logger logger = LoggerFactory.getLogger( getClass() );
+ private Logger logger = LoggerFactory.getLogger( getClass( ) );
public void executeTask( Task task0 )
throws TaskExecutionException
{
BuildProjectTask task = (BuildProjectTask) task0;
- task.start();
+ task.start( );
- logger.info( "Task:{} cancelled: {}; done: {}", task, task.isCancelled(), task.isDone() );
+ logger.info( "Task:{} cancelled: {}; done: {}", task, task.isCancelled( ), task.isDone( ) );
- long time = System.currentTimeMillis();
+ long time = System.currentTimeMillis( );
- long endTime = task.getExecutionTime() + time;
+ long endTime = task.getExecutionTime( ) + time;
- for ( long timeToSleep = endTime - time; timeToSleep > 0; timeToSleep = endTime - System.currentTimeMillis() )
+ for ( long timeToSleep = endTime - time; timeToSleep > 0; timeToSleep = endTime - System.currentTimeMillis( ) )
{
try
{
- logger.info( "Sleeping {} ms (interrupts ignored: {} )", timeToSleep, task.ignoreInterrupts() );
+ logger.info( "Sleeping {} ms (interrupts ignored: {} )", timeToSleep, task.ignoreInterrupts( ) );
Thread.sleep( timeToSleep );
- task.done();
+ task.done( );
- logger.info( "Task completed normally: {} cancelled: {}; done: {}", task, task.isCancelled(),
- task.isDone() );
+ logger.info( "Task completed normally: {} cancelled: {}; done: {}", task, task.isCancelled( ),
+ task.isDone( ) );
}
catch ( InterruptedException e )
{
- if ( !task.ignoreInterrupts() )
+ if ( !task.ignoreInterrupts( ) )
{
- task.cancel();
+ task.cancel( );
- logger.info( "Task cancelled: {} cancelled: {} ; done: {}", task, task.isCancelled(),
- task.isDone() );
+ logger.info( "Task cancelled: {} cancelled: {} ; done: {}", task, task.isCancelled( ),
+ task.isDone( ) );
throw new TaskExecutionException( "Never interrupt sleeping threads! :)", e );
}
diff --git a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutorTest.java b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutorTest.java
index 81982ea..3eded88 100644
--- a/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutorTest.java
+++ b/spring-taskqueue/src/test/java/org/apache/archiva/components/taskqueue/execution/TaskQueueExecutorTest.java
@@ -20,7 +20,6 @@ package org.apache.archiva.components.taskqueue.execution;
*/
import junit.framework.TestCase;
-import org.apache.archiva.components.taskqueue.execution.TaskQueueExecutor;
import org.apache.archiva.components.taskqueue.BuildProjectTask;
import org.apache.archiva.components.taskqueue.TaskQueue;
import org.apache.archiva.components.taskqueue.TaskQueueException;
@@ -36,7 +35,7 @@ import javax.inject.Named;
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
*/
@RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml"} )
public class TaskQueueExecutorTest
extends TestCase
{
@@ -52,18 +51,17 @@ public class TaskQueueExecutorTest
/**
* We run both tests in one test method, to avoid the shutdown of the executor
- *
*/
@Test
- public void testTimeoutWithInterrupts()
+ public void testTimeoutWithInterrupts( )
throws TaskQueueException, InterruptedException
{
BuildProjectTask task = putTask( 2 * 1000, false );
waitForExpectedTaskEnd( task );
- assertTrue( task.isCancelled() );
- assertFalse( task.isDone() );
+ assertTrue( task.isCancelled( ) );
+ assertFalse( task.isDone( ) );
task = putTask( 2 * 1000, true );
@@ -71,8 +69,8 @@ public class TaskQueueExecutorTest
waitForExpectedTaskEnd( task );
// the thread is killed so the task is neither done nor cancelled
- assertFalse( task.isCancelled() );
- assertFalse( task.isDone() );
+ assertFalse( task.isCancelled( ) );
+ assertFalse( task.isDone( ) );
}
private BuildProjectTask putTask( int executionTime, boolean ignoreInterrupts )
@@ -94,15 +92,15 @@ public class TaskQueueExecutorTest
// is actually running before starting to count the timeout.
for ( int i = 0; i < 500; i++ )
{
- if ( task.wasStarted() )
+ if ( task.wasStarted( ) )
{
break;
}
Thread.sleep( 10 );
}
- assertTrue( "Task not started in 5 seconds - heavy load?", task.isStarted() );
+ assertTrue( "Task not started in 5 seconds - heavy load?", task.isStarted( ) );
- Thread.sleep( task.getMaxExecutionTime() );
+ Thread.sleep( task.getMaxExecutionTime( ) );
}
}
diff --git a/spring-taskqueue/src/test/resources/log4j2-test.xml b/spring-taskqueue/src/test/resources/log4j2-test.xml
index 2eb2827..22276c2 100644
--- a/spring-taskqueue/src/test/resources/log4j2-test.xml
+++ b/spring-taskqueue/src/test/resources/log4j2-test.xml
@@ -18,19 +18,19 @@
~ under the License.
-->
<configuration>
- <appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%t] %-5p %c %x - %m%n"/>
- </Console>
- </appenders>
- <loggers>
- <logger name="org.apache.archiva" level="warn"/>
- <logger name="org.apache.archiva.components.taskqueue" level="info"/>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="[%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="warn"/>
+ <logger name="org.apache.archiva.components.taskqueue" level="info"/>
- <root level="error" includeLocation="true">
- <appender-ref ref="console"/>
- </root>
- </loggers>
+ <root level="error" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
</configuration>
diff --git a/spring-taskqueue/src/test/resources/spring-context.xml b/spring-taskqueue/src/test/resources/spring-context.xml
index b20dd11..e58f4cb 100644
--- a/spring-taskqueue/src/test/resources/spring-context.xml
+++ b/spring-taskqueue/src/test/resources/spring-context.xml
@@ -24,40 +24,42 @@
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
default-lazy-init="true">
- <bean name="queueExecutor#default" class="org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor">
- <property name="queue" ref="taskQueue#default"/>
- <property name="executor" ref="taskExecutor#build-project"/>
- <property name="name" value="default"/>
- </bean>
+ <bean name="queueExecutor#default"
+ class="org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor">
+ <property name="queue" ref="taskQueue#default"/>
+ <property name="executor" ref="taskExecutor#build-project"/>
+ <property name="name" value="default"/>
+ </bean>
- <bean name="queueExecutor#taskQueueTest" class="org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor">
- <property name="queue" ref="taskQueue#taskQueueTest"/>
- <property name="executor" ref="taskExecutor#build-project"/>
- <property name="name" value="taskQueueTest"/>
- </bean>
+ <bean name="queueExecutor#taskQueueTest"
+ class="org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor">
+ <property name="queue" ref="taskQueue#taskQueueTest"/>
+ <property name="executor" ref="taskExecutor#build-project"/>
+ <property name="name" value="taskQueueTest"/>
+ </bean>
- <bean abstract="true" name="abstractQueue" class="org.apache.archiva.components.taskqueue.DefaultTaskQueue">
- <property name="taskEntryEvaluators">
- <list>
- <ref bean="taskEntryEvaluator#a"/>
- <ref bean="taskEntryEvaluator#b"/>
- </list>
- </property>
- <property name="taskExitEvaluators">
- <list>
- <ref bean="taskExitEvaluator#a"/>
- <ref bean="taskExitEvaluator#b"/>
- </list>
- </property>
- <property name="taskViabilityEvaluators">
- <list>
- <ref bean="taskViabilityEvaluator#build-project"/>
- </list>
- </property>
- </bean>
+ <bean abstract="true" name="abstractQueue" class="org.apache.archiva.components.taskqueue.DefaultTaskQueue">
+ <property name="taskEntryEvaluators">
+ <list>
+ <ref bean="taskEntryEvaluator#a"/>
+ <ref bean="taskEntryEvaluator#b"/>
+ </list>
+ </property>
+ <property name="taskExitEvaluators">
+ <list>
+ <ref bean="taskExitEvaluator#a"/>
+ <ref bean="taskExitEvaluator#b"/>
+ </list>
+ </property>
+ <property name="taskViabilityEvaluators">
+ <list>
+ <ref bean="taskViabilityEvaluator#build-project"/>
+ </list>
+ </property>
+ </bean>
- <bean name="taskQueue#default" parent="abstractQueue"/>
+ <bean name="taskQueue#default" parent="abstractQueue"/>
- <bean name="taskQueue#taskQueueTest" parent="abstractQueue"/>
+ <bean name="taskQueue#taskQueueTest" parent="abstractQueue"/>
</beans>