Skip to content

Commit ceb03b0

Browse files
minnieliuMinnie Liu
andauthored
[Communication] - Common - CommunicationCloudEnvironment Fix (#635)
* Rename token to initialToken * Revert * Update CommunicationCloudEnvironment * Address comments * Address comments * Address comments * Address comments Co-authored-by: Minnie Liu <[email protected]>
1 parent 115f92d commit ceb03b0

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

sdk/communication/azure-communication-chat/src/main/java/com/azure/android/communication/chat/CommunicationIdentifierSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static CommunicationIdentifier deserialize(CommunicationIdentifierModel i
5151
return new MicrosoftTeamsUserIdentifier(teamsUserIdentifierModel.getUserId(),
5252
teamsUserIdentifierModel.isAnonymous())
5353
.setRawId(rawId)
54-
.setCloudEnvironment(new CommunicationCloudEnvironment(teamsUserIdentifierModel.getCloud().toString()));
54+
.setCloudEnvironment(CommunicationCloudEnvironment.fromString(teamsUserIdentifierModel.getCloud().toString()));
5555
}
5656

5757
Objects.requireNonNull(rawId);

sdk/communication/azure-communication-common/src/main/java/com/azure/android/communication/common/CommunicationCloudEnvironment.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/**
88
* The cloud that the identifier belongs to.
99
*/
10-
public final class CommunicationCloudEnvironment{
10+
public final class CommunicationCloudEnvironment {
1111
private static final String PUBLIC_VALUE = "public";
1212
private static final String DOD_VALUE = "dod";
1313
private static final String GCCH_VALUE = "gcch";
@@ -23,20 +23,30 @@ public CommunicationCloudEnvironment(String environmentValue) {
2323
this.environmentValue = environmentValue;
2424
}
2525

26+
/**
27+
* Sets an environment value from a String
28+
* @param environmentValue string representation of the environment value
29+
* @return CommunicationCloudEnvironment object itself
30+
*/
31+
public final static CommunicationCloudEnvironment fromString(String environmentValue) {
32+
Objects.requireNonNull(environmentValue);
33+
return new CommunicationCloudEnvironment(environmentValue);
34+
}
35+
2636
/**
2737
* Represent Azure public cloud
2838
*/
29-
public static final CommunicationCloudEnvironment PUBLIC = new CommunicationCloudEnvironment(PUBLIC_VALUE);
39+
public static final CommunicationCloudEnvironment PUBLIC = CommunicationCloudEnvironment.fromString(PUBLIC_VALUE);
3040

3141
/**
3242
* Represent Azure Dod cloud
3343
*/
34-
public static final CommunicationCloudEnvironment DOD = new CommunicationCloudEnvironment(DOD_VALUE);
44+
public static final CommunicationCloudEnvironment DOD = CommunicationCloudEnvironment.fromString(DOD_VALUE);
3545

3646
/**
3747
* Represent Azure Gcch cloud
3848
*/
39-
public static final CommunicationCloudEnvironment GCCH = new CommunicationCloudEnvironment(GCCH_VALUE);
49+
public static final CommunicationCloudEnvironment GCCH = CommunicationCloudEnvironment.fromString(GCCH_VALUE);
4050

4151
@Override
4252
public boolean equals(Object that) {

0 commit comments

Comments
 (0)