Update Java and .NET code samples

Author: antonsamson-msft

articles/communication-services/quickstarts/rooms/includes/rooms-quickstart-java.md

@@ -86,27 +86,36 @@ Create a new `RoomsClient` object that will be used to create new `rooms` and ma
 // Find your Communication Services resource in the Azure portal
 String connectionString = "<connection string>";
 RoomsClient roomsClient = new RoomsClientBuilder().connectionString(connectionString).buildClient();
+
+// Set communication user id
+static String USER_ID_1 = "<communication-user-id-1>";
+static String USER_ID_2 = "<communication-user-id-2>";
+static String USER_ID_3 = "<communication-user-id-3>";
 ```
 
 ### Create a room
 
 Create a new `room` with default properties using the code snippet below:
 
 ```java
-OffsetDateTime validFrom = OffsetDateTime.of(2022, 8, 1, 5, 30, 20, 10, ZoneOffset.UTC);
-OffsetDateTime validUntil = OffsetDateTime.of(2022, 9, 1, 5, 30, 20, 10, ZoneOffset.UTC);
-List<RoomParticipant> participants = new ArrayList<>();
+OffsetDateTime validFrom = OffsetDateTime.now();
+OffsetDateTime validUntil = validFrom.plusDays(30);
+RoomJoinPolicy roomJoinPolicy = RoomJoinPolicy.INVITE_ONLY;
+
+List<RoomParticipant> roomParticipants = new ArrayList<RoomParticipant>();
 
-// Add participants
-participants.add(new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier("<ACS User MRI identity 1>")).setRole(RoleType.ATTENDEE));
-participants.add(new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier("<ACS User MRI identity 2>")).setRole(RoleType.CONSUMER));
-participants.add(new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier("<ACS User MRI identity 3>")).setRole(RoleType.ATTENDEE));
+roomParticipants.add(new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier(USER_ID_1)).setRole(RoleType.CONSUMER));
+roomParticipants.add(new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier(USER_ID_2)).setRole(RoleType.ATTENDEE));
 
-RoomsClient roomsClient = createRoomsClientWithConnectionString();
-CommunicationRoom roomResult = roomsClient.createRoom(validFrom, validUntil, RoomJoinPolicy.INVITE_ONLY, participants);
+return roomsClient.createRoom(
+    validFrom,
+    validUntil,
+    roomJoinPolicy,
+    roomParticipants
+);
 ```
 
-Since `rooms` are server-side entities, you may want to keep track of and persist the `roomId` in the storage medium of choice. You can reference the `roomId` to view or update the properties of a `room` object. 
+Since `rooms` are server-side entities, you may want to keep track of and persist the `roomId` in the storage medium of choice. You can reference the `roomId` to view or update the properties of a `room` object.
 
 ### Get properties of an existing room
 
@@ -118,37 +127,22 @@ CommunicationRoom roomResult = roomsClient.getRoom(roomId);
 
 ### Update the lifetime of a room
 
-The lifetime of a `room` can be modified by issuing an update request for the `ValidFrom` and `ValidUntil` parameters. A room can be valid for a maximum of six months. 
+The lifetime of a `room` can be modified by issuing an update request for the `ValidFrom` and `ValidUntil` parameters. A room can be valid for a maximum of six months.
 
 ```java
-OffsetDateTime validFrom = OffsetDateTime.of(2022, 2, 1, 5, 30, 20, 10, ZoneOffset.UTC);
-OffsetDateTime validUntil = OffsetDateTime.of(2022, 5, 2, 5, 30, 20, 10, ZoneOffset.UTC);
+OffsetDateTime validFrom = OffsetDateTime.now().plusDays(1);
+OffsetDateTime validUntil = validFrom.plusDays(1);
 
-RoomRequest request = new RoomRequest();
-request.setValidFrom(validFrom);
-request.setValidUntil(validUntil);
-
-CommunicationRoom roomResult = roomsClient.updateRoom(roomId, request);
+CommunicationRoom roomResult = roomsClient.updateRoom(roomId, validFrom, validUntil);
 ```
 
-### Add new participants 
+### Add new participants
 
 To add new participants to a `room`, use the `addParticipants` method exposed on the client.
 
 ```java
