Skip to content

Fix typo. Change MemberShip to Membership. #16734

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

Merged
chenrujun merged 1 commit into from
Oct 26, 2020
Merged

Fix typo. Change MemberShip to Membership. #16734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ve-directory/src/main/java/com/azure/spring/sample/aad/controller/TodoListController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import com.azure.spring.sample.aad.model.TodoItem;
import com.azure.spring.autoconfigure.aad.AADAuthenticationProperties;
import com.azure.spring.autoconfigure.aad.MemberShip;
import com.azure.spring.autoconfigure.aad.Membership;
import com.azure.spring.autoconfigure.aad.UserPrincipal;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
Expand Down Expand Up @@ -96,11 +96,11 @@ public ResponseEntity<String> updateTodoItem(@RequestBody TodoItem item) {
public ResponseEntity<String> deleteTodoItem(@PathVariable("id") int id,
PreAuthenticatedAuthenticationToken authToken) {
final UserPrincipal current = (UserPrincipal) authToken.getPrincipal();
MemberShip memberShip = new MemberShip(
Membership membership = new Membership(
"xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
MemberShip.OBJECT_TYPE_GROUP,
Membership.OBJECT_TYPE_GROUP,
"group1");
if (current.isMemberOf(aadAuthenticationProperties, memberShip.getDisplayName())) {
if (current.isMemberOf(aadAuthenticationProperties, membership.getDisplayName())) {
return todoList.stream()
.filter(i -> i.getID() == id)
.findFirst()
Expand Down
2 changes: 1 addition & 1 deletion ...ng-boot/src/main/java/com/azure/spring/autoconfigure/aad/AADAuthenticationProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public static class UserGroupProperties {
* Node is a UserGroup.
*/
@NotEmpty
private String value = MemberShip.OBJECT_TYPE_GROUP;
private String value = Membership.OBJECT_TYPE_GROUP;

/**
* Key of the JSON Node containing the Azure Object ID for the {@code UserGroup}.
Expand Down
14 changes: 7 additions & 7 deletions ...zure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AzureADGraphClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,22 @@ public Set<String> getGroups(String graphApiToken) throws IOException {
String aadMembershipRestUri = serviceEndpoints.getAadMembershipRestUri();
while (aadMembershipRestUri != null) {
String membershipsJson = getUserMemberships(graphApiToken, aadMembershipRestUri);
MemberShips memberShips = objectMapper.readValue(membershipsJson, MemberShips.class);
memberShips.getValue()
Memberships memberships = objectMapper.readValue(membershipsJson, Memberships.class);
memberships.getValue()
.stream()
.filter(this::isGroupObject)
.map(MemberShip::getDisplayName)
.map(Membership::getDisplayName)
.forEach(groups::add);
aadMembershipRestUri = Optional.of(memberShips)
.map(MemberShips::getOdataNextLink)
aadMembershipRestUri = Optional.of(memberships)
.map(Memberships::getOdataNextLink)
.map(this::getUrlStringFromODataNextLink)
.orElse(null);
}
return groups;
}

private boolean isGroupObject(final MemberShip memberShip) {
return memberShip.getObjectType().equals(aadAuthenticationProperties.getUserGroup().getValue());
private boolean isGroupObject(final Membership membership) {
return membership.getObjectType().equals(aadAuthenticationProperties.getUserGroup().getValue());
}

/**
Expand Down
8 changes: 4 additions & 4 deletions .../spring/autoconfigure/aad/MemberShip.java → .../spring/autoconfigure/aad/Membership.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* Refs: https://docs.microsoft.com/en-us/previous-versions/azure/ad/graph/api/api-catalog
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class MemberShip implements Serializable {
public class Membership implements Serializable {
private static final long serialVersionUID = 9064197572478554735L;
public static final String OBJECT_TYPE_GROUP = "Group";

Expand All @@ -25,7 +25,7 @@ public class MemberShip implements Serializable {
private final String displayName;

@JsonCreator
public MemberShip(
public Membership(
@JsonProperty("objectId") @JsonAlias("id") String objectID,
@JsonProperty("objectType") @JsonAlias("@odata.type") String objectType,
@JsonProperty("displayName") String displayName) {
Expand All @@ -51,10 +51,10 @@ public boolean equals(Object o) {
if (o == this) {
return true;
}
if (!(o instanceof MemberShip)) {
if (!(o instanceof Membership)) {
return false;
}
final MemberShip group = (MemberShip) o;
final Membership group = (Membership) o;
return this.getDisplayName().equals(group.getDisplayName())
&& this.getObjectID().equals(group.getObjectID())
&& this.getObjectType().equals(group.getObjectType());
Expand Down
14 changes: 7 additions & 7 deletions ...spring/autoconfigure/aad/MemberShips.java → ...spring/autoconfigure/aad/Memberships.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
* Refs: https://docs.microsoft.com/en-us/previous-versions/azure/ad/graph/api/api-catalog
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class MemberShips {
public class Memberships {

private final String odataNextLink;
private final List<MemberShip> value;
private final List<Membership> value;

@JsonCreator
public MemberShips(
public Memberships(
@JsonProperty("odata.nextLink") String odataNextLink,
@JsonProperty("value") List<MemberShip> value) {
@JsonProperty("value") List<Membership> value) {
this.odataNextLink = odataNextLink;
this.value = value;
}
Expand All @@ -32,7 +32,7 @@ public String getOdataNextLink() {
return odataNextLink;
}

public List<MemberShip> getValue() {
public List<Membership> getValue() {
return value;
}

Expand All @@ -41,10 +41,10 @@ public boolean equals(Object o) {
if (o == this) {
return true;
}
if (!(o instanceof MemberShips)) {
if (!(o instanceof Memberships)) {
return false;
}
final MemberShips groups = (MemberShips) o;
final Memberships groups = (Memberships) o;
return this.getOdataNextLink().equals(groups.getOdataNextLink())
&& this.getValue().equals(groups.getValue());
}
Expand Down
10 changes: 5 additions & 5 deletions ...ing/autoconfigure/aad/MemberShipTest.java → ...ing/autoconfigure/aad/MembershipTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import org.junit.Assert;
import org.junit.Test;

public class MemberShipTest {
private static final MemberShip GROUP_1 = new MemberShip("12345", MemberShip.OBJECT_TYPE_GROUP, "test");
public class MembershipTest {
private static final Membership GROUP_1 = new Membership("12345", Membership.OBJECT_TYPE_GROUP, "test");

@Test
public void getDisplayName() {
Expand All @@ -16,7 +16,7 @@ public void getDisplayName() {

@Test
public void getObjectType() {
Assert.assertEquals(MemberShip.OBJECT_TYPE_GROUP, GROUP_1.getObjectType());
Assert.assertEquals(Membership.OBJECT_TYPE_GROUP, GROUP_1.getObjectType());
}

@Test
Expand All @@ -26,13 +26,13 @@ public void getObjectID() {

@Test
public void equals() {
final MemberShip group2 = new MemberShip("12345", MemberShip.OBJECT_TYPE_GROUP, "test");
final Membership group2 = new Membership("12345", Membership.OBJECT_TYPE_GROUP, "test");
Assert.assertEquals(GROUP_1, group2);
}

@Test
public void hashCodeTest() {
final MemberShip group2 = new MemberShip("12345", MemberShip.OBJECT_TYPE_GROUP, "test");
final Membership group2 = new Membership("12345", Membership.OBJECT_TYPE_GROUP, "test");
Assert.assertEquals(GROUP_1.hashCode(), group2.hashCode());
}
}