Skip to content

Commit

Permalink
Fix incorrect @ConditionalOnBean class for the s3 filetransfer implem…
Browse files Browse the repository at this point in the history
…entation (#545)
  • Loading branch information
tgianos authored Jun 28, 2017
1 parent 3b00ad9 commit 25ef712
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
import com.amazonaws.retry.PredefinedRetryPolicies;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.netflix.genie.common.exceptions.GenieException;
import com.netflix.genie.core.services.FileTransfer;
Expand Down Expand Up @@ -112,7 +111,7 @@ public AmazonS3 genieS3Client(
*/
@Bean(name = {"file.system.s3", "file.system.s3n", "file.system.s3a"})
@Order(value = 1)
@ConditionalOnBean(AmazonS3Client.class)
@ConditionalOnBean(AmazonS3.class)
public FileTransfer s3FileTransferImpl(final AmazonS3 s3Client, final Registry registry) throws GenieException {
return new S3FileTransferImpl(s3Client, registry);
}
Expand Down

0 comments on commit 25ef712

Please sign in to comment.