Revert "internal: resolve circular dependency"

This reverts commit c42bc2f.
chingor13 · Jun 25, 2018 · c0502b0 · c0502b0
1 parent b81a9b2
commit c0502b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
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
@@ -18,6 +18,7 @@
 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/...ogle/api/client/http/OpenCensusUtils.java → ...ogle/api/client/util/OpenCensusUtils.java b/...ogle/api/client/http/OpenCensusUtils.java → ...ogle/api/client/util/OpenCensusUtils.java
@@ -12,9 +12,11 @@
  * the License.
  */
 
-package com.google.api.client.http;
+package com.google.api.client.util;
 
-import com.google.api.client.util.Preconditions;
+import com.google.api.client.http.HttpHeaders;
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpStatusCodes;
 import com.google.common.annotations.VisibleForTesting;
 
 import io.opencensus.contrib.http.util.HttpPropagationUtil;

diff --git a/.../api/client/http/OpenCensusUtilsTest.java → .../api/client/util/OpenCensusUtilsTest.java b/.../api/client/http/OpenCensusUtilsTest.java → .../api/client/util/OpenCensusUtilsTest.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.api.client.http;
+package com.google.api.client.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -21,7 +21,6 @@
 import static org.mockito.Mockito.verify;
 
 import com.google.api.client.http.HttpHeaders;
-import com.google.api.client.http.OpenCensusUtils;
 import io.opencensus.trace.EndSpanOptions;
 import io.opencensus.trace.NetworkEvent;
 import io.opencensus.trace.Span;