-RoomParticipant user1 = new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier("<ACS User MRI identity 1>")).setRole(RoleType.ATTENDEE);
-RoomParticipant user2 = new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier("<ACS User MRI identity 2>")).setRole(RoleType.PRESENTER);
-RoomParticipant user3 = new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier("<ACS User MRI identity 3>")).setRole(RoleType.CONSUMER);
-
-List<RoomParticipant> participants = new ArrayList<RoomParticipant>(Arrays.asList(user1, user2, user3));
-RoomsClient roomsClient = createRoomsClientWithConnectionString();
-
-try {
-    ParticipantsCollection roomParticipants =  roomsClient.addParticipants("<Room Id>", participants);
-    System.out.println("No. of Participants in Room: " + roomParticipants.getParticipants().size());
-} catch (RuntimeException ex) {
-    System.out.println(ex);
-}
+RoomParticipant newParticipant = new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier(USER_ID_3)).setRole(RoleType.CONSUMER);
+ParticipantsCollection updatedParticipants = roomsClient.addParticipants(roomId, List.of(newParticipant));
 ```
 
 Participants that have been added to a `room` become eligible to join calls.
@@ -159,8 +153,8 @@ Retrieve the list of participants for an existing `room` by referencing the `roo
 
 ```java
 try {
-    ParticipantsCollection participants = roomsClient.listParticipants(roomId);
-    System.out.println("Participants: \n" + participants.getParticipants());
+     ParticipantsCollection participants = roomsClient.getParticipants(roomId);
+     System.out.println("Participants: \n" + listParticipantsAsString(participants.getParticipants()));
 } catch (Exception ex) {
     System.out.println(ex);
 }
@@ -171,22 +165,13 @@ try {
 To remove a participant from a `room` and revoke their access, use the `removeParticipants` method.
 
 ```java
-RoomParticipant user1 = new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier("<ACS User MRI identity 1>")).setRole(RoleType.ATTENDEE);
-RoomParticipant user2 = new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier("<ACS User MRI identity 2>")).setRole(RoleType.PRESENTER);
-
-List<RoomParticipant> participants = new ArrayList<RoomParticipant>(Arrays.asList(user1, user2));
-RoomsClient roomsClient = createRoomsClientWithConnectionString();
-
-try {
-    ParticipantsCollection roomParticipants =  roomsClient.removeParticipants("<Room Id>", participants);
-    System.out.println("Room Id: " + roomParticipants.getParticipants().size());
-} catch (RuntimeException ex) {
-System.out.println(ex);
-}
+RoomParticipant existingParticipant = new RoomParticipant().setCommunicationIdentifier(new CommunicationUserIdentifier(USER_ID_1));
+ParticipantsCollection updatedParticipants = roomsClient.removeParticipants(roomId, List.of(existingParticipant));
 ```
 
 ### Delete room
-If you wish to disband an existing `room`, you may issue an explicit delete request. All `rooms` and their associated resources are automatically deleted at the end of their validity plus a grace period. 
+
+If you wish to disband an existing `room`, you may issue an explicit delete request. All `rooms` and their associated resources are automatically deleted at the end of their validity plus a grace period.
 
 ```java
 roomsClient.deleteRoomWithResponse(roomId, Context.NONE);

articles/communication-services/quickstarts/rooms/includes/rooms-quickstart-net.md

@@ -47,56 +47,50 @@ Install the Azure Communication Rooms client library for .NET with [NuGet][https
 
 ```console
 dotnet add package Azure.Communication.Rooms
-``` 
+```
 
 ### Initialize a room client
 
 Create a new `RoomsClient` object that will be used to create new `rooms` and manage their properties and lifecycle. The connection string of your `Communications Service` will be used to authenticate the request. For more information on connection strings, see [this page](../../create-communication-resource.md#access-your-connection-strings-and-service-endpoints).
 
 ```csharp
 // Find your Communication Services resource in the Azure portal
-var connectionString = "<connection_string>"; 
-RoomsClient roomsClient = new RoomsClient(connectionString);
+var connectionString = "<connection_string>";
+RoomsClient roomsCollection = new RoomsClient(connectionString);
 ```
 
 ### Create a room
 
 Create a new `room` with default properties using the code snippet below:
 
 ```csharp
-RoomRequest request = new RoomRequest();
-Response<RoomModel> createRoomResponse = await roomsClient.CreateRoomAsync(validFrom, validUntil, RoomJoinPolicy.InviteOnly, participants);
-RoomModel createCommunicationRoom = createRoomResponse.Value;
+CommunicationRoom createdRoom = await RoomCollection.CreateRoomAsync(validFrom, validUntil, RoomJoinPolicy.InviteOnly, roomParticipants, cancellationToken);
+string roomId = createdRoom.Id;
 ```
 
-Since `rooms` are server-side entities, you may want to keep track of and persist the `roomId` in the storage medium of choice. You can reference the `roomId` to view or update the properties of a `room` object. 
+Since `rooms` are server-side entities, you may want to keep track of and persist the `roomId` in the storage medium of choice. You can reference the `roomId` to view or update the properties of a `room` object.
 
 ### Get properties of an existing room
 
 Retrieve the details of an existing `room` by referencing the `roomId`:
 
 ```csharp
-Response<RoomModel> getRoomResponse = await roomsClient.GetRoomAsync(createdRoomId)
-RoomModel getCommunicationRoom = getRoomResponse.Value;
+CommunicationRoom getRoomResponse = await roomsClient.GetRoomAsync(roomId);
 ```
 
 ### Update the lifetime of a room
 
-The lifetime of a `room` can be modified by issuing an update request for the `ValidFrom` and `ValidUntil` parameters. A room can be valid for a maximum of six months. 
+The lifetime of a `room` can be modified by issuing an update request for the `ValidFrom` and `ValidUntil` parameters. A room can be valid for a maximum of six months.
 
 ```csharp
-var validFrom = new DateTime(2022, 05, 01, 00, 00, 00, DateTimeKind.Utc);
-var validUntil = validFrom.AddDays(1);
+DateTimeOffset  validFrom = new DateTime(2022, 05, 01, 00, 00, 00, DateTimeKind.Utc);
+DateTimeOffset  validUntil = validFrom.AddDays(1);
 
-UpdateRoomRequest updateRoomRequest = new UpdateRoomRequest();
-updateRoomRequest.ValidFrom = validFrom;
-updateRoomRequest.ValidUntil = validUntil;
+CommunicationRoom updatedRoom = await RoomCollection.UpdateRoomAsync(roomId, validFrom, validUntil, RoomJoinPolicy.InviteOnly, null, cancellationToken);
 
-Response<CommunicationRoom> updateRoomResponse = await roomsClient.UpdateRoomAsync(roomId, updateRoomRequest);
-CommunicationRoom updateCommunicationRoom = updateRoomResponse.Value;
-``` 
+```
 
-### Add new participants 
+### Add new participants
 
 To add new participants to a `room`, use the `AddParticipantsAsync` method exposed on the client.
 
@@ -105,13 +99,12 @@ var communicationUser1 = "<CommunicationUserId1>";
 var communicationUser2 = "<CommunicationUserId2>";
 var communicationUser3 = "<CommunicationUserId3>";
 
-List<RoomParticipant> toAddCommunicationUsers = new List<RoomParticipant>();
-toAddCommunicationUsers.Add(new RoomParticipant(new CommunicationUserIdentifier(communicationUser1), "Presenter"));
-toAddCommunicationUsers.Add(new RoomParticipant(new CommunicationUserIdentifier(communicationUser2), "Attendee"));
-toAddCommunicationUsers.Add(new RoomParticipant(new CommunicationUserIdentifier(communicationUser3), "Attendee"));
+List<RoomParticipant> participants = new List<RoomParticipant>();
+participants.Add(new RoomParticipant(new CommunicationUserIdentifier(communicationUser1), "Presenter"));
+participants.Add(new RoomParticipant(new CommunicationUserIdentifier(communicationUser2), "Attendee"));
+participants.Add(new RoomParticipant(new CommunicationUserIdentifier(communicationUser3), "Attendee"));
 
-Response<RoomModel> addParticipantResponse = await roomsClient.AddParticipantsAsync(createdRoomId, toAddCommunicationUsers);
-ParticipantsCollection addedParticipantsRoom = addParticipantResponse.Value;
+var addParticipantsResult = await RoomCollection.AddParticipantsAsync(roomId, participants);
 ```
 
 Participants that have been added to a `room` become eligible to join calls.
@@ -121,8 +114,7 @@ Participants that have been added to a `room` become eligible to join calls.
 Retrieve the list of participants for an existing `room` by referencing the `roomId`:
 
 ```csharp
-Response<ParticipantsCollection> getParticipantsResponse = await roomsClient.GetParticipantsAsync(roomId);
-ParticipantsCollection roomParticipants = getParticipantsResponse.Value;
+ParticipantsCollection existingParticipants = await RoomCollection.GetParticipantsAsync(roomId);
 ```
 
 ### Remove participants
@@ -132,18 +124,17 @@ To remove a participant from a `room` and revoke their access, use the `RemovePa
 ```csharp
 var communicationUser = "<CommunicationUserId1>";
 
- List<CommunicationIdentifier> toRemoveCommunicationUsers = new List<CommunicationIdentifier>();
-toRemoveCommunicationUsers.Add(new CommunicationUserIdentifier(communicationUser));
+List<CommunicationIdentifier> participants = new List<CommunicationIdentifier>();
+participants.Add(new CommunicationUserIdentifier(communicationUser));
 
-Response<RoomModel> removeParticipantResponse = await roomsClient.RemoveParticipantsAsync(createdRoomId, toRemoveCommunicationUsers);
-ParticipantsCollection removeParticipantsRoom = removeParticipantResponse.Value;
+var removeParticipantsResult = await RoomCollection.RemoveParticipantsAsync(roomId, participants);
 ```
 
 ### Delete room
-If you wish to disband an existing `room`, you may issue an explicit delete request. All `rooms` and their associated resources are automatically deleted at the end of their validity plus a grace period. 
+If you wish to disband an existing `room`, you may issue an explicit delete request. All `rooms` and their associated resources are automatically deleted at the end of their validity plus a grace period.
 
 ```csharp
-Response deleteRoomResponse = await roomsClient.DeleteRoomAsync(createdRoomId);
+Response deleteRoomResponse = await RoomCollection.DeleteRoomAsync(createdRoomId);
 ```
 
 ## Reference documentation