Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 62D7417549 for ; Mon, 6 Apr 2015 18:59:47 +0000 (UTC) Received: (qmail 75486 invoked by uid 500); 6 Apr 2015 18:59:47 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 75459 invoked by uid 500); 6 Apr 2015 18:59:47 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 75450 invoked by uid 99); 6 Apr 2015 18:59:47 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 18:59:47 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 2E185AC0044 for ; Mon, 6 Apr 2015 18:59:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1671645 - /continuum/trunk/continuum-purge/continuum-purge-master/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java Date: Mon, 06 Apr 2015 18:59:47 -0000 To: commits@continuum.apache.org From: batkinson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150406185947.2E185AC0044@hades.apache.org> Author: batkinson Date: Mon Apr 6 18:59:46 2015 New Revision: 1671645 URL: http://svn.apache.org/r1671645 Log: Pulled directory executor creation out of controller and into factory. Modified: continuum/trunk/continuum-purge/continuum-purge-master/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java Modified: continuum/trunk/continuum-purge/continuum-purge-master/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-purge/continuum-purge-master/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java?rev=1671645&r1=1671644&r2=1671645&view=diff ============================================================================== --- continuum/trunk/continuum-purge/continuum-purge-master/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java (original) +++ continuum/trunk/continuum-purge/continuum-purge-master/src/main/java/org/apache/continuum/purge/controller/DirectoryPurgeController.java Mon Apr 6 18:59:46 2015 @@ -67,20 +67,32 @@ public class DirectoryPurgeController throws ContinuumPurgeExecutorException { DirectoryPurgeConfiguration dirPurge = (DirectoryPurgeConfiguration) purgeConfig; + purgeExecutor = new DirectoryPurgeExecutorFactoryImpl().create( dirPurge.isDeleteAll(), dirPurge.getDaysOlder(), + dirPurge.getRetentionCount(), + dirPurge.getDirectoryType() ); + } +} - if ( dirPurge.isDeleteAll() ) - { - purgeExecutor = new CleanAllPurgeExecutor( dirPurge.getDirectoryType() ); - } - else if ( dirPurge.getDaysOlder() > 0 ) +interface DirectoryPurgeExecutorFactory +{ + ContinuumPurgeExecutor create( boolean deleteAll, int daysOld, int retentionCount, String dirType ); +} + +class DirectoryPurgeExecutorFactoryImpl + implements DirectoryPurgeExecutorFactory +{ + public ContinuumPurgeExecutor create( boolean deleteAll, int daysOld, int retentionCount, String dirType ) + { + if ( deleteAll ) { - purgeExecutor = new DaysOldDirectoryPurgeExecutor( dirPurge.getDaysOlder(), dirPurge.getRetentionCount(), - dirPurge.getDirectoryType() ); + return new CleanAllPurgeExecutor( dirType ); } - else + + if ( daysOld > 0 ) { - purgeExecutor = new RetentionCountDirectoryPurgeExecutor( dirPurge.getRetentionCount(), - dirPurge.getDirectoryType() ); + return new DaysOldDirectoryPurgeExecutor( daysOld, retentionCount, dirType ); } + + return new RetentionCountDirectoryPurgeExecutor( retentionCount, dirType ); } }