Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wps from main to release/azure-core/1.23.0, set version to 1.0.0 #25616

Merged
merged 7 commits into from
Nov 23, 2021
Merged

wps from main to release/azure-core/1.23.0, set version to 1.0.0 #25616

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
37ef374
code from main
weidongxu-microsoft Nov 23, 2021
2bda49c
Delete AzureWebPubSubServiceRestAPIImpl.java
weidongxu-microsoft Nov 23, 2021
c018924
Merge branch 'release/azure-core/1.23.0' into wps_1.23.0
weidongxu-microsoft Nov 23, 2021
8a9e308
1.0.0
weidongxu-microsoft Nov 23, 2021
a8970e5
update readme
weidongxu-microsoft Nov 23, 2021
48b231d
update changelog
weidongxu-microsoft Nov 23, 2021
3031f90
Update CHANGELOG.md
weidongxu-microsoft Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/jacoco-test-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-webpubsub</artifactId>
<version>1.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-messaging-webpubsub;current} -->
<version>1.0.0</version> <!-- {x-version-update;com.azure:azure-messaging-webpubsub;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ com.azure:azure-messaging-eventhubs-track2-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-servicebus;7.5.0;7.6.0-beta.1
com.azure:azure-messaging-servicebus-track1-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-servicebus-track2-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-webpubsub;1.0.0-beta.6;1.0.0-beta.7
com.azure:azure-messaging-webpubsub;1.0.0-beta.6;1.0.0
com.azure:azure-mixedreality-authentication;1.1.3;1.2.0-beta.1
com.azure:azure-mixedreality-remoterendering;1.1.2;1.2.0-beta.1
com.azure:azure-monitor-opentelemetry-exporter;1.0.0-beta.5;1.0.0-beta.6
Expand Down
10 changes: 4 additions & 6 deletions sdk/webpubsub/azure-messaging-webpubsub/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# Release History

## 1.0.0-beta.7 (Unreleased)
## 1.0.0 (2021-11-23)

### Features Added

### Breaking Changes
### Other Changes
weidongxu-microsoft marked this conversation as resolved.
Show resolved Hide resolved

### Bugs Fixed
#### Dependency Updates

### Other Changes
- Upgraded `azure-core` to `1.23.0`.

## 1.0.0-beta.6 (2021-11-11)

Expand Down
2 changes: 1 addition & 1 deletion sdk/webpubsub/azure-messaging-webpubsub/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Details about the terms used here are described in [Key concepts](#key-concepts)
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-webpubsub</artifactId>
<version>1.0.0-beta.6</version>
<version>1.0.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion sdk/webpubsub/azure-messaging-webpubsub/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-messaging-webpubsub</artifactId>
<version>1.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-messaging-webpubsub;current} -->
<version>1.0.0</version> <!-- {x-version-update;com.azure:azure-messaging-webpubsub;current} -->

<name>Microsoft Azure client library for Azure Web Pub Sub Service</name>
<description>This package contains the Microsoft Azure Web Pub Sub library.</description>
Expand Down
8 changes: 4 additions & 4 deletions ...-webpubsub/src/main/java/com/azure/messaging/webpubsub/WebPubSubServiceClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import com.azure.core.util.CoreUtils;
import com.azure.core.util.UrlBuilder;
import com.azure.core.util.logging.ClientLogger;
import com.azure.messaging.webpubsub.implementation.AzureWebPubSubServiceRestAPIImpl;
import com.azure.messaging.webpubsub.implementation.AzureWebPubSubServiceRestApiImpl;

import java.net.MalformedURLException;
import java.net.URL;
Expand Down Expand Up @@ -322,7 +322,7 @@ public WebPubSubServiceClientBuilder serviceVersion(final WebPubSubServiceVersio
}


private AzureWebPubSubServiceRestAPIImpl buildInnerClient() {
private AzureWebPubSubServiceRestApiImpl buildInnerClient() {
if (hub == null || hub.isEmpty()) {
logger.logThrowableAsError(
new IllegalStateException("hub is not valid - it must be non-null and non-empty."));
Expand Down Expand Up @@ -365,7 +365,7 @@ private AzureWebPubSubServiceRestAPIImpl buildInnerClient() {


if (pipeline != null) {
return new AzureWebPubSubServiceRestAPIImpl(pipeline, endpoint, serviceVersion);
return new AzureWebPubSubServiceRestApiImpl(pipeline, endpoint, serviceVersion);
}

// Global Env configuration store
Expand Down Expand Up @@ -415,7 +415,7 @@ private AzureWebPubSubServiceRestAPIImpl buildInnerClient() {
.policies(policies.toArray(new HttpPipelinePolicy[0]))
.httpClient(httpClient)
.build();
return new AzureWebPubSubServiceRestAPIImpl(buildPipeline, endpoint, serviceVersion);
return new AzureWebPubSubServiceRestApiImpl(buildPipeline, endpoint, serviceVersion);
}


Expand Down
16 changes: 8 additions & 8 deletions ...ion/AzureWebPubSubServiceRestAPIImpl.java → ...ion/AzureWebPubSubServiceRestApiImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import com.azure.core.util.serializer.SerializerAdapter;
import com.azure.messaging.webpubsub.WebPubSubServiceVersion;

/** Initializes a new instance of the AzureWebPubSubServiceRestAPI type. */
public final class AzureWebPubSubServiceRestAPIImpl {
/** Initializes a new instance of the AzureWebPubSubServiceRestApi type. */
public final class AzureWebPubSubServiceRestApiImpl {
/** HTTP or HTTPS endpoint for the Web PubSub service instance. */
private final String endpoint;

Expand Down Expand Up @@ -88,12 +88,12 @@ public WebPubSubsImpl getWebPubSubs() {
}

/**
* Initializes an instance of AzureWebPubSubServiceRestAPI client.
* Initializes an instance of AzureWebPubSubServiceRestApi client.
*
* @param endpoint HTTP or HTTPS endpoint for the Web PubSub service instance.
* @param serviceVersion Service version.
*/
public AzureWebPubSubServiceRestAPIImpl(String endpoint, WebPubSubServiceVersion serviceVersion) {
public AzureWebPubSubServiceRestApiImpl(String endpoint, WebPubSubServiceVersion serviceVersion) {
this(
new HttpPipelineBuilder()
.policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy())
Expand All @@ -104,26 +104,26 @@ public AzureWebPubSubServiceRestAPIImpl(String endpoint, WebPubSubServiceVersion
}

/**
* Initializes an instance of AzureWebPubSubServiceRestAPI client.
* Initializes an instance of AzureWebPubSubServiceRestApi client.
*
* @param httpPipeline The HTTP pipeline to send requests through.
* @param endpoint HTTP or HTTPS endpoint for the Web PubSub service instance.
* @param serviceVersion Service version.
*/
public AzureWebPubSubServiceRestAPIImpl(
public AzureWebPubSubServiceRestApiImpl(
HttpPipeline httpPipeline, String endpoint, WebPubSubServiceVersion serviceVersion) {
this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, serviceVersion);
}

/**
* Initializes an instance of AzureWebPubSubServiceRestAPI client.
* Initializes an instance of AzureWebPubSubServiceRestApi client.
*
* @param httpPipeline The HTTP pipeline to send requests through.
* @param serializerAdapter The serializer to serialize an object into a string.
* @param endpoint HTTP or HTTPS endpoint for the Web PubSub service instance.
* @param serviceVersion Service version.
*/
public AzureWebPubSubServiceRestAPIImpl(
public AzureWebPubSubServiceRestApiImpl(
HttpPipeline httpPipeline,
SerializerAdapter serializerAdapter,
String endpoint,
Expand Down
17 changes: 8 additions & 9 deletions ...-webpubsub/src/main/java/com/azure/messaging/webpubsub/implementation/HealthApisImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

package com.azure.messaging.webpubsub.implementation;

import com.azure.core.annotation.ExpectedResponses;
import com.azure.core.annotation.Head;
import com.azure.core.annotation.Host;
import com.azure.core.annotation.HostParam;
Expand All @@ -25,27 +26,28 @@ public final class HealthApisImpl {
private final HealthApisService service;

/** The service client containing this operation class. */
private final AzureWebPubSubServiceRestAPIImpl client;
private final AzureWebPubSubServiceRestApiImpl client;

/**
* Initializes an instance of HealthApisImpl.
*
* @param client the instance of the service client containing this operation class.
*/
HealthApisImpl(AzureWebPubSubServiceRestAPIImpl client) {
HealthApisImpl(AzureWebPubSubServiceRestApiImpl client) {
this.service =
RestProxy.create(HealthApisService.class, client.getHttpPipeline(), client.getSerializerAdapter());
this.client = client;
}

/**
* The interface defining all the services for AzureWebPubSubServiceRestAPIHealthApis to be used by the proxy
* The interface defining all the services for AzureWebPubSubServiceRestApiHealthApis to be used by the proxy
* service to perform REST calls.
*/
@Host("{Endpoint}")
@ServiceInterface(name = "AzureWebPubSubServic")
public interface HealthApisService {
@Head("/api/health")
@ExpectedResponses({200})
Mono<Response<Void>> getServiceStatus(
@HostParam("Endpoint") String endpoint,
@QueryParam("api-version") String apiVersion,
Expand All @@ -65,8 +67,7 @@ Mono<Response<Void>> getServiceStatus(
* </table>
*
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @throws HttpResponseException thrown if status code is 400 or above, if throwOnError in requestOptions is not
* false.
* @throws HttpResponseException thrown if the request is rejected by server.
* @return service health status.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Expand All @@ -93,8 +94,7 @@ public Mono<Response<Void>> getServiceStatusWithResponseAsync(RequestOptions req
*
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @param context The context to associate with this operation.
* @throws HttpResponseException thrown if status code is 400 or above, if throwOnError in requestOptions is not
* false.
* @throws HttpResponseException thrown if the request is rejected by server.
* @return service health status.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Expand All @@ -115,8 +115,7 @@ public Mono<Response<Void>> getServiceStatusWithResponseAsync(RequestOptions req
* </table>
*
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
* @throws HttpResponseException thrown if status code is 400 or above, if throwOnError in requestOptions is not
* false.
* @throws HttpResponseException thrown if the request is rejected by server.
* @return service health status.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Expand Down