Skip to content

Commit 1cdc9c9

Browse files
authored
Update Schema Registry API to include protobuf (Azure#36559)
* Update README to use latest. * Regenerate from autorest. * Update assets.json * update changelog.
1 parent 1333e70 commit 1cdc9c9

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

sdk/schemaregistry/azure-data-schemaregistry/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
### Features Added
66

7+
- Add support for protobuf schema format.
8+
79
### Breaking Changes
810

911
### Bugs Fixed

sdk/schemaregistry/azure-data-schemaregistry/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "java",
44
"TagPrefix": "java/schemaregistry/azure-data-schemaregistry",
5-
"Tag": "java/schemaregistry/azure-data-schemaregistry_11bc411368"
5+
"Tag": "java/schemaregistry/azure-data-schemaregistry_1eb85e2a8b"
66
}

sdk/schemaregistry/azure-data-schemaregistry/src/main/java/com/azure/data/schemaregistry/implementation/AzureSchemaRegistryImpl.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import com.azure.core.http.HttpPipeline;
88
import com.azure.core.http.HttpPipelineBuilder;
9-
import com.azure.core.http.policy.CookiePolicy;
109
import com.azure.core.http.policy.RetryPolicy;
1110
import com.azure.core.http.policy.UserAgentPolicy;
1211
import com.azure.core.util.serializer.JacksonAdapter;
@@ -94,9 +93,7 @@ public SchemasImpl getSchemas() {
9493
*/
9594
AzureSchemaRegistryImpl(String endpoint, String apiVersion) {
9695
this(
97-
new HttpPipelineBuilder()
98-
.policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy())
99-
.build(),
96+
new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(),
10097
JacksonAdapter.createDefaultSerializerAdapter(),
10198
endpoint,
10299
apiVersion);

sdk/schemaregistry/azure-data-schemaregistry/src/main/java/com/azure/data/schemaregistry/implementation/AzureSchemaRegistryImplBuilder.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.azure.core.http.policy.AddDatePolicy;
1818
import com.azure.core.http.policy.AddHeadersFromContextPolicy;
1919
import com.azure.core.http.policy.AddHeadersPolicy;
20-
import com.azure.core.http.policy.CookiePolicy;
2120
import com.azure.core.http.policy.HttpLogOptions;
2221
import com.azure.core.http.policy.HttpLoggingPolicy;
2322
import com.azure.core.http.policy.HttpPipelinePolicy;
@@ -217,11 +216,11 @@ public AzureSchemaRegistryImplBuilder retryPolicy(RetryPolicy retryPolicy) {
217216
@Generated
218217
public AzureSchemaRegistryImpl buildClient() {
219218
HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline();
220-
String localApiVersion = (apiVersion != null) ? apiVersion : "2022-10";
219+
String localApiVersion = (apiVersion != null) ? apiVersion : "2023-07-01";
221220
SerializerAdapter localSerializerAdapter =
222221
(serializerAdapter != null) ? serializerAdapter : JacksonAdapter.createDefaultSerializerAdapter();
223222
AzureSchemaRegistryImpl client =
224-
new AzureSchemaRegistryImpl(localPipeline, localSerializerAdapter, endpoint, localApiVersion);
223+
new AzureSchemaRegistryImpl(localPipeline, localSerializerAdapter, this.endpoint, localApiVersion);
225224
return client;
226225
}
227226

@@ -249,7 +248,6 @@ private HttpPipeline createHttpPipeline() {
249248
HttpPolicyProviders.addBeforeRetryPolicies(policies);
250249
policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy()));
251250
policies.add(new AddDatePolicy());
252-
policies.add(new CookiePolicy());
253251
this.pipelinePolicies.stream()
254252
.filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
255253
.forEach(p -> policies.add(p));

sdk/schemaregistry/azure-data-schemaregistry/src/main/java/com/azure/data/schemaregistry/implementation/SchemasImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ Response<SchemaVersions> getVersionsNextSync(
249249
@ServiceMethod(returns = ReturnType.SINGLE)
250250
public Mono<ResponseBase<SchemasGetByIdHeaders, Flux<ByteBuffer>>> getByIdWithResponseAsync(String id) {
251251
final String accept =
252-
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8";
252+
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8, text/vnd.ms.protobuf";
253253
return FluxUtil.withContext(
254254
context ->
255255
service.getById(this.client.getEndpoint(), id, this.client.getApiVersion(), accept, context));
@@ -273,7 +273,7 @@ public Mono<ResponseBase<SchemasGetByIdHeaders, Flux<ByteBuffer>>> getByIdWithRe
273273
public Mono<ResponseBase<SchemasGetByIdHeaders, Flux<ByteBuffer>>> getByIdWithResponseAsync(
274274
String id, Context context) {
275275
final String accept =
276-
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8";
276+
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8, text/vnd.ms.protobuf";
277277
return service.getById(this.client.getEndpoint(), id, this.client.getApiVersion(), accept, context);
278278
}
279279

@@ -328,7 +328,7 @@ public Mono<Flux<ByteBuffer>> getByIdAsync(String id, Context context) {
328328
@ServiceMethod(returns = ReturnType.SINGLE)
329329
public ResponseBase<SchemasGetByIdHeaders, BinaryData> getByIdWithResponse(String id, Context context) {
330330
final String accept =
331-
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8";
331+
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8, text/vnd.ms.protobuf";
332332
return service.getByIdSync(this.client.getEndpoint(), id, this.client.getApiVersion(), accept, context);
333333
}
334334

@@ -581,7 +581,7 @@ public PagedIterable<Integer> getVersions(String groupName, String schemaName, C
581581
public Mono<ResponseBase<SchemasGetSchemaVersionHeaders, Flux<ByteBuffer>>> getSchemaVersionWithResponseAsync(
582582
String groupName, String schemaName, int schemaVersion) {
583583
final String accept =
584-
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8";
584+
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8, text/vnd.ms.protobuf";
585585
return FluxUtil.withContext(
586586
context ->
587587
service.getSchemaVersion(
@@ -614,7 +614,7 @@ public Mono<ResponseBase<SchemasGetSchemaVersionHeaders, Flux<ByteBuffer>>> getS
614614
public Mono<ResponseBase<SchemasGetSchemaVersionHeaders, Flux<ByteBuffer>>> getSchemaVersionWithResponseAsync(
615615
String groupName, String schemaName, int schemaVersion, Context context) {
616616
final String accept =
617-
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8";
617+
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8, text/vnd.ms.protobuf";
618618
return service.getSchemaVersion(
619619
this.client.getEndpoint(),
620620
groupName,
@@ -686,7 +686,7 @@ public Mono<Flux<ByteBuffer>> getSchemaVersionAsync(
686686
public ResponseBase<SchemasGetSchemaVersionHeaders, BinaryData> getSchemaVersionWithResponse(
687687
String groupName, String schemaName, int schemaVersion, Context context) {
688688
final String accept =
689-
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8";
689+
"application/json; serialization=Avro, application/json; serialization=json, text/plain; charset=utf-8, text/vnd.ms.protobuf";
690690
return service.getSchemaVersionSync(
691691
this.client.getEndpoint(),
692692
groupName,

sdk/schemaregistry/azure-data-schemaregistry/swagger/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ autorest --java --use:@autorest/java@4.0.x
1616

1717
### Code generation settings
1818
```yaml
19-
input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/19aa8ab5d14b22bdeb67eab31c65b47c5380fd06/specification/schemaregistry/data-plane/Microsoft.EventHub/stable/2022-10/schemaregistry.json
19+
use: '@autorest/java@4.1.19'
20+
input-file: https://github.com/Azure/azure-rest-api-specs/blob/84d7b8f05a60d12922341578434b512540563850/specification/schemaregistry/data-plane/Microsoft.EventHub/stable/2023-07-01/schemaregistry.json
2021
java: true
2122
output-folder: ../
2223
namespace: com.azure.data.schemaregistry

0 commit comments

Comments
 (0)