Skip to content

Commit a610b55

Browse files
committed
updates for http-okhttp3 changes
1 parent 5c02254 commit a610b55

File tree

20 files changed

+369
-95
lines changed

20 files changed

+369
-95
lines changed

sdk/clientcore/annotation-processor-test/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
--add-exports io.clientcore.core/io.clientcore.core.implementation.http.serializer=ALL-UNNAMED
4848
--add-exports io.clientcore.core/io.clientcore.core.implementation.utils=ALL-UNNAMED
4949

50-
--add-exports io.clientcore.core/io.clientcore.core.shared=ALL-UNNAMED
51-
--add-opens io.clientcore.core/io.clientcore.core.shared=ALL-UNNAMED
50+
--add-exports io.clientcore.annotation.processor.test/io.clientcore.annotation.processor.test.shared=ALL-UNNAMED
51+
--add-opens io.clientcore.annotation.processor.test/io.clientcore.annotation.processor.test.shared.=ALL-UNNAMED
5252
</javaModulesSurefireArgLine>
5353
</properties>
5454

sdk/clientcore/annotation-processor-test/src/main/java/module-info.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module annotation.processor.test {
22
requires transitive io.clientcore.core;
3-
requires io.clientcore.http.okhttp3;
43

54
// TODO: refactor Foo class to implement JsonSerializable
65
exports io.clientcore.annotation.processor.test.implementation.models to io.clientcore.core;

sdk/clientcore/annotation-processor-test/src/test/java/io/clientcore/annotation/processor/test/http/TestInterfaceGenerationTests.java

+333
Large diffs are not rendered by default.

sdk/clientcore/annotation-processor-test/src/test/java/io/clientcore/annotation/processor/test/http/client/JdkHttpClientBuilderIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
package io.clientcore.annotation.processor.test.http.client;
55

6+
import io.clientcore.annotation.processor.test.shared.LocalTestServer;
7+
import io.clientcore.annotation.processor.test.shared.TestConfigurationSource;
68
import io.clientcore.core.http.client.HttpClient;
79
import io.clientcore.core.http.client.JdkHttpClientBuilder;
810
import io.clientcore.core.http.models.HttpMethod;
911
import io.clientcore.core.http.models.HttpRequest;
1012
import io.clientcore.core.http.models.ProxyOptions;
1113
import io.clientcore.core.http.models.Response;
12-
import io.clientcore.core.shared.LocalTestServer;
13-
import io.clientcore.core.shared.TestConfigurationSource;
1414
import io.clientcore.core.utils.configuration.Configuration;
1515
import org.junit.jupiter.api.AfterAll;
1616
import org.junit.jupiter.api.BeforeAll;

sdk/clientcore/annotation-processor-test/src/test/java/io/clientcore/annotation/processor/test/http/client/SimpleBasicAuthHttpProxyServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
package io.clientcore.annotation.processor.test.http.client;
55

6-
import io.clientcore.core.shared.LocalTestServer;
6+
import io.clientcore.annotation.processor.test.shared.LocalTestServer;
77

88
import javax.servlet.ServletException;
99
import java.util.Base64;

sdk/clientcore/annotation-processor-test/src/test/java/io/clientcore/annotation/processor/test/implementation/client/JdkHttpClientIT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
package io.clientcore.annotation.processor.test.implementation.client;
55

6+
import io.clientcore.annotation.processor.test.shared.InsecureTrustManager;
7+
import io.clientcore.annotation.processor.test.shared.LocalTestServer;
68
import io.clientcore.core.http.client.HttpClient;
79
import io.clientcore.core.http.client.JdkHttpClientBuilder;
810
import io.clientcore.core.http.models.HttpHeader;
@@ -13,9 +15,8 @@
1315
import io.clientcore.core.http.models.RequestOptions;
1416
import io.clientcore.core.http.models.Response;
1517
import io.clientcore.core.implementation.http.ContentType;
18+
import io.clientcore.core.implementation.http.client.JdkHttpClient;
1619
import io.clientcore.core.models.binarydata.BinaryData;
17-
import io.clientcore.core.shared.InsecureTrustManager;
18-
import io.clientcore.core.shared.LocalTestServer;
1920
import io.clientcore.core.utils.Context;
2021
import io.clientcore.core.utils.TestUtils;
2122
import org.conscrypt.Conscrypt;

sdk/clientcore/annotation-processor-test/src/test/java/io/clientcore/annotation/processor/test/implementation/client/JdkHttpClientTestsIT.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
package io.clientcore.annotation.processor.test.implementation.client;
55

6+
import io.clientcore.annotation.processor.test.shared.HttpClientTests;
7+
import io.clientcore.annotation.processor.test.shared.HttpClientTestsServer;
8+
import io.clientcore.annotation.processor.test.shared.LocalTestServer;
69
import io.clientcore.core.http.client.HttpClient;
710
import io.clientcore.core.implementation.http.client.GlobalJdkHttpClient;
811
import io.clientcore.core.implementation.http.client.JdkHttpClient;
9-
import io.clientcore.core.shared.HttpClientTests;
10-
import io.clientcore.core.shared.HttpClientTestsServer;
11-
import io.clientcore.core.shared.LocalTestServer;
1212
import org.junit.jupiter.api.AfterAll;
1313
import org.junit.jupiter.api.BeforeAll;
1414
import org.junit.jupiter.api.condition.DisabledForJreRange;

sdk/clientcore/core/checkstyle-suppressions.xml

-7
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,18 @@
44

55
<suppressions>
66
<suppress files="io.clientcore.core.implementation.utils.InternalContext.java" checks="JavadocMethodCheck" />
7-
<suppress files="io.clientcore.core.implementation.http.rest.RequestDataConfiguration.java" checks="MissingJavadocMethodCheck" />
8-
<suppress files="io.clientcore.core.implementation.http.rest.SwaggerMethodParser.java" checks="MissingJavadocMethodCheck" />
97
<suppress files="io.clientcore.core.implementation.instrumentation.DefaultLogger.java" checks="MissingJavadocMethodCheck" />
108
<suppress files="io.clientcore.core.implementation.instrumentation.Slf4jLoggerShim.java" checks="MissingJavadocMethodCheck" />
119
<suppress files="io.clientcore.core.implementation.utils.ImplUtils.java" checks="MissingJavadocMethodCheck" />
1210
<suppress files="io.clientcore.core.implementation.utils.IterableOfByteBuffersInputStream.java" checks="MissingJavadocMethodCheck" />
1311
<suppress files="io.clientcore.core.implementation.utils.ServerSentEventHelper.java" checks="MissingJavadocMethodCheck" />
14-
<suppress files="io.clientcore.core.implementation.http.rest.HeaderSubstitution.java" checks="MissingJavadocTypeCheck" />
15-
<suppress files="io.clientcore.core.implementation.http.rest.RequestDataConfiguration.java" checks="MissingJavadocTypeCheck" />
16-
<suppress files="io.clientcore.core.implementation.http.rest.RestProxyImpl.java" checks="MissingJavadocTypeCheck" />
1712
<suppress files="io.clientcore.core.implementation.instrumentation.Slf4jLoggerShim.java" checks="MissingJavadocTypeCheck" />
1813
<suppress files="io.clientcore.core.implementation.utils.ImplUtils.java" checks="MissingJavadocTypeCheck" />
1914
<suppress files="io.clientcore.core.implementation.instrumentation.Slf4jLoggerShim.java" checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" />
2015
<suppress files="io.clientcore.core.implementation.ReflectionSerializable.java" checks="com.azure.tools.checkstyle.checks.JavadocThrowsChecks" />
21-
<suppress files="io.clientcore.core.implementation.http.serializer.HttpResponseBodyDecoder.java" checks="com.azure.tools.checkstyle.checks.JavadocThrowsChecks" />
2216
<suppress files="io.clientcore.core.http.client.JdkHttpClientBuilder.java" checks="com.azure.tools.checkstyle.checks.ServiceClientBuilderCheck" />
2317
<suppress files="io.clientcore.core.http.pipeline.HttpInstrumentationPolicy.java" checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" />
2418
<suppress files="io.clientcore.core.implementation.MethodHandleReflectiveInvoker.java" checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" />
25-
<suppress files="io.clientcore.core.implementation.http.rest.LengthValidatingInputStream.java" checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" />
2619
<suppress files="io.clientcore.core.implementation.instrumentation.fallback.FallbackInstrumentation.java" checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" />
2720
<suppress files="io.clientcore.core.implementation.instrumentation.otel.OTelInstrumentation.java" checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" />
2821
<suppress files="io.clientcore.core.instrumentation.logging.LoggingEvent.java" checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" />

sdk/clientcore/core/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737

3838
<properties>
3939
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<jacoco.min.linecoverage>0.70</jacoco.min.linecoverage>
41-
<jacoco.min.branchcoverage>0.65</jacoco.min.branchcoverage>
40+
<jacoco.min.linecoverage>0.66</jacoco.min.linecoverage>
41+
<jacoco.min.branchcoverage>0.62</jacoco.min.branchcoverage>
4242

4343
<javaModulesSurefireArgLine>
4444
--add-opens io.clientcore.core/io.clientcore.core.annotations=ALL-UNNAMED

sdk/clientcore/core/spotbugs-exclude.xml

+4-53
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
<Class name="io.clientcore.core.implementation.GenericParameterizedType" />
2525
<Class name="io.clientcore.core.implementation.ReflectionUtilsMethodHandle" />
2626
<Class name="io.clientcore.core.implementation.http.HttpPipelineCallState" />
27-
<Class name="io.clientcore.core.implementation.http.rest.PercentEscaper" />
28-
<Class name="io.clientcore.core.implementation.http.rest.RestProxyImpl" />
2927
<Class name="io.clientcore.core.implementation.utils.AuthenticateChallengeParser" />
3028
<Class name="io.clientcore.core.implementation.utils.InternalContext" />
29+
<Class name="io.clientcore.core.implementation.utils.PercentEscaper" />
3130
<Class name="io.clientcore.core.implementation.utils.Providers" />
3231
<Class name="io.clientcore.core.implementation.utils.SliceInputStream" />
3332
<Class name="io.clientcore.core.implementation.utils.StreamUtil" />
@@ -42,7 +41,6 @@
4241
<Class name="io.clientcore.core.serialization.json.JsonSerializer" />
4342
<Class name="io.clientcore.core.serialization.xml.XmlReader" />
4443
<Class name="io.clientcore.core.serialization.xml.XmlSerializer" />
45-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTests" />
4644
<Class name="io.clientcore.core.utils.AuthenticateChallenge" />
4745
<Class name="io.clientcore.core.utils.DateTimeRfc1123" />
4846
<Class name="io.clientcore.core.utils.SharedExecutorService" />
@@ -64,7 +62,6 @@
6462
<Class name="io.clientcore.core.http.client.JdkHttpClientBuilder" />
6563
<Class name="io.clientcore.core.http.pipeline.KeyCredentialPolicy" />
6664
<Class name="io.clientcore.core.http.pipeline.UserAgentPolicy" />
67-
<Class name="io.clientcore.core.implementation.http.rest.SwaggerMethodParser" />
6865
<Class name="io.clientcore.core.implementation.instrumentation.otel.OTelInstrumentation" />
6966
<Class name="io.clientcore.core.instrumentation.logging.ClientLogger" />
7067
<Class name="io.clientcore.core.serialization.json.implementation.jackson.core.util.RequestPayload" />
@@ -82,13 +79,10 @@
8279
<Class name="io.clientcore.core.http.pipeline.AddHeadersPolicyJavadocCodeSnippets" />
8380
<Class name="io.clientcore.core.http.pipeline.SetRequestIdPolicyJavadocCodeSnippets" />
8481
<Class name="io.clientcore.core.http.pipeline.SetUserAgentPolicyJavadocCodeSnippets" />
85-
<Class name="io.clientcore.core.implementation.http.rest.RestProxyImpl" />
86-
<Class name="io.clientcore.core.implementation.http.serializer.HttpResponseDecodeData" />
8782
<Class name="io.clientcore.core.instrumentation.TelemetryForLibraryDevelopersJavaDocCodeSnippets" />
8883
<Class name="io.clientcore.core.models.CloudEventJavaDocCodeSnippet" />
8984
<Class name="io.clientcore.core.models.ContextJavaDocCodeSnippets" />
9085
<Class name="io.clientcore.core.serialization.xml.implementation.aalto.in.ReaderScanner" />
91-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTests" />
9286
<Class name="io.clientcore.core.utils.AuthorizationChallengeHandlerTests" />
9387
<Class name="io.clientcore.core.utils.ClientOptionsJavadocCodeSnippets" />
9488
<Class name="io.clientcore.core.utils.ProgressReporterTests" />
@@ -111,10 +105,6 @@
111105
<Match>
112106
<Bug pattern="DM_DEFAULT_ENCODING" />
113107
<Or>
114-
<Class name="io.clientcore.core.http.RestProxyTests" />
115-
<Class name="io.clientcore.annotation.processor.test.client.http.SimpleBasicAuthHttpProxyServer" />
116-
<Class name="io.clientcore.annotation.processor.test.implementation.client.JdkHttpClientIT" />
117-
<Class name="io.clientcore.core.implementation.http.rest.RestProxyImplTests" />
118108
<Class name="io.clientcore.core.implementation.serializer.AdditionalPropertiesSerializerTests" />
119109
<Class name="io.clientcore.core.implementation.serializer.BinaryDataSerializationTests" />
120110
<Class name="io.clientcore.core.implementation.serializer.BinaryDataSerializationTests$ListProperty" />
@@ -129,8 +119,6 @@
129119
<Class name="io.clientcore.core.serialization.json.JsonReader" />
130120
<Class name="io.clientcore.core.serialization.json.JsonWriter" />
131121
<Class name="io.clientcore.core.serialization.xml.XmlReader" />
132-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTests" />
133-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTestsServer" />
134122
<Class name="io.clientcore.core.utils.serializers.JsonSerializerTests" />
135123
</Or>
136124
</Match>
@@ -156,18 +144,10 @@
156144
<Bug pattern="ES_COMPARING_STRINGS_WITH_EQ" />
157145
<Class name="io.clientcore.core.serialization.json.models.JsonStringTests" />
158146
</Match>
159-
<Match>
160-
<Bug pattern="HARD_CODE_PASSWORD" />
161-
<Class name="io.clientcore.annotation.processor.test.shared.LocalTestServer" />
162-
</Match>
163147
<Match>
164148
<Bug pattern="HE_HASHCODE_USE_OBJECT_EQUALS" />
165149
<Class name="io.clientcore.core.serialization.xml.implementation.aalto.out.OutputElement" />
166150
</Match>
167-
<Match>
168-
<Bug pattern="HTTP_RESPONSE_SPLITTING" />
169-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTestsServer" />
170-
</Match>
171151
<Match>
172152
<Bug pattern="INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE" />
173153
<Or>
@@ -253,7 +233,6 @@
253233
<Match>
254234
<Bug pattern="NP_NULL_PARAM_DEREF_NONVIRTUAL" />
255235
<Or>
256-
<Class name="io.clientcore.core.implementation.http.rest.LengthValidatingInputStreamTests" />
257236
<Class name="io.clientcore.core.implementation.instrumentation.fallback.FallbackInstrumentationTests" />
258237
<Class name="io.clientcore.core.models.binarydata.BinaryDataTest" />
259238
<Class name="io.clientcore.core.models.geo.GeoCollectionTests" />
@@ -271,7 +250,7 @@
271250
<Match>
272251
<Bug pattern="OS_OPEN_STREAM" />
273252
<Or>
274-
<Class name="io.clientcore.annotation.processor.test.pipeline.http.HttpInstrumentationLoggingTests" />
253+
<Class name="io.clientcore.core.http.pipeline.HttpInstrumentationLoggingTests" />
275254
<Class name="io.clientcore.core.serialization.json.implementation.StringBuilderWriterTests" />
276255
</Or>
277256
</Match>
@@ -284,8 +263,6 @@
284263
<Or>
285264
<Class name="io.clientcore.core.http.pipeline.HttpRetryPolicy" />
286265
<Class name="io.clientcore.core.implementation.instrumentation.fallback.RandomIdUtils" />
287-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTests" />
288-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTestsServer" />
289266
<Class name="io.clientcore.core.utils.CoreUtils" />
290267
</Or>
291268
</Match>
@@ -312,7 +289,6 @@
312289
<Match>
313290
<Bug pattern="RR_NOT_CHECKED" />
314291
<Or>
315-
<Class name="io.clientcore.core.implementation.http.rest.LengthValidatingInputStreamTests" />
316292
<Class name="io.clientcore.core.models.CloudEventTests" />
317293
<Class name="io.clientcore.core.models.binarydata.BinaryDataJavaDocCodeSnippet" />
318294
</Or>
@@ -325,14 +301,6 @@
325301
<Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" />
326302
<Class name="io.clientcore.core.serialization.xml.XmlReaderCodesnippetsTests" />
327303
</Match>
328-
<Match>
329-
<Bug pattern="SERVLET_QUERY_STRING" />
330-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTestsServer" />
331-
</Match>
332-
<Match>
333-
<Bug pattern="SERVLET_SERVER_NAME" />
334-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTestsServer" />
335-
</Match>
336304
<Match>
337305
<Bug pattern="SE_BAD_FIELD" />
338306
<Or>
@@ -375,18 +343,11 @@
375343
<Match>
376344
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON" />
377345
<Or>
378-
<Class name="io.clientcore.annotation.processor.test.pipeline.http.RetryPolicyTests" />
379-
<Class name="io.clientcore.core.implementation.serializer.HttpResponseBodyDecoderTests" />
346+
<Class name="io.clientcore.core.http.pipeline.RetryPolicyTests" />
380347
<Class name="io.clientcore.core.instrumentation.TelemetryForLibraryDevelopersJavaDocCodeSnippets" />
381348
<Class name="io.clientcore.core.models.binarydata.BinaryDataJavaDocCodeSnippet" />
382-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTests" />
383-
<Class name="io.clientcore.annotation.processor.test.shared.LocalTestServer" />
384349
</Or>
385350
</Match>
386-
<Match>
387-
<Bug pattern="SR_NOT_CHECKED" />
388-
<Class name="io.clientcore.core.implementation.http.rest.LengthValidatingInputStreamTests" />
389-
</Match>
390351
<Match>
391352
<Bug pattern="SS_SHOULD_BE_STATIC" />
392353
<Or>
@@ -402,16 +363,14 @@
402363
<Bug pattern="UPM_UNCALLED_PRIVATE_METHOD" />
403364
<Or>
404365
<Class name="io.clientcore.core.http.models.ETag" />
405-
<Class name="io.clientcore.core.implementation.http.rest.RestProxyImpl" />
406366
<Class name="io.clientcore.core.models.binarydata.BinaryDataJavaDocCodeSnippet" />
407367
</Or>
408368
</Match>
409369
<Match>
410370
<Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" />
411371
<Or>
412-
<Class name="io.clientcore.annotation.processor.test.models.http.PagedIterableTests" />
372+
<Class name="io.clientcore.core.http.models.PagedIterableTests" />
413373
<Class name="io.clientcore.core.implementation.http.client.InputStreamTimeoutResponseSubscriber" />
414-
<Class name="io.clientcore.core.implementation.http.rest.ResponseConstructorsCacheBenchMark" />
415374
<Class name="io.clientcore.core.models.binarydata.BinaryDataTest$BinaryDataAsProperty" />
416375
<Class name="io.clientcore.core.serialization.xml.DefaultXmlWriterContractTests" />
417376
<Class name="io.clientcore.core.serialization.xml.implementation.aalto.in.ReaderConfig$EncodingContext" />
@@ -433,14 +392,6 @@
433392
<Class name="io.clientcore.core.models.binarydata.StringBinaryData" />
434393
</Or>
435394
</Match>
436-
<Match>
437-
<Bug pattern="WEAK_MESSAGE_DIGEST_MD5" />
438-
<Class name="io.clientcore.annotation.processor.test.shared.HttpClientTestsServer" />
439-
</Match>
440-
<Match>
441-
<Bug pattern="WEAK_TRUST_MANAGER" />
442-
<Class name="io.clientcore.annotation.processor.test.shared.InsecureTrustManager" />
443-
</Match>
444395
<Match>
445396
<Bug pattern="WMI_WRONG_MAP_ITERATOR" />
446397
<Class name="io.clientcore.core.serialization.json.JsonReaderTests" />

sdk/clientcore/core/src/main/java/io/clientcore/core/http/models/RequestOptions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.clientcore.core.annotations.MetadataProperties;
88
import io.clientcore.core.http.annotations.QueryParam;
99
import io.clientcore.core.http.client.HttpClient;
10-
import io.clientcore.core.implementation.http.rest.UriEscapers;
10+
import io.clientcore.core.implementation.utils.UriEscapers;
1111
import io.clientcore.core.instrumentation.InstrumentationContext;
1212
import io.clientcore.core.instrumentation.logging.ClientLogger;
1313
import io.clientcore.core.models.binarydata.BinaryData;

sdk/clientcore/core/src/main/java/io/clientcore/core/implementation/http/rest/PercentEscaper.java sdk/clientcore/core/src/main/java/io/clientcore/core/implementation/utils/PercentEscaper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package io.clientcore.core.implementation.http.rest;
4+
package io.clientcore.core.implementation.utils;
55

66
import io.clientcore.core.instrumentation.logging.ClientLogger;
77

sdk/clientcore/core/src/main/java/io/clientcore/core/implementation/http/rest/UriEscapers.java sdk/clientcore/core/src/main/java/io/clientcore/core/implementation/utils/UriEscapers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package io.clientcore.core.implementation.http.rest;
4+
package io.clientcore.core.implementation.utils;
55

66
/**
77
* Collection of useful URI escapers.

sdk/clientcore/core/src/test/java/io/clientcore/core/implementation/utils/PercentEscaperTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
package io.clientcore.core.implementation.utils;
55

6-
import io.clientcore.core.implementation.http.rest.PercentEscaper;
76
import org.junit.jupiter.api.Test;
87
import org.junit.jupiter.params.ParameterizedTest;
98
import org.junit.jupiter.params.provider.Arguments;

sdk/clientcore/core/src/test/java/io/clientcore/core/implementation/utils/UriEscaperTests.java

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
package io.clientcore.core.implementation.utils;
55

6-
import io.clientcore.core.implementation.http.rest.PercentEscaper;
7-
import io.clientcore.core.implementation.http.rest.UriEscapers;
86
import org.junit.jupiter.api.Test;
97

108
import static org.junit.jupiter.api.Assertions.assertEquals;

sdk/clientcore/http-okhttp3/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>io.clientcore</groupId>
6565
<artifactId>core</artifactId>
66-
<version>1.0.0-beta.8</version> <!-- {x-version-update;io.clientcore:core;current} -->
66+
<version>1.0.0-beta.8</version> <!-- {x-version-update;unreleased_io.clientcore:core;current} -->
6767
</dependency>
6868
<dependency>
6969
<groupId>com.squareup.okio</groupId>
@@ -85,8 +85,8 @@
8585
<!-- Test dependencies on core, because we want to run tests inherited from this module using OkHttp -->
8686
<dependency>
8787
<groupId>io.clientcore</groupId>
88-
<artifactId>core</artifactId>
89-
<version>1.0.0-beta.8</version> <!-- {x-version-update;io.clientcore:core;current} -->
88+
<artifactId>annotation-processor-test</artifactId>
89+
<version>1.0.0-beta.1</version> <!-- {x-version-update;io.clientcore:annotation-processor-test;current} -->
9090
<type>test-jar</type>
9191
<scope>test</scope>
9292
</dependency>

0 commit comments

Comments
 (0)