Skip to content

Commit c42bc2f

Browse files
jeanbzamattwhisenhunt
authored andcommitted
internal: resolve circular dependency
1 parent 0a154ba commit c42bc2f

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.google.api.client.util.IOUtils;
1919
import com.google.api.client.util.LoggingStreamingContent;
2020
import com.google.api.client.util.ObjectParser;
21-
import com.google.api.client.util.OpenCensusUtils;
2221
import com.google.api.client.util.Preconditions;
2322
import com.google.api.client.util.Sleeper;
2423
import com.google.api.client.util.StreamingContent;

google-http-client/src/main/java/com/google/api/client/util/OpenCensusUtils.java renamed to google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
* the License.
1313
*/
1414

15-
package com.google.api.client.util;
15+
package com.google.api.client.http;
1616

17-
import com.google.api.client.http.HttpHeaders;
18-
import com.google.api.client.http.HttpRequest;
19-
import com.google.api.client.http.HttpStatusCodes;
17+
import com.google.api.client.util.Preconditions;
2018
import com.google.common.annotations.VisibleForTesting;
2119

2220
import io.opencensus.contrib.http.util.HttpPropagationUtil;

google-http-client/src/test/java/com/google/api/client/util/OpenCensusUtilsTest.java renamed to google-http-client/src/test/java/com/google/api/client/http/OpenCensusUtilsTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* the License.
1313
*/
1414

15-
package com.google.api.client.util;
15+
package com.google.api.client.http;
1616

1717
import static org.junit.Assert.assertEquals;
1818
import static org.junit.Assert.assertNotNull;
@@ -21,6 +21,7 @@
2121
import static org.mockito.Mockito.verify;
2222

2323
import com.google.api.client.http.HttpHeaders;
24+
import com.google.api.client.http.OpenCensusUtils;
2425
import io.opencensus.trace.EndSpanOptions;
2526
import io.opencensus.trace.NetworkEvent;
2627
import io.opencensus.trace.Span;

0 commit comments

Comments
 (0)