Skip to content

Commit 5c92be5

Browse files
authored
Web PubSub service SDK Remove hub name parameter (Azure#45860)
`hub` name should be a client parameter
1 parent 08ab5cb commit 5c92be5

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

sdk/webpubsub/azure-messaging-webpubsub/src/main/java/com/azure/messaging/webpubsub/WebPubSubServiceAsyncClient.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.azure.messaging.webpubsub.models.GetClientAccessTokenOptions;
2929
import com.azure.messaging.webpubsub.models.WebPubSubClientAccessToken;
3030
import com.azure.messaging.webpubsub.models.WebPubSubContentType;
31-
import com.azure.messaging.webpubsub.models.WebPubSubGroupMember;
31+
import com.azure.messaging.webpubsub.models.WebPubSubGroupConnection;
3232
import com.azure.messaging.webpubsub.models.WebPubSubPermission;
3333

3434
import reactor.core.publisher.Flux;
@@ -441,7 +441,6 @@ public Mono<Void> addConnectionsToGroups(List<String> groups, String filter) {
441441
* }
442442
* </pre>
443443
*
444-
* @param hub Target hub name, which should start with alphabetic characters and only contain alpha-numeric characters or underscore.
445444
* @param group Target group name, whose length should be greater than 0 and less than 1025.
446445
* @param requestOptions The options to configure the HTTP request before HTTP client sends it.
447446
* @throws HttpResponseException thrown if the request is rejected by server.
@@ -451,8 +450,7 @@ public Mono<Void> addConnectionsToGroups(List<String> groups, String filter) {
451450
* @return represents a page of elements as a LIST REST API result as paginated response with {@link PagedFlux}.
452451
*/
453452
@ServiceMethod(returns = ReturnType.COLLECTION)
454-
public PagedFlux<WebPubSubGroupMember> listConnectionsInGroup(String hub, String group,
455-
RequestOptions requestOptions) {
453+
public PagedFlux<WebPubSubGroupConnection> listConnectionsInGroup(String group, RequestOptions requestOptions) {
456454
PagedFlux<BinaryData> binaryDataPagedFlux
457455
= this.serviceClient.listConnectionsInGroupAsync(hub, group, requestOptions);
458456

@@ -464,7 +462,7 @@ public PagedFlux<WebPubSubGroupMember> listConnectionsInGroup(String hub, String
464462
pagedResponse.getStatusCode(), pagedResponse.getHeaders(),
465463
pagedResponse.getValue()
466464
.stream()
467-
.map(bd -> bd.toObject(WebPubSubGroupMember.class))
465+
.map(bd -> bd.toObject(WebPubSubGroupConnection.class))
468466
.collect(java.util.stream.Collectors.toList()),
469467
pagedResponse.getContinuationToken(), null));
470468
});

sdk/webpubsub/azure-messaging-webpubsub/src/main/java/com/azure/messaging/webpubsub/WebPubSubServiceClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.azure.messaging.webpubsub.models.GetClientAccessTokenOptions;
2525
import com.azure.messaging.webpubsub.models.WebPubSubClientAccessToken;
2626
import com.azure.messaging.webpubsub.models.WebPubSubContentType;
27-
import com.azure.messaging.webpubsub.models.WebPubSubGroupMember;
27+
import com.azure.messaging.webpubsub.models.WebPubSubGroupConnection;
2828
import com.azure.messaging.webpubsub.models.WebPubSubPermission;
2929

3030
import java.util.List;
@@ -690,8 +690,8 @@ public Response<Void> closeUserConnectionsWithResponse(String userId, RequestOpt
690690
* @return represents a page of elements as a LIST REST API result as paginated response with {@link PagedIterable}.
691691
*/
692692
@ServiceMethod(returns = ReturnType.COLLECTION)
693-
public PagedIterable<WebPubSubGroupMember> listConnectionsInGroup(String group, RequestOptions requestOptions) {
693+
public PagedIterable<WebPubSubGroupConnection> listConnectionsInGroup(String group, RequestOptions requestOptions) {
694694
return this.serviceClient.listConnectionsInGroup(hub, group, requestOptions)
695-
.mapPage(binaryData -> binaryData.toObject(WebPubSubGroupMember.class));
695+
.mapPage(binaryData -> binaryData.toObject(WebPubSubGroupConnection.class));
696696
}
697697
}

sdk/webpubsub/azure-messaging-webpubsub/src/main/java/com/azure/messaging/webpubsub/models/WebPubSubGroupMember.java renamed to sdk/webpubsub/azure-messaging-webpubsub/src/main/java/com/azure/messaging/webpubsub/models/WebPubSubGroupConnection.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Represents a connection in a group.
1616
*/
1717
@Immutable
18-
public final class WebPubSubGroupMember implements JsonSerializable<WebPubSubGroupMember> {
18+
public final class WebPubSubGroupConnection implements JsonSerializable<WebPubSubGroupConnection> {
1919

2020
/**
2121
* The ID of a connection.
@@ -33,7 +33,7 @@ public final class WebPubSubGroupMember implements JsonSerializable<WebPubSubGro
3333
* @param connectionId the connectionId value to set.
3434
* @param userId the userId value to set.
3535
*/
36-
private WebPubSubGroupMember(String connectionId, String userId) {
36+
private WebPubSubGroupConnection(String connectionId, String userId) {
3737
this.connectionId = connectionId;
3838
this.userId = userId;
3939
}
@@ -78,7 +78,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
7878
* @throws IllegalStateException If the deserialized JSON object was missing any required properties.
7979
* @throws IOException If an error occurs while reading the WebPubSubGroupMember.
8080
*/
81-
public static WebPubSubGroupMember fromJson(JsonReader jsonReader) throws IOException {
81+
public static WebPubSubGroupConnection fromJson(JsonReader jsonReader) throws IOException {
8282
return jsonReader.readObject(reader -> {
8383
String connectionId = null;
8484
String userId = null;
@@ -96,7 +96,7 @@ public static WebPubSubGroupMember fromJson(JsonReader jsonReader) throws IOExce
9696
if (connectionId == null) {
9797
throw new IllegalStateException("Missing required property: connectionId");
9898
}
99-
return new WebPubSubGroupMember(connectionId, userId);
99+
return new WebPubSubGroupConnection(connectionId, userId);
100100
});
101101
}
102102
}

sdk/webpubsub/azure-messaging-webpubsub/src/test/java/com/azure/messaging/webpubsub/WebPubSubServiceAsyncClientTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,7 @@ public void testListConnectionsInGroupAsync(int totalConnectionCount, int top, i
495495
options.addQueryParam("top", String.valueOf(top));
496496
}
497497

498-
PagedFlux<WebPubSubGroupMember> pagedFlux
499-
= client.listConnectionsInGroup(TestUtils.HUB_NAME, groupName, options);
498+
PagedFlux<WebPubSubGroupConnection> pagedFlux = client.listConnectionsInGroup(groupName, options);
500499
StepVerifier.create(pagedFlux.byPage()).thenConsumeWhile(page -> {
501500
actualPageCount[0]++;
502501
actualConnectionCount[0] += page.getValue().size();

sdk/webpubsub/azure-messaging-webpubsub/src/test/java/com/azure/messaging/webpubsub/WebPubSubServiceClientTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
import com.azure.core.http.rest.PagedIterable;
4545
import com.azure.core.http.rest.PagedResponse;
46-
import com.azure.messaging.webpubsub.models.WebPubSubGroupMember;
46+
import com.azure.messaging.webpubsub.models.WebPubSubGroupConnection;
4747

4848
public class WebPubSubServiceClientTests extends TestProxyTestBase {
4949

@@ -458,8 +458,8 @@ public void testListConnectionsInGroup(int totalConnectionCount, int top, int ma
458458
options.addQueryParam("top", String.valueOf(top));
459459
}
460460

461-
PagedIterable<WebPubSubGroupMember> pages = client.listConnectionsInGroup(groupName, options);
462-
for (PagedResponse<WebPubSubGroupMember> page : pages.iterableByPage()) {
461+
PagedIterable<WebPubSubGroupConnection> pages = client.listConnectionsInGroup(groupName, options);
462+
for (PagedResponse<WebPubSubGroupConnection> page : pages.iterableByPage()) {
463463
actualPageCount++;
464464
actualConnectionCount += page.getValue().size();
465465
}

0 commit comments

Comments
 (0)