From d369d57ab4df1bd9b8612b29cb77177bf18d34ab Mon Sep 17 00:00:00 2001 From: Prashant Bhagat Date: Thu, 8 Mar 2018 17:34:51 +0530 Subject: [PATCH 1/5] Fixing warn log message Fixing warn log message --- .../main/java/com/google/cloud/translate/TranslateOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java index 11e8b8cbcb56..68af54c251d3 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java @@ -169,7 +169,7 @@ private TranslateOptions(Builder builder) { logger.log( Level.WARNING, String.format( - "Ignoring Application Default Credentials: using explicit setting for API key instead.", + "Ignoring Application Default Credentials %s: using explicit setting for API key instead.", ServiceOptions.CREDENTIAL_ENV_NAME)); } else if (credentials != null) { // credentials assigned from ADC in superclass constructor apiKey = null; From 6af541ef866344577c538c1ce1b0e021f3ab83d3 Mon Sep 17 00:00:00 2001 From: Prashant Bhagat Date: Fri, 9 Mar 2018 10:22:48 +0530 Subject: [PATCH 2/5] Code review comment, avoiding String.format while logging --- .../cloud/translate/TranslateOptions.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java index 68af54c251d3..66cc5f138258 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java @@ -155,30 +155,28 @@ private TranslateOptions(Builder builder) { apiKey = null; if (builder.apiKey != null) { logger.log( - Level.WARNING, "Ignoring API key: using explicit setting for credentials instead."); + Level.WARNING, + "Ignoring API key: using explicit setting for credentials instead."); } else if (getDefaultApiKey() != null) { logger.log( Level.WARNING, - String.format( - "Ignoring API key set in environment variable %s: using explicit setting for credentials instead.", - API_KEY_ENV_NAME)); + "Ignoring API key set in environment variable {}: using explicit setting for credentials instead.", + API_KEY_ENV_NAME); } } else if (builder.apiKey != null) { credentials = null; apiKey = builder.apiKey; logger.log( Level.WARNING, - String.format( - "Ignoring Application Default Credentials %s: using explicit setting for API key instead.", - ServiceOptions.CREDENTIAL_ENV_NAME)); + "Ignoring Application Default Credentials {}: using explicit setting for API key instead.", + ServiceOptions.CREDENTIAL_ENV_NAME); } else if (credentials != null) { // credentials assigned from ADC in superclass constructor apiKey = null; if (getDefaultApiKey() != null) { logger.log( Level.WARNING, - String.format( - "Ignoring API key set in environment variable %s: using Application Default Credentials instead.", - API_KEY_ENV_NAME)); + "Ignoring API key set in environment variable {}: using Application Default Credentials instead.", + API_KEY_ENV_NAME); } } else { apiKey = getDefaultApiKey(); From 980cedb71f8a846a9657475b73cf5c0e7bc282ad Mon Sep 17 00:00:00 2001 From: Prashant Bhagat Date: Fri, 9 Mar 2018 13:51:36 +0530 Subject: [PATCH 3/5] Code review comment --- .../java/com/google/cloud/translate/TranslateOptions.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java index 66cc5f138258..a76da3d822b3 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java @@ -160,7 +160,7 @@ private TranslateOptions(Builder builder) { } else if (getDefaultApiKey() != null) { logger.log( Level.WARNING, - "Ignoring API key set in environment variable {}: using explicit setting for credentials instead.", + "Ignoring API key set in environment variable {0}: using explicit setting for credentials instead.", API_KEY_ENV_NAME); } } else if (builder.apiKey != null) { @@ -168,14 +168,14 @@ private TranslateOptions(Builder builder) { apiKey = builder.apiKey; logger.log( Level.WARNING, - "Ignoring Application Default Credentials {}: using explicit setting for API key instead.", + "Ignoring Application Default Credentials {0}: using explicit setting for API key instead.", ServiceOptions.CREDENTIAL_ENV_NAME); } else if (credentials != null) { // credentials assigned from ADC in superclass constructor apiKey = null; if (getDefaultApiKey() != null) { logger.log( Level.WARNING, - "Ignoring API key set in environment variable {}: using Application Default Credentials instead.", + "Ignoring API key set in environment variable {0}: using Application Default Credentials instead.", API_KEY_ENV_NAME); } } else { From cd2e7aae5e49bb6316dff80e68026f5d00194bef Mon Sep 17 00:00:00 2001 From: Prashant Bhagat Date: Fri, 9 Mar 2018 17:25:32 +0530 Subject: [PATCH 4/5] Code review --- .../main/java/com/google/cloud/translate/TranslateOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java index a76da3d822b3..ffc2be7f538e 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java @@ -175,7 +175,7 @@ private TranslateOptions(Builder builder) { if (getDefaultApiKey() != null) { logger.log( Level.WARNING, - "Ignoring API key set in environment variable {0}: using Application Default Credentials instead.", + "Ignoring API key set in environment variable {}: using Application Default Credentials instead.", API_KEY_ENV_NAME); } } else { From 58695826b108daa0e8876388d728078f70fa745f Mon Sep 17 00:00:00 2001 From: Prashant Bhagat Date: Fri, 9 Mar 2018 17:25:49 +0530 Subject: [PATCH 5/5] Check in to trigger a build --- .../main/java/com/google/cloud/translate/TranslateOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java index ffc2be7f538e..a76da3d822b3 100644 --- a/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java +++ b/google-cloud-translate/src/main/java/com/google/cloud/translate/TranslateOptions.java @@ -175,7 +175,7 @@ private TranslateOptions(Builder builder) { if (getDefaultApiKey() != null) { logger.log( Level.WARNING, - "Ignoring API key set in environment variable {}: using Application Default Credentials instead.", + "Ignoring API key set in environment variable {0}: using Application Default Credentials instead.", API_KEY_ENV_NAME); } } else {