From commits-return-5171-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Tue Apr 14 18:35:09 2009 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 17165 invoked from network); 14 Apr 2009 18:35:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Apr 2009 18:35:08 -0000 Received: (qmail 54707 invoked by uid 500); 14 Apr 2009 18:35:08 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 54649 invoked by uid 500); 14 Apr 2009 18:35:08 -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 54640 invoked by uid 99); 14 Apr 2009 18:35:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Apr 2009 18:35:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Apr 2009 18:35:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 81BE32388A13; Tue, 14 Apr 2009 18:34:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r764918 - in /continuum/branches/continuum-1.3.x: continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/ continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/ continuum-bu... Date: Tue, 14 Apr 2009 18:34:43 -0000 To: commits@continuum.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090414183444.81BE32388A13@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Tue Apr 14 18:34:43 2009 New Revision: 764918 URL: http://svn.apache.org/viewvc?rev=764918&view=rev Log: More java5 code and clean up lot of warnings found by Idea Modified: continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/continuum/profile/DefaultProfileServiceTest.java continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java Modified: continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java?rev=764918&r1=764917&r2=764918&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java (original) +++ continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/main/java/org/apache/continuum/configuration/DefaultContinuumConfiguration.java Tue Apr 14 18:34:43 2009 @@ -43,7 +43,7 @@ public class DefaultContinuumConfiguration implements ContinuumConfiguration { - private Logger log = LoggerFactory.getLogger( getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultContinuumConfiguration.class ); private File configurationFile; Modified: continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java?rev=764918&r1=764917&r2=764918&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java (original) +++ continuum/branches/continuum-1.3.x/continuum-base/continuum-configuration/src/test/java/org/apache/continuum/configuration/TestDefaultContinuumConfiguration.java Tue Apr 14 18:34:43 2009 @@ -19,15 +19,15 @@ * under the License. */ +import java.io.File; +import java.util.ArrayList; +import java.util.List; + import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.codehaus.plexus.util.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - /** * @author olamy * @version $Id$ @@ -36,9 +36,9 @@ public class TestDefaultContinuumConfiguration extends PlexusInSpringTestCase { - private Logger log = LoggerFactory.getLogger( getClass() ); + private static final Logger log = LoggerFactory.getLogger( TestDefaultContinuumConfiguration.class ); - private String confFile = "target/test-classes/conf/continuum.xml"; + private static final String confFile = "target/test-classes/conf/continuum.xml"; @Override protected void setUp() Modified: continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java?rev=764918&r1=764917&r2=764918&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java (original) +++ continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java Tue Apr 14 18:34:43 2009 @@ -20,6 +20,7 @@ */ import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; @@ -79,7 +80,7 @@ public static final String KEY_PROJECT_GROUP_ID = "project-group-id"; public static final String KEY_PROJECT_GROUP_NAME = "project-group-name"; - + public static final String KEY_SCM_ROOT_ADDRESS = "scm-root-address"; public static final String KEY_SCM_ERROR = "scm-error"; @@ -339,7 +340,7 @@ public static String getGroupId( Map context ) { - return getString( context, KEY_GROUP_ID); + return getString( context, KEY_GROUP_ID ); } public static String getArtifactId( Map context ) @@ -350,7 +351,7 @@ public static String getVersion( Map context ) { return getString( context, KEY_PROJECT_VERSION ); - + } public static String getProjectName( Map context ) @@ -514,33 +515,26 @@ protected static boolean getBoolean( Map context, String key ) { Object obj = getObject( context, key, null ); - - if ( obj == null ) - { - return false; - } - else - { - return ( (Boolean) obj ).booleanValue(); - } + + return obj != null && (Boolean) obj; } - + protected static boolean getBoolean( Map context, String key, boolean defaultValue ) { - return ( (Boolean) getObject( context, key, Boolean.valueOf( defaultValue ) ) ).booleanValue(); - } + return (Boolean) getObject( context, key, defaultValue ); + } protected static int getInteger( Map context, String key ) { Object obj = getObject( context, key, null ); - + if ( obj == null ) { return 0; } else { - return ( (Integer) obj ).intValue(); + return (Integer) obj; } } @@ -554,7 +548,7 @@ } else { - return (Date)obj; + return (Date) obj; } } @@ -568,20 +562,10 @@ } else { - List list = new ArrayList(); + List list = new ArrayList(); Object[] objA = (Object[]) obj; - for ( Object o : objA ) - { - if ( o instanceof Map ) - { - list.add( (Map) o ); - } - else - { - list.add( o ); - } - } + list.addAll( Arrays.asList( objA ) ); return list; } Modified: continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java?rev=764918&r1=764917&r2=764918&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java (original) +++ continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java Tue Apr 14 18:34:43 2009 @@ -62,7 +62,7 @@ public class DefaultInstallationService implements InstallationService, Initializable { - private Logger log = LoggerFactory.getLogger( DefaultInstallationService.class ); + private static final Logger log = LoggerFactory.getLogger( DefaultInstallationService.class ); @Resource private InstallationDao installationDao; @@ -454,8 +454,9 @@ List all = getAllInstallations(); for ( Installation install : all ) { - if ( org.apache.commons.lang.StringUtils.equals( installation.getName(), install.getName() ) - && ( installation.getInstallationId() == 0 || installation.getInstallationId() != install.getInstallationId() ) ) + if ( org.apache.commons.lang.StringUtils.equals( installation.getName(), install.getName() ) && + ( installation.getInstallationId() == 0 || + installation.getInstallationId() != install.getInstallationId() ) ) { return true; } Modified: continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java?rev=764918&r1=764917&r2=764918&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java (original) +++ continuum/branches/continuum-1.3.x/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java Tue Apr 14 18:34:43 2009 @@ -19,6 +19,13 @@ * under the License. */ +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Resource; + import org.apache.continuum.buildqueue.BuildQueueService; import org.apache.continuum.buildqueue.BuildQueueServiceException; import org.apache.continuum.configuration.BuildAgentConfiguration; @@ -37,13 +44,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Resource; - /** * @author Jason van Zyl * @version $Id$ @@ -51,7 +51,7 @@ public class DefaultConfigurationService implements ConfigurationService { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultConfigurationService.class ); // when adding a requirement, the template in spring-context.xml must be updated CONTINUUM-1207 Modified: continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/continuum/profile/DefaultProfileServiceTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/continuum/profile/DefaultProfileServiceTest.java?rev=764918&r1=764917&r2=764918&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/continuum/profile/DefaultProfileServiceTest.java (original) +++ continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/continuum/profile/DefaultProfileServiceTest.java Tue Apr 14 18:34:43 2009 @@ -1,5 +1,7 @@ package org.apache.continuum.profile; +import java.util.List; + import org.apache.continuum.dao.DaoUtils; import org.apache.maven.continuum.AbstractContinuumTest; import org.apache.maven.continuum.installation.InstallationService; @@ -8,8 +10,6 @@ import org.apache.maven.continuum.profile.AlreadyExistsProfileException; import org.apache.maven.continuum.profile.ProfileService; -import java.util.List; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -40,35 +40,35 @@ Installation jdk1; - String jdk1Name = "jdk1"; + private static final String jdk1Name = "jdk1"; - Installation jdk2; + private Installation jdk2; - String jdk2Name = "jdk2"; + private static final String jdk2Name = "jdk2"; Installation mvn205; - String mvn205Name = "mvn 2.0.5"; + private static final String mvn205Name = "mvn 2.0.5"; Installation mvn206; - String mvn206Name = "mvn 2.0.6"; + private static final String mvn206Name = "mvn 2.0.6"; Profile jdk1mvn205; - String jdk1mvn205Name = "jdk1 mvn 2.0.5"; + private static final String jdk1mvn205Name = "jdk1 mvn 2.0.5"; Profile jdk2mvn206; - String jdk2mvn206Name = "jdk2 mvn 2.0.6"; + private static final String jdk2mvn206Name = "jdk2 mvn 2.0.6"; Installation mvnOpts1; - String mvnOpts1Name = "mvnOpts1"; + private static final String mvnOpts1Name = "mvnOpts1"; Installation mvnOpts2; - String mvnOpts2Name = "mvnOpts2"; + private static final String mvnOpts2Name = "mvnOpts2"; protected void setUp() throws Exception Modified: continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java?rev=764918&r1=764917&r2=764918&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java (original) +++ continuum/branches/continuum-1.3.x/continuum-commons/src/test/java/org/apache/maven/continuum/configuration/ConfigurationServiceTest.java Tue Apr 14 18:34:43 2009 @@ -19,6 +19,8 @@ * under the License. */ +import java.io.File; + import org.apache.continuum.configuration.BuildAgentConfiguration; import org.apache.continuum.configuration.BuildAgentGroupConfiguration; import org.codehaus.plexus.spring.PlexusInSpringTestCase; @@ -26,8 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; - /** * @author Jason van Zyl * @version $Id$ @@ -35,9 +35,9 @@ public class ConfigurationServiceTest extends PlexusInSpringTestCase { - private Logger log = LoggerFactory.getLogger( getClass() ); + private static final Logger log = LoggerFactory.getLogger( ConfigurationServiceTest.class ); - private String confFile = "target/test-classes/conf/continuum.xml"; + private static final String confFile = "target/test-classes/conf/continuum.xml"; @Override protected void setUp()