diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/src/main/java/com/azure/spring/sample/aad/controller/TodoListController.java b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/src/main/java/com/azure/spring/sample/aad/controller/TodoListController.java index f17af46fda28..4a2f001b5186 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/src/main/java/com/azure/spring/sample/aad/controller/TodoListController.java +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/src/main/java/com/azure/spring/sample/aad/controller/TodoListController.java @@ -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; @@ -96,11 +96,11 @@ public ResponseEntity updateTodoItem(@RequestBody TodoItem item) { public ResponseEntity 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() diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AADAuthenticationProperties.java b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AADAuthenticationProperties.java index 02cce164facd..9f02a1d0e583 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AADAuthenticationProperties.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AADAuthenticationProperties.java @@ -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}. diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AzureADGraphClient.java b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AzureADGraphClient.java index c85e50a73f85..9fe91e8ea36d 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AzureADGraphClient.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/AzureADGraphClient.java @@ -122,22 +122,22 @@ public Set 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()); } /** diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/MemberShip.java b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/Membership.java similarity index 91% rename from sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/MemberShip.java rename to sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/Membership.java index 043f9650f66f..9911094a1ab8 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/MemberShip.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/Membership.java @@ -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"; @@ -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) { @@ -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()); diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/MemberShips.java b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/Memberships.java similarity index 81% rename from sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/MemberShips.java rename to sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/Memberships.java index 6f6e3ba66925..08be48301dce 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/MemberShips.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/autoconfigure/aad/Memberships.java @@ -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 value; + private final List value; @JsonCreator - public MemberShips( + public Memberships( @JsonProperty("odata.nextLink") String odataNextLink, - @JsonProperty("value") List value) { + @JsonProperty("value") List value) { this.odataNextLink = odataNextLink; this.value = value; } @@ -32,7 +32,7 @@ public String getOdataNextLink() { return odataNextLink; } - public List getValue() { + public List getValue() { return value; } @@ -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()); } diff --git a/sdk/spring/azure-spring-boot/src/test/java/com/azure/spring/autoconfigure/aad/MemberShipTest.java b/sdk/spring/azure-spring-boot/src/test/java/com/azure/spring/autoconfigure/aad/MembershipTest.java similarity index 63% rename from sdk/spring/azure-spring-boot/src/test/java/com/azure/spring/autoconfigure/aad/MemberShipTest.java rename to sdk/spring/azure-spring-boot/src/test/java/com/azure/spring/autoconfigure/aad/MembershipTest.java index 0dafd27e0abd..8c27525c463e 100644 --- a/sdk/spring/azure-spring-boot/src/test/java/com/azure/spring/autoconfigure/aad/MemberShipTest.java +++ b/sdk/spring/azure-spring-boot/src/test/java/com/azure/spring/autoconfigure/aad/MembershipTest.java @@ -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() { @@ -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 @@ -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()); } }