From bfb4d9cacdadd8065be07b1bf0c22ea7aeb94d97 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 21 Nov 2019 15:02:37 -0600 Subject: [PATCH] fix: user-agent should use identifier/version (#1425) * fix: user-agent should use identifier/version * test: inline USER_AGENT_SUFFIX in test --- .../googleapis/services/AbstractGoogleClientRequest.java | 5 +++-- .../services/AbstractGoogleClientRequestTest.java | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java index f5cbd8f77..9622addf1 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java @@ -126,9 +126,10 @@ protected AbstractGoogleClientRequest(AbstractGoogleClient abstractGoogleClient, // application name String applicationName = abstractGoogleClient.getApplicationName(); if (applicationName != null) { - requestHeaders.setUserAgent(applicationName + " " + USER_AGENT_SUFFIX); + requestHeaders.setUserAgent(applicationName + " " + USER_AGENT_SUFFIX + "/" + + GoogleUtils.VERSION); } else { - requestHeaders.setUserAgent(USER_AGENT_SUFFIX); + requestHeaders.setUserAgent(USER_AGENT_SUFFIX + "/" + GoogleUtils.VERSION); } // Set the header for the Api Client version (Java and OS version) requestHeaders.set(API_VERSION_HEADER, ApiClientVersion.DEFAULT_VERSION); diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java index 439b6ad27..398ceb93a 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java @@ -12,6 +12,7 @@ package com.google.api.client.googleapis.services; +import com.google.api.client.googleapis.GoogleUtils; import com.google.api.client.googleapis.services.AbstractGoogleClientRequest.ApiClientVersion; import com.google.api.client.googleapis.testing.services.MockGoogleClient; import com.google.api.client.googleapis.testing.services.MockGoogleClientRequest; @@ -203,7 +204,7 @@ public void testUserAgentSuffix() throws Exception { // Specify an Application Name. String applicationName = "Test Application"; transport.expectedUserAgent = applicationName + " " - + AbstractGoogleClientRequest.USER_AGENT_SUFFIX + " " + + "Google-API-Java-Client/" + GoogleUtils.VERSION + " " + HttpRequest.USER_AGENT_SUFFIX; MockGoogleClient client = new MockGoogleClient.Builder( transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).setApplicationName( @@ -215,7 +216,8 @@ public void testUserAgentSuffix() throws Exception { public void testUserAgent() throws IOException { AssertUserAgentTransport transport = new AssertUserAgentTransport(); - transport.expectedUserAgent = AbstractGoogleClientRequest.USER_AGENT_SUFFIX + " " + HttpRequest.USER_AGENT_SUFFIX; + transport.expectedUserAgent = "Google-API-Java-Client/" + GoogleUtils.VERSION + " " + + HttpRequest.USER_AGENT_SUFFIX; // Don't specify an Application Name. MockGoogleClient client = new MockGoogleClient.Builder( transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).build();