Skip to content

Commit ec371ed

Browse files
alzimmermsftalzimmermsft
authored
ClientCore API review updates part 2 (Azure#44210)
ClientCore API review updates part 2
1 parent f50c074 commit ec371ed

File tree

134 files changed

+1295
-670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+1295
-670
lines changed

‎sdk/clientcore/annotation-processor-test/src/main/java/io/clientcore/annotation/processor/test/MockHttpResponse.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
import io.clientcore.core.http.models.HttpHeaders;
77
import io.clientcore.core.http.models.HttpRequest;
8-
import io.clientcore.core.http.models.HttpResponse;
8+
import io.clientcore.core.implementation.http.HttpResponse;
99
import io.clientcore.core.implementation.utils.JsonSerializer;
10-
import io.clientcore.core.utils.binarydata.BinaryData;
11-
import io.clientcore.core.utils.serializers.ObjectSerializer;
10+
import io.clientcore.core.models.binarydata.BinaryData;
11+
import io.clientcore.core.serialization.ObjectSerializer;
1212

1313
/**
1414
* A mock implementation of {@link HttpResponse} that can be used for testing.

‎sdk/clientcore/annotation-processor-test/src/main/java/io/clientcore/annotation/processor/test/implementation/TestInterfaceClientService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import io.clientcore.core.http.models.HttpMethod;
1414
import io.clientcore.core.http.models.Response;
1515
import io.clientcore.core.http.pipeline.HttpPipeline;
16-
import io.clientcore.core.utils.binarydata.BinaryData;
17-
import io.clientcore.core.utils.serializers.ObjectSerializer;
16+
import io.clientcore.core.models.binarydata.BinaryData;
17+
import io.clientcore.core.serialization.ObjectSerializer;
1818

1919
import java.io.InputStream;
2020
import java.lang.reflect.InvocationTargetException;

‎sdk/clientcore/annotation-processor-test/src/test/java/io/clientcore/annotation/processor/test/RestProxyTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import io.clientcore.annotation.processor.test.implementation.TestInterfaceClientService;
77
import io.clientcore.core.http.RestProxy;
88
import io.clientcore.core.http.client.HttpClient;
9-
import io.clientcore.core.http.models.ContentType;
9+
import io.clientcore.core.implementation.http.ContentType;
1010
import io.clientcore.core.http.models.Response;
1111
import io.clientcore.core.http.pipeline.HttpPipeline;
1212
import io.clientcore.core.http.pipeline.HttpPipelineBuilder;
1313
import io.clientcore.core.implementation.utils.JsonSerializer;
14-
import io.clientcore.core.utils.binarydata.BinaryData;
14+
import io.clientcore.core.models.binarydata.BinaryData;
1515
import org.junit.jupiter.api.Named;
1616
import org.junit.jupiter.api.Test;
1717
import org.junit.jupiter.params.ParameterizedTest;

‎sdk/clientcore/annotation-processor/src/main/java/io/clientcore/annotation/processor/AnnotationProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import io.clientcore.core.http.models.HttpHeaders;
2121
import io.clientcore.core.http.models.HttpMethod;
2222
import io.clientcore.core.http.models.HttpRequest;
23-
import io.clientcore.core.http.models.HttpResponse;
23+
import io.clientcore.core.implementation.http.HttpResponse;
2424
import io.clientcore.core.http.models.Response;
2525
import io.clientcore.core.http.pipeline.HttpPipeline;
2626
import io.clientcore.core.utils.Context;
27-
import io.clientcore.core.utils.binarydata.BinaryData;
27+
import io.clientcore.core.models.binarydata.BinaryData;
2828

2929
import javax.annotation.processing.AbstractProcessor;
3030
import javax.annotation.processing.RoundEnvironment;

‎sdk/clientcore/annotation-processor/src/main/java/io/clientcore/annotation/processor/templating/JavaParserTemplateProcessor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.github.javaparser.ast.stmt.Statement;
2222
import io.clientcore.annotation.processor.models.HttpRequestContext;
2323
import io.clientcore.annotation.processor.models.TemplateInput;
24-
import io.clientcore.core.http.models.ContentType;
24+
import io.clientcore.core.implementation.http.ContentType;
2525
import io.clientcore.core.http.models.HttpHeaderName;
2626
import io.clientcore.core.http.models.HttpHeaders;
2727
import io.clientcore.core.http.models.HttpMethod;
@@ -30,8 +30,8 @@
3030
import io.clientcore.core.http.pipeline.HttpPipeline;
3131
import io.clientcore.core.implementation.utils.JsonSerializer;
3232
import io.clientcore.core.instrumentation.logging.ClientLogger;
33-
import io.clientcore.core.utils.binarydata.BinaryData;
34-
import io.clientcore.core.utils.serializers.ObjectSerializer;
33+
import io.clientcore.core.models.binarydata.BinaryData;
34+
import io.clientcore.core.serialization.ObjectSerializer;
3535

3636
import javax.annotation.processing.ProcessingEnvironment;
3737
import java.io.IOException;
@@ -412,7 +412,7 @@ public void configureRequestWithBodyAndContentType(BlockStmt body, String parame
412412
if (!isContentTypeSetInHeaders) {
413413
setContentTypeHeader(body, contentType);
414414
}
415-
if ("io.clientcore.core.utils.binarydata.BinaryData".equals(parameterType)) {
415+
if ("io.clientcore.core.models.binarydata.BinaryData".equals(parameterType)) {
416416
body.tryAddImportToParentCompilationUnit(BinaryData.class);
417417
body.addStatement(
418418
StaticJavaParser.parseStatement("BinaryData binaryData = (BinaryData) " + parameterName + ";"));

‎sdk/clientcore/annotation-processor/src/main/java/io/clientcore/annotation/processor/utils/ResponseBodyModeGeneration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import com.github.javaparser.ast.stmt.BlockStmt;
88
import com.github.javaparser.ast.stmt.IfStmt;
99
import com.github.javaparser.ast.stmt.ReturnStmt;
10-
import io.clientcore.core.http.models.HttpResponse;
10+
import io.clientcore.core.implementation.http.HttpResponse;
1111
import io.clientcore.core.http.models.ResponseBodyMode;
1212
import io.clientcore.core.implementation.http.HttpResponseAccessHelper;
13-
import io.clientcore.core.utils.binarydata.BinaryData;
13+
import io.clientcore.core.models.binarydata.BinaryData;
1414

1515
import java.io.IOException;
1616
import java.io.InputStream;

‎sdk/clientcore/core/spotbugs-exclude.xml‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,22 @@
2828
<Class name="io.clientcore.core.implementation.http.rest.ResponseConstructorsNoCacheReflection" />
2929
<Class name="io.clientcore.core.implementation.http.rest.ResponseExceptionConstructorCache" />
3030
<Class name="io.clientcore.core.implementation.http.rest.RestProxyImpl" />
31+
<Class name="io.clientcore.core.implementation.utils.AuthenticateChallengeParser" />
3132
<Class name="io.clientcore.core.implementation.utils.InternalContext" />
3233
<Class name="io.clientcore.core.implementation.utils.JsonSerializer" />
3334
<Class name="io.clientcore.core.implementation.utils.Providers" />
3435
<Class name="io.clientcore.core.implementation.utils.SliceInputStream" />
3536
<Class name="io.clientcore.core.implementation.utils.StreamUtil" />
3637
<Class name="io.clientcore.core.implementation.utils.XmlSerializer" />
38+
<Class name="io.clientcore.core.models.binarydata.FileBinaryData" />
39+
<Class name="io.clientcore.core.models.binarydata.InputStreamBinaryData" />
40+
<Class name="io.clientcore.core.models.binarydata.ListByteBufferBinaryData" />
3741
<Class name="io.clientcore.core.serialization.xml.XmlReader" />
3842
<Class name="io.clientcore.core.shared.HttpClientTests" />
43+
<Class name="io.clientcore.core.utils.AuthenticateChallenge" />
3944
<Class name="io.clientcore.core.utils.DateTimeRfc1123" />
4045
<Class name="io.clientcore.core.utils.SharedExecutorService" />
4146
<Class name="io.clientcore.core.utils.Union" />
42-
<Class name="io.clientcore.core.utils.binarydata.FileBinaryData" />
43-
<Class name="io.clientcore.core.utils.binarydata.InputStreamBinaryData" />
44-
<Class name="io.clientcore.core.utils.binarydata.ListByteBufferBinaryData" />
4547
<Class name="io.clientcore.core.utils.configuration.Configuration" />
4648
</Or>
4749
</Match>
@@ -52,14 +54,6 @@
5254
<Class name="io.clientcore.core.serialization.json.JsonReaderTests" />
5355
</Or>
5456
</Match>
55-
<Match>
56-
<Bug pattern="CN_IDIOM_NO_SUPER_CALL" />
57-
<Class name="io.clientcore.core.implementation.http.HttpPipelineCallState" />
58-
</Match>
59-
<Match>
60-
<Bug pattern="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE" />
61-
<Class name="io.clientcore.core.http.pipeline.HttpPipelineNextPolicy" />
62-
</Match>
6357
<Match>
6458
<Bug pattern="CT_CONSTRUCTOR_THROW" />
6559
<Or>
@@ -81,7 +75,7 @@
8175
<Or>
8276
<Class name="io.clientcore.core.implementation.http.serializer.HttpResponseDecodeData" />
8377
<Class name="io.clientcore.core.serialization.xml.implementation.aalto.in.ReaderScanner" />
84-
<Class name="io.clientcore.core.utils.auth.AuthorizationChallengeHandlerTests" />
78+
<Class name="io.clientcore.core.utils.AuthorizationChallengeHandlerTests" />
8579
</Or>
8680
</Match>
8781
<Match>
@@ -92,8 +86,8 @@
9286
<Bug pattern="DM_CONVERT_CASE" />
9387
<Or>
9488
<Class name="io.clientcore.core.http.models.HttpHeaderName" />
89+
<Class name="io.clientcore.core.utils.AuthUtils" />
9590
<Class name="io.clientcore.core.utils.ServerSentEventUtils" />
96-
<Class name="io.clientcore.core.utils.auth.AuthUtils" />
9791
</Or>
9892
</Match>
9993
<Match>
@@ -111,12 +105,12 @@
111105
<Class name="io.clientcore.core.implementation.serializer.JsonSerializableEndToEndTests" />
112106
<Class name="io.clientcore.core.instrumentation.logging.ClientLoggerTests" />
113107
<Class name="io.clientcore.core.instrumentation.logging.InstrumentationTestUtils" />
108+
<Class name="io.clientcore.core.models.binarydata.BinaryDataTest" />
114109
<Class name="io.clientcore.core.serialization.json.JsonReader" />
115110
<Class name="io.clientcore.core.serialization.json.JsonWriter" />
116111
<Class name="io.clientcore.core.serialization.xml.XmlReader" />
117112
<Class name="io.clientcore.core.shared.HttpClientTests" />
118113
<Class name="io.clientcore.core.shared.HttpClientTestsServer" />
119-
<Class name="io.clientcore.core.utils.binarydata.BinaryDataTest" />
120114
<Class name="io.clientcore.core.utils.serializers.JsonSerializerTests" />
121115
</Or>
122116
</Match>
@@ -210,7 +204,7 @@
210204
<Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE" />
211205
<Or>
212206
<Class name="io.clientcore.core.http.pipeline.HttpInstrumentationPolicy" />
213-
<Class name="io.clientcore.core.utils.binarydata.BinaryDataTest" />
207+
<Class name="io.clientcore.core.models.binarydata.BinaryDataTest" />
214208
</Or>
215209
</Match>
216210
<Match>
@@ -232,8 +226,8 @@
232226
<Or>
233227
<Class name="io.clientcore.core.implementation.http.rest.LengthValidatingInputStreamTests" />
234228
<Class name="io.clientcore.core.implementation.instrumentation.fallback.FallbackInstrumentationTests" />
229+
<Class name="io.clientcore.core.models.binarydata.BinaryDataTest" />
235230
<Class name="io.clientcore.core.serialization.json.implementation.StringBuilderWriterTests" />
236-
<Class name="io.clientcore.core.utils.binarydata.BinaryDataTest" />
237231
</Or>
238232
</Match>
239233
<Match>
@@ -350,9 +344,9 @@
350344
<Or>
351345
<Class name="io.clientcore.core.implementation.http.client.InputStreamTimeoutResponseSubscriber" />
352346
<Class name="io.clientcore.core.implementation.http.rest.ResponseConstructorsCacheBenchMark" />
347+
<Class name="io.clientcore.core.models.binarydata.BinaryDataTest$BinaryDataAsProperty" />
353348
<Class name="io.clientcore.core.serialization.xml.DefaultXmlWriterContractTests" />
354349
<Class name="io.clientcore.core.serialization.xml.implementation.aalto.in.ReaderConfig$EncodingContext" />
355-
<Class name="io.clientcore.core.utils.binarydata.BinaryDataTest$BinaryDataAsProperty" />
356350
<Class name="io.clientcore.core.utils.serializers.JsonSerializerTests$DateTimeWrapper" />
357351
</Or>
358352
</Match>
@@ -366,12 +360,12 @@
366360
<Match>
367361
<Bug pattern="VO_VOLATILE_REFERENCE_TO_ARRAY" />
368362
<Or>
369-
<Class name="io.clientcore.core.utils.binarydata.ByteBufferBinaryData" />
370-
<Class name="io.clientcore.core.utils.binarydata.FileBinaryData" />
371-
<Class name="io.clientcore.core.utils.binarydata.InputStreamBinaryData" />
372-
<Class name="io.clientcore.core.utils.binarydata.ListByteBufferBinaryData" />
373-
<Class name="io.clientcore.core.utils.binarydata.SerializableBinaryData" />
374-
<Class name="io.clientcore.core.utils.binarydata.StringBinaryData" />
363+
<Class name="io.clientcore.core.models.binarydata.ByteBufferBinaryData" />
364+
<Class name="io.clientcore.core.models.binarydata.FileBinaryData" />
365+
<Class name="io.clientcore.core.models.binarydata.InputStreamBinaryData" />
366+
<Class name="io.clientcore.core.models.binarydata.ListByteBufferBinaryData" />
367+
<Class name="io.clientcore.core.models.binarydata.SerializableBinaryData" />
368+
<Class name="io.clientcore.core.models.binarydata.StringBinaryData" />
375369
</Or>
376370
</Match>
377371
<Match>

‎sdk/clientcore/core/src/main/java/io/clientcore/core/http/RestProxy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import io.clientcore.core.implementation.http.rest.SwaggerInterfaceParser;
1010
import io.clientcore.core.implementation.http.rest.SwaggerMethodParser;
1111
import io.clientcore.core.implementation.utils.JsonSerializer;
12-
import io.clientcore.core.utils.serializers.ObjectSerializer;
12+
import io.clientcore.core.serialization.ObjectSerializer;
1313
import io.clientcore.core.implementation.utils.XmlSerializer;
1414

1515
import java.lang.reflect.InvocationHandler;

‎sdk/clientcore/core/src/main/java/io/clientcore/core/http/client/HttpClientProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public HttpClientProvider() {
4242
static Providers<HttpClientProvider, HttpClient> getProviders() {
4343
if (providers == null) {
4444
providers = new Providers<>(HttpClientProvider.class,
45-
Configuration.getGlobalConfiguration().get(Configuration.PROPERTY_HTTP_CLIENT_IMPLEMENTATION),
45+
Configuration.getGlobalConfiguration().get(Configuration.HTTP_CLIENT_IMPLEMENTATION),
4646
NO_DEFAULT_PROVIDER_MESSAGE);
4747
}
4848

‎sdk/clientcore/core/src/main/java/io/clientcore/core/http/client/JdkHttpClientBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public JdkHttpClientBuilder connectionTimeout(Duration connectionTimeout) {
8686
* write tracker will update when each operation completes and the outbound buffer will be periodically checked to
8787
* determine if it is still draining.
8888
* <p>
89-
* If {@code writeTimeout} is null either {@link Configuration#PROPERTY_REQUEST_WRITE_TIMEOUT} or a 60-second
89+
* If {@code writeTimeout} is null either {@link Configuration#REQUEST_WRITE_TIMEOUT_IN_MS} or a 60-second
9090
* timeout will be used, if it is a {@link Duration} less than or equal to zero then no write timeout will be
9191
* applied. When applying the timeout the greatest of one millisecond and the value of {@code writeTimeout} will be
9292
* used.
@@ -104,7 +104,7 @@ public JdkHttpClientBuilder writeTimeout(Duration writeTimeout) {
104104
* The response timeout begins once the request write completes and finishes once the first response read is
105105
* triggered when the server response is received.
106106
* <p>
107-
* If {@code responseTimeout} is null either {@link Configuration#PROPERTY_REQUEST_RESPONSE_TIMEOUT} or a
107+
* If {@code responseTimeout} is null either {@link Configuration#REQUEST_RESPONSE_TIMEOUT_IN_MS} or a
108108
* 60-second timeout will be used, if it is a {@link Duration} less than or equal to zero then no timeout will be
109109
* applied to the response. When applying the timeout the greatest of one millisecond and the value of {@code
110110
* responseTimeout} will be used.
@@ -123,7 +123,7 @@ public JdkHttpClientBuilder responseTimeout(Duration responseTimeout) {
123123
* timeout triggers periodically but won't fire its operation if another read operation has completed between when
124124
* the timeout is triggered and completes.
125125
* <p>
126-
* If {@code readTimeout} is null or {@link Configuration#PROPERTY_REQUEST_READ_TIMEOUT} or a 60-second
126+
* If {@code readTimeout} is null or {@link Configuration#REQUEST_READ_TIMEOUT_IN_MS} or a 60-second
127127
* timeout will be used, if it is a {@link Duration} less than or equal to zero then no timeout period will be
128128
* applied to response read. When applying the timeout the greatest of one millisecond and the value of {@code
129129
* readTimeout} will be used.

0 commit comments

Comments
 (0)