From e78a177ef03125a256eab96f0690ee97122dc22b Mon Sep 17 00:00:00 2001
From: Julien Ruaux <jrx@github.com>
Date: Mon, 16 Jan 2023 09:06:32 +0800
Subject: [PATCH] refactor!: Renamed credentials to key file

---
 .../main/java/com/redis/riot/file/GcsOptions.java   | 13 ++++++-------
 .../com/redis/riot/AbstractTransferCommand.java     |  3 ++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/connectors/riot-file/src/main/java/com/redis/riot/file/GcsOptions.java b/connectors/riot-file/src/main/java/com/redis/riot/file/GcsOptions.java
index 0bb466507..543007828 100644
--- a/connectors/riot-file/src/main/java/com/redis/riot/file/GcsOptions.java
+++ b/connectors/riot-file/src/main/java/com/redis/riot/file/GcsOptions.java
@@ -21,14 +21,14 @@
 public class GcsOptions {
 
 	@Option(names = "--gcs-key-file", description = "GCS private key (e.g. /usr/local/key.json).", paramLabel = "<file>")
-	private Optional<File> credentials = Optional.empty();
+	private Optional<File> keyFile = Optional.empty();
 	@Option(names = "--gcs-project", description = "GCP project id.", paramLabel = "<id>")
 	private Optional<String> projectId = Optional.empty();
 	@Option(names = "--gcs-key", arity = "0..1", interactive = true, description = "GCS Base64 encoded key.", paramLabel = "<key>")
 	private Optional<String> encodedKey = Optional.empty();
 
-	public void setCredentials(File credentials) {
-		this.credentials = Optional.of(credentials);
+	public void setKeyFile(File credentials) {
+		this.keyFile = Optional.of(credentials);
 	}
 
 	public void setProjectId(String projectId) {
@@ -42,8 +42,8 @@ public void setEncodedKey(String encodedKey) {
 	public GoogleStorageResource resource(String locationUri, boolean readOnly) throws IOException {
 		StorageOptions.Builder builder = StorageOptions.newBuilder().setProjectId(ServiceOptions.getDefaultProjectId())
 				.setHeaderProvider(new UserAgentHeaderProvider(GcpStorageAutoConfiguration.class));
-		if (credentials.isPresent()) {
-			builder.setCredentials(GoogleCredentials.fromStream(Files.newInputStream(credentials.get().toPath()))
+		if (keyFile.isPresent()) {
+			builder.setCredentials(GoogleCredentials.fromStream(Files.newInputStream(keyFile.get().toPath()))
 					.createScoped((readOnly ? GcpScope.STORAGE_READ_ONLY : GcpScope.STORAGE_READ_WRITE).getUrl()));
 		}
 		if (encodedKey.isPresent()) {
@@ -56,8 +56,7 @@ public GoogleStorageResource resource(String locationUri, boolean readOnly) thro
 
 	@Override
 	public String toString() {
-		return "GcsOptions [credentials=" + credentials + ", projectId=" + projectId + ", encodedKey=" + encodedKey
-				+ "]";
+		return "GcsOptions [credentials=" + keyFile + ", projectId=" + projectId + ", encodedKey=" + encodedKey + "]";
 	}
 
 }
diff --git a/core/riot-core/src/main/java/com/redis/riot/AbstractTransferCommand.java b/core/riot-core/src/main/java/com/redis/riot/AbstractTransferCommand.java
index 34c7a1930..9821d5d10 100644
--- a/core/riot-core/src/main/java/com/redis/riot/AbstractTransferCommand.java
+++ b/core/riot-core/src/main/java/com/redis/riot/AbstractTransferCommand.java
@@ -3,6 +3,7 @@
 import java.time.Duration;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -84,7 +85,7 @@ protected <I, O> FaultTolerantStepBuilder<I, O> step(SimpleStepBuilder<I, O> ste
 			LimitCheckingItemSkipPolicy limitSkipPolicy = (LimitCheckingItemSkipPolicy) skipPolicy;
 			limitSkipPolicy.setSkippableExceptionMap(
 					Stream.of(RedisCommandExecutionException.class, RedisCommandTimeoutException.class,
-							TimeoutException.class).collect(Collectors.toMap(t -> t, t -> true)));
+							TimeoutException.class).collect(Collectors.toMap(Function.identity(), t -> true)));
 		}
 		return step.faultTolerant().skipPolicy(options.getSkipPolicy().getSkipPolicy());
 	}