You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/04/25 03:49:24 UTC
[maven-resolver] 05/08: [MRESOLVER-88] Try/catch with resource close
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MRESOLVER-88
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 36d13f033e36ec104d34f5a2fd4f4988a2ccf6e7
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Dec 28 23:37:52 2018 +0100
[MRESOLVER-88] Try/catch with resource close
---
.../aether/internal/impl/DefaultArtifactResolver.java | 16 +++-------------
.../eclipse/aether/internal/impl/DefaultDeployer.java | 8 +-------
.../eclipse/aether/internal/impl/DefaultInstaller.java | 7 +------
.../aether/internal/impl/DefaultMetadataResolver.java | 16 +++-------------
4 files changed, 8 insertions(+), 39 deletions(-)
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
index 3b358a8..762fe31 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
@@ -206,9 +206,8 @@ public class DefaultArtifactResolver
Collection<? extends ArtifactRequest> requests )
throws ArtifactResolutionException
{
- SyncContext syncContext = syncContextFactory.newInstance( session, false );
- try
+ try ( SyncContext syncContext = syncContextFactory.newInstance( session, false ) )
{
Collection<Artifact> artifacts = new ArrayList<>( requests.size() );
for ( ArtifactRequest request : requests )
@@ -224,10 +223,6 @@ public class DefaultArtifactResolver
return resolve( session, requests );
}
- finally
- {
- syncContext.close();
- }
}
private List<ArtifactResult> resolve( RepositorySystemSession session,
@@ -492,16 +487,11 @@ public class DefaultArtifactResolver
try
{
- RepositoryConnector connector =
- repositoryConnectorProvider.newRepositoryConnector( session, group.repository );
- try
+ try ( RepositoryConnector connector =
+ repositoryConnectorProvider.newRepositoryConnector( session, group.repository ) )
{
connector.get( downloads, null );
}
- finally
- {
- connector.close();
- }
}
catch ( NoRepositoryConnectorException e )
{
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
index ad32772..05b2e5b 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
@@ -204,16 +204,10 @@ public class DefaultDeployer
+ request.getRepository().getUrl() + ") is in offline mode", e );
}
- SyncContext syncContext = syncContextFactory.newInstance( session, false );
-
- try
+ try ( SyncContext syncContext = syncContextFactory.newInstance( session, false ) )
{
return deploy( syncContext, session, request );
}
- finally
- {
- syncContext.close();
- }
}
private DeployResult deploy( SyncContext syncContext, RepositorySystemSession session, DeployRequest request )
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
index 4150ea4..cedf293 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
@@ -138,16 +138,11 @@ public class DefaultInstaller
public InstallResult install( RepositorySystemSession session, InstallRequest request )
throws InstallationException
{
- SyncContext syncContext = syncContextFactory.newInstance( session, false );
- try
+ try ( SyncContext syncContext = syncContextFactory.newInstance( session, false ) )
{
return install( syncContext, session, request );
}
- finally
- {
- syncContext.close();
- }
}
private InstallResult install( SyncContext syncContext, RepositorySystemSession session, InstallRequest request )
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
index bf1f3fc..44df569 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
@@ -163,9 +163,8 @@ public class DefaultMetadataResolver
public List<MetadataResult> resolveMetadata( RepositorySystemSession session,
Collection<? extends MetadataRequest> requests )
{
- SyncContext syncContext = syncContextFactory.newInstance( session, false );
- try
+ try ( SyncContext syncContext = syncContextFactory.newInstance( session, false ) )
{
Collection<Metadata> metadata = new ArrayList<>( requests.size() );
for ( MetadataRequest request : requests )
@@ -177,10 +176,6 @@ public class DefaultMetadataResolver
return resolve( session, requests );
}
- finally
- {
- syncContext.close();
- }
}
private List<MetadataResult> resolve( RepositorySystemSession session,
@@ -571,16 +566,11 @@ public class DefaultMetadataResolver
download.setListener( SafeTransferListener.wrap( session ) );
download.setTrace( trace );
- RepositoryConnector connector =
- repositoryConnectorProvider.newRepositoryConnector( session, requestRepository );
- try
+ try ( RepositoryConnector connector =
+ repositoryConnectorProvider.newRepositoryConnector( session, requestRepository ) )
{
connector.get( null, Arrays.asList( download ) );
}
- finally
- {
- connector.close();
- }
exception = download.getException();