You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/04/11 14:39:47 UTC
svn commit: r1672872 - in
/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor:
./ dir/ repo/
Author: batkinson
Date: Sat Apr 11 12:39:46 2015
New Revision: 1672872
URL: http://svn.apache.org/r1672872
Log:
Further refactored purging to make it more cohesive and readable.
Added:
continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/MultiplexedPurgeExecutor.java
- copied, changed from r1672871, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/MultiplexedPurgeExecutor.java
Removed:
continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/MultiplexedPurgeExecutor.java
continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/CleanAllPurgeExecutor.java
continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutor.java
continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/RemoveDirHandler.java
Modified:
continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactoryImpl.java
continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactoryImpl.java
Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactoryImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactoryImpl.java?rev=1672872&r1=1672871&r2=1672872&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactoryImpl.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/dir/DirectoryPurgeExecutorFactoryImpl.java Sat Apr 11 12:39:46 2015
@@ -19,10 +19,21 @@ package org.apache.continuum.purge.execu
* under the License.
*/
+import org.apache.continuum.purge.ContinuumPurgeConstants;
import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
import org.apache.continuum.utils.file.FileSystemManager;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+
+import static org.apache.commons.io.filefilter.DirectoryFileFilter.DIRECTORY;
+import static org.apache.continuum.purge.ContinuumPurgeConstants.*;
@Component( role = DirectoryPurgeExecutorFactory.class )
public class DirectoryPurgeExecutorFactoryImpl
@@ -33,10 +44,264 @@ public class DirectoryPurgeExecutorFacto
public ContinuumPurgeExecutor create( boolean deleteAll, int daysOld, int retentionCount, String dirType )
{
+ if ( PURGE_DIRECTORY_RELEASES.equals( dirType ) )
+ {
+ return new ReleasesPurgeExecutor( fsManager, deleteAll, daysOld, retentionCount, dirType );
+ }
+ if ( PURGE_DIRECTORY_WORKING.equals( dirType ) )
+ {
+ return new WorkingPurgeExecutor( fsManager, deleteAll, daysOld, retentionCount, dirType );
+ }
+ if ( PURGE_DIRECTORY_BUILDOUTPUT.equals( dirType ) )
+ {
+ return new BuildOutputPurgeExecutor( fsManager, deleteAll, daysOld, retentionCount, dirType );
+ }
+ return new UnsupportedPurgeExecutor( dirType );
+ }
+}
+
+class UnsupportedPurgeExecutor
+ implements ContinuumPurgeExecutor
+{
+ private static Logger log = LoggerFactory.getLogger( UnsupportedPurgeExecutor.class );
+
+ private String dirType;
+
+ UnsupportedPurgeExecutor( String dirType )
+ {
+ this.dirType = dirType;
+ }
+
+ public void purge( String path )
+ throws ContinuumPurgeExecutorException
+ {
+ log.warn( "ignoring purge request, directory type {} no supported", dirType );
+ }
+}
+
+abstract class AbstractPurgeExecutor
+ implements ContinuumPurgeExecutor
+{
+ protected final FileSystemManager fsManager;
+
+ protected boolean deleteAll;
+
+ protected final int daysOlder;
+
+ protected final int retentionCount;
+
+ protected final String directoryType;
+
+ AbstractPurgeExecutor( FileSystemManager fsManager, boolean deleteAll, int daysOlder, int retentionCount,
+ String directoryType )
+ {
+ this.fsManager = fsManager;
+ this.deleteAll = deleteAll;
+ this.daysOlder = daysOlder;
+ this.retentionCount = retentionCount;
+ this.directoryType = directoryType;
+ }
+
+ public void purge( String path )
+ throws ContinuumPurgeExecutorException
+ {
+ try
+ {
+ File dir = new File( path );
+ purge( dir );
+ }
+ catch ( PurgeBuilderException e )
+ {
+ throw new ContinuumPurgeExecutorException( "purge failed: " + e.getMessage() );
+ }
+ }
+
+ abstract void purge( File dir )
+ throws PurgeBuilderException;
+}
+
+class ReleasesPurgeExecutor
+ extends AbstractPurgeExecutor
+{
+ ReleasesPurgeExecutor( FileSystemManager fsManager, boolean deleteAll, int daysOlder, int retentionCount,
+ String directoryType )
+ {
+ super( fsManager, deleteAll, daysOlder, retentionCount, directoryType );
+ }
+
+ @Override
+ void purge( File dir )
+ throws PurgeBuilderException
+ {
+ if ( deleteAll )
+ {
+ PurgeBuilder.purge( dir )
+ .dirs()
+ .namedLike( ContinuumPurgeConstants.RELEASE_DIR_PATTERN )
+ .executeWith( new RemoveDirHandler( fsManager ) );
+ }
+ else
+ {
+ PurgeBuilder.purge( dir )
+ .dirs()
+ .namedLike( RELEASE_DIR_PATTERN )
+ .olderThan( daysOlder )
+ .inAgeOrder()
+ .retainLast( retentionCount )
+ .executeWith( new RemoveDirHandler( fsManager ) );
+ }
+ }
+}
+
+class BuildOutputPurgeExecutor
+ extends AbstractPurgeExecutor
+{
+ BuildOutputPurgeExecutor( FileSystemManager fsManager, boolean deleteAll, int daysOlder, int retentionCount,
+ String directoryType )
+ {
+ super( fsManager, deleteAll, daysOlder, retentionCount, directoryType );
+ }
+
+ @Override
+ void purge( File dir )
+ throws PurgeBuilderException
+ {
if ( deleteAll )
{
- return new CleanAllPurgeExecutor( fsManager, dirType );
+ PurgeBuilder.purge( dir )
+ .dirs()
+ .executeWith( new WipeDirHandler( fsManager ) );
+ }
+ else
+ {
+ File[] projectDirs = dir.listFiles( (FileFilter) DIRECTORY );
+
+ if ( projectDirs == null )
+ return;
+
+ for ( File projectDir : projectDirs )
+ {
+ if ( projectDir.isDirectory() )
+ {
+ PurgeBuilder.purge( projectDir )
+ .dirs()
+ .olderThan( daysOlder )
+ .inAgeOrder()
+ .retainLast( retentionCount )
+ .executeWith( new BuildOutputHandler( fsManager ) );
+ }
+ }
}
- return new DirectoryPurgeExecutor( fsManager, daysOld, retentionCount, dirType );
}
}
+
+class WorkingPurgeExecutor
+ extends AbstractPurgeExecutor
+{
+ WorkingPurgeExecutor( FileSystemManager fsManager, boolean deleteAll, int daysOlder, int retentionCount,
+ String directoryType )
+ {
+ super( fsManager, deleteAll, daysOlder, retentionCount, directoryType );
+ }
+
+ @Override
+ void purge( File dir )
+ throws PurgeBuilderException
+ {
+ if ( deleteAll )
+ {
+ PurgeBuilder.purge( dir )
+ .dirs()
+ .notNamedLike( ContinuumPurgeConstants.RELEASE_DIR_PATTERN )
+ .executeWith( new RemoveDirHandler( fsManager ) );
+ }
+ else
+ {
+ PurgeBuilder.purge( dir )
+ .dirs()
+ .notNamedLike( RELEASE_DIR_PATTERN )
+ .olderThan( daysOlder )
+ .inAgeOrder()
+ .retainLast( retentionCount )
+ .executeWith( new RemoveDirHandler( fsManager ) );
+ }
+ }
+}
+
+abstract class AbstractFSHandler
+ implements Handler
+{
+ private Logger log = LoggerFactory.getLogger( getClass() );
+
+ protected FileSystemManager fsManager;
+
+ AbstractFSHandler( FileSystemManager fsManager )
+ {
+ this.fsManager = fsManager;
+ }
+
+ public void handle( File dir )
+ {
+ try
+ {
+ handleFile( dir );
+ }
+ catch ( IOException e )
+ {
+ log.warn( "failed to purge file {}: {}", dir, e.getMessage() );
+ }
+ }
+
+ abstract void handleFile( File dir )
+ throws IOException;
+}
+
+class WipeDirHandler
+ extends AbstractFSHandler
+{
+ WipeDirHandler( FileSystemManager fsManager )
+ {
+ super( fsManager );
+ }
+
+ public void handleFile( File dir )
+ throws IOException
+ {
+ fsManager.wipeDir( dir );
+ }
+}
+
+class BuildOutputHandler
+ extends AbstractFSHandler
+{
+ BuildOutputHandler( FileSystemManager fsManager )
+ {
+ super( fsManager );
+ }
+
+ public void handleFile( File dir )
+ throws IOException
+ {
+ fsManager.removeDir( dir );
+ File logFile = new File( dir.getAbsoluteFile() + ".log.txt" );
+ if ( logFile.exists() )
+ {
+ logFile.delete();
+ }
+ }
+}
+
+class RemoveDirHandler
+ extends AbstractFSHandler
+{
+ RemoveDirHandler( FileSystemManager fsManager )
+ {
+ super( fsManager );
+ }
+
+ public void handleFile( File dir )
+ throws IOException
+ {
+ fsManager.removeDir( dir );
+ }
+}
\ No newline at end of file
Copied: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/MultiplexedPurgeExecutor.java (from r1672871, continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/MultiplexedPurgeExecutor.java)
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/MultiplexedPurgeExecutor.java?p2=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/MultiplexedPurgeExecutor.java&p1=continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/MultiplexedPurgeExecutor.java&r1=1672871&r2=1672872&rev=1672872&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/MultiplexedPurgeExecutor.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/MultiplexedPurgeExecutor.java Sat Apr 11 12:39:46 2015
@@ -1,4 +1,4 @@
-package org.apache.continuum.purge.executor;
+package org.apache.continuum.purge.executor.repo;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,9 @@ package org.apache.continuum.purge.execu
* under the License.
*/
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
+import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
+
import java.util.Arrays;
import java.util.List;
Modified: continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactoryImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactoryImpl.java?rev=1672872&r1=1672871&r2=1672872&view=diff
==============================================================================
--- continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactoryImpl.java (original)
+++ continuum/trunk/continuum-purge/src/main/java/org/apache/continuum/purge/executor/repo/RepositoryPurgeExecutorFactoryImpl.java Sat Apr 11 12:39:46 2015
@@ -21,7 +21,6 @@ package org.apache.continuum.purge.execu
import org.apache.continuum.purge.executor.ContinuumPurgeExecutor;
import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException;
-import org.apache.continuum.purge.executor.MultiplexedPurgeExecutor;
import org.apache.continuum.purge.repository.content.RepositoryManagedContent;
import org.apache.continuum.purge.repository.scanner.RepositoryScanner;
import org.apache.continuum.utils.file.FileSystemManager;