Author: olamy
Date: Wed Apr 9 13:11:11 2014
New Revision: 1585961
URL: http://svn.apache.org/r1585961
Log:
try with resources
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java?rev=1585961&r1=1585960&r2=1585961&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/ChecksumPolicyTest.java
Wed Apr 9 13:11:11 2014
@@ -273,25 +273,11 @@ public class ChecksumPolicyTest
private String readChecksumFile( File checksumFile )
throws Exception
{
- FileReader freader = null;
- BufferedReader buf = null;
-
- try
- {
- freader = new FileReader( checksumFile );
- buf = new BufferedReader( freader );
- return buf.readLine();
- }
- finally
+ try (FileReader freader = new FileReader( checksumFile ))
{
- if ( buf != null )
- {
- buf.close();
- }
-
- if ( freader != null )
+ try (BufferedReader buf = new BufferedReader( freader ))
{
- freader.close();
+ return buf.readLine();
}
}
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java?rev=1585961&r1=1585960&r2=1585961&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/AbstractProxyTestCase.java
Wed Apr 9 13:11:11 2014
@@ -38,7 +38,6 @@ import org.apache.archiva.proxy.model.Re
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
import org.apache.maven.wagon.Wagon;
@@ -71,8 +70,8 @@ import static org.junit.Assert.*;
/**
* AbstractProxyTestCase
*/
-@RunWith ( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration ( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public abstract class AbstractProxyTestCase
{
@Inject
@@ -204,7 +203,7 @@ public abstract class AbstractProxyTestC
proxyHandler = applicationContext.getBean(
"repositoryProxyConnectors#test", RepositoryProxyConnectors.class );
// Setup the wagon mock.
- wagonMockControl = EasyMock.createNiceControl( );
+ wagonMockControl = EasyMock.createNiceControl();
wagonMock = wagonMockControl.createMock( Wagon.class );
delegate = (WagonDelegate) applicationContext.getBean( "wagon#test",
Wagon.class );
@@ -341,7 +340,7 @@ public abstract class AbstractProxyTestC
assertNull( "Found file: " + downloadedFile + "; but was expecting a
failure", downloadedFile );
}
- @SuppressWarnings ( "unchecked" )
+ @SuppressWarnings( "unchecked" )
protected void assertNoTempFiles( File expectedFile )
{
File workingDir = expectedFile.getParentFile();
@@ -457,25 +456,11 @@ public abstract class AbstractProxyTestC
protected String readChecksumFile( File checksumFile )
throws Exception
{
- FileReader freader = null;
- BufferedReader buf = null;
-
- try
- {
- freader = new FileReader( checksumFile );
- buf = new BufferedReader( freader );
- return buf.readLine();
- }
- finally
+ try (FileReader freader = new FileReader( checksumFile ))
{
- if ( buf != null )
- {
- buf.close();
- }
-
- if ( freader != null )
+ try (BufferedReader buf = new BufferedReader( freader ))
{
- freader.close();
+ return buf.readLine();
}
}
}
@@ -685,7 +670,8 @@ public abstract class AbstractProxyTestC
assertTrue(
"Unit Test Failure: File <" + testFile + "> should be have been
defined within the legacy managed path of <"
- + managedLegacyPath + ">", testFile.startsWith(
managedLegacyPath ) );
+ + managedLegacyPath + ">", testFile.startsWith(
managedLegacyPath )
+ );
assertFalse( "File < " + testFile + "> should not exist in managed
legacy repository.", file.exists() );
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java?rev=1585961&r1=1585960&r2=1585961&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
Wed Apr 9 13:11:11 2014
@@ -383,8 +383,7 @@ public class DefaultManagedRepositoryAdm
}
if ( !stagedOne )
{
- RepositorySession repositorySession =
getRepositorySessionFactory().createSession();
- try
+ try (RepositorySession repositorySession =
getRepositorySessionFactory().createSession())
{
MetadataRepository metadataRepository =
repositorySession.getRepository();
metadataRepository.removeRepository( repository.getId() );
@@ -399,10 +398,6 @@ public class DefaultManagedRepositoryAdm
//throw new RepositoryAdminException( e.getMessage(), e );
log.warn( "skip error during removing repository from
MetadataRepository:{}", e.getMessage(), e );
}
- finally
- {
- repositorySession.close();
- }
}
config.removeManagedRepository( repository );
