Skip to content

Commit fa7d4a0

Browse files
committed
rename method logResponsePayload
1 parent 7069230 commit fa7d4a0

File tree

9 files changed

+15
-16
lines changed

9 files changed

+15
-16
lines changed

oauth2_http/java/com/google/auth/oauth2/ComputeEngineCredentials.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ public AccessToken refreshAccessToken() throws IOException {
373373
throw new IOException(METADATA_RESPONSE_EMPTY_CONTENT_ERROR_MESSAGE);
374374
}
375375
GenericData responseData = response.parseAs(GenericData.class);
376-
LoggingUtils.logGenericData(responseData, LOGGER_PROVIDER, "Response payload for access token");
376+
LoggingUtils.logResponsePayload(responseData, LOGGER_PROVIDER, "Response payload for access token");
377377
String accessToken =
378378
OAuth2Utils.validateString(responseData, "access_token", PARSE_ERROR_PREFIX);
379379
int expiresInSeconds =
@@ -755,7 +755,7 @@ private String getDefaultServiceAccount() throws IOException {
755755
throw new IOException(METADATA_RESPONSE_EMPTY_CONTENT_ERROR_MESSAGE);
756756
}
757757
GenericData responseData = response.parseAs(GenericData.class);
758-
LoggingUtils.logGenericData(
758+
LoggingUtils.logResponsePayload(
759759
responseData, LOGGER_PROVIDER, "Received default service account payload");
760760
Map<String, Object> defaultAccount =
761761
OAuth2Utils.validateMap(responseData, "default", PARSE_ERROR_ACCOUNT);

oauth2_http/java/com/google/auth/oauth2/IamUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private static String getSignature(
186186
}
187187

188188
GenericData responseData = response.parseAs(GenericData.class);
189-
LoggingUtils.logGenericData(responseData, LOGGER_PROVIDER, "Response payload for sign blob");
189+
LoggingUtils.logResponsePayload(responseData, LOGGER_PROVIDER, "Response payload for sign blob");
190190
return OAuth2Utils.validateString(responseData, "signedBlob", PARSE_ERROR_SIGNATURE);
191191
}
192192

@@ -268,7 +268,7 @@ static IdToken getIdToken(
268268
}
269269

270270
GenericJson responseData = response.parseAs(GenericJson.class);
271-
LoggingUtils.logGenericData(
271+
LoggingUtils.logResponsePayload(
272272
responseData, LOGGER_PROVIDER, "Response payload for ID token request");
273273
String rawToken = OAuth2Utils.validateString(responseData, "token", PARSE_ERROR_MESSAGE);
274274
return IdToken.create(rawToken);

oauth2_http/java/com/google/auth/oauth2/ImpersonatedCredentials.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ public AccessToken refreshAccessToken() throws IOException {
564564
}
565565

566566
GenericData responseData = response.parseAs(GenericData.class);
567-
LoggingUtils.logGenericData(responseData, LOGGER_PROVIDER, "Response payload for access token");
567+
LoggingUtils.logResponsePayload(responseData, LOGGER_PROVIDER, "Response payload for access token");
568568
response.disconnect();
569569

570570
String accessToken =

oauth2_http/java/com/google/auth/oauth2/LoggingUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ static void logResponse(HttpResponse response, LoggerProvider loggerProvider, St
6666
}
6767
}
6868

69-
static void logGenericData(
69+
static void logResponsePayload(
7070
GenericData genericData, LoggerProvider loggerProvider, String message) {
7171
if (loggingEnabled) {
72-
Slf4jUtils.logGenericData(genericData, loggerProvider, message);
72+
Slf4jUtils.logResponsePayload(genericData, loggerProvider, message);
7373
}
7474
}
7575
}

oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ boolean isConfiguredForDomainWideDelegation() {
507507

508508
private GenericData parseResponseAs(HttpResponse response) throws IOException {
509509
GenericData genericData = response.parseAs(GenericData.class);
510-
LoggingUtils.logGenericData(genericData, LOGGER_PROVIDER, "Response payload");
510+
LoggingUtils.logResponsePayload(genericData, LOGGER_PROVIDER, "Response payload");
511511
return genericData;
512512
}
513513
/**

oauth2_http/java/com/google/auth/oauth2/Slf4jUtils.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static void logRequest(HttpRequest request, LoggerProvider loggerProvider, Strin
214214
}
215215
}
216216
} catch (Exception e) {
217-
217+
// let logging fail silently
218218
}
219219
}
220220

@@ -231,12 +231,11 @@ static void logResponse(HttpResponse response, LoggerProvider loggerProvider, St
231231
log(logger, org.slf4j.event.Level.INFO, responseLogDataMap, message);
232232
}
233233
} catch (Exception e) {
234-
235-
// logger.error("Error logging response: ", e);
234+
// let logging fail silently
236235
}
237236
}
238237

239-
static void logGenericData(
238+
static void logResponsePayload(
240239
GenericData genericData, LoggerProvider loggerProvider, String message) {
241240
try {
242241

@@ -246,7 +245,7 @@ static void logGenericData(
246245
log(logger, org.slf4j.event.Level.DEBUG, contextMap, message);
247246
}
248247
} catch (Exception e) {
249-
// logger.error("Error logging GenericData: ", e);
248+
// let logging fail silently
250249
}
251250
}
252251

oauth2_http/java/com/google/auth/oauth2/UserCredentials.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ private GenericData doRefreshAccessToken() throws IOException {
297297

298298
GenericData data = response.parseAs(GenericData.class);
299299

300-
LoggingUtils.logGenericData(data, LOGGER_PROVIDER, "Response payload for access token");
300+
LoggingUtils.logResponsePayload(data, LOGGER_PROVIDER, "Response payload for access token");
301301
return data;
302302
}
303303

oauth2_http/javatests/com/google/auth/oauth2/Slf4jUtils1xTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void testLogGenericData() {
6767

6868
LoggerProvider loggerProvider = Mockito.mock(LoggerProvider.class);
6969
when(loggerProvider.getLogger()).thenReturn(LOGGER);
70-
LoggingUtils.logGenericData(data, loggerProvider, "test generic data");
70+
LoggingUtils.logResponsePayload(data, loggerProvider, "test generic data");
7171

7272
assertEquals(1, testAppender.events.size());
7373
Map<String, String> mdcPropertyMap = testAppender.events.get(0).getMDCPropertyMap();

oauth2_http/javatests/com/google/auth/oauth2/Slf4jUtilsLogbackTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void testLogGenericData() {
144144

145145
LoggerProvider loggerProvider = mock(LoggerProvider.class);
146146
when(loggerProvider.getLogger()).thenReturn(LOGGER);
147-
LoggingUtils.logGenericData(data, loggerProvider, "test generic data");
147+
LoggingUtils.logResponsePayload(data, loggerProvider, "test generic data");
148148

149149
assertEquals(1, testAppender.events.size());
150150
List<KeyValuePair> keyValuePairs = testAppender.events.get(0).getKeyValuePairs();

0 commit comments

Comments
 (0)