IGNITE-4858: TcpDiscoveryS3IpFinder.setAwsCredentials should not be be overloaded
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/746ed2b0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/746ed2b0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/746ed2b0 Branch: refs/heads/ignite-1192 Commit: 746ed2b07552fbac7d0e849eefff4073764e8044 Parents: 927ead1 Author: Denis Magda <[email protected]> Authored: Thu Mar 23 10:12:54 2017 -0700 Committer: Denis Magda <[email protected]> Committed: Thu Mar 23 10:12:54 2017 -0700 ---------------------------------------------------------------------- .../spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 6 +++--- .../TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/746ed2b0/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java index 53d6532..d9f50c2 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java @@ -53,7 +53,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter; * <h2 class="header">Mandatory</h2> * <ul> * <li>AWS credentials (see {@link #setAwsCredentials(AWSCredentials)} and - * {@link #setAwsCredentials(AWSCredentialsProvider)})</li> + * {@link #setAwsCredentialsProvider(AWSCredentialsProvider)}</li> * <li>Bucket name (see {@link #setBucketName(String)})</li> * </ul> * <h2 class="header">Optional</h2> @@ -327,7 +327,7 @@ public class TcpDiscoveryS3IpFinder extends TcpDiscoveryIpFinderAdapter { } /** - * Sets AWS credentials. Either use {@link #setAwsCredentials(AWSCredentialsProvider)} or this one. + * Sets AWS credentials. Either use {@link #setAwsCredentialsProvider(AWSCredentialsProvider)} or this one. * <p> * For details refer to Amazon S3 API reference. * @@ -346,7 +346,7 @@ public class TcpDiscoveryS3IpFinder extends TcpDiscoveryIpFinderAdapter { * @param credProvider AWS credentials provider. */ @IgniteSpiConfiguration(optional = false) - public void setAwsCredentials(AWSCredentialsProvider credProvider) { + public void setAwsCredentialsProvider(AWSCredentialsProvider credProvider) { this.credProvider = credProvider; } http://git-wip-us.apache.org/repos/asf/ignite/blob/746ed2b0/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java index 6952b54..ea316c4 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest.java @@ -36,7 +36,7 @@ public class TcpDiscoveryS3IpFinderAwsCredentialsProviderSelfTest extends TcpDis /** {@inheritDoc} */ @Override protected void setAwsCredentials(TcpDiscoveryS3IpFinder finder) { - finder.setAwsCredentials(new AWSStaticCredentialsProvider( + finder.setAwsCredentialsProvider(new AWSStaticCredentialsProvider( new BasicAWSCredentials(IgniteS3TestSuite.getAccessKey(), IgniteS3TestSuite.getSecretKey()))); }
