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 2021/07/14 22:11:29 UTC
[maven-resolver] 02/02: [MRESOLVER-152] Fix typos in requireNonNull
checks
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch java8v2
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 468001737f39618e8f0481ce59587e73edd973e1
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Jul 15 00:11:17 2021 +0200
[MRESOLVER-152] Fix typos in requireNonNull checks
---
.../connector/basic/BasicRepositoryConnectorFactory.java | 4 ++--
.../internal/impl/DefaultChecksumPolicyProvider.java | 14 +++++++-------
.../aether/internal/impl/DefaultTransporterProvider.java | 4 ++--
.../internal/impl/EnhancedLocalRepositoryManager.java | 2 +-
.../impl/EnhancedLocalRepositoryManagerFactory.java | 12 ++++++------
.../internal/impl/SimpleLocalRepositoryManagerFactory.java | 8 ++++----
.../impl/synccontext/DefaultSyncContextFactory.java | 2 +-
.../impl/synccontext/legacy/DefaultSyncContextFactory.java | 4 ++--
.../impl/synccontext/named/DiscriminatingNameMapper.java | 4 ++--
.../impl/synccontext/named/NamedLockFactoryAdapter.java | 9 +++++----
.../internal/impl/synccontext/named/StaticNameMapper.java | 5 +++--
.../synccontext/NamedLockFactoryAdapterTestSupport.java | 4 ++--
.../aether/named/support/NamedLockFactorySupport.java | 5 +++--
.../spi/connector/transport/AbstractTransporter.java | 9 +++++----
.../transport/classpath/ClasspathTransporterFactory.java | 8 ++++----
.../aether/transport/file/FileTransporterFactory.java | 8 ++++----
.../aether/transport/http/HttpTransporterFactory.java | 8 ++++----
.../eclipse/aether/transport/wagon/WagonTransporter.java | 5 +++--
.../aether/transport/wagon/WagonTransporterFactory.java | 8 ++++----
19 files changed, 64 insertions(+), 59 deletions(-)
diff --git a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
index aa747a9..52c5724 100644
--- a/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
+++ b/maven-resolver-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
@@ -152,8 +152,8 @@ public final class BasicRepositoryConnectorFactory
public RepositoryConnector newInstance( RepositorySystemSession session, RemoteRepository repository )
throws NoRepositoryConnectorException
{
- requireNonNull( "session", "session cannot be null" );
- requireNonNull( "repository", "repository cannot be null" );
+ requireNonNull( session, "session cannot be null" );
+ requireNonNull( repository, "repository cannot be null" );
return new BasicRepositoryConnector( session, repository, transporterProvider, layoutProvider,
checksumPolicyProvider, fileProcessor );
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
index 270ac86..9f4716d 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
@@ -22,8 +22,6 @@ package org.eclipse.aether.internal.impl;
import javax.inject.Named;
import javax.inject.Singleton;
-import java.util.Objects;
-
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.repository.RepositoryPolicy;
@@ -31,6 +29,8 @@ import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy;
import org.eclipse.aether.spi.connector.checksum.ChecksumPolicyProvider;
import org.eclipse.aether.transfer.TransferResource;
+import static java.util.Objects.requireNonNull;
+
/**
*/
@Singleton
@@ -53,9 +53,9 @@ public final class DefaultChecksumPolicyProvider
public ChecksumPolicy newChecksumPolicy( RepositorySystemSession session, RemoteRepository repository,
TransferResource resource, String policy )
{
- Objects.requireNonNull( session, "session cannot be null" );
- Objects.requireNonNull( repository, "repository cannot be null" );
- Objects.requireNonNull( resource, "resource cannot be null" );
+ requireNonNull( session, "session cannot be null" );
+ requireNonNull( repository, "repository cannot be null" );
+ requireNonNull( resource, "resource cannot be null" );
validatePolicy( "policy", policy );
switch ( policy )
@@ -73,7 +73,7 @@ public final class DefaultChecksumPolicyProvider
public String getEffectiveChecksumPolicy( RepositorySystemSession session, String policy1, String policy2 )
{
- Objects.requireNonNull( session, "session cannot be null" );
+ requireNonNull( session, "session cannot be null" );
validatePolicy( "policy1", policy1 );
validatePolicy( "policy2", policy2 );
@@ -110,7 +110,7 @@ public final class DefaultChecksumPolicyProvider
private static void validatePolicy( String paramName, String policy )
{
- Objects.requireNonNull( policy, paramName + "cannot be null" );
+ requireNonNull( policy, paramName + "cannot be null" );
switch ( policy )
{
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
index af1d1d4..07ba820 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
@@ -90,8 +90,8 @@ public final class DefaultTransporterProvider
public Transporter newTransporter( RepositorySystemSession session, RemoteRepository repository )
throws NoTransporterException
{
- requireNonNull( "session", "session cannot be null" );
- requireNonNull( "repository", "repository cannot be null" );
+ requireNonNull( session, "session cannot be null" );
+ requireNonNull( repository, "repository cannot be null" );
PrioritizedComponents<TransporterFactory> factories = new PrioritizedComponents<>( session );
for ( TransporterFactory factory : this.factories )
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManager.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManager.java
index 677406e..293bc2e 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManager.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManager.java
@@ -79,7 +79,7 @@ class EnhancedLocalRepositoryManager
filename = "_remote.repositories";
}
this.trackingFilename = filename;
- this.trackingFileManager = Objects.requireNonNull( trackingFileManager );
+ this.trackingFileManager = requireNonNull( trackingFileManager );
}
@Override
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
index 56ace05..6a8b059 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
@@ -19,8 +19,6 @@ package org.eclipse.aether.internal.impl;
* under the License.
*/
-import java.util.Objects;
-
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
@@ -33,6 +31,8 @@ import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory;
import org.eclipse.aether.spi.locator.Service;
import org.eclipse.aether.spi.locator.ServiceLocator;
+import static java.util.Objects.requireNonNull;
+
/**
* Creates enhanced local repository managers for repository types {@code "default"} or {@code "" (automatic)}. Enhanced
* local repository manager is built upon the classical Maven 2.0 local repository structure but additionally keeps
@@ -57,20 +57,20 @@ public class EnhancedLocalRepositoryManagerFactory
@Inject
public EnhancedLocalRepositoryManagerFactory( final TrackingFileManager trackingFileManager )
{
- this.trackingFileManager = Objects.requireNonNull( trackingFileManager );
+ this.trackingFileManager = requireNonNull( trackingFileManager );
}
@Override
public void initService( final ServiceLocator locator )
{
- this.trackingFileManager = Objects.requireNonNull( locator.getService( TrackingFileManager.class ) );
+ this.trackingFileManager = requireNonNull( locator.getService( TrackingFileManager.class ) );
}
public LocalRepositoryManager newInstance( RepositorySystemSession session, LocalRepository repository )
throws NoLocalRepositoryManagerException
{
- Objects.requireNonNull( "session", "session cannot be null" );
- Objects.requireNonNull( "repository", "repository cannot be null" );
+ requireNonNull( session, "session cannot be null" );
+ requireNonNull( repository, "repository cannot be null" );
if ( "".equals( repository.getContentType() ) || "default".equals( repository.getContentType() ) )
{
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java
index 1be1bce..b483c74 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java
@@ -22,14 +22,14 @@ package org.eclipse.aether.internal.impl;
import javax.inject.Named;
import javax.inject.Singleton;
-import java.util.Objects;
-
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.LocalRepositoryManager;
import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory;
+import static java.util.Objects.requireNonNull;
+
/**
* Creates local repository managers for repository type {@code "simple"}.
*/
@@ -48,8 +48,8 @@ public class SimpleLocalRepositoryManagerFactory
public LocalRepositoryManager newInstance( RepositorySystemSession session, LocalRepository repository )
throws NoLocalRepositoryManagerException
{
- Objects.requireNonNull( "session", "session cannot be null" );
- Objects.requireNonNull( "repository", "repository cannot be null" );
+ requireNonNull( session, "session cannot be null" );
+ requireNonNull( repository, "repository cannot be null" );
if ( "".equals( repository.getContentType() ) || "simple".equals( repository.getContentType() ) )
{
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/DefaultSyncContextFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/DefaultSyncContextFactory.java
index 733f25c..c708530 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/DefaultSyncContextFactory.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/DefaultSyncContextFactory.java
@@ -67,7 +67,7 @@ public final class DefaultSyncContextFactory
@Override
public void initService( final ServiceLocator locator )
{
- NamedLockFactorySelector selector = Objects.requireNonNull(
+ NamedLockFactorySelector selector = requireNonNull(
locator.getService( NamedLockFactorySelector.class ) );
this.namedLockFactoryAdapter = new NamedLockFactoryAdapter(
selector.getSelectedNameMapper(),
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java
index 669f558..8dd26f0 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/legacy/DefaultSyncContextFactory.java
@@ -56,13 +56,13 @@ public final class DefaultSyncContextFactory
@Inject
public DefaultSyncContextFactory( final SyncContextFactory delegate )
{
- this.delegate = Objects.requireNonNull( delegate );
+ this.delegate = requireNonNull( delegate );
}
@Override
public void initService( final ServiceLocator locator )
{
- this.delegate = Objects.requireNonNull( locator.getService( SyncContextFactory.class ) );
+ this.delegate = requireNonNull( locator.getService( SyncContextFactory.class ) );
}
@Override
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/DiscriminatingNameMapper.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/DiscriminatingNameMapper.java
index 862403e..009946d 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/DiscriminatingNameMapper.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/DiscriminatingNameMapper.java
@@ -37,8 +37,8 @@ import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-import java.util.Objects;
+import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;
/**
@@ -79,7 +79,7 @@ public class DiscriminatingNameMapper implements NameMapper
@Inject
public DiscriminatingNameMapper( @Named( GAVNameMapper.NAME ) final NameMapper nameMapper )
{
- this.nameMapper = Objects.requireNonNull( nameMapper );
+ this.nameMapper = requireNonNull( nameMapper );
this.hostname = getHostname();
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactoryAdapter.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactoryAdapter.java
index 6fb68d3..fe1e24a 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactoryAdapter.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/NamedLockFactoryAdapter.java
@@ -31,9 +31,10 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayDeque;
import java.util.Collection;
import java.util.Deque;
-import java.util.Objects;
import java.util.concurrent.TimeUnit;
+import static java.util.Objects.requireNonNull;
+
/**
* Adapter to adapt {@link NamedLockFactory} and {@link NamedLock} to {@link SyncContext}.
*/
@@ -50,14 +51,14 @@ public final class NamedLockFactoryAdapter
public NamedLockFactoryAdapter( final NameMapper nameMapper, final NamedLockFactory namedLockFactory,
final long time, final TimeUnit timeUnit )
{
- this.nameMapper = Objects.requireNonNull( nameMapper );
- this.namedLockFactory = Objects.requireNonNull( namedLockFactory );
+ this.nameMapper = requireNonNull( nameMapper );
+ this.namedLockFactory = requireNonNull( namedLockFactory );
if ( time < 0L )
{
throw new IllegalArgumentException( "time cannot be negative" );
}
this.time = time;
- this.timeUnit = Objects.requireNonNull( timeUnit );
+ this.timeUnit = requireNonNull( timeUnit );
}
public SyncContext newInstance( final RepositorySystemSession session, final boolean shared )
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/StaticNameMapper.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/StaticNameMapper.java
index 14fc7e7..c8eb1d6 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/StaticNameMapper.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/StaticNameMapper.java
@@ -29,7 +29,8 @@ import javax.inject.Named;
import javax.inject.Singleton;
import java.util.Collection;
import java.util.Collections;
-import java.util.Objects;
+
+import static java.util.Objects.requireNonNull;
/**
* Static {@link NameMapper}, always assigns one same name, effectively becoming equivalent to "static" sync context.
@@ -61,7 +62,7 @@ public class StaticNameMapper implements NameMapper
*/
public StaticNameMapper( final String name )
{
- this.name = Objects.requireNonNull( name );
+ this.name = requireNonNull( name );
}
@Override
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java
index 87cab6f..12244c4 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java
@@ -35,10 +35,10 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
-import java.util.Objects;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import static java.util.Objects.requireNonNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -66,7 +66,7 @@ public abstract class NamedLockFactoryAdapterTestSupport {
private RepositorySystemSession session;
public static void createAdapter() {
- Objects.requireNonNull(namedLockFactory, "NamedLockFactory not set");
+ requireNonNull(namedLockFactory, "NamedLockFactory not set");
adapter = new NamedLockFactoryAdapter(nameMapper, namedLockFactory, ADAPTER_TIME, ADAPTER_TIME_UNIT);
}
diff --git a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java b/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java
index 9b9a2b4..8e1acdc 100644
--- a/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java
+++ b/maven-resolver-named-locks/src/main/java/org/eclipse/aether/named/support/NamedLockFactorySupport.java
@@ -23,11 +23,12 @@ import org.eclipse.aether.named.NamedLockFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
+import static java.util.Objects.requireNonNull;
+
/**
* Support class for {@link NamedLockFactory} implementations providing reference counting.
*/
@@ -117,7 +118,7 @@ public abstract class NamedLockFactorySupport
private NamedLockHolder( final NamedLockSupport namedLock )
{
- this.namedLock = Objects.requireNonNull( namedLock );
+ this.namedLock = requireNonNull( namedLock );
this.referenceCount = new AtomicInteger( 0 );
}
diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
index 125d84d..e9d8e99 100644
--- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
+++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
@@ -24,11 +24,12 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.Buffer;
import java.nio.ByteBuffer;
-import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.aether.transfer.TransferCancelledException;
+import static java.util.Objects.requireNonNull;
+
/**
* A skeleton implementation for custom transporters.
*/
@@ -49,7 +50,7 @@ public abstract class AbstractTransporter
public void peek( PeekTask task )
throws Exception
{
- Objects.requireNonNull( "task", "task cannot be null" );
+ requireNonNull( task, "task cannot be null" );
failIfClosed( task );
implPeek( task );
@@ -67,7 +68,7 @@ public abstract class AbstractTransporter
public void get( GetTask task )
throws Exception
{
- Objects.requireNonNull( "task", "task cannot be null" );
+ requireNonNull( task, "task cannot be null" );
failIfClosed( task );
implGet( task );
@@ -149,7 +150,7 @@ public abstract class AbstractTransporter
public void put( PutTask task )
throws Exception
{
- Objects.requireNonNull( "task", "task cannot be null" );
+ requireNonNull( task, "task cannot be null" );
failIfClosed( task );
implPut( task );
diff --git a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java b/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java
index 5f5b48d..ee85890 100644
--- a/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java
+++ b/maven-resolver-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java
@@ -21,14 +21,14 @@ package org.eclipse.aether.transport.classpath;
import javax.inject.Named;
-import java.util.Objects;
-
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.spi.connector.transport.Transporter;
import org.eclipse.aether.spi.connector.transport.TransporterFactory;
import org.eclipse.aether.transfer.NoTransporterException;
+import static java.util.Objects.requireNonNull;
+
/**
* A transporter factory for repositories using the {@code classpath:} protocol. As example, getting an item named
* {@code some/file.txt} from a repository with the URL {@code classpath:/base/dir} results in retrieving the resource
@@ -82,8 +82,8 @@ public final class ClasspathTransporterFactory
public Transporter newInstance( RepositorySystemSession session, RemoteRepository repository )
throws NoTransporterException
{
- Objects.requireNonNull( "session", "session cannot be null" );
- Objects.requireNonNull( "repository", "repository cannot be null" );
+ requireNonNull( session, "session cannot be null" );
+ requireNonNull( repository, "repository cannot be null" );
return new ClasspathTransporter( session, repository );
}
diff --git a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java b/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java
index 42e651f..3916ada 100644
--- a/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java
+++ b/maven-resolver-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java
@@ -21,14 +21,14 @@ package org.eclipse.aether.transport.file;
import javax.inject.Named;
-import java.util.Objects;
-
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.spi.connector.transport.Transporter;
import org.eclipse.aether.spi.connector.transport.TransporterFactory;
import org.eclipse.aether.transfer.NoTransporterException;
+import static java.util.Objects.requireNonNull;
+
/**
* A transporter factory for repositories using the {@code file:} protocol.
*/
@@ -69,8 +69,8 @@ public final class FileTransporterFactory
public Transporter newInstance( RepositorySystemSession session, RemoteRepository repository )
throws NoTransporterException
{
- Objects.requireNonNull( "session", "session cannot be null" );
- Objects.requireNonNull( "repository", "repository cannot be null" );
+ requireNonNull( session, "session cannot be null" );
+ requireNonNull( repository, "repository cannot be null" );
return new FileTransporter( repository );
}
diff --git a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
index e748836..a0c9fb9 100644
--- a/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
+++ b/maven-resolver-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
@@ -21,14 +21,14 @@ package org.eclipse.aether.transport.http;
import javax.inject.Named;
-import java.util.Objects;
-
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.spi.connector.transport.Transporter;
import org.eclipse.aether.spi.connector.transport.TransporterFactory;
import org.eclipse.aether.transfer.NoTransporterException;
+import static java.util.Objects.requireNonNull;
+
/**
* A transporter factory for repositories using the {@code http:} or {@code https:} protocol. The provided transporters
* support uploads to WebDAV servers and resumable downloads.
@@ -72,8 +72,8 @@ public final class HttpTransporterFactory
public Transporter newInstance( RepositorySystemSession session, RemoteRepository repository )
throws NoTransporterException
{
- Objects.requireNonNull( "session", "session cannot be null" );
- Objects.requireNonNull( "repository", "repository cannot be null" );
+ requireNonNull( session, "session cannot be null" );
+ requireNonNull( repository, "repository cannot be null" );
return new HttpTransporter( repository, session );
}
diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
index 6441d0c..dbc9830 100644
--- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
+++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
@@ -29,7 +29,6 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Locale;
import java.util.Map;
-import java.util.Objects;
import java.util.Properties;
import java.util.Queue;
import java.util.UUID;
@@ -61,6 +60,8 @@ import org.eclipse.aether.util.ConfigUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static java.util.Objects.requireNonNull;
+
/**
* A transporter using Maven Wagon.
*/
@@ -416,7 +417,7 @@ final class WagonTransporter
private void execute( TransportTask task, TaskRunner runner )
throws Exception
{
- Objects.requireNonNull( "task", "task cannot be null" );
+ requireNonNull( task, "task cannot be null" );
if ( closed.get() )
{
diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
index a8487d6..3cc4273 100644
--- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
+++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
@@ -22,8 +22,6 @@ package org.eclipse.aether.transport.wagon;
import javax.inject.Inject;
import javax.inject.Named;
-import java.util.Objects;
-
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.spi.connector.transport.Transporter;
@@ -32,6 +30,8 @@ import org.eclipse.aether.spi.locator.Service;
import org.eclipse.aether.spi.locator.ServiceLocator;
import org.eclipse.aether.transfer.NoTransporterException;
+import static java.util.Objects.requireNonNull;
+
/**
* A transporter factory using <a href="http://maven.apache.org/wagon/" target="_blank">Apache Maven Wagon</a>. Note
* that this factory merely serves as an adapter to the Wagon API and by itself does not provide any transport services
@@ -115,8 +115,8 @@ public final class WagonTransporterFactory
public Transporter newInstance( RepositorySystemSession session, RemoteRepository repository )
throws NoTransporterException
{
- Objects.requireNonNull( "session", "session cannot be null" );
- Objects.requireNonNull( "repository", "repository cannot be null" );
+ requireNonNull( session, "session cannot be null" );
+ requireNonNull( repository, "repository cannot be null" );
return new WagonTransporter( wagonProvider, wagonConfigurator, repository, session );
}