From b93f2315dd82d14fb92b2004c7caa636fac8cdf3 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 7 Jan 2019 15:46:45 -0800 Subject: [PATCH 1/2] Move OpenCensusUtils to com.google.api.client.http to avoid circular dependency between packages --- .../main/java/com/google/api/client/http/HttpRequest.java | 1 - .../google/api/client/{util => http}/OpenCensusUtils.java | 6 ++---- .../api/client/{util => http}/OpenCensusUtilsTest.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) rename google-http-client/src/main/java/com/google/api/client/{util => http}/OpenCensusUtils.java (98%) rename google-http-client/src/test/java/com/google/api/client/{util => http}/OpenCensusUtilsTest.java (99%) diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java index 1c68d9036..ef1427e22 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java +++ b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java @@ -18,7 +18,6 @@ import com.google.api.client.util.IOUtils; import com.google.api.client.util.LoggingStreamingContent; import com.google.api.client.util.ObjectParser; -import com.google.api.client.util.OpenCensusUtils; import com.google.api.client.util.Preconditions; import com.google.api.client.util.Sleeper; import com.google.api.client.util.StreamingContent; diff --git a/google-http-client/src/main/java/com/google/api/client/util/OpenCensusUtils.java b/google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java similarity index 98% rename from google-http-client/src/main/java/com/google/api/client/util/OpenCensusUtils.java rename to google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java index a636dc7cc..99812b5d9 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/OpenCensusUtils.java +++ b/google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java @@ -12,11 +12,9 @@ * the License. */ -package com.google.api.client.util; +package com.google.api.client.http; -import com.google.api.client.http.HttpHeaders; -import com.google.api.client.http.HttpRequest; -import com.google.api.client.http.HttpStatusCodes; +import com.google.api.client.util.Preconditions; import com.google.common.annotations.VisibleForTesting; import io.opencensus.contrib.http.util.HttpPropagationUtil; diff --git a/google-http-client/src/test/java/com/google/api/client/util/OpenCensusUtilsTest.java b/google-http-client/src/test/java/com/google/api/client/http/OpenCensusUtilsTest.java similarity index 99% rename from google-http-client/src/test/java/com/google/api/client/util/OpenCensusUtilsTest.java rename to google-http-client/src/test/java/com/google/api/client/http/OpenCensusUtilsTest.java index f3c850ca7..d88f34d6a 100644 --- a/google-http-client/src/test/java/com/google/api/client/util/OpenCensusUtilsTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/OpenCensusUtilsTest.java @@ -12,7 +12,7 @@ * the License. */ -package com.google.api.client.util; +package com.google.api.client.http; import com.google.api.client.http.HttpHeaders; From 4047facdd07e027496001d57330c80f88fd5fa7e Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 7 Jan 2019 16:02:12 -0800 Subject: [PATCH 2/2] Make OpenCensusUtils package private for now --- .../main/java/com/google/api/client/http/OpenCensusUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java b/google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java index 99812b5d9..a52ace894 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java +++ b/google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java @@ -40,7 +40,7 @@ * @author Hailong Wen * @since 1.28 */ -public class OpenCensusUtils { +class OpenCensusUtils { private static final Logger logger = Logger.getLogger(OpenCensusUtils.class.getName());