Add Equals and HashCode methods for better comparison.

Closes spring-projectsgh-16394

Signed-off-by: Maximilian Klose <[email protected]>

Author: GrmpfNarf

Diff for: oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -188,6 +188,71 @@ public static Builder authorizationCode() {
 		return new Builder(AuthorizationGrantType.AUTHORIZATION_CODE);
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null || this.getClass() != obj.getClass()) {
+			return false;
+		}
+		OAuth2AuthorizationRequest that = (OAuth2AuthorizationRequest) obj;
+
+		if (!this.authorizationUri.equals(that.authorizationUri)) {
+			return false;
+		}
+
+		if (!this.authorizationGrantType.equals(that.authorizationGrantType)) {
+			return false;
+		}
+
+		if (this.responseType != that.responseType) {
+			return false;
+		}
+
+		if (!this.clientId.equals(that.clientId)) {
+			return false;
+		}
+
+		if (!this.redirectUri.equals(that.redirectUri)) {
+			return false;
+		}
+
+		if (!this.scopes.equals(that.scopes)) {
+			return false;
+		}
+
+		if (!this.state.equals(that.state)) {
+			return false;
+		}
+
+		if (!this.additionalParameters.equals(that.additionalParameters)) {
+			return false;
+		}
+
+		if (!this.authorizationRequestUri.equals(that.authorizationRequestUri)) {
+			return false;
+		}
+
+		return this.attributes.equals(that.attributes);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = this.authorizationUri.hashCode();
+		result = 31 * result + this.clientId.hashCode();
+		result = 31 * result + ((this.authorizationGrantType == null) ? 0 : this.authorizationGrantType.hashCode());
+		result = 31 * result + ((this.responseType == null) ? 0 : this.responseType.hashCode());
+		result = 31 * result + ((this.redirectUri == null) ? 0 : this.redirectUri.hashCode());
+		result = 31 * result + ((this.scopes == null) ? 0 : this.scopes.hashCode());
+		result = 31 * result + ((this.state == null) ? 0 : this.state.hashCode());
+		result = 31 * result + ((this.additionalParameters == null) ? 0 : this.additionalParameters.hashCode());
+		result = 31 * result + ((this.authorizationRequestUri == null) ? 0 : this.authorizationRequestUri.hashCode());
+		result = 31 * result + ((this.attributes == null) ? 0 : this.attributes.hashCode());
+
+		return result;
+	}
+
 	/**
 	 * Returns a new {@link Builder}, initialized with the values from the provided
 	 * {@code authorizationRequest}.

Diff for: oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequestTests.java

@@ -18,6 +18,7 @@
 
 import java.net.URI;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -28,8 +29,7 @@
 
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.*;
 
 /**
  * Tests for {@link OAuth2AuthorizationRequest}.
@@ -365,4 +365,45 @@ public void buildWhenAdditionalParametersContainsNullThenAuthorizationRequestUri
 					+ "item1=null&item2=value2");
 	}
 
+	@Test
+	public void equalsTrueTest() {
+		OAuth2AuthorizationRequest authorizationRequest1 = TestOAuth2AuthorizationRequests.request()
+				.authorizationRequestUri("http://example.com")
+				.additionalParameters(Collections.singletonMap("someAdditionalParameterKey", "someAdditionalParameterValue"))
+				.parameters(parametersMap -> parametersMap.put("someParameterKey", "someParameterValue"))
+				.scope("someScope")
+				.build();
+
+		OAuth2AuthorizationRequest authorizationRequest2 = TestOAuth2AuthorizationRequests.request()
+				.authorizationRequestUri("http://example.com")
+				.additionalParameters(Collections.singletonMap("someAdditionalParameterKey", "someAdditionalParameterValue"))
+				.parameters(parametersMap -> parametersMap.put("someParameterKey", "someParameterValue"))
+				.scope("someScope")
+				.build();
+
+		assertThat(authorizationRequest1).isEqualTo(authorizationRequest2);
+	}
+
+	@Test
+	public void hashCodeTest() {
+		OAuth2AuthorizationRequest authorizationRequest1 = TestOAuth2AuthorizationRequests.request()
+				.authorizationRequestUri("http://example.com")
+				.additionalParameters(Collections.singletonMap("someAdditionalParameterKey", "someAdditionalParameterValue"))
+				.parameters(parametersMap -> parametersMap.put("someParameterKey", "someParameterValue"))
+				.scope("someScope")
+				.build();
+
+		OAuth2AuthorizationRequest authorizationRequest2 = TestOAuth2AuthorizationRequests.request()
+				.authorizationRequestUri("http://example.com")
+				.additionalParameters(Collections.singletonMap("someAdditionalParameterKey", "someAdditionalParameterValue"))
+				.parameters(parametersMap -> parametersMap.put("someParameterKey", "someParameterValue"))
+				.scope("someScope")
+				.build();
+
+		int authorizationRequest1HashCode = authorizationRequest1.hashCode();
+		int authorizationRequest2HashCode = authorizationRequest2.hashCode();
+
+		assertThat(authorizationRequest1HashCode).isEqualTo(authorizationRequest2HashCode);
+	}
+
 